From 161f35a687bd1ca5150e46e26bb6b78cecf071a8 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Sat, 5 May 2018 14:32:31 +0530
Subject: [PATCH] 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 d8220528d4..b174d9b224 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