fix: ignore pricing rule for other item group
diff --git a/erpnext/accounts/doctype/pricing_rule/utils.py b/erpnext/accounts/doctype/pricing_rule/utils.py
index 87f6822..fe68fdb 100644
--- a/erpnext/accounts/doctype/pricing_rule/utils.py
+++ b/erpnext/accounts/doctype/pricing_rule/utils.py
@@ -495,7 +495,7 @@
if pr_doc.apply_rule_on_other:
apply_on = frappe.scrub(pr_doc.apply_rule_on_other)
- apply_on_data.append(pr_doc.get(apply_on))
+ apply_on_data.append(pr_doc.get("other_" + apply_on))
return list(set(apply_on_data))
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 3b907da..748e623 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1398,7 +1398,8 @@
remove_pricing_rule: function(item) {
let me = this;
- const fields = ["discount_percentage", "discount_amount", "pricing_rules"];
+ const fields = ["discount_percentage",
+ "discount_amount", "margin_rate_or_amount", "rate_with_margin"];
if(item.remove_free_item) {
var items = [];
@@ -1418,6 +1419,12 @@
fields.forEach(f => {
row[f] = 0;
});
+
+ ["pricing_rules", "margin_type"].forEach(field => {
+ if (row[field]) {
+ row[field] = '';
+ }
+ })
}
});