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

Merge pull request #7509 from kickapoo/develop

Browse Source 
Add Full Name as option in HR Setting Employee creation option
This commit is contained in:
Nabin Hait 2017-01-17 11:26:25 +05:30 committed by GitHub
commit 2dab8809e7
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/doctype/employee/employee.py
View File

@ -26,6 +26,8 @@ class Employee(Document):
self.name = make_autoname(self.naming_series + '.####') self.name = make_autoname(self.naming_series + '.####')
elif naming_method == 'Employee Number': elif naming_method == 'Employee Number':
self.name = self.employee_number self.name = self.employee_number
elif naming_method == 'Full Name':
self.name = self.employee_name
self.employee = self.name self.employee = self.name

17
erpnext/hr/doctype/hr_settings/hr_settings.json
View File

@ -22,6 +22,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0,
"label": "Employee Settings", "label": "Employee Settings",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
@ -50,6 +51,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0,
"label": "Retirement Age", "label": "Retirement Age",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
@ -79,10 +81,11 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0,
"label": "Employee Records to be created by", "label": "Employee Records to be created by",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Naming Series\nEmployee Number", "options": "Naming Series\nEmployee Number\nFull Name",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
@ -106,6 +109,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0,
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
@ -133,6 +137,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0,
"label": "Stop Birthday Reminders", "label": "Stop Birthday Reminders",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
@ -159,6 +164,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0,
"label": "Maintain Billing Hours and Working Hours Same on Timesheet", "label": "Maintain Billing Hours and Working Hours Same on Timesheet",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
@ -186,6 +192,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0,
"label": "Payroll Settings", "label": "Payroll Settings",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
@ -213,6 +220,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0,
"label": "Include holidays in Total no. of Working Days", "label": "Include holidays in Total no. of Working Days",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
@ -241,6 +249,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0,
"label": "Email Salary Slip to Employee", "label": "Email Salary Slip to Employee",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
@ -268,6 +277,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0,
"label": "Max working hours against Timesheet", "label": "Max working hours against Timesheet",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
@ -295,8 +305,8 @@
"issingle": 1, "issingle": 1,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-12-21 18:52:03.633251", "modified": "2017-01-16 14:01:31.183485",
"modified_by": "Administrator", "modified_by": "anastasiadis.st00@gmail.com",
"module": "HR", "module": "HR",
"name": "HR Settings", "name": "HR Settings",
"owner": "Administrator", "owner": "Administrator",
@ -327,5 +337,6 @@
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"sort_order": "ASC", "sort_order": "ASC",
"track_changes": 0,
"track_seen": 0 "track_seen": 0
} }