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

[fix] leave approver selection

Browse Source
This commit is contained in:
Anand Doshi 2013-08-06 15:21:43 +05:30
parent 41006c545e
commit d5b06f78a5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,11 +30,12 @@ erpnext.hr.EmployeeController = wn.ui.form.Controller.extend({
return this.frm.call({ return this.frm.call({
method:"hr.utils.get_leave_approver_list", method:"hr.utils.get_leave_approver_list",
callback: function(r) { callback: function(r) {
me.frm.fields_dict.employee_leave_approvers.grid var df = wn.meta.get_docfield("Employee Leave Approver", "leave_approver",
.get_field("leave_approver").df.options = me.frm.doc.name);
$.map(r.message, function(profile) { df.options = $.map(r.message, function(profile) {
return {value: profile, label: wn.user_info(profile).fullname}; return {value: profile, label: wn.user_info(profile).fullname};
}); });
me.frm.fields_dict.employee_leave_approvers.refresh();
} }
}); });
}, },

1
hr/doctype/leave_application/leave_application.js
View File

@ -10,7 +10,6 @@ cur_frm.cscript.onload = function(doc, dt, dn) {
cur_frm.set_value("status", "Open"); cur_frm.set_value("status", "Open");
cur_frm.cscript.calculate_total_days(doc, dt, dn); cur_frm.cscript.calculate_total_days(doc, dt, dn);
} }
cur_frm.set_df_property("leave_approver", "options", "");
return cur_frm.call({ return cur_frm.call({
method:"hr.utils.get_leave_approver_list", method:"hr.utils.get_leave_approver_list",
callback: function(r) { callback: function(r) {