diff --git a/hr_payroll_overtime/__manifest__.py b/hr_payroll_overtime/__manifest__.py index 99e48601..0895cf20 100644 --- a/hr_payroll_overtime/__manifest__.py +++ b/hr_payroll_overtime/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Payroll Overtime', 'description': 'Provide mechanisms to calculate overtime.', - 'version': '13.0.1.0.1', + 'version': '14.0.1.0.0', 'website': 'https://hibou.io/', 'author': 'Hibou Corp. ', 'license': 'AGPL-3', diff --git a/hr_payroll_overtime/tests/test_overtime.py b/hr_payroll_overtime/tests/test_overtime.py index d934f78e..6160f1b2 100644 --- a/hr_payroll_overtime/tests/test_overtime.py +++ b/hr_payroll_overtime/tests/test_overtime.py @@ -151,7 +151,7 @@ class TestOvertime(common.TransactionCase): def test_10_overtime_aggregation_daily(self): self.overtime_rules.hours_per_day = 8.0 - self.overtime_rules.multiplier_per_day = 1.5 + self.overtime_rules.multiplier = 1.5 # 38 hours in 1 week work_data = [ ((2020, 24, 1), [ @@ -286,7 +286,7 @@ class TestOvertime(common.TransactionCase): 'multiplier': 2.0, }) self.overtime_rules.hours_per_day = 8.0 - self.overtime_rules.multiplier_per_day = 1.5 + self.overtime_rules.multiplier = 1.5 self.work_type_overtime.overtime_type_id = self.overtime_rules2 self.work_type_overtime.overtime_work_type_id = self.work_type_overtime2 @@ -328,7 +328,7 @@ class TestOvertime(common.TransactionCase): def test_13_recursive_infinite_trivial(self): # recursive should will use a second overtime, but not this time! self.overtime_rules.hours_per_day = 8.0 - self.overtime_rules.multiplier_per_day = 1.5 + self.overtime_rules.multiplier = 1.5 self.work_type.overtime_type_id = self.overtime_rules # overtime goes to itself self.work_type.overtime_work_type_id = self.work_type @@ -347,7 +347,7 @@ class TestOvertime(common.TransactionCase): def test_14_recursive_infinite_loop(self): # recursive will use a second overtime, but not this time! self.overtime_rules.hours_per_day = 8.0 - self.overtime_rules.multiplier_per_day = 1.5 + self.overtime_rules.multiplier = 1.5 self.work_type_overtime.overtime_type_id = self.overtime_rules # overtime goes back to worktype self.work_type_overtime.overtime_work_type_id = self.work_type @@ -366,7 +366,7 @@ class TestOvertime(common.TransactionCase): def test_15_override_day_of_week(self): iso_date = (2020, 24, 1) self.overtime_rules.hours_per_day = 8.0 - self.overtime_rules.multiplier_per_day = 1.5 + self.overtime_rules.multiplier = 1.5 work_data = [ (iso_date, [ (self.work_type, 4.0, None), @@ -405,7 +405,7 @@ class TestOvertime(common.TransactionCase): def test_16_override_date(self): iso_date = (2020, 24, 1) self.overtime_rules.hours_per_day = 8.0 - self.overtime_rules.multiplier_per_day = 1.5 + self.overtime_rules.multiplier = 1.5 work_data = [ (iso_date, [ (self.work_type, 4.0, None), diff --git a/hr_payroll_overtime/views/hr_work_entry_views.xml b/hr_payroll_overtime/views/hr_work_entry_views.xml index ac304e33..c60f693a 100644 --- a/hr_payroll_overtime/views/hr_work_entry_views.xml +++ b/hr_payroll_overtime/views/hr_work_entry_views.xml @@ -87,6 +87,6 @@ + sequence="11" parent="hr_work_entry_contract.menu_hr_work_entry_confirguration"/> \ No newline at end of file