From c2e5e569a0d63b5542d0d5326947bec120e17657 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 27 Jun 2019 11:15:18 +0530 Subject: [PATCH 1/2] fix: same taxes adding multiple times in pos --- erpnext/public/js/controllers/transaction.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index d0ebce8c429..79119b262ca 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -1290,10 +1290,13 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ }, callback: function(r) { if(!r.exc) { - for (let tax of r.message) { - me.frm.add_child("taxes", tax); + me.frm.set_value("taxes", r.message); + + if(me.frm.doc.shipping_rule) { + me.frm.script_manager.trigger("shipping_rule"); + } else { + me.calculate_taxes_and_totals(); } - me.calculate_taxes_and_totals(); } } }); From 415c90d9d0b5effc56b38c60aa80defd87b86b7c Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 27 Jun 2019 13:21:14 +0600 Subject: [PATCH 2/2] bumped to version 11.1.42 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index ce107235f50..8c70de3cc19 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '11.1.41' +__version__ = '11.1.42' def get_default_company(user=None): '''Get default company for user'''