From c3d8479443c420043eaf76d23522837157e3d07c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 19 Dec 2016 12:32:11 +0530 Subject: [PATCH] [minor] allow website user to be selected as employee --- erpnext/hr/doctype/employee/employee.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/erpnext/hr/doctype/employee/employee.js b/erpnext/hr/doctype/employee/employee.js index 0a8d9a1e49..fe83f4078a 100755 --- a/erpnext/hr/doctype/employee/employee.js +++ b/erpnext/hr/doctype/employee/employee.js @@ -5,7 +5,11 @@ frappe.provide("erpnext.hr"); erpnext.hr.EmployeeController = frappe.ui.form.Controller.extend({ setup: function() { this.frm.fields_dict.user_id.get_query = function(doc, cdt, cdn) { - return { query:"frappe.core.doctype.user.user.user_query"} } + return { + query: "frappe.core.doctype.user.user.user_query", + filters: {ignore_user_type: 1} + } + } this.frm.fields_dict.reports_to.get_query = function(doc, cdt, cdn) { return { query: "erpnext.controllers.queries.employee_query"} } }, @@ -41,7 +45,7 @@ erpnext.hr.EmployeeController = frappe.ui.form.Controller.extend({ }[this.frm.doc.salutation]); } }, - + }); frappe.ui.form.on('Employee',{ prefered_contact_email:function(frm){ @@ -57,7 +61,9 @@ frappe.ui.form.on('Employee',{ frm.events.update_contact(frm) }, update_contact:function(frm){ - frm.set_value("prefered_email",frm.fields_dict[frappe.model.scrub(frm.doc.prefered_contact_email)].value) + var prefered_email_fieldname = frappe.model.scrub(frm.doc.prefered_contact_email) || 'user_id'; + frm.set_value("prefered_email", + frm.fields_dict[prefered_email_fieldname].value) }, status: function(frm) { return frm.call({