nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-15 23:54:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45539 from frappe/mergify/bp/version-15-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-27 17:35:27 +05:30
committed by GitHub
parent 2c3e765896 4e347d835e
commit 8d30b4d14e
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -415,8 +415,6 @@ 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,
}
)

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

@@ -1658,7 +1658,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
},
callback: function(r) {
if (!r.exc && r.message) {
me.remove_pricing_rule(r.message, removed_pricing_rule);
me.remove_pricing_rule(r.message, removed_pricing_rule, item.name);
me.calculate_taxes_and_totals();
if(me.frm.doc.apply_discount_on) me.frm.trigger("apply_discount_on");
}
@@ -1751,7 +1751,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
@@ -1935,7 +1937,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
});
}
remove_pricing_rule(item, removed_pricing_rule) {
remove_pricing_rule(item, removed_pricing_rule, row_name) {
let me = this;
const fields = ["discount_percentage",
"discount_amount", "margin_rate_or_amount", "rate_with_margin"];
@@ -1974,6 +1976,13 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
me.trigger_price_list_rate();
}
else if(!item.is_free_item && row_name){
me.frm.doc.items.forEach(d => {
if (d.name != row_name) return;
Object.assign(d, item);
});
}
}
trigger_price_list_rate() {