fix: use user defined discount amount or 0

frappe · Jan 20, 2025 · 16352d3 · 16352d3
1 parent 5fb158a
commit 16352d3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -415,8 +415,8 @@ def get_pricing_rule_for_item(args, doc=None, for_validate=False):
 			"parent": args.parent,
 			"parenttype": args.parenttype,
 			"child_docname": args.get("child_docname"),
-			"discount_percentage": 0.0,
-			"discount_amount": 0,
+			"discount_percentage": args.get("discount_percentage") or 0.0,
+			"discount_amount": args.get("discount_amount") or 0.0,
 		}
 	)
 
@@ -513,6 +513,8 @@ def get_pricing_rule_for_item(args, doc=None, for_validate=False):
 			rate=args.get("price_list_rate"),
 		)
 
+	print(item_details)
+
 	return item_details
 
 

diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
@@ -1793,7 +1793,9 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 					"serial_no": d.serial_no,
 					"batch_no": d.batch_no,
 					"price_list_rate": d.price_list_rate,
-					"conversion_factor": d.conversion_factor || 1.0
+					"conversion_factor": d.conversion_factor || 1.0,
+					"discount_percentage" : d.discount_percentage,
+					"discount_amount" : d.discount_amount,
 				});
 
 				// if doctype is Quotation Item / Sales Order Iten then add Margin Type and rate in item_list