vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #12044 from deepeshgarg007/query_report_filter

Browse source 
fix: Query report filter
This commit is contained in:
mergify[bot] 2020-12-14 07:24:13 +00:00 • committed by GitHub
commit 718b8ae594
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/core/doctype/report_filter/report_filter.json
View file

@ -44,7 +44,7 @@
},
{
"fieldname": "options",
"fieldtype": "Data",
"fieldtype": "Small Text",
"label": "Options"
},
{
@ -58,7 +58,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2020-08-17 16:15:46.937267",
"modified": "2020-12-05 19:20:00.503097",
"modified_by": "Administrator",
"module": "Core",
"name": "Report Filter",

4
frappe/public/js/frappe/views/reports/query_report.js
View file

@ -1112,7 +1112,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
}
get_filter_values(raise) {
const mandatory = this.filters.filter(f => f.df.reqd);
// check for mandatory property for filters added via UI
const mandatory = this.filters.filter(f => (f.df.reqd || f.df.mandatory));
const missing_mandatory = mandatory.filter(f => !f.get_value());
if (raise && missing_mandatory.length > 0) {
let message = __('Please set filters');