From 6fd356b6548fa5108f0d0236b1a7f38db364cc5b Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 26 Apr 2024 13:13:55 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/delivery_note/delivery_note.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index f8be3f1b54f..ec05738c68a 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -1066,8 +1066,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 make_delivery_trip(source_name, target_doc=None, kwargs=None): def update_stop_details(source_doc, target_doc, source_parent): target_doc.customer = source_parent.customer target_doc.address = source_parent.shipping_address_name @@ -1081,11 +1080,6 @@ 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,