diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 8140a0b11e..073576c437 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -77,7 +77,7 @@ def run(report_name, filters=None, user=None): frappe.msgprint(_("Must have report permission to access this report."), raise_exception=True) - columns, result, message, chart = [], [], None, None + columns, result, message, chart, data_to_be_printed = [], [], None, None, None if report.report_type=="Query Report": if not report.query: frappe.msgprint(_("Must specify a Query to run"), raise_exception=True) @@ -99,6 +99,8 @@ def run(report_name, filters=None, user=None): message = res[2] if len(res) > 3: chart = res[3] + if len(res) > 4: + data_to_be_printed = res[4] if report.apply_user_permissions and result: result = get_filtered_data(report.ref_doctype, columns, result, user) @@ -110,7 +112,8 @@ def run(report_name, filters=None, user=None): "result": result, "columns": columns, "message": message, - "chart": chart + "chart": chart, + "data_to_be_printed": data_to_be_printed } diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 7e0bc14a13..d5bc9a05e5 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -184,12 +184,12 @@ frappe.views.QueryReport = Class.extend({ frappe.msgprint(__("You are not allowed to print this report")); return false; } - if(this.html_format) { var content = frappe.render(this.html_format, { data: frappe.slickgrid_tools.get_filtered_items(this.dataView), filters: this.get_values(), - report: this + report: this, + data_to_be_printed: this.data_to_be_printed }); frappe.render_grid({ @@ -223,7 +223,8 @@ frappe.views.QueryReport = Class.extend({ var content = frappe.render(this.html_format, { data: frappe.slickgrid_tools.get_filtered_items(this.dataView), filters:this.get_values(), - report:this + report:this, + data_to_be_printed: this.data_to_be_printed }); //Render Report in HTML @@ -477,6 +478,7 @@ frappe.views.QueryReport = Class.extend({ this.set_message(res.message); this.setup_chart(res); + this.set_print_data(res.data_to_be_printed); this.toggle_expand_collapse_buttons(this.is_tree_report); }, @@ -887,5 +889,9 @@ frappe.views.QueryReport = Class.extend({ if(this.chart && opts.data && opts.data.rows && opts.data.rows.length) { this.chart_area.toggle(true); } + }, + + set_print_data: function(data_to_be_printed) { + this.data_to_be_printed = data_to_be_printed; } })