Merge acf8ea7 into 870e324

erpnext/stock/doctype/delivery_trip/delivery_trip.py

@@ -29,14 +29,18 @@ def validate(self):
 		self.update_package_total()
 
 	def on_submit(self):
-		self.update_status()
 		self.update_delivery_notes()
 
-	def on_update_after_submit(self):
+	def before_submit(self):
 		self.update_status()
 
-	def on_cancel(self):
+	def before_update_after_submit(self):
+		self.update_status()
+
+	def before_cancel(self):
 		self.update_status()
+
+	def on_cancel(self):
 		self.update_delivery_notes(delete=True)
 
 	def update_package_total(self):
@@ -61,8 +65,7 @@ def update_status(self):
 			elif any(visited_stops):
 				status = "In Transit"
 
-		self.db_set("status", status)
-
+		self.status = status
 	def update_delivery_notes(self, delete=False):
 		"""
 		Update all connected Delivery Notes with Delivery Trip details
@@ -468,6 +471,7 @@ def get_driver_email(driver):
 @frappe.whitelist()
 def create_or_update_timesheet(trip, action, odometer_value=None):
 	delivery_trip = frappe.get_doc("Delivery Trip", trip)
+	delivery_trip.flags.ignore_validate_update_after_submit = True
 	time = frappe.utils.now()
 
 	def get_timesheet():
@@ -487,9 +491,9 @@ def get_timesheet():
 		})
 		timesheet.save()
 
-		frappe.db.set_value("Delivery Trip", trip, "status", "In Transit", update_modified=False)  # Because we can't set status as allow on submit
-		frappe.db.set_value("Delivery Trip", trip, "odometer_start_value", odometer_value, update_modified=False)
-		frappe.db.set_value("Delivery Trip", trip, "odometer_start_time", time, update_modified=False)
+		delivery_trip.status = "In Transit"
+		delivery_trip.odometer_start_value = odometer_value
+		delivery_trip.odometer_start_time = time
 	elif action == "pause":
 		timesheet = get_timesheet()
 
@@ -501,7 +505,7 @@ def get_timesheet():
 					last_timelog.to_time = time
 					timesheet.save()
 
-		frappe.db.set_value("Delivery Trip", trip, "status", "Paused", update_modified=False)
+		delivery_trip.status = "Paused"
 	elif action == "continue":
 		timesheet = get_timesheet()
 
@@ -516,7 +520,7 @@ def get_timesheet():
 					})
 					timesheet.save()
 
-		frappe.db.set_value("Delivery Trip", trip, "status", "In Transit", update_modified=False)
+		delivery_trip.status = "In Transit"
 	elif action == "end":
 		timesheet = get_timesheet()
 
@@ -528,13 +532,13 @@ def get_timesheet():
 				timesheet.save()
 				timesheet.submit()
 
-		frappe.db.set_value("Delivery Trip", trip, "status", "Completed", update_modified=False)
-		frappe.db.set_value("Delivery Trip", trip, "odometer_end_value", odometer_value, update_modified=False)
-		frappe.db.set_value("Delivery Trip", trip, "odometer_end_time", time, update_modified=False)
-
-		start_value = frappe.db.get_value("Delivery Trip", trip, "odometer_start_value")
-		frappe.db.set_value("Delivery Trip", trip, "actual_distance_travelled", flt(odometer_value) - start_value, update_modified=False)
+
+		delivery_trip.status = "Completed"
+		delivery_trip.odometer_end_value = odometer_value
+		delivery_trip.odometer_end_time = time
 
+		delivery_trip.actual_distance_travelled = flt(odometer_value) - delivery_trip.odometer_start_value
+	delivery_trip.save()
 
 @frappe.whitelist()
 def make_payment_entry(payment_amount, sales_invoice):