Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] contract_hourly_rate #139

Merged
merged 2 commits into from
Oct 15, 2015
Merged

[FIX] contract_hourly_rate #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6b5661
[FIX] contract_hourly_rate
Sep 25, 2015
917f2eb
Put monthly as default wage type
Oct 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion hr_contract_hourly_rate/i18n/fr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
6 changes: 6 additions & 0 deletions hr_contract_hourly_rate/i18n/hr_contract_hourly_rate.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions hr_contract_hourly_rate/models/hr_contract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 5 additions & 0 deletions hr_contract_multi_jobs/i18n/fr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
5 changes: 5 additions & 0 deletions hr_contract_multi_jobs/i18n/hr_contract_multi_jobs.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""