commit fff3ab752c15cedac250b8b985995b73a70c8ec9
author Nabin Hait <nabinhait@gmail.com> Wed Jan 14 16:27:13 2015 +0530
committer Nabin Hait <nabinhait@gmail.com> Wed Jan 14 16:27:13 2015 +0530
tree 9a41508ecb61caa604ffbd35fb142e3e16b093d4
parent 0bcf3e307c1ac5f9acb50e51b577bdc7eed4df89
parent da975f5a76aacc24abb71c4a26cb204f9ec72610

Fixed conflict

erpnext/controllers/buying_controller.py

diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index c3f449c..82da90e 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -115,7 +115,8 @@
 
 	def calculate_totals(self):
 		self.grand_total = flt(self.get("taxes")[-1].total if self.get("taxes") else self.net_total)
-		self.grand_total_import = flt(self.grand_total / self.conversion_rate)
+		self.grand_total_import = flt(self.grand_total / self.conversion_rate) \
+			if self.get("taxes") else self.net_total_import
 
 		self.total_tax = flt(self.grand_total - self.net_total, self.precision("total_tax"))