From 241e478dc029530cea936da7c181072dbf772a11 Mon Sep 17 00:00:00 2001 From: Stavros Anastasiadis Date: Mon, 16 Jan 2017 14:02:28 +0200 Subject: [PATCH] Add Full Name as option in HR Setting Employee creation option --- erpnext/hr/doctype/employee/employee.py | 6 ++++-- erpnext/hr/doctype/hr_settings/hr_settings.json | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py index 881853d6c4..1026de1ea3 100755 --- a/erpnext/hr/doctype/employee/employee.py +++ b/erpnext/hr/doctype/employee/employee.py @@ -26,6 +26,8 @@ class Employee(Document): self.name = make_autoname(self.naming_series + '.####') elif naming_method == 'Employee Number': self.name = self.employee_number + elif naming_method == 'Full Name': + self.name = self.employee_name self.employee = self.name @@ -271,7 +273,7 @@ def create_user(employee, user = None): last_name = employee_name[1] first_name = employee_name[0] - + user = frappe.new_doc("User") user.update({ "name": emp.employee_name, @@ -286,4 +288,4 @@ def create_user(employee, user = None): "bio": emp.bio }) user.insert() - return user.name \ No newline at end of file + return user.name diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.json b/erpnext/hr/doctype/hr_settings/hr_settings.json index e9d209879e..5281045098 100644 --- a/erpnext/hr/doctype/hr_settings/hr_settings.json +++ b/erpnext/hr/doctype/hr_settings/hr_settings.json @@ -22,6 +22,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Employee Settings", "length": 0, "no_copy": 0, @@ -50,6 +51,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Retirement Age", "length": 0, "no_copy": 0, @@ -79,10 +81,11 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Employee Records to be created by", "length": 0, "no_copy": 0, - "options": "Naming Series\nEmployee Number", + "options": "Naming Series\nEmployee Number\nFull Name", "permlevel": 0, "print_hide": 0, "print_hide_if_no_value": 0, @@ -106,6 +109,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "length": 0, "no_copy": 0, "permlevel": 0, @@ -133,6 +137,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Stop Birthday Reminders", "length": 0, "no_copy": 0, @@ -159,6 +164,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Maintain Billing Hours and Working Hours Same on Timesheet", "length": 0, "no_copy": 0, @@ -186,6 +192,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Payroll Settings", "length": 0, "no_copy": 0, @@ -213,6 +220,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Include holidays in Total no. of Working Days", "length": 0, "no_copy": 0, @@ -241,6 +249,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Email Salary Slip to Employee", "length": 0, "no_copy": 0, @@ -268,6 +277,7 @@ "ignore_xss_filter": 0, "in_filter": 0, "in_list_view": 0, + "in_standard_filter": 0, "label": "Max working hours against Timesheet", "length": 0, "no_copy": 0, @@ -295,8 +305,8 @@ "issingle": 1, "istable": 0, "max_attachments": 0, - "modified": "2016-12-21 18:52:03.633251", - "modified_by": "Administrator", + "modified": "2017-01-16 14:01:31.183485", + "modified_by": "anastasiadis.st00@gmail.com", "module": "HR", "name": "HR Settings", "owner": "Administrator", @@ -327,5 +337,6 @@ "read_only": 0, "read_only_onload": 0, "sort_order": "ASC", + "track_changes": 0, "track_seen": 0 } \ No newline at end of file