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-test

Browse Source
This commit is contained in:
Jared Kipe
2019-07-27 07:35:57 -07:00
parent c3a56fcc8c cbba381c35
commit c621ea4cc8
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sale_planner/models/delivery.py
View File

@@ -72,9 +72,9 @@ class DeliveryCarrier(models.Model):
return self._calculate_transit_days_naive(date_planned, date_delivered) return self._calculate_transit_days_naive(date_planned, date_delivered)
if current_date_planned == date_planned: if current_date_planned == date_planned:
date_planned += timedelta(days=1) date_planned += timedelta(days=1)
transit_days += 1
else: else:
date_planned = current_date_planned date_planned = current_date_planned
transit_days += 1
if transit_days > 1: if transit_days > 1:
transit_days -= 1 transit_days -= 1

2
sale_planner/wizard/order_planner.py
View File

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