Maintainers
This module is maintained by the OCA.
- -
-
+
OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.
diff --git a/hr_attendance_validation/tests/test_hr_attendance_validation.py b/hr_attendance_validation/tests/test_hr_attendance_validation.py index 039c31e5..7cad432d 100644 --- a/hr_attendance_validation/tests/test_hr_attendance_validation.py +++ b/hr_attendance_validation/tests/test_hr_attendance_validation.py @@ -67,8 +67,19 @@ def setup_employee_holidays(self): "number_of_days": 6, } ) + self.empl_leave_hour = self.env["hr.leave"].create( + { + "employee_id": self.employee.id, + "holiday_status_id": self.leave_cl.id, + "request_date_from": "2021-12-11", + "request_hour_from": "8", + "request_hour_to": "10", + "request_unit_hours": True, + "number_of_days": 0.25, + } + ) self.empl_leave.action_validate() - + self.empl_leave_hour.action_validate() self.env["hr.leave.allocation"].create( { "employee_id": self.employee.id, @@ -84,9 +95,9 @@ def setup_employee_holidays(self): "holiday_status_id": self.leave_comp.id, "request_date_from": "2021-12-10", "request_hour_from": "8", - "request_hour_to": "12", + "request_hour_to": "10", "request_unit_hours": True, - "number_of_days": 0.5, + "number_of_days": 0.25, } ) self.empl_leave_comp.action_validate() @@ -171,7 +182,9 @@ def setUp(self): self.HrAttendance = self.env["hr.attendance"] self.HrAttendanceValidation = self.env["hr.attendance.validation.sheet"] self.leave_cl = self.env.ref("hr_holidays.holiday_status_cl") + self.leave_cl.is_compensatory = False self.leave_comp = self.env.ref("hr_holidays.holiday_status_comp") + self.leave_comp.is_compensatory = True self.leave_remote = self.env["hr.leave.type"].create( { "name": "Remote test", @@ -185,11 +198,30 @@ def setUp(self): } ) self.setup_employee() + public_holidays_2021 = self.env["hr.holidays.public"].create( + { + "year": 2021, + "country_id": self.employee.address_id.country_id.id, + } + ) + self.env["hr.holidays.public.line"].create( + { + "name": "Fête nationale", + "date": "2021-07-14", + "year_id": public_holidays_2021.id, + } + ) self.setup_employee_allocation() self.setup_employee_holidays() self.setup_employee_remote_days() self.setup_employee_attendances() + def test_new_without_calendar(self): + validation = self.HrAttendanceValidation.new({}) + + self.assertFalse(validation.calendar_id) + self.assertEqual(validation.theoretical_hours, 0) + def test_name_get_missing_employee(self): with freeze_time("2021-12-12 20:45", tz_offset=0): new_element = self.HrAttendanceValidation.new({}) @@ -255,7 +287,7 @@ def test_action_retrieve_attendance_and_leaves(self): validation.date_from = "2021-12-06" validation.date_to = "2021-12-12" validation.action_retrieve_attendance_and_leaves() - self.assertEqual(len(validation.leave_ids), 2) + self.assertEqual(len(validation.leave_ids), 3) self.assertEqual(validation.leave_hours, 28) self.assertEqual(len(validation.attendance_ids), 5) @@ -287,7 +319,8 @@ def test_computed_fields_base(self): self.assertEqual(validation.overtime_due_hours, 1.5) self.assertEqual(validation.attendance_total_hours, 12.5) self.assertEqual(validation.overtime_not_due_hours, 0.5) - self.assertEqual(validation.leave_hours, 3 * 8 + 0.5 * 8) + self.assertEqual(validation.leave_hours, 3 * 8 + 0.25 * 8 + 0.25 * 8) + self.assertEqual(validation.compensatory_leave_hours, 0.25 * 8) self.assertEqual(validation.compensatory_hour, 0.5) self.assertEqual(validation.regularization_compensatory_hour_taken, 0) @@ -544,3 +577,14 @@ def test_employee_works_hours_month_before(self): self.assertEqual(self.employee.hours_current_week, 0) self.assertEqual(self.employee.hours_last_month, 13.5) self.assertEqual(self.employee.hours_today, 0) + + def test_hr_holidays_public(self): + validation = self.HrAttendanceValidation.create( + { + "employee_id": self.employee.id, + "date_from": "2021-07-12", + "date_to": "2021-07-18", + } + ) + + self.assertEqual(validation.theoretical_hours, 40 - 8) diff --git a/hr_attendance_validation/views/hr_attendance_validation.xml b/hr_attendance_validation/views/hr_attendance_validation.xml index a49a7c57..d88e1d04 100644 --- a/hr_attendance_validation/views/hr_attendance_validation.xml +++ b/hr_attendance_validation/views/hr_attendance_validation.xml @@ -102,8 +102,8 @@