nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 00:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] Fix Delivery Trip Error (#11868)

Browse Source
This commit is contained in:
Doridel Cahanap
2017-12-07 14:22:33 +08:00
committed by Nabin Hait
parent 4cfbeebdef
commit 9f7e109c3e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/stock/doctype/delivery_trip/delivery_trip.py
View File

@@ -111,11 +111,11 @@ def calculate_time_matrix(name):
departure_time = doc.departure_time departure_time = doc.departure_time
matrix_duration = [] matrix_duration = []
for i, stop in enumerate(doc.delivery_stop): for i, stop in enumerate(doc.delivery_stops):
if i == 0: if i == 0:
# The first row is the starting pointing # The first row is the starting pointing
origin = gmaps.home_address origin = gmaps.home_address
destination = format_address(doc.delivery_stop[i].address) destination = format_address(doc.delivery_stops[i].address)
distance_calc = gmaps_client.distance_matrix(origin, destination) distance_calc = gmaps_client.distance_matrix(origin, destination)
matrix_duration.append(distance_calc) matrix_duration.append(distance_calc)
@@ -129,8 +129,8 @@ def calculate_time_matrix(name):
datetime.timedelta(minutes=15)) datetime.timedelta(minutes=15))
else: else:
# Calculation based on previous # Calculation based on previous
origin = format_address(doc.delivery_stop[i - 1].address) origin = format_address(doc.delivery_stops[i - 1].address)
destination = format_address(doc.delivery_stop[i].address) destination = format_address(doc.delivery_stops[i].address)
distance_calc = gmaps_client.distance_matrix(origin, destination) distance_calc = gmaps_client.distance_matrix(origin, destination)
matrix_duration.append(distance_calc) matrix_duration.append(distance_calc)
@@ -140,7 +140,7 @@ def calculate_time_matrix(name):
frappe.throw(_("Error '{0}' occured. Arguments {1}.").format(e.message, e.args)) frappe.throw(_("Error '{0}' occured. Arguments {1}.").format(e.message, e.args))
stop.estimated_arrival = round_timedelta( stop.estimated_arrival = round_timedelta(
doc.delivery_stop[i - 1].estimated_arrival + doc.delivery_stops[i - 1].estimated_arrival +
datetime.timedelta(0, distance_secs + secs_15min), datetime.timedelta(minutes=15)) datetime.timedelta(0, distance_secs + secs_15min), datetime.timedelta(minutes=15))
stop.save() stop.save()
frappe.db.commit() frappe.db.commit()