nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 23:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove free item row only if pricing rule matches

Browse Source 
(cherry picked from commit fea20db262)
This commit is contained in:
Gursheen Anand
2024-02-28 12:47:41 +05:30
committed by Mergify
parent 930df21a5f
commit 6352bfe34e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1513,6 +1513,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
} }
remove_pricing_rule_for_item(item) { remove_pricing_rule_for_item(item) {
// capture pricing rule before removing it to delete free items
let removed_pricing_rule = item.pricing_rules;
if (item.pricing_rules){ if (item.pricing_rules){
let me = this; let me = this;
return this.frm.call({ return this.frm.call({
@@ -1533,7 +1535,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}, },
callback: function(r) { callback: function(r) {
if (!r.exc && r.message) { if (!r.exc && r.message) {
me.remove_pricing_rule(r.message); me.remove_pricing_rule(r.message, removed_pricing_rule);
me.calculate_taxes_and_totals(); me.calculate_taxes_and_totals();
if(me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on"); if(me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on");
} }
@@ -1791,7 +1793,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
}); });
} }
remove_pricing_rule(item) { remove_pricing_rule(item, removed_pricing_rule) {
let me = this; let me = this;
const fields = ["discount_percentage", const fields = ["discount_percentage",
"discount_amount", "margin_rate_or_amount", "rate_with_margin"]; "discount_amount", "margin_rate_or_amount", "rate_with_margin"];
@@ -1800,7 +1802,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
let items = []; let items = [];
me.frm.doc.items.forEach(d => { me.frm.doc.items.forEach(d => {
if(d.item_code != item.remove_free_item || !d.is_free_item) { // if same item was added a free item through a different pricing rule, keep it
if(d.item_code != item.remove_free_item || !d.is_free_item || removed_pricing_rule?.includes(d.pricing_rules)) {
items.push(d); items.push(d);
} }
}); });