Deepesh Garg
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
6 deletions
-
erpnext/public/js/controllers/transaction.js
|
|
|
@ -1622,13 +1622,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe |
|
|
|
me.frm.refresh_field('items'); |
|
|
|
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(); |
|
|
|
}, |
|
|
|
>>>>>>> 233f79bf96 (fix: Recalculate taxes irrespective of price list rate changed or not) |
|
|
|
} |
|
|
|
|
|
|
|
apply_rule_on_other_items(args) { |
|
|
|
const me = this; |
|
|
|
|
