From 45ca02258c64907ca7ac3d71eff64b130b401089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 25 Jan 2017 11:13:00 +0100 Subject: [PATCH] [REF] hr_contract and various: rename working_hours to resource_calendar_id --- addons/hr_contract/models/hr_contract.py | 5 ++++- addons/hr_contract/views/hr_contract_views.xml | 6 +++--- addons/hr_payroll/data/hr_payroll_demo.xml | 2 -- addons/hr_payroll/models/hr_payroll.py | 4 ++-- addons/hr_payroll/tests/common.py | 1 - addons/hr_payroll/views/hr_payroll_views.xml | 2 +- addons/hr_payroll_account/tests/test_hr_payroll_account.py | 1 - addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_demo.xml | 1 - 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/addons/hr_contract/models/hr_contract.py b/addons/hr_contract/models/hr_contract.py index 07b2f380fac..fe886173ce9 100644 --- a/addons/hr_contract/models/hr_contract.py +++ b/addons/hr_contract/models/hr_contract.py @@ -61,7 +61,9 @@ class Contract(models.Model): date_end = fields.Date('End Date') trial_date_start = fields.Date('Trial Start Date') trial_date_end = fields.Date('Trial End Date') - working_hours = fields.Many2one('resource.calendar', string='Working Schedule') + resource_calendar_id = fields.Many2one( + 'resource.calendar', 'Working Schedule', + default=lambda self: self.env['res.company']._company_default_get().resource_calendar_id.id) wage = fields.Float('Wage', digits=(16, 2), required=True, help="Basic Salary of the employee") advantages = fields.Text('Advantages') notes = fields.Text('Notes') @@ -80,6 +82,7 @@ class Contract(models.Model): if self.employee_id: self.job_id = self.employee_id.job_id self.department_id = self.employee_id.department_id + self.resource_calendar_id = self.employee_id.resource_calendar_id @api.constrains('date_start', 'date_end') def _check_dates(self): diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml index f54ecce28c7..583107efa38 100644 --- a/addons/hr_contract/views/hr_contract_views.xml +++ b/addons/hr_contract/views/hr_contract_views.xml @@ -55,7 +55,7 @@ - + @@ -115,7 +115,7 @@
-
- + @@ -147,7 +147,7 @@ - + diff --git a/addons/hr_payroll/data/hr_payroll_demo.xml b/addons/hr_payroll/data/hr_payroll_demo.xml index e025ed9faec..21e1b150abe 100644 --- a/addons/hr_payroll/data/hr_payroll_demo.xml +++ b/addons/hr_payroll/data/hr_payroll_demo.xml @@ -146,7 +146,6 @@ Default contract for marketing executives - @@ -158,7 +157,6 @@ This is Gilles Gravie's contract - diff --git a/addons/hr_payroll/models/hr_payroll.py b/addons/hr_payroll/models/hr_payroll.py index 82cff684b14..d06e44e1ff3 100644 --- a/addons/hr_payroll/models/hr_payroll.py +++ b/addons/hr_payroll/models/hr_payroll.py @@ -320,7 +320,7 @@ class HrPayslip(models.Model): res = [] #fill only if the contract as a working schedule linked - for contract in self.env['hr.contract'].browse(contract_ids).filtered(lambda contract: contract.working_hours): + for contract in self.env['hr.contract'].browse(contract_ids).filtered(lambda contract: contract.resource_calendar_id): attendances = { 'name': _("Normal Working Days paid at 100%"), 'sequence': 1, @@ -334,7 +334,7 @@ class HrPayslip(models.Model): day_to = fields.Datetime.from_string(date_to) nb_of_days = (day_to - day_from).days + 1 for day in range(0, nb_of_days): - working_hours_on_day = contract.working_hours.get_work_hours_count(day_from + timedelta(days=day), False, contract.employee_id.resource_id.id) + working_hours_on_day = contract.resource_calendar_id.get_work_hours_count(day_from + timedelta(days=day), False, contract.employee_id.resource_id.id) if working_hours_on_day: #the employee had to work leave_type = was_on_leave(contract.employee_id.id, day_from + timedelta(days=day)) diff --git a/addons/hr_payroll/tests/common.py b/addons/hr_payroll/tests/common.py index 89ed2ff22da..8df3e9f09b1 100644 --- a/addons/hr_payroll/tests/common.py +++ b/addons/hr_payroll/tests/common.py @@ -46,5 +46,4 @@ class TestPayslipBase(TransactionCase): 'type_id': self.ref('hr_contract.hr_contract_type_emp'), 'employee_id': self.richard_emp.id, 'struct_id': self.developer_pay_structure.id, - 'working_hours': self.ref('resource.resource_calendar_std') }) diff --git a/addons/hr_payroll/views/hr_payroll_views.xml b/addons/hr_payroll/views/hr_payroll_views.xml index 65d86afc89f..306af34cb1e 100644 --- a/addons/hr_payroll/views/hr_payroll_views.xml +++ b/addons/hr_payroll/views/hr_payroll_views.xml @@ -15,7 +15,7 @@ - + diff --git a/addons/hr_payroll_account/tests/test_hr_payroll_account.py b/addons/hr_payroll_account/tests/test_hr_payroll_account.py index 5b1b9a32d19..dfc5e7cbcc8 100644 --- a/addons/hr_payroll_account/tests/test_hr_payroll_account.py +++ b/addons/hr_payroll_account/tests/test_hr_payroll_account.py @@ -70,7 +70,6 @@ class TestHrPayrollAccount(common.TransactionCase): 'type_id': self.ref('hr_contract.hr_contract_type_emp'), 'employee_id': self.hr_employee_john.id, 'struct_id': self.hr_structure_softwaredeveloper.id, - 'working_hours': self.ref('resource.resource_calendar_std'), 'journal_id': self.ref('hr_payroll_account.expenses_journal'), }) diff --git a/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_demo.xml b/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_demo.xml index ca7fb2ffd56..f45f732dc99 100644 --- a/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_demo.xml +++ b/addons/l10n_be_hr_payroll/data/l10n_be_hr_payroll_demo.xml @@ -10,7 +10,6 @@ -