From 161f35a687bd1ca5150e46e26bb6b78cecf071a8 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Sat, 5 May 2018 14:32:31 +0530 Subject: [PATCH 1/2] Update sales_invoice.py --- erpnext/accounts/doctype/sales_invoice/sales_invoice.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index d8220528d43..b174d9b224f 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -344,8 +344,8 @@ class SalesInvoice(SellingController): self.terms = frappe.db.get_value("Terms and Conditions", self.tc_name, "terms") # fetch charges - if self.taxes_and_charges: - self.set_other_charges() + if self.taxes_and_charges and not len(self.get("taxes")): + self.set_taxes() return pos From ea199f9cd96923675a5fe6e5046de59c59d471b5 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Sat, 5 May 2018 15:03:33 +0600 Subject: [PATCH 2/2] bumped to version 10.1.30 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index ea1a4023e55..1073c7ef19b 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__ = '10.1.29' +__version__ = '10.1.30' def get_default_company(user=None): '''Get default company for user'''