fix: Conflicts

2021-12-25 09:04:34 +05:30
parent 2d0208ba1f
commit 6eb3d6a814
1 changed files with 1 additions and 6 deletions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/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;