From 44971c2be1693473101566b5d64bcdc962352839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 16 Feb 2017 16:58:25 +0100 Subject: [PATCH] [FIX] resource: compute working hours of current day using only the current day Tomorrow never dies; however no need to add its working hours today. Indeed rrule until parameter is inclusive. This means that in current implementation next day is included in computation. This commit fixes that. --- addons/resource/models/resource.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/resource/models/resource.py b/addons/resource/models/resource.py index 12f7c38bd3a..b6e4bcd6129 100644 --- a/addons/resource/models/resource.py +++ b/addons/resource/models/resource.py @@ -393,8 +393,9 @@ class ResourceCalendar(models.Model): def get_working_hours(self, start_dt, end_dt, compute_leaves=False, resource_id=None, default_interval=None): hours = 0.0 - for day in rrule.rrule(rrule.DAILY, dtstart=start_dt, - until=(end_dt + timedelta(days=1)).replace(hour=0, minute=0, second=0), + for day in rrule.rrule(rrule.DAILY, + dtstart=start_dt, + until=end_dt, byweekday=self.get_weekdays()): day_start_dt = day.replace(hour=0, minute=0, second=0) if start_dt and day.date() == start_dt.date():