diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 3f906d8f12..69cdecb6dd 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -298,7 +298,9 @@ def export_query(): if isinstance(visible_idx, str): visible_idx = json.loads(visible_idx) - data = run(report_name, form_params.filters, custom_columns=custom_columns) + data = run( + report_name, form_params.filters, custom_columns=custom_columns, are_default_filters=False + ) data = frappe._dict(data) if not data.columns: frappe.respond_as_web_page( diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.js b/frappe/email/doctype/auto_email_report/auto_email_report.js index 4ce4a63b03..62b562b97d 100644 --- a/frappe/email/doctype/auto_email_report/auto_email_report.js +++ b/frappe/email/doctype/auto_email_report/auto_email_report.js @@ -93,7 +93,7 @@ frappe.ui.form.on("Auto Email Report", { wrapper ); - var filters = JSON.parse(frm.doc.filters || "{}"); + var filters = {}; let report_filters; @@ -102,8 +102,19 @@ frappe.ui.form.on("Auto Email Report", { frappe.query_reports[frm.doc.reference_report] && frappe.query_reports[frm.doc.reference_report].filters ) { + if (frm.doc.filters) { + filters = JSON.parse(frm.doc.filters); + } else { + frappe.db.get_value("Report", frm.doc.report, "json", (r) => { + if (r && r.json) { + filters = JSON.parse(r.json).filters || {}; + } + }); + } + report_filters = frappe.query_reports[frm.doc.reference_report].filters; } else { + filters = JSON.parse(frm.doc.filters || "{}"); report_filters = frappe.query_reports[frm.doc.report].filters; }