nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[conflict] merged for get_query

Browse Source
This commit is contained in:
Nabin Hait
2013-07-10 19:05:57 +05:30
parent c0ebaae15a ee85cfd476
commit a4f0240bfc
72 changed files with 1243 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hr/doctype/employee/employee.js
View File

@@ -18,8 +18,10 @@ wn.provide("erpnext.hr");
erpnext.hr.EmployeeController = wn.ui.form.Controller.extend({
setup: function() {
this.setup_leave_approver_select();
this.frm.fields_dict.user_id.get_query = erpnext.utils.profile_query;
this.frm.fields_dict.reports_to.get_query = erpnext.utils.employee_query;
this.frm.fields_dict.user_id.get_query = function(doc,cdt,cdn) {
return { query:"controllers.queries.profile_query"} }
this.frm.fields_dict.reports_to.get_query = function(doc,cdt,cdn) {
return{ query:"controllers.queries.employee_query"} }
},
onload: function() {