nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

net_total and grand_total mismatch issue

Browse Source
This commit is contained in:
Nabin Hait
2015-02-05 17:18:03 +05:30
parent e0ce9407cb
commit 5e13e0c316
4 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/controllers/selling_controller.py
View File

@@ -218,10 +218,11 @@ class SellingController(StockController):
def calculate_totals(self):
self.grand_total = flt(self.tax_doclist[-1].total if self.tax_doclist else self.net_total)
self.grand_total_export = flt(self.grand_total / self.conversion_rate)
self.other_charges_total = flt(self.grand_total - self.net_total, self.precision("other_charges_total"))
self.grand_total_export = flt(self.grand_total / self.conversion_rate) \
if (self.other_charges_total or self.discount_amount) else self.net_total_export
self.other_charges_total_export = flt(self.grand_total_export - self.net_total_export +
flt(self.discount_amount), self.precision("other_charges_total_export"))