Merge pull request #139 from savoirfairelinux/8.0_fix_contract_hourly…

…_rate [FIX] contract_hourly_rate
OCA · Oct 15, 2015 · 38643d4 · 38643d4
2 parents ff502c1 + 917f2eb
commit 38643d4
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/hr_contract_hourly_rate/i18n/fr.po b/hr_contract_hourly_rate/i18n/fr.po
@@ -92,8 +92,14 @@ msgstr "Taux horaire"
 
 #. module: hr_contract_hourly_rate
 #: selection:hr.contract,salary_computation_method:0
+#: field:hr.contract.job,hourly_rate:0
 msgid "Hourly Wage"
-msgstr ""
+msgstr "Taux horaire"
+
+#. module: hr_contract_hourly_rate
+#: model:ir.model,name:hr_contract_hourly_rate.model_hr_hourly_rate
+msgid "Hourly rate"
+msgstr "Taux horaire"
 
 #. module: hr_contract_hourly_rate
 #: model:ir.model,name:hr_contract_hourly_rate.model_hr_hourly_rate
@@ -150,3 +156,8 @@ msgstr "Date de début"
 msgid ""
 "Whether to use the annual wage or an hourly rate for computation of payslip."
 msgstr "La méthode utilisée pour calculer le salaire d'un employé. Soit par taux horaire ou par salaire annuel."
+
+#. module: hr_contract_hourly_rate
+#: selection:hr.contract,salary_computation_method:0
+msgid "Monthly Wage"
+msgstr "Salaire mensuel"
diff --git a/hr_contract_hourly_rate/i18n/hr_contract_hourly_rate.pot b/hr_contract_hourly_rate/i18n/hr_contract_hourly_rate.pot
@@ -72,9 +72,15 @@ msgstr ""
 
 #. module: hr_contract_hourly_rate
 #: selection:hr.contract,salary_computation_method:0
+#: field:hr.contract.job,hourly_rate:0
 msgid "Hourly Rate"
 msgstr ""
 
+#. module: hr_contract_hourly_rate
+#: selection:hr.contract,salary_computation_method:0
+msgid "Monthly Wage"
+msgstr ""
+
 #. module: hr_contract_hourly_rate
 #: field:hr.contract.job,hourly_rate_class_id:0
 #: view:hr.hourly.rate.class:hr_contract_hourly_rate.view_hr_hourly_rate_class_filter

diff --git a/hr_contract_hourly_rate/models/hr_contract.py b/hr_contract_hourly_rate/models/hr_contract.py
@@ -26,12 +26,13 @@ class hr_contract(models.Model):
 
     salary_computation_method = fields.Selection(
         [('yearly', 'Annual Wage'),
-         ('monthly', 'Annual Wage'),
+         ('monthly', 'Monthly Wage'),
          ('hourly', 'Hourly Wage')],
         string='Salary Computation Method',
         help="Whether to use the annual wage or an hourly rate "
              "for computation of payslip.",
-        required=True, default='monthly')
+        required=True,
+        default='monthly')
 
     @api.multi
     def get_job_hourly_rate(self, date_from, date_to,

diff --git a/hr_contract_multi_jobs/i18n/fr.po b/hr_contract_multi_jobs/i18n/fr.po
@@ -81,3 +81,8 @@ msgstr "Poste Principal"
 msgid "Relational object between contract and job"
 msgstr "Relation entre un contrat et un poste"
 
+#. module: hr_contract_multi_jobs
+#: code:addons/hr_contract_multi_jobs/models/hr_contract.py:0
+#, python-format
+msgid "You must assign one and only one job position as main job position."
+msgstr "Vous devez indiquer un poste comme étant le poste principal."
diff --git a/hr_contract_multi_jobs/i18n/hr_contract_multi_jobs.pot b/hr_contract_multi_jobs/i18n/hr_contract_multi_jobs.pot
@@ -81,3 +81,8 @@ msgstr ""
 msgid "Relational object between contract and job"
 msgstr ""
 
+#. module: hr_contract_multi_jobs
+#: code:addons/hr_contract_multi_jobs/models/hr_contract.py:0
+#, python-format
+msgid "You must assign one and only one job position as main job position."
+msgstr ""