diff --git a/repos.yml b/repos.yml index 1fdad00..8458f0b 100644 --- a/repos.yml +++ b/repos.yml @@ -6,10 +6,13 @@ hr: hr-attendance: remotes: oca: https://github.com/OCA/hr-attendance.git + hbrunn: https://github.com/hbrunn/hr-attendance.git merges: - oca 15.0 # https://github.com/OCA/hr-attendance/pull/140 - oca refs/pull/140/head + # PR on the above + - hbrunn 15.0-hr_attendance_missing_days # https://github.com/OCA/hr-attendance/pull/141 - oca refs/pull/141/head # https://github.com/OCA/hr-attendance/pull/142 diff --git a/verdigado_attendance/tests/test_overtime_calculation.py b/verdigado_attendance/tests/test_overtime_calculation.py index 76518bc..969d5b0 100644 --- a/verdigado_attendance/tests/test_overtime_calculation.py +++ b/verdigado_attendance/tests/test_overtime_calculation.py @@ -138,6 +138,18 @@ def test_calculation_employeeA(self): attendance.check_out += timedelta(hours=1) self.assertOvertime(employeeA, "2023-08-06", 9 * 60, 0) + self.assertOvertime(employeeA, "2023-08-06", 9 * 60, 0) + self.assertOvertime(employeeA, "2023-08-06", 1.5 * 9 * 60, 0, adjustment=True) + attendance.check_out += timedelta(hours=1) + self.assertOvertime(employeeA, "2023-08-06", 10 * 60, 0) + self.assertOvertime(employeeA, "2023-08-06", 1.5 * 10 * 60, 0, adjustment=True) + + # be sure that a day spanning attendance generates overtime records for all days + attendance.apply_holiday_overtime_factor = False + attendance.check_out += timedelta(days=1) + self.assertOvertime(employeeA, "2023-08-06", 34 * 60, 0) + self.assertOvertime(employeeA, "2023-08-07", 0, 8 * 60) + def to_time(self, time_string): if isinstance(time_string, str): return datetime.strptime(time_string, "%H:%M:%S").time()