nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 03:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

frappe/frappe#478 fixes

Browse Source
This commit is contained in:
Nabin Hait
2014-04-04 11:06:10 +05:30
parent c10213d861
commit 312ba99e71
11 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/accounts_controller.py
View File

@@ -210,7 +210,7 @@ class AccountsController(TransactionBase):
"row_range": row_range
})
if cint(tax.included_in_print_rate):
if cint(getattr(tax, "included_in_print_rate", None)):
if tax.charge_type == "Actual":
# inclusive tax cannot be of type Actual
throw((_("Row")
@@ -259,7 +259,7 @@ class AccountsController(TransactionBase):
tax.tax_amount_after_discount_amount += current_tax_amount
if tax.category:
if getattr(tax, "category", None):
# if just for valuation, do not add the tax amount in total
# hence, setting it as 0 for further steps
current_tax_amount = 0.0 if (tax.category == "Valuation") \