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

Fixed conflict while merging with develop brnach

Browse Source
This commit is contained in:
Nabin Hait
2014-01-20 16:48:49 +05:30
parent 06720dfb90 dbb4955483
commit dc15b4fa8a
74 changed files with 768 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/selling_controller.py
View File

@@ -191,7 +191,8 @@ class SellingController(StockController):
self.doc.other_charges_total = flt(self.doc.grand_total - self.doc.net_total,
self.precision("other_charges_total"))
self.doc.other_charges_total_export = flt(self.doc.grand_total_export - self.doc.net_total_export,
self.doc.other_charges_total_export = flt(
self.doc.grand_total_export - self.doc.net_total_export,
self.precision("other_charges_total_export"))
self.doc.rounded_total = _round(self.doc.grand_total)