fix: filter in reports (backport #1987) (#2044)

* fix: filter in reports (#1987) * fix: filter in reports * fix: filter in reports --prettier (cherry picked from commit 559ef06) # Conflicts: # hrms/public/js/hrms.bundle.js * chore: fix conflicts --------- Co-authored-by: Nihantra C. Patel <[email protected]> Co-authored-by: Rucha Mahabal <[email protected]>
frappe · Aug 6, 2024 · adeb482 · adeb482
1 parent 3411d7a
commit adeb482
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,2 +1,3 @@
 import "./templates/employees_with_unmarked_attendance.html";
 import "./utils";
+import "./salary_slip_deductions_report_filters.js";