mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-31 18:59:08 +00:00
Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
@@ -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()
|
||||||
|
|
||||||
|
|||||||
@@ -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()
|
||||||
|
|||||||
Reference in New Issue
Block a user