From bc640308476e10f7eeecadecc37192d810f482b5 Mon Sep 17 00:00:00 2001 From: Quentin Mondot Date: Thu, 9 Oct 2025 14:44:46 +0200 Subject: [PATCH] [IMP] hr_holidays_timeoff_analysis : migrate from version 16 to 18 --- .../data/hr_leave_timeoff_day_cron.xml | 1 - .../tests/test_hr_leave_timeoff_day.py | 18 +++++++++--------- .../views/hr_leave_timeoff_day_views.xml | 14 ++++---------- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/hr_holidays_timeoff_analysis/data/hr_leave_timeoff_day_cron.xml b/hr_holidays_timeoff_analysis/data/hr_leave_timeoff_day_cron.xml index 151e71f..379ccab 100644 --- a/hr_holidays_timeoff_analysis/data/hr_leave_timeoff_day_cron.xml +++ b/hr_holidays_timeoff_analysis/data/hr_leave_timeoff_day_cron.xml @@ -6,7 +6,6 @@ model.cron_manage_timeoff_days() 1 days - -1 True diff --git a/hr_holidays_timeoff_analysis/tests/test_hr_leave_timeoff_day.py b/hr_holidays_timeoff_analysis/tests/test_hr_leave_timeoff_day.py index d679e56..586a719 100644 --- a/hr_holidays_timeoff_analysis/tests/test_hr_leave_timeoff_day.py +++ b/hr_holidays_timeoff_analysis/tests/test_hr_leave_timeoff_day.py @@ -377,13 +377,13 @@ class TestHrLeaveTimeoffDay(TransactionCase): def test_public_holidays_between_a_leave(self): # Leaves the code below commented because # the default database already has a public holiday on 8th May 2025 - # self.env["resource.calendar.leaves"].create( - # { - # "name": "8 mai 2025", - # "date_from": Date.to_date("2025-05-07 22:00:00"), - # "date_to": Date.to_date("2025-05-08 23:00:00"), - # } - # ) + self.env["resource.calendar.leaves"].create( + { + "name": "8 mai 2025", + "date_from": Date.to_date("2025-05-07 22:00:00"), + "date_to": Date.to_date("2025-05-08 23:00:00"), + } + ) leave = self.env["hr.leave"].create( { "employee_id": self.employee.id, @@ -438,7 +438,7 @@ class TestHrLeaveTimeoffDay(TransactionCase): len(timeoff_days), 5, "There should be 5 timeoff days for this leave" ) - leave.state = "draft" + leave.state = "confirm" self.env["hr.leave.timeoff.day"].cron_manage_timeoff_days() # Vérifie qu'il n'existe plus de hr.leave.timeoff.day pour ce leave @@ -475,7 +475,7 @@ class TestHrLeaveTimeoffDay(TransactionCase): len(timeoff_days), 5, "There should be 5 timeoff days for this leave" ) - leave.state = "draft" + leave.state = "confirm" leave.unlink() self.env["hr.leave.timeoff.day"].cron_manage_timeoff_days() diff --git a/hr_holidays_timeoff_analysis/views/hr_leave_timeoff_day_views.xml b/hr_holidays_timeoff_analysis/views/hr_leave_timeoff_day_views.xml index d092ca4..17e351c 100644 --- a/hr_holidays_timeoff_analysis/views/hr_leave_timeoff_day_views.xml +++ b/hr_holidays_timeoff_analysis/views/hr_leave_timeoff_day_views.xml @@ -3,13 +3,13 @@ hr.leave.timeoff.day - + - + @@ -32,12 +32,7 @@ - + @@ -45,9 +40,8 @@ Timeoff Days hr.leave.timeoff.day - tree,form,pivot + list,form,pivot - {'search_default_filter_date': True}