From 5070224079cd9527581e3aee9857759a33c9dd26 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 13 Feb 2013 19:49:42 +0530 Subject: [PATCH] select leave approver by fullname in leave application --- home/page/latest_updates/latest_updates.js | 5 +++++ hr/doctype/leave_application/leave_application.js | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index 7e28824229..dea571d177 100644 --- a/home/page/latest_updates/latest_updates.js +++ b/home/page/latest_updates/latest_updates.js @@ -1,4 +1,9 @@ erpnext.updates = [ + ["13th February, 2013", [ + "Employee: If Employee is linked to a Profile, copy Full Name, Date of Birth, \ + Image and Gender to Profile", + "Leave Application: Select Leave Approver by their Full Name", + ]], ["6th February, 2013", [ "Bookmarks: Add bookmarks via toolbar by clicking on the sign.", ]], diff --git a/hr/doctype/leave_application/leave_application.js b/hr/doctype/leave_application/leave_application.js index 3c26a51d25..9df348a17e 100755 --- a/hr/doctype/leave_application/leave_application.js +++ b/hr/doctype/leave_application/leave_application.js @@ -23,10 +23,14 @@ cur_frm.cscript.onload = function(doc, dt, dn) { if(doc.__islocal) { cur_frm.set_value("status", "Open") } + cur_frm.set_df_property("leave_approver", "options", ""); cur_frm.call({ method:"get_approver_list", callback: function(r) { - cur_frm.set_df_property("leave_approver", "options", r.message); + cur_frm.set_df_property("leave_approver", "options", $.map(r.message, + function(profile) { + return {value: profile, label: wn.user_info(profile).fullname}; + })); cur_frm.cscript.get_leave_balance(cur_frm.doc); } });