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

fix: Auto email support for custom reports

Browse source
This commit is contained in:
deepeshgarg007 2019-05-09 22:35:11 +05:30
parent 532f9e1399
commit f7c9064038
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/core/doctype/report/report.py
View file

@ -100,7 +100,7 @@ class Report(Document):
columns = []
out = []
if self.report_type in ('Query Report', 'Script Report'):
if self.report_type in ('Query Report', 'Script Report', 'Custom Report'):
# query and script reports
data = frappe.desk.query_report.run(self.name, filters=filters, user=user)
for d in data.get('columns'):

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

@ -54,9 +54,9 @@ frappe.ui.form.on('Auto Email Report', {
show_filters: function(frm) {
var wrapper = $(frm.get_field('filters_display').wrapper);
wrapper.empty();
if(frm.doc.report_type !== 'Report Builder'
if(frm.doc.report_type === 'Custom Report' || (frm.doc.report_type !== 'Report Builder'
&& frappe.query_reports[frm.doc.report]
&& frappe.query_reports[frm.doc.report].filters) {
&& frappe.query_reports[frm.doc.report].filters)) {
// make a table to show filters
var table = $('<table class="table table-bordered" style="cursor:pointer; margin:0px;"><thead>\
@ -65,7 +65,16 @@ frappe.ui.form.on('Auto Email Report', {
$('<p class="text-muted small">' + __("Click table to edit") + '</p>').appendTo(wrapper);
var filters = JSON.parse(frm.doc.filters || '{}');
var report_filters = frappe.query_reports[frm.doc.report].filters;
if (frm.doc.report_type === 'Custom Report'
&& frappe.query_reports[frm.doc.reference_report]
&& frappe.query_reports[frm.doc.reference_report].filters) {
var report_filters = frappe.query_reports[frm.doc.reference_report].filters;
}
else{
var report_filters = frappe.query_reports[frm.doc.report].filters;
}
if(report_filters && report_filters.length > 0) {
frm.set_value('filter_meta', JSON.stringify(report_filters));
}