From 9761342c12d450dcc84248ba4084b0bee5d59697 Mon Sep 17 00:00:00 2001 From: RomainLibert Date: Wed, 5 Jun 2019 10:20:26 +0000 Subject: [PATCH] [FIX] hr_holidays: add method to override selection of calendar --- addons/hr_holidays/models/hr_leave.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py index ec3ee75f609..8dfdbde3f11 100644 --- a/addons/hr_holidays/models/hr_leave.py +++ b/addons/hr_holidays/models/hr_leave.py @@ -383,11 +383,15 @@ class HolidaysRequest(models.Model): for holiday in self: holiday.number_of_days_display = holiday.number_of_days + def _get_calendar(self): + self.ensure_one() + return self.employee_id.resource_calendar_id or self.env.company.resource_calendar_id + @api.multi @api.depends('number_of_days') def _compute_number_of_hours_display(self): for holiday in self: - calendar = holiday.employee_id.resource_calendar_id or self.env.company.resource_calendar_id + calendar = holiday._get_calendar() if holiday.date_from and holiday.date_to: number_of_hours = calendar.get_work_hours_count(holiday.date_from, holiday.date_to) holiday.number_of_hours_display = number_of_hours or (holiday.number_of_days * HOURS_PER_DAY)