From cbba381c356fbd2c8c18123e029d0c53b6234fbb Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sat, 27 Jul 2019 07:34:41 -0700 Subject: [PATCH] FIX `sale_planner` Converting arrival date to transit days makes transit days too high. --- sale_planner/models/delivery.py | 2 +- sale_planner/wizard/order_planner.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sale_planner/models/delivery.py b/sale_planner/models/delivery.py index 17a5eb25..fcf09acc 100644 --- a/sale_planner/models/delivery.py +++ b/sale_planner/models/delivery.py @@ -72,9 +72,9 @@ class DeliveryCarrier(models.Model): return self._calculate_transit_days_naive(date_planned, date_delivered) if current_date_planned == date_planned: date_planned += timedelta(days=1) + transit_days += 1 else: date_planned = current_date_planned - transit_days += 1 if transit_days > 1: transit_days -= 1 diff --git a/sale_planner/wizard/order_planner.py b/sale_planner/wizard/order_planner.py index c3308c66..8b8ac472 100644 --- a/sale_planner/wizard/order_planner.py +++ b/sale_planner/wizard/order_planner.py @@ -625,6 +625,8 @@ class SaleOrderMakePlan(models.TransientModel): if warehouse.shipping_calendar_id: now = fields.Datetime.from_string(fields.Datetime.now()) then = warehouse.shipping_calendar_id.plan_days(0.01, fields.Datetime.from_string(fields.Datetime.now()), compute_leaves=True) + if not then: + return False if then < now: then = warehouse.shipping_calendar_id.plan_days(1.01, fields.Datetime.from_string(fields.Datetime.now()), compute_leaves=True) return fields.Datetime.to_string(then)