CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-25 22:21:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: args when get the delivery note in delivery trip

Browse Source 
(cherry picked from commit 2f359e201d)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.py
This commit is contained in:
Nihantra Patel
2024-04-25 16:42:38 +05:30
committed by Mergify
parent 3bb26fde2b
commit e9acacdd5d
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@@ -1066,6 +1066,7 @@ def make_sales_invoice(source_name, target_doc=None, args=None):
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
def make_delivery_trip(source_name, target_doc=None): def make_delivery_trip(source_name, target_doc=None):
def update_stop_details(source_doc, target_doc, source_parent): def update_stop_details(source_doc, target_doc, source_parent):
target_doc.customer = source_parent.customer target_doc.customer = source_parent.customer
@@ -1080,6 +1081,11 @@ def make_delivery_trip(source_name, target_doc=None):
delivery_notes = [] 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( doclist = get_mapped_doc(
"Delivery Note", "Delivery Note",
source_name, source_name,

1
erpnext/stock/doctype/delivery_trip/delivery_trip.js
View File

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