From 348f852792630d92731b5876fdb82e48505d1403 Mon Sep 17 00:00:00 2001 From: anandbaburajan Date: Wed, 10 May 2023 19:08:01 +0530 Subject: [PATCH 01/20] fix: custom filters while exporting and creating new auto email reports --- frappe/desk/query_report.py | 4 +++- .../doctype/auto_email_report/auto_email_report.js | 13 ++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) 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; } From bc5b10b9ded1696813faac808d2191edd079b2a3 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 15 May 2023 13:06:16 +0530 Subject: [PATCH 02/20] chore: removed FormBuilder.vue from components --- .../public/js/form_builder/{components => }/FormBuilder.vue | 6 +++--- frappe/public/js/form_builder/form_builder.bundle.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename frappe/public/js/form_builder/{components => }/FormBuilder.vue (97%) diff --git a/frappe/public/js/form_builder/components/FormBuilder.vue b/frappe/public/js/form_builder/FormBuilder.vue similarity index 97% rename from frappe/public/js/form_builder/components/FormBuilder.vue rename to frappe/public/js/form_builder/FormBuilder.vue index 354346fcc2..862f337690 100644 --- a/frappe/public/js/form_builder/components/FormBuilder.vue +++ b/frappe/public/js/form_builder/FormBuilder.vue @@ -1,8 +1,8 @@