diff --git a/hr_payroll_hibou/models/hr_contract.py b/hr_payroll_hibou/models/hr_contract.py index 165c45ed..75a5460d 100644 --- a/hr_payroll_hibou/models/hr_contract.py +++ b/hr_payroll_hibou/models/hr_contract.py @@ -17,4 +17,4 @@ class HrContract(models.Model): def _get_contract_wage_field(self, work_type=None): if self.wage_type == 'hourly': return 'hourly_wage' - return super()._get_contract_wage_field() + return 'wage' diff --git a/hr_payroll_hibou/models/hr_salary_rule.py b/hr_payroll_hibou/models/hr_salary_rule.py index 0108dba4..e6f09bc2 100644 --- a/hr_payroll_hibou/models/hr_salary_rule.py +++ b/hr_payroll_hibou/models/hr_salary_rule.py @@ -8,7 +8,7 @@ class HrPayrollStructure(models.Model): schedule_pay = fields.Selection(selection_add=[ ('semi-monthly', 'Semi-monthly'), - ], ondelete={'semi-monthly': 'set null'}) + ]) class HrPayrollStructureType(models.Model): diff --git a/hr_payroll_hibou/tests/common.py b/hr_payroll_hibou/tests/common.py index 8079d9ca..562b0c81 100755 --- a/hr_payroll_hibou/tests/common.py +++ b/hr_payroll_hibou/tests/common.py @@ -126,11 +126,9 @@ class TestPayslip(common.TransactionCase): 'date_from': date_from, 'date_to': date_to }) - # Included in hr.payslip.action_refresh_from_work_entries() as ov 14.0 EE - # slip._onchange_employee() - # as is the 'compute' that is almost always called immediaately after + slip._onchange_employee() if not skip_compute: - slip.action_refresh_from_work_entries() + slip.compute_sheet() return slip def _getCategories(self, payslip): diff --git a/hr_payroll_hibou/views/update_views.xml b/hr_payroll_hibou/views/update_views.xml index 9a3a1afd..5e06e61a 100644 --- a/hr_payroll_hibou/views/update_views.xml +++ b/hr_payroll_hibou/views/update_views.xml @@ -58,6 +58,6 @@ + sequence="20" parent="hr_payroll.menu_hr_payroll_configuration"/> \ No newline at end of file