From c9477b4cfd6c844da44c5e22baf61e4370cb0f49 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Mon, 31 Dec 2018 13:45:14 +0000 Subject: [PATCH] [FIX] hr_holidays: date and datetime comparison The fields `validity_start` and `validity_stop` are `Date` fields, they should therefore be compared to `datetime.date`. opw-1918843 closes odoo/odoo#29834 --- addons/hr_holidays/models/hr_leave_type.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_holidays/models/hr_leave_type.py b/addons/hr_holidays/models/hr_leave_type.py index 828df4a5586..f0d8eddd1a0 100644 --- a/addons/hr_holidays/models/hr_leave_type.py +++ b/addons/hr_holidays/models/hr_leave_type.py @@ -95,7 +95,7 @@ class HolidaysType(models.Model): @api.multi @api.depends('validity_start', 'validity_stop') def _compute_valid(self): - dt = self._context.get('default_date_from') or fields.Datetime.now() + dt = self._context.get('default_date_from') or fields.Date.context_today(self) for holiday_type in self: if holiday_type.validity_start and holiday_type.validity_stop: @@ -106,7 +106,7 @@ class HolidaysType(models.Model): holiday_type.valid = True def _search_valid(self, operator, value): - dt = self._context.get('default_date_from') or fields.Datetime.now() + dt = self._context.get('default_date_from') or fields.Date.context_today(self) signs = ['>=', '<='] if operator == '=' else ['<=', '>=']