schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2015-01-14 16:27:13 +05:30
parent 0bcf3e307c da975f5a76
commit fff3ab752c
31 changed files with 3893 additions and 3804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/buying_controller.py
View File

@@ -115,7 +115,8 @@ class BuyingController(StockController):
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"))