Skip to content

Commit

Permalink
fix: filter in reports (#1987)
Browse files Browse the repository at this point in the history
* fix: filter in reports

* fix: filter in reports --prettier
  • Loading branch information
Nihantra-Patel authored Aug 6, 2024
1 parent b4db5ac commit 559ef06
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
});
1 change: 1 addition & 0 deletions hrms/public/js/hrms.bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";

0 comments on commit 559ef06

Please sign in to comment.