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

Update accounts_controller.py

Browse Source
This commit is contained in:
Nabin Hait 2015-02-27 23:40:56 +05:30
parent ad7ece63fe
commit bc6c360bf1
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/accounts_controller.py
View File

@ -371,13 +371,9 @@ def validate_taxes_and_charges(tax):
frappe.throw(_("Cannot refer row number greater than or equal to current row number for this Charge type")) frappe.throw(_("Cannot refer row number greater than or equal to current row number for this Charge type"))
if tax.charge_type == "Actual": if tax.charge_type == "Actual":
tax.rate = None
if not tax.tax_amount: if not tax.tax_amount:
frappe.throw(_("Amount is mandatory for charge type 'Actual'")) 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 validate_inclusive_tax(tax, doc):
def _on_previous_row_error(row_range): def _on_previous_row_error(row_range):