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

Fixed conflict while merging v4 into v5

Browse Source
This commit is contained in:
Nabin Hait
2015-02-10 16:37:18 +05:30
parent 2813f38c5a eac82039e3
commit 15cd12214e
55 changed files with 7612 additions and 3974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/controllers/selling_controller.py
View File

@@ -216,10 +216,11 @@ class SellingController(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_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"))