Skip to content

Commit f382a94

Browse files
authored
fix: filters on vehicle expenses report (#2440)
1 parent 0d8fb35 commit f382a94

File tree

1 file changed

+20
-3
lines changed

1 file changed

+20
-3
lines changed

hrms/hr/report/vehicle_expenses/vehicle_expenses.js

+20-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,20 @@ frappe.query_reports["Vehicle Expenses"] = {
99
options: ["Fiscal Year", "Date Range"],
1010
default: ["Fiscal Year"],
1111
reqd: 1,
12+
on_change: () => {
13+
let filter_based_on = frappe.query_report.get_filter_value("filter_based_on");
14+
15+
if (filter_based_on == "Fiscal Year") {
16+
set_reqd_filter("fiscal_year", true);
17+
set_reqd_filter("from_date", false);
18+
set_reqd_filter("to_date", false);
19+
}
20+
if (filter_based_on == "Date Range") {
21+
set_reqd_filter("fiscal_year", false);
22+
set_reqd_filter("from_date", true);
23+
set_reqd_filter("to_date", true);
24+
}
25+
},
1226
},
1327
{
1428
fieldname: "fiscal_year",
@@ -17,21 +31,18 @@ frappe.query_reports["Vehicle Expenses"] = {
1731
options: "Fiscal Year",
1832
default: frappe.defaults.get_user_default("fiscal_year"),
1933
depends_on: "eval: doc.filter_based_on == 'Fiscal Year'",
20-
reqd: 1,
2134
},
2235
{
2336
fieldname: "from_date",
2437
label: __("From Date"),
2538
fieldtype: "Date",
26-
reqd: 1,
2739
depends_on: "eval: doc.filter_based_on == 'Date Range'",
2840
default: frappe.datetime.add_months(frappe.datetime.nowdate(), -12),
2941
},
3042
{
3143
fieldname: "to_date",
3244
label: __("To Date"),
3345
fieldtype: "Date",
34-
reqd: 1,
3546
depends_on: "eval: doc.filter_based_on == 'Date Range'",
3647
default: frappe.datetime.nowdate(),
3748
},
@@ -49,3 +60,9 @@ frappe.query_reports["Vehicle Expenses"] = {
4960
},
5061
],
5162
};
63+
64+
function set_reqd_filter(fieldname, is_reqd) {
65+
let filter = frappe.query_report.get_filter(fieldname);
66+
filter.df.reqd = is_reqd;
67+
filter.refresh();
68+
}

0 commit comments

Comments
 (0)