Merge pull request #28641 from frappe/mergify/bp/version-13-hotfix/pr-28302

fix: Shipping Rule picking up old net_rate (backport #28302)
2021-12-03 15:20:09 +05:30
parent 99dfa91f81 f591596615
commit b09274bd49
5 changed files with 16 additions and 45 deletions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1065,16 +1065,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 			return this.frm.call({
 				doc: this.frm.doc,
 				method: "apply_shipping_rule",
-				callback: function(r) {
-					if(!r.exc) {
-						me.calculate_taxes_and_totals();
-					}
-				}
 			}).fail(() => this.frm.set_value('shipping_rule', ''));
 		}
-		else {
-			me.calculate_taxes_and_totals();
-		}
 	},

 	set_margin_amount_based_on_currency: function(exchange_rate) {