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

FIX sale_planner Carrier testing/plannning in 12.0

Browse Source
This commit is contained in:
Jared Kipe
2019-03-16 14:14:17 -07:00
committed by Jared Kipe
parent 73498edde1
commit fb52c611a7
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sale_planner/models/delivery.py
View File

@@ -92,11 +92,11 @@ class DeliveryCarrier(models.Model):
# date calculations needs an extra day
effective_transit_days = transit_days + 1
last_day = self.delivery_calendar_id.plan_days(effective_transit_days, date_planned, compute_leaves=True)
last_day = self.delivery_calendar_id.plan_days_end(effective_transit_days, date_planned, compute_leaves=True)
if not last_day:
return self._calculate_date_delivered_naive(date_planned, transit_days)
return fields.Datetime.to_string(last_day)
return last_day
def _calculate_date_delivered_naive(self, date_planned, transit_days):
return fields.Datetime.to_string(date_planned + timedelta(days=transit_days))
return date_planned + timedelta(days=transit_days)