nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 03:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30731 from frappe/mergify/bp/version-13-hotfix/pr-30728

Browse Source 
fix: Price changing on creating Sales return from Delivery Note (backport #30728)
This commit is contained in:
Deepesh Garg
2022-04-18 16:33:14 +05:30
committed by GitHub
parent 183ff53ccb 93fe840844
commit d6126b6695
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1500,6 +1500,11 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
return; return;
} }
// Target doc created from a mapped doc
if (this.frm.doc.__onload && this.frm.doc.__onload.ignore_price_list) {
return;
}
return this.frm.call({ return this.frm.call({
method: "erpnext.accounts.doctype.pricing_rule.pricing_rule.apply_pricing_rule", method: "erpnext.accounts.doctype.pricing_rule.pricing_rule.apply_pricing_rule",
args: { args: args, doc: me.frm.doc }, args: { args: args, doc: me.frm.doc },
@@ -1616,7 +1621,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
me.remove_pricing_rule(frappe.get_doc(d.doctype, d.name)); me.remove_pricing_rule(frappe.get_doc(d.doctype, d.name));
} }
if (d.free_item_data) { if (d.free_item_data.length > 0) {
me.apply_product_discount(d); me.apply_product_discount(d);
} }