commit 2244ac4d52a500f89e5c88a451b8cc9dc4e9ebe1
author Nabin Hait <nabinhait@gmail.com> Mon Jan 12 17:35:14 2015 +0530
committer Nabin Hait <nabinhait@gmail.com> Mon Jan 12 17:35:37 2015 +0530
tree 4adb646e53e10542e822b150b3def5ef8241dff7
parent 024b537b7f1593f0506d0897404984bcbd22c9b8

Discount amount in party currency

erpnext/controllers/accounts_controller.py

diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 02fdf2c..5219339 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -295,7 +295,7 @@
 			self.precision("tax_amount", tax))
 
 	def adjust_discount_amount_loss(self, tax):
-		discount_amount_loss = self.grand_total - flt(self.discount_amount) - tax.total
+		discount_amount_loss = self.grand_total - flt(self.base_discount_amount) - tax.total
 		tax.tax_amount_after_discount_amount = flt(tax.tax_amount_after_discount_amount +
 			discount_amount_loss, self.precision("tax_amount", tax))
 		tax.total = flt(tax.total + discount_amount_loss, self.precision("total", tax))