nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: reset value conditionally based on merge taxes

Browse Source
This commit is contained in:
Ninad1306
2024-09-05 13:29:22 +05:30
parent 5442487b6c
commit 9d899f3c4a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1048,7 +1048,7 @@ def make_sales_invoice(source_name, target_doc=None, args=None):
}, },
"Sales Taxes and Charges": { "Sales Taxes and Charges": {
"doctype": "Sales Taxes and Charges", "doctype": "Sales Taxes and Charges",
"reset_value": True, "reset_value": not (args and args.get("merge_taxes")),
"ignore": args.get("merge_taxes") if args else 0, "ignore": args.get("merge_taxes") if args else 0,
}, },
"Sales Team": { "Sales Team": {

2
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@@ -1205,7 +1205,7 @@ def make_purchase_invoice(source_name, target_doc=None, args=None):
}, },
"Purchase Taxes and Charges": { "Purchase Taxes and Charges": {
"doctype": "Purchase Taxes and Charges", "doctype": "Purchase Taxes and Charges",
"reset_value": True, "reset_value": not (args and args.get("merge_taxes")),
"ignore": args.get("merge_taxes") if args else 0, "ignore": args.get("merge_taxes") if args else 0,
}, },
}, },