From 4d93d339f79f1edb30a873d280a4a8cb76b3ddf0 Mon Sep 17 00:00:00 2001 From: Jamsheer Date: Fri, 11 May 2018 14:08:40 +0530 Subject: [PATCH] Employee benefit - filters fro earning component --- .../employee_benefit_application.js | 13 +++++++++++-- .../employee_benefit_claim.js | 12 ++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js b/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js index 8cf6909a12..4a04b5afb3 100644 --- a/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js +++ b/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js @@ -2,7 +2,16 @@ // For license information, please see license.txt frappe.ui.form.on('Employee Benefit Application', { - refresh: function(frm) { - + setup: function(frm) { + frm.set_query("earning_component", "employee_benefits", function() { + return { + filters: { + type: "Earning", + is_flexible_benefit: true, + disabled: false, + is_pro_rata_applicable: true + } + } + }) } }); diff --git a/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.js b/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.js index 816b1bd90a..99d7809d1a 100644 --- a/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.js +++ b/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.js @@ -2,7 +2,15 @@ // For license information, please see license.txt frappe.ui.form.on('Employee Benefit Claim', { - refresh: function(frm) { - + setup: function(frm) { + frm.set_query("earning_component", function() { + return { + filters: { + type: "Earning", + is_flexible_benefit: true, + disabled: false + } + } + }) } });