nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta
2013-08-06 17:54:11 +05:30
parent 0b50b48104 5e4e5d78df
commit 4d0f37e97c
11 changed files with 100 additions and 43 deletions
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({
method:"hr.utils.get_leave_approver_list",
callback: function(r) {
me.frm.fields_dict.employee_leave_approvers.grid
.get_field("leave_approver").df.options =
$.map(r.message, function(profile) {
return {value: profile, label: wn.user_info(profile).fullname};
});
var df = wn.meta.get_docfield("Employee Leave Approver", "leave_approver",
me.frm.doc.name);
df.options = $.map(r.message, function(profile) {
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.cscript.calculate_total_days(doc, dt, dn);
}
cur_frm.set_df_property("leave_approver", "options", "");
return cur_frm.call({
method:"hr.utils.get_leave_approver_list",
callback: function(r) {