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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi 2012-12-05 17:32:32 +05:30
commit 4f29be2948
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hr/doctype/expense_claim/expense_claim.py
View File

@ -27,10 +27,16 @@ class DocType:
def __init__(self, doc, doclist=[]):
self.doc = doc
self.doclist = doclist
def validate(self):
if self.doc.exp_approver == self.doc.owner:
webnotes.msgprint("""Self Approval is not allowed.""", raise_exception=1)
self.validate_fiscal_year()
self.validate_exp_details()
def on_submit(self):
if self.doc.status=="Draft":
webnotes.msgprint("""Please set status to 'Approved' or 'Rejected' before submitting""",
if self.doc.approval_status=="Draft":
webnotes.msgprint("""Please set Approval Status to 'Approved' or 'Rejected' before submitting""",
raise_exception=1)
def validate_fiscal_year(self):
@ -40,9 +46,6 @@ class DocType:
if str(self.doc.posting_date) < str(ysd) or str(self.doc.posting_date) > str(yed):
msgprint("Posting Date is not within the Fiscal Year selected")
raise Exception
def validate(self):
self.validate_fiscal_year()
def validate_exp_details(self):
if not getlist(self.doclist, 'expense_voucher_details'):

3
hr/doctype/leave_application/leave_application.py
View File

@ -90,6 +90,9 @@ class DocType:
raise Exception
def validate(self):
if self.doc.leave_approver == self.doc.owner:
webnotes.msgprint("""Self Approval is not allowed.""", raise_exception=1)
self.validate_to_date()
self.validate_balance_leaves()
self.validate_leave_overlap()