From e9acacdd5d7f1afe08318fc5dd5487febcaa13ca Mon Sep 17 00:00:00 2001 From: Nihantra Patel Date: Thu, 25 Apr 2024 16:42:38 +0530 Subject: [PATCH 1/3] fix: args when get the delivery note in delivery trip (cherry picked from commit 2f359e201d9cbc7e06ccec13ef87280eb6314880) # Conflicts: # erpnext/stock/doctype/delivery_note/delivery_note.py --- erpnext/stock/doctype/delivery_note/delivery_note.py | 6 ++++++ erpnext/stock/doctype/delivery_trip/delivery_trip.js | 1 + 2 files changed, 7 insertions(+) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index bce87b80c51..f8be3f1b54f 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -1066,6 +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 update_stop_details(source_doc, target_doc, source_parent): target_doc.customer = source_parent.customer @@ -1080,6 +1081,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, diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.js b/erpnext/stock/doctype/delivery_trip/delivery_trip.js index 4f8649c0bfa..ba4a3b3486c 100755 --- a/erpnext/stock/doctype/delivery_trip/delivery_trip.js +++ b/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", From 61d6838b2c16f6e06bc89758dafcf6ff447a8aa5 Mon Sep 17 00:00:00 2001 From: Nihantra Patel Date: Thu, 25 Apr 2024 16:46:29 +0530 Subject: [PATCH 2/3] fix: args when get the delivery note in delivery trip (cherry picked from commit ca577f7aaa595ec05754d54ac3a672ad4187c8af) --- erpnext/stock/doctype/delivery_trip/delivery_trip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.js b/erpnext/stock/doctype/delivery_trip/delivery_trip.js index ba4a3b3486c..77eae534d17 100755 --- a/erpnext/stock/doctype/delivery_trip/delivery_trip.js +++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.js @@ -51,7 +51,7 @@ frappe.ui.form.on("Delivery Trip", { frm.add_custom_button( __("Delivery Note"), () => { - frm.clear_table('delivery_stops'); + 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", From 6fd356b6548fa5108f0d0236b1a7f38db364cc5b Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 26 Apr 2024 13:13:55 +0530 Subject: [PATCH 3/3] 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,