fix: args when get the delivery note in delivery trip

(cherry picked from commit 2f359e201d)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.py

erpnext/stock/doctype/delivery_note/delivery_note.py

@@ -739,6 +739,7 @@ def make_sales_invoice(source_name, target_doc=None, args=None):
 
 
 @frappe.whitelist()
+<<<<<<< HEAD
 def make_delivery_trip(source_name, target_doc=None):
 	def update_stop_details(source_doc, target_doc, source_parent):
 		target_doc.customer = source_parent.customer
@@ -753,6 +754,11 @@ def make_delivery_trip(source_name, target_doc=None):
 
 	delivery_notes = []
 
+=======
+def make_delivery_trip(source_name, target_doc=None, kwargs=None):
+	if not target_doc:
+		target_doc = frappe.new_doc("Delivery Trip")
+>>>>>>> 2f359e201d (fix: args when get the delivery note in delivery trip)
 	doclist = get_mapped_doc(
 		"Delivery Note",
 		source_name,

erpnext/stock/doctype/delivery_trip/delivery_trip.js

@@ -51,6 +51,7 @@ frappe.ui.form.on("Delivery Trip", {
 			frm.add_custom_button(
 				__("Delivery Note"),
 				() => {
+					frm.clear_table('delivery_stops');
 					erpnext.utils.map_current_doc({
 						method: "erpnext.stock.doctype.delivery_note.delivery_note.make_delivery_trip",
 						source_doctype: "Delivery Note",