From 71a9fa4fe9289c6628e6630a0dabb2de97ef2e73 Mon Sep 17 00:00:00 2001 From: Rutwik Hiwalkar Date: Mon, 22 Apr 2024 22:13:53 +0530 Subject: [PATCH] fix: filters on prepared report export --- .../public/js/frappe/views/reports/query_report.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 7df36f4df9..9ad2e27d6b 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1522,12 +1522,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { this.make_access_log("Export", file_format); let filters = this.get_filter_values(true); - if (frappe.urllib.get_dict("prepared_report_name")) { - filters = Object.assign( - frappe.urllib.get_dict("prepared_report_name"), - filters - ); - } let boolean_labels = { 1: __("Yes"), 0: __("No") }; let applied_filters = Object.fromEntries( Object.entries(filters).map(([key, value]) => [ @@ -1537,6 +1531,13 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { : value, ]) ); + let query_params = this.get_query_params(); + if ("prepared_report_name" in query_params) { + filters = Object.assign( + { prepared_report_name: query_params["prepared_report_name"] }, + filters + ); + } const visible_idx = this.datatable?.bodyRenderer.visibleRowIndices || []; if (visible_idx.length + 1 === this.data?.length) {