nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 05:29:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[naming series] create, remove Property Setters to set naming fixes webnotes/erpnext#854

Browse Source
This commit is contained in:
Rushabh Mehta
2013-10-18 17:23:50 +05:30
parent 5566bcaa0e
commit 70d7c481e9
13 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,12 +20,8 @@ class DocType:
webnotes.throw(_("Please setup Employee Naming System in Human Resource > HR Settings"))
else:
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 + '.####')
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.employee = self.doc.name

14
hr/doctype/hr_settings/hr_settings.py
View File

@@ -13,12 +13,18 @@ class DocType:
self.doc, self.doclist = d, dl
def validate(self):
self.original_stop_birthday_reminders = cint(webnotes.conn.get_value("HR Settings",
None, "stop_birthday_reminders"))
self.update_birthday_reminders()
from setup.doctype.naming_series.naming_series import set_by_naming_series
set_by_naming_series("Employee", "employee_number",
self.doc.get("emp_created_by")=="Naming Series", hide_name_field=True)
def on_update(self):
def update_birthday_reminders(self):
original_stop_birthday_reminders = cint(webnotes.conn.get_value("HR Settings",
None, "stop_birthday_reminders"))
# reset birthday reminders
if cint(self.doc.stop_birthday_reminders) != self.original_stop_birthday_reminders:
if cint(self.doc.stop_birthday_reminders) != original_stop_birthday_reminders:
webnotes.conn.sql("""delete from `tabEvent` where repeat_on='Every Year' and ref_type='Employee'""")
if not self.doc.stop_birthday_reminders: