From 0ee1926887edef36c4b1fc0c12497af64c7ada89 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 6 Oct 2021 08:54:21 -0700 Subject: [PATCH] [MIG] sale_planner: to Odoo 15.0 --- sale_planner/__manifest__.py | 2 +- sale_planner/models/resource.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sale_planner/__manifest__.py b/sale_planner/__manifest__.py index cce9a189..c87d85f2 100644 --- a/sale_planner/__manifest__.py +++ b/sale_planner/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Sale Order Planner', 'summary': 'Plans order dates and warehouses.', - 'version': '14.0.1.0.0', + 'version': '15.0.1.0.0', 'author': "Hibou Corp.", 'category': 'Sale', 'license': 'AGPL-3', diff --git a/sale_planner/models/resource.py b/sale_planner/models/resource.py index 07556ce7..de7895aa 100644 --- a/sale_planner/models/resource.py +++ b/sale_planner/models/resource.py @@ -15,16 +15,16 @@ class ResourceCalendar(models.Model): # which method to use for retrieving intervals if compute_leaves: - get_intervals = partial(self._work_intervals, domain=domain) + get_intervals = partial(self._work_intervals_batch, domain=domain) else: - get_intervals = self._attendance_intervals + get_intervals = self._attendance_intervals_batch if days >= 0: found = set() delta = timedelta(days=14) for n in range(100): dt = day_dt + delta * n - for start, stop, meta in get_intervals(dt, dt + delta): + for start, stop, meta in get_intervals(dt, dt + delta)[False]: found.add(start.date()) if len(found) >= days: return revert(stop) @@ -36,7 +36,7 @@ class ResourceCalendar(models.Model): delta = timedelta(days=14) for n in range(100): dt = day_dt - delta * n - for start, stop, meta in reversed(get_intervals(dt - delta, dt)): + for start, stop, meta in reversed(get_intervals(dt - delta, dt))[False]: found.add(start.date()) if len(found) == days: return revert(start)