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:
Rushabh Mehta 2012-12-06 18:22:01 +01:00
commit 1e840c5a18
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,8 +29,8 @@ class DocType:
self.doclist = doclist self.doclist = doclist
def validate(self): def validate(self):
if self.doc.exp_approver == self.doc.owner: # if self.doc.exp_approver == self.doc.owner:
webnotes.msgprint("""Self Approval is not allowed.""", raise_exception=1) # webnotes.msgprint("""Self Approval is not allowed.""", raise_exception=1)
self.validate_fiscal_year() self.validate_fiscal_year()
self.validate_exp_details() self.validate_exp_details()

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

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