From 0da58f4133903c0eef672df77260fee5a42a4ddb Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Mon, 20 Aug 2018 09:30:32 +0200 Subject: [PATCH] [FIX] hr_holidays: fix _compute_leave_status Click on the employee app causes a traceback when hr_holidays is installed. With this commit, leave_date_from and leave_date_to receive a date as expected instead of a datetime when computing the leave status. --- addons/hr_holidays/models/hr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_holidays/models/hr.py b/addons/hr_holidays/models/hr.py index d59458c49c3..5c19745e412 100644 --- a/addons/hr_holidays/models/hr.py +++ b/addons/hr_holidays/models/hr.py @@ -160,8 +160,8 @@ class Employee(models.Model): leave_data = {} for holiday in holidays: leave_data[holiday.employee_id.id] = {} - leave_data[holiday.employee_id.id]['leave_date_from'] = holiday.date_from - leave_data[holiday.employee_id.id]['leave_date_to'] = holiday.date_to + leave_data[holiday.employee_id.id]['leave_date_from'] = holiday.date_from.date() + leave_data[holiday.employee_id.id]['leave_date_to'] = holiday.date_to.date() leave_data[holiday.employee_id.id]['current_leave_state'] = holiday.state leave_data[holiday.employee_id.id]['current_leave_id'] = holiday.holiday_status_id.id