Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Precision issue in tax calculation

Browse Source
This commit is contained in:
Nabin Hait 2014-08-19 12:39:40 +05:30
parent 5e893ef8fd
commit 0a35effe49
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -343,13 +343,12 @@ class PurchaseInvoice(BuyingController):
self.get_gl_dict({ self.get_gl_dict({
"account": stock_received_but_not_billed, "account": stock_received_but_not_billed,
"against": self.credit_to, "against": self.credit_to,
"debit": flt(item.item_tax_amount), "debit": flt(item.item_tax_amount, self.precision("item_tax_amount", item)),
"remarks": self.remarks or "Accounting Entry for Stock" "remarks": self.remarks or "Accounting Entry for Stock"
}) })
) )
negative_expense_to_be_booked += flt(item.item_tax_amount) negative_expense_to_be_booked += flt(item.item_tax_amount, self.precision("item_tax_amount", item))
if negative_expense_to_be_booked and valuation_tax: if negative_expense_to_be_booked and valuation_tax:
# credit valuation tax amount in "Expenses Included In Valuation" # credit valuation tax amount in "Expenses Included In Valuation"

2
erpnext/controllers/accounts_controller.py
View File

@ -209,7 +209,7 @@ class AccountsController(TransactionBase):
def calculate_taxes(self): def calculate_taxes(self):
# maintain actual tax rate based on idx # maintain actual tax rate based on idx
actual_tax_dict = dict([[tax.idx, tax.rate] for tax in self.tax_doclist actual_tax_dict = dict([[tax.idx, flt(tax.rate, self.precision("tax_amount", tax))] for tax in self.tax_doclist
if tax.charge_type == "Actual"]) if tax.charge_type == "Actual"])
for n, item in enumerate(self.item_doclist): for n, item in enumerate(self.item_doclist):

2
erpnext/public/js/transaction.js
View File

@ -647,7 +647,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
// maintain actual tax rate based on idx // maintain actual tax rate based on idx
$.each(this.frm.tax_doclist, function(i, tax) { $.each(this.frm.tax_doclist, function(i, tax) {
if (tax.charge_type == "Actual") { if (tax.charge_type == "Actual") {
actual_tax_dict[tax.idx] = flt(tax.rate); actual_tax_dict[tax.idx] = flt(tax.rate, precision("tax_amount", tax));
} }
}); });