fix: dynamic condition in the pricing rule not working (backport #42467…

…) (backport #42495) (#42496) fix: dynamic condition in the pricing rule not working (backport #42467) (#42495) fix: dynamic condition in the pricing rule not working (#42467) (cherry picked from commit 0e817f4) Co-authored-by: rohitwaghchaure <[email protected]> (cherry picked from commit ac2ef21) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
frappe · Jul 27, 2024 · 334c4d0 · 334c4d0
1 parent 2de69e2
commit 334c4d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
@@ -1796,7 +1796,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 		me.in_apply_price_list = true;
 		return this.frm.call({
 			method: "erpnext.stock.get_item_details.apply_price_list",
-			args: {	args: args },
+			args: {	args: args, doc: me.frm.doc },
 			callback: function(r) {
 				if (!r.exc) {
 					frappe.run_serially([

diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
@@ -1189,7 +1189,7 @@ def get_batch_qty(batch_no, warehouse, item_code):
 
 
 @frappe.whitelist()
-def apply_price_list(args, as_doc=False):
+def apply_price_list(args, as_doc=False, doc=None):
 	"""Apply pricelist on a document-like dict object and return as
 	{'parent': dict, 'children': list}
 
@@ -1228,7 +1228,7 @@ def apply_price_list(args, as_doc=False):
 		for item in item_list:
 			args_copy = frappe._dict(args.copy())
 			args_copy.update(item)
-			item_details = apply_price_list_on_item(args_copy)
+			item_details = apply_price_list_on_item(args_copy, doc=doc)
 			children.append(item_details)
 
 	if as_doc:
@@ -1246,10 +1246,10 @@ def apply_price_list(args, as_doc=False):
 		return {"parent": parent, "children": children}
 
 
-def apply_price_list_on_item(args):
+def apply_price_list_on_item(args, doc=None):
 	item_doc = frappe.db.get_value("Item", args.item_code, ["name", "variant_of"], as_dict=1)
 	item_details = get_price_list_rate(args, item_doc)
-	item_details.update(get_pricing_rule_for_item(args))
+	item_details.update(get_pricing_rule_for_item(args, doc=doc))
 
 	return item_details