commit 338e1b6e916a06943aef81f600760c0c4e7478c0
author Nabin Hait <nabinhait@gmail.com> Sat May 05 14:33:35 2018 +0530
committer Nabin Hait <nabinhait@gmail.com> Sat May 05 14:33:35 2018 +0530
tree 7ef21ffd5adb79843eda43d2b6b39967890bca83
parent 4bbe5fbefc61396cee0500494143fb2f09e951a3
parent 02a40e9d7b6c2545d0177f2166be41b973174cf5

Merge branch 'master' into develop

erpnext/__init__.py

diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index ea1a402..1073c7e 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
 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'''

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 4b497d0..a3ad049 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -346,8 +346,8 @@
 				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