schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2021-12-25 09:04:34 +05:30
committed by GitHub
parent 2d0208ba1f
commit 6eb3d6a814
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1622,13 +1622,8 @@ 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();
}
=======
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;