commit 6eb3d6a814a1a86a6d606946779278488c0a8b68
author Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Sat Dec 25 09:04:34 2021 +0530
committer GitHub <noreply@github.com> Sat Dec 25 09:04:34 2021 +0530
tree c3fefaba6770feadd8d143407bac23931fcdb53d
parent 2d0208ba1fc6808cad18de509ebb2e2cfa5cd152

fix: Conflicts

erpnext/public/js/controllers/transaction.js

diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 794e912..3791741 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1622,13 +1622,8 @@
 		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;