audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/11.0/transit_days_calc' into 11.0

Browse Source
This commit is contained in:
Jared Kipe
2019-11-18 11:03:20 -08:00
parent 990da8c2ae 8478695590
commit aa41b19e62
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sale_planner/wizard/order_planner.py
View File

@@ -627,6 +627,8 @@ class SaleOrderMakePlan(models.TransientModel):
if warehouse.shipping_calendar_id: if warehouse.shipping_calendar_id:
now = fields.Datetime.from_string(fields.Datetime.now()) 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) 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: if then < now:
then = warehouse.shipping_calendar_id.plan_days(1.01, fields.Datetime.from_string(fields.Datetime.now()), compute_leaves=True) 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) return fields.Datetime.to_string(then)