commit 86cd4cc739e313f4736f3c71f2b5348239db8695
author Nabin Hait <nabinhait@gmail.com> Sat Feb 28 19:11:51 2015 +0530
committer Nabin Hait <nabinhait@gmail.com> Sat Feb 28 19:12:55 2015 +0530
tree e65e4f5c725a7f3801467c74274fa7cd54f3a2b8
parent bc6c360bf136b3e61ca272a78a71b18d0a1e578c

discount related fix

erpnext/controllers/taxes_and_totals.py

diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 2d5df15..c846dd0 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -73,8 +73,9 @@
 
 	def initialize_taxes(self):
 		for tax in self.doc.get("taxes"):
-			validate_taxes_and_charges(tax)
-			validate_inclusive_tax(tax, self.doc)
+			if not self.discount_amount_applied:
+				validate_taxes_and_charges(tax)
+				validate_inclusive_tax(tax, self.doc)
 
 			tax.item_wise_tax_detail = {}
 			tax_fields = ["total", "tax_amount_after_discount_amount",