Merge branch 'fix/11.0/transit_days_calc' into 11.0

This commit is contained in:
Jared Kipe
2019-11-19 11:25:07 -08:00

View File

@@ -72,12 +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:
transit_days -= 1
return transit_days return transit_days