schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-04-26 13:15:32 +05:30
committed by GitHub
parent abe64aa1ab
commit 2f6fee9877
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -739,8 +739,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, kwargs=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
target_doc.address = source_parent.shipping_address_name target_doc.address = source_parent.shipping_address_name
@@ -754,11 +753,6 @@ 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,