From 603511204354f041120448edd36835aaaa0ec7fe Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Thu, 6 Dec 2018 14:03:08 +0000 Subject: [PATCH] [FIX] hr_holidays: Wrong computation of leave duration When all days in a calendar don't have the same schedule, it's wrong to compute the leave duration with the average working time hour per day. opw:1909145 closes odoo/odoo#29313 --- addons/hr_holidays/models/hr_leave.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py index 2702676aff3..a46cc8afd38 100644 --- a/addons/hr_holidays/models/hr_leave.py +++ b/addons/hr_holidays/models/hr_leave.py @@ -363,7 +363,8 @@ class HolidaysRequest(models.Model): def _compute_number_of_hours_display(self): for holiday in self: calendar = holiday.employee_id.resource_calendar_id or self.env.user.company_id.resource_calendar_id - holiday.number_of_hours_display = holiday.number_of_days * (calendar.hours_per_day or HOURS_PER_DAY) + number_of_hours = calendar.get_work_hours_count(self.date_from, self.date_to) + holiday.number_of_hours_display = number_of_hours or (holiday.number_of_days * HOURS_PER_DAY) @api.multi @api.depends('state', 'employee_id', 'department_id')