diff options
| author | alt-odoo <alt@odoo.com> | 2020-09-03 10:45:25 +0000 |
|---|---|---|
| committer | alt-odoo <alt@odoo.com> | 2020-09-03 14:55:10 +0000 |
| commit | eff7084d24b86de4b66f3075deffe4f8f06c0a98 (patch) | |
| tree | 6f4fec33b9ee4dab062243a73f9aeb718a71e784 /addons/resource | |
| parent | 2d6e0b7680eaf4831cdef4008566ee0c135d78df (diff) | |
[FIX] resource: attendance intervals should be expressed in resource timezone
closes odoo/odoo#57047
X-original-commit: efec3e57c2eeda188e0dd2cc7c7413987d58513e
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Signed-off-by: Alex Tuyls <alt-odoo@users.noreply.github.com>
Co-authored-by: PierreCourt <pco@odoo.com>
Diffstat (limited to 'addons/resource')
| -rw-r--r-- | addons/resource/models/resource.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/resource/models/resource.py b/addons/resource/models/resource.py index 4f75a2e1edf..1f8ab1d23c7 100644 --- a/addons/resource/models/resource.py +++ b/addons/resource/models/resource.py @@ -415,7 +415,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): |
