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

fix: set_query in leave application (#22197)

Browse Source
This commit is contained in:
Anurag Mishra 2020-06-12 17:37:59 +05:30 committed by GitHub
parent ee6f80e25b
commit 7558e64d6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/hr/doctype/leave_application/leave_application.js
View File

@ -46,6 +46,7 @@ frappe.ui.form.on("Leave Application", {
make_dashboard: function(frm) { make_dashboard: function(frm) {
var leave_details; var leave_details;
let lwps;
if (frm.doc.employee) { if (frm.doc.employee) {
frappe.call({ frappe.call({
method: "erpnext.hr.doctype.leave_application.leave_application.get_leave_details", method: "erpnext.hr.doctype.leave_application.leave_application.get_leave_details",
@ -61,6 +62,7 @@ frappe.ui.form.on("Leave Application", {
if (!r.exc && r.message['leave_approver']) { if (!r.exc && r.message['leave_approver']) {
frm.set_value('leave_approver', r.message['leave_approver']); frm.set_value('leave_approver', r.message['leave_approver']);
} }
lwps = r.message["lwps"];
} }
}); });
$("div").remove(".form-dashboard-section.custom"); $("div").remove(".form-dashboard-section.custom");
@ -70,12 +72,17 @@ frappe.ui.form.on("Leave Application", {
}) })
); );
frm.dashboard.show(); frm.dashboard.show();
let allowed_leave_types = Object.keys(leave_details);
// lwps should be allowed, lwps don't have any allocation
allowed_leave_types = allowed_leave_types.concat(lwps);
frm.set_query('leave_type', function(){ frm.set_query('leave_type', function(){
return { return {
filters : [ filters : [
['leave_type_name', 'in', Object.keys(leave_details)] ['leave_type_name', 'in', allowed_leave_types]
] ]
} };
}); });
} }
}, },

8
erpnext/hr/doctype/leave_application/leave_application.py
View File

@ -19,7 +19,6 @@ class NotAnOptionalHoliday(frappe.ValidationError): pass
from frappe.model.document import Document from frappe.model.document import Document
class LeaveApplication(Document): class LeaveApplication(Document):
def get_feed(self): def get_feed(self):
return _("{0}: From {0} of type {1}").format(self.employee_name, self.leave_type) return _("{0}: From {0} of type {1}").format(self.employee_name, self.leave_type)
@ -463,9 +462,14 @@ def get_leave_details(employee, date):
"pending_leaves": leaves_pending, "pending_leaves": leaves_pending,
"remaining_leaves": remaining_leaves} "remaining_leaves": remaining_leaves}
#is used in set query
lwps = frappe.get_list("Leave Type", filters = {"is_lwp": 1})
lwps = [lwp.name for lwp in lwps]
ret = { ret = {
'leave_allocation': leave_allocation, 'leave_allocation': leave_allocation,
'leave_approver': get_leave_approver(employee) 'leave_approver': get_leave_approver(employee),
'lwps': lwps
} }
return ret return ret