From e8f81ae39c034903549a5dfc89b04c8eac4e4b77 Mon Sep 17 00:00:00 2001 From: alt-odoo Date: Thu, 3 Sep 2020 10:45:25 +0000 Subject: [PATCH] [FIX] resource: attendance intervals should be expressed in resource timezone closes odoo/odoo#57053 X-original-commit: efec3e57c2eeda188e0dd2cc7c7413987d58513e Signed-off-by: Yannick Tivisse (yti) Signed-off-by: Alex Tuyls Co-authored-by: PierreCourt --- addons/resource/models/resource.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/resource/models/resource.py b/addons/resource/models/resource.py index e8b6f6e56bc..4617ecc27ce 100644 --- a/addons/resource/models/resource.py +++ b/addons/resource/models/resource.py @@ -416,7 +416,7 @@ class ResourceCalendar(models.Model): else: dt1 = tz.localize(combine(day, float_to_time(hour_to))) cache_deltas[(tz, day, hour_to)] = dt1 - result[resource.id].append((max(start_dt, dt0), min(end_dt, dt1), attendance)) + result[resource.id].append((max(cache_dates[(tz, start_dt)], dt0), min(cache_dates[(tz, end_dt)], dt1), attendance)) return {r.id: Intervals(result[r.id]) for r in resources_list} def _leave_intervals(self, start_dt, end_dt, resource=None, domain=None, tz=None):