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

[taxes and charges] refactor

Browse Source
This commit is contained in:
Rushabh Mehta
2015-02-25 15:08:42 +05:30
parent e91388381c
commit 2a21bc9fc2
15 changed files with 213 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/controllers/accounts_controller.py
View File

@@ -370,6 +370,15 @@ def validate_taxes_and_charges(tax):
elif tax.row_id and cint(tax.row_id) >= cint(tax.idx):
frappe.throw(_("Cannot refer row number greater than or equal to current row number for this Charge type"))
if tax.charge_type == "Actual":
if not tax.tax_amount:
frappe.throw(_("Amount is mandatory for charge type 'Actual'"))
tax.rate = None
else:
if not tax.rate:
frappe.throw(_("Rate is mandatory for charge type '{0}'").format(tax.charge_type))
tax.tax_amount = None
def validate_inclusive_tax(tax, doc):
def _on_previous_row_error(row_range):
throw(_("To include tax in row {0} in Item rate, taxes in rows {1} must also be included").format(tax.idx,