From bbaed45d46b4600e8ce59d9d25086e7d7bb1ed80 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Wed, 30 Oct 2024 15:42:59 +0530 Subject: [PATCH] fix: do not show hidden filters in export or print --- .../js/frappe/views/reports/query_report.js | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 48cdfc3257..37c328b835 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1481,10 +1481,14 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { get_filters_html_for_print() { const applied_filters = this.get_filter_values(); return Object.keys(applied_filters) - .filter((fieldname) => !frappe.utils.is_empty(applied_filters[fieldname])) .map((fieldname) => { const docfield = frappe.query_report.get_filter(fieldname).df; const value = applied_filters[fieldname]; + + if (frappe.utils.is_empty(value) || docfield.hidden_due_to_dependency) { + return null; + } + return `
${__(docfield.label, null, docfield.parent)}: ${frappe.format(value, docfield)}
`; @@ -1532,14 +1536,16 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { let filters = this.get_filter_values(true); let boolean_labels = { 1: __("Yes"), 0: __("No") }; - let applied_filters = Object.fromEntries( - Object.entries(filters).map(([key, value]) => [ - frappe.query_report.get_filter(key).df.label, - frappe.query_report.get_filter(key).df.fieldtype == "Check" - ? boolean_labels[value] - : value, - ]) - ); + let applied_filters = {}; + + for (const [key, value] of Object.entries(filters)) { + const df = frappe.query_report.get_filter(key).df; + if (!df.hidden_due_to_dependency) { + applied_filters[df.label] = + df.fieldtype === "Check" ? boolean_labels[value] : value; + } + } + if (this.prepared_report_name) { filters.prepared_report_name = this.prepared_report_name; }