nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 15:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45538 from frappe/mergify/bp/version-14-hotfix/pr-45345

Browse Source 
fix:  maintain existing discounts in get_pricing_rule_for_item (backport #45345)
This commit is contained in:
ruthra kumar
2025-01-29 12:26:52 +05:30
committed by GitHub
parent 30f001edea 9eda931b97
commit 80ed2fb1fb
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

@@ -328,8 +328,6 @@ def get_pricing_rule_for_item(args, doc=None, for_validate=False):
"parent": args.parent, "parent": args.parent,
"parenttype": args.parenttype, "parenttype": args.parenttype,
"child_docname": args.get("child_docname"), "child_docname": args.get("child_docname"),
"discount_percentage": 0.0,
"discount_amount": 0,
} }
) )

2
erpnext/public/js/controllers/transaction.js
View File

@@ -1527,7 +1527,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
"serial_no": d.serial_no, "serial_no": d.serial_no,
"batch_no": d.batch_no, "batch_no": d.batch_no,
"price_list_rate": d.price_list_rate, "price_list_rate": d.price_list_rate,
"conversion_factor": d.conversion_factor || 1.0 "conversion_factor": d.conversion_factor || 1.0,
}); });
// if doctype is Quotation Item / Sales Order Iten then add Margin Type and rate in item_list // if doctype is Quotation Item / Sales Order Iten then add Margin Type and rate in item_list