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

for tax account, rate is no more mandatory

Browse Source
This commit is contained in:
Anand Doshi 2012-11-29 18:29:56 +05:30
parent b12d5363bc
commit 681d21dd1f
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accounts/doctype/account/account.py
View File

@ -49,11 +49,6 @@ class DocType:
msgprint("Message: Please enter Master Name once the account is created.")
# Rate is mandatory for tax account
def validate_rate_for_tax(self):
if self.doc.account_type == 'Tax' and not self.doc.tax_rate:
msgprint("Please Enter Rate", raise_exception=1)
# Fetch Parent Details and validation for account not to be created under ledger
def validate_parent(self):
if self.doc.parent_account:
@ -135,7 +130,6 @@ class DocType:
def validate(self):
self.validate_master_name()
self.validate_rate_for_tax()
self.validate_parent()
self.validate_duplicate_account()
self.validate_root_details()

5
accounts/page/accounts_browser/accounts_browser.js
View File

@ -185,9 +185,9 @@ erpnext.AccountsChart = Class.extend({
// tax rate if tax
$(fd.account_type.input).change(function() {
if($(this).val()=='Tax') {
$(fd.tax_rate.wrapper).toggle(true);
$(fd.tax_rate.wrapper).toggle(true);
} else {
$(fd.tax_rate.wrapper).toggle(false);
$(fd.tax_rate.wrapper).toggle(false);
}
})
@ -214,6 +214,7 @@ erpnext.AccountsChart = Class.extend({
// show
d.onshow = function() {
$(fd.group_or_ledger.input).change();
$(fd.account_type.input).change();
}
d.show();
},