nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-01-21 15:27:12 +05:30
parent d3440cf545
commit 386567a6ea
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -2211,13 +2211,7 @@ def make_delivery_note(source_name, target_doc=None):
"cost_center": "cost_center", "cost_center": "cost_center",
}, },
"postprocess": update_item, "postprocess": update_item,
<<<<<<< HEAD "condition": lambda doc: doc.delivered_by_supplier != 1 and not doc.dn_detail,
"condition": lambda doc: doc.delivered_by_supplier != 1,
=======
"condition": lambda doc: doc.delivered_by_supplier != 1
and not doc.scio_detail
and not doc.dn_detail,
>>>>>>> b691de0147 (fix: allow creation of DN in SI for items not having DN reference)
}, },
"Sales Taxes and Charges": {"doctype": "Sales Taxes and Charges", "reset_value": True}, "Sales Taxes and Charges": {"doctype": "Sales Taxes and Charges", "reset_value": True},
"Sales Team": { "Sales Team": {