nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-18 10:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commonified sales/purchase taxes and charges master.js code

Browse Source
This commit is contained in:
Nabin Hait
2015-02-22 20:14:49 +05:30
parent e7679703cf
commit ce24512ed7
10 changed files with 185 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/taxes_and_totals.py
View File

@@ -290,6 +290,8 @@ class calculate_taxes_and_totals(object):
tax.tax_amount = flt(tax.tax_amount, tax.precision("tax_amount"))
tax.tax_amount_after_discount_amount = flt(tax.tax_amount_after_discount_amount, tax.precision("tax_amount"))
self._set_in_company_currency(tax, ["total", "tax_amount", "tax_amount_after_discount_amount"]);
def adjust_discount_amount_loss(self, tax):
discount_amount_loss = self.doc.grand_total - flt(self.doc.discount_amount) - tax.total
tax.tax_amount_after_discount_amount = flt(tax.tax_amount_after_discount_amount +