diff --git a/hrms/payroll/report/income_tax_deductions/income_tax_deductions.js b/hrms/payroll/report/income_tax_deductions/income_tax_deductions.js index 0acbda4807..33f73d87b4 100644 --- a/hrms/payroll/report/income_tax_deductions/income_tax_deductions.js +++ b/hrms/payroll/report/income_tax_deductions/income_tax_deductions.js @@ -2,6 +2,7 @@ // For license information, please see license.txt /* eslint-disable */ -frappe.require("assets/hrms/js/salary_slip_deductions_report_filters.js", function () { - frappe.query_reports["Income Tax Deductions"] = hrms.salary_slip_deductions_report_filters; -}); +frappe.query_reports["Income Tax Deductions"] = $.extend( + {}, + hrms.salary_slip_deductions_report_filters, +); diff --git a/hrms/payroll/report/professional_tax_deductions/professional_tax_deductions.js b/hrms/payroll/report/professional_tax_deductions/professional_tax_deductions.js index 469c3f5861..0f473481f2 100644 --- a/hrms/payroll/report/professional_tax_deductions/professional_tax_deductions.js +++ b/hrms/payroll/report/professional_tax_deductions/professional_tax_deductions.js @@ -2,7 +2,7 @@ // For license information, please see license.txt /* eslint-disable */ -frappe.require("assets/hrms/js/salary_slip_deductions_report_filters.js", function () { - frappe.query_reports["Professional Tax Deductions"] = - hrms.salary_slip_deductions_report_filters; -}); +frappe.query_reports["Professional Tax Deductions"] = $.extend( + {}, + hrms.salary_slip_deductions_report_filters, +); diff --git a/hrms/payroll/report/provident_fund_deductions/provident_fund_deductions.js b/hrms/payroll/report/provident_fund_deductions/provident_fund_deductions.js index b288a758f6..20302045bd 100644 --- a/hrms/payroll/report/provident_fund_deductions/provident_fund_deductions.js +++ b/hrms/payroll/report/provident_fund_deductions/provident_fund_deductions.js @@ -2,6 +2,7 @@ // For license information, please see license.txt /* eslint-disable */ -frappe.require("assets/hrms/js/salary_slip_deductions_report_filters.js", function () { - frappe.query_reports["Provident Fund Deductions"] = hrms.salary_slip_deductions_report_filters; -}); +frappe.query_reports["Provident Fund Deductions"] = $.extend( + {}, + hrms.salary_slip_deductions_report_filters, +); diff --git a/hrms/payroll/report/salary_payments_via_ecs/salary_payments_via_ecs.js b/hrms/payroll/report/salary_payments_via_ecs/salary_payments_via_ecs.js index 163dc0144d..f0fccc20bb 100644 --- a/hrms/payroll/report/salary_payments_via_ecs/salary_payments_via_ecs.js +++ b/hrms/payroll/report/salary_payments_via_ecs/salary_payments_via_ecs.js @@ -2,14 +2,14 @@ // For license information, please see license.txt /* eslint-disable */ -frappe.require("assets/hrms/js/salary_slip_deductions_report_filters.js", function () { - let ecs_checklist_filter = hrms.salary_slip_deductions_report_filters; - ecs_checklist_filter["filters"].push({ - fieldname: "type", - label: __("Type"), - fieldtype: "Select", - options: ["", "Bank", "Cash", "Cheque"], - }); +frappe.query_reports["Salary Payments via ECS"] = $.extend( + {}, + hrms.salary_slip_deductions_report_filters, +); - frappe.query_reports["Salary Payments via ECS"] = ecs_checklist_filter; +frappe.query_reports["Salary Payments via ECS"]["filters"].push({ + fieldname: "type", + label: __("Type"), + fieldtype: "Select", + options: ["", "Bank", "Cash", "Cheque"], }); diff --git a/hrms/public/js/hrms.bundle.js b/hrms/public/js/hrms.bundle.js index f53beddd87..8793d78423 100644 --- a/hrms/public/js/hrms.bundle.js +++ b/hrms/public/js/hrms.bundle.js @@ -5,3 +5,4 @@ import "./templates/rating.html"; import "./utils"; import "./utils/payroll_utils"; import "./utils/leave_utils"; +import "./salary_slip_deductions_report_filters.js";