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

[employee] [fix] Employee naming fix

Browse Source
This commit is contained in:
Rushabh Mehta 2013-08-06 12:53:09 +05:30
parent 5eedde191f
commit 9a921f479b
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hr/doctype/employee/employee.py
View File

@ -16,13 +16,17 @@ class DocType:
self.doclist = doclist self.doclist = doclist
def autoname(self): def autoname(self):
ret = sql("select value from `tabSingles` where doctype = 'Global Defaults' and field = 'emp_created_by'") naming_method = webnotes.conn.get_value("HR Settings", None, "emp_created_by")
if not ret: if not naming_method:
msgprint("Please setup Employee Naming System in Setup > Global Defaults > HR", raise_exception=True) webnotes.throw(_("Please setup Employee Naming System in Human Resource > HR Settings"))
else: else:
if ret[0][0]=='Naming Series': if naming_method=='Naming Series':
if not self.doc.naming_series:
webnotes.throw(_("Please select Naming Neries"))
self.doc.name = make_autoname(self.doc.naming_series + '.####') self.doc.name = make_autoname(self.doc.naming_series + '.####')
elif ret[0][0]=='Employee Number': elif naming_method=='Employee Number':
if not self.doc.employee_number:
webnotes.throw(_("Please enter Employee Number"))
self.doc.name = self.doc.employee_number self.doc.name = self.doc.employee_number
self.doc.employee = self.doc.name self.doc.employee = self.doc.name
@ -34,7 +38,6 @@ class DocType:
self.doc.employee = self.doc.name self.doc.employee = self.doc.name
self.validate_date() self.validate_date()
self.validate_email() self.validate_email()
self.validate_name()
self.validate_status() self.validate_status()
self.validate_employee_leave_approver() self.validate_employee_leave_approver()
@ -136,20 +139,6 @@ class DocType:
if self.doc.personal_email and not validate_email_add(self.doc.personal_email): if self.doc.personal_email and not validate_email_add(self.doc.personal_email):
msgprint("Please enter valid Personal Email") msgprint("Please enter valid Personal Email")
raise Exception raise Exception
def validate_name(self):
ret = sql("select value from `tabSingles` where doctype = 'Global Defaults' and field = 'emp_created_by'")
if not ret:
msgprint("To Save Employee, please go to Setup -->Global Defaults. Click on HR and select 'Employee Records to be created by'.")
raise Exception
else:
if ret[0][0]=='Naming Series' and not self.doc.naming_series:
msgprint("Please select Naming Series.")
raise Exception
elif ret[0][0]=='Employee Number' and not self.doc.employee_number:
msgprint("Please enter Employee Number.")
raise Exception
def validate_status(self): def validate_status(self):
if self.doc.status == 'Left' and not self.doc.relieving_date: if self.doc.status == 'Left' and not self.doc.relieving_date: