Merge branch 'fix/11.0/transit_days_calc' into 11.0

This commit is contained in:
Jared Kipe
2019-11-18 11:03:20 -08:00

View File

@@ -627,6 +627,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)