nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Recalculate taxes irrespective of price list rate changed or not

Browse Source 
(cherry picked from commit 233f79bf96)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
This commit is contained in:
Deepesh Garg
2021-12-22 11:26:19 +05:30
committed by mergify-bot
parent 4756fbc253
commit d19369b198
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1582,7 +1582,6 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
_set_values_for_item_list(children) { _set_values_for_item_list(children) {
var me = this; var me = this;
var price_list_rate_changed = false;
var items_rule_dict = {}; var items_rule_dict = {};
for(var i=0, l=children.length; i<l; i++) { for(var i=0, l=children.length; i<l; i++) {
@@ -1593,7 +1592,6 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
var v = d[k]; var v = d[k];
if (["doctype", "name"].indexOf(k)===-1) { if (["doctype", "name"].indexOf(k)===-1) {
if(k=="price_list_rate") { if(k=="price_list_rate") {
if(flt(v) != flt(d.price_list_rate)) price_list_rate_changed = true;
item_row['rate'] = v; item_row['rate'] = v;
} }
@@ -1622,8 +1620,13 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
me.frm.refresh_field('items'); me.frm.refresh_field('items');
me.apply_rule_on_other_items(items_rule_dict); me.apply_rule_on_other_items(items_rule_dict);
<<<<<<< HEAD
if(!price_list_rate_changed) me.calculate_taxes_and_totals(); if(!price_list_rate_changed) me.calculate_taxes_and_totals();
} }
=======
me.calculate_taxes_and_totals();
},
>>>>>>> 233f79bf96 (fix: Recalculate taxes irrespective of price list rate changed or not)
apply_rule_on_other_items(args) { apply_rule_on_other_items(args) {
const me = this; const me = this;