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

Merge pull request #20960 from AnandBaburajan/custom_report_export_and_auto_email

Browse source
This commit is contained in:
Shariq Ansari 2023-05-16 13:48:01 +05:30 • committed by GitHub
commit d4efef204f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/desk/query_report.py
View file

@ -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(

13
frappe/email/doctype/auto_email_report/auto_email_report.js
View file

@ -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;
}