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 'imp/12.0/sale_planner__transit_calc' into '12.0-test'

Browse Source 
imp/12.0/sale_planner__transit_calc into 12.0-test

See merge request hibou-io/hibou-odoo/suite!356
This commit is contained in:
Hibou Bot
2020-05-28 17:49:37 +00:00
parent 58965d046c 001a3cd582
commit 303c253f54
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sale_planner/models/delivery.py
View File

@@ -50,8 +50,12 @@ class DeliveryCarrier(models.Model):
elif rate.get('transit_days'):
rate['date_delivered'] = self.calculate_date_delivered(date_planned, rate.get('transit_days'))
elif rate:
if rate.get('date_delivered'):
rate.pop('date_delivered')
date_delivered = rate.get('date_delivered')
if date_delivered and not rate.get('transit_days'):
# we could have a date delivered based on shipping it "now"
# so we can still calculate the transit days
rate['transit_days'] = self.calculate_transit_days(fields.Datetime.now(), date_delivered)
rate.pop('date_delivered') # because we don't have a date_planned, we cannot have a guarenteed delivery
return rate