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

Merge pull request #8317 from netchampfaris/reportview-export-fix-d

Browse source 
fix: Show report_name in Print, Excel, CSV
This commit is contained in:
mergify[bot] 2019-09-03 06:34:17 +00:00 • committed by GitHub
commit 7b15fc429a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/desk/reportview.py
View file

@ -118,12 +118,16 @@ def save_report():
@frappe.read_only()
def export_query():
"""export from report builder"""
title = frappe.form_dict.title
frappe.form_dict.pop('title')
form_params = get_form_params()
form_params["limit_page_length"] = None
form_params["as_list"] = True
doctype = form_params.doctype
add_totals_row = None
file_format_type = form_params["file_format_type"]
title = title or doctype
del form_params["doctype"]
del form_params["file_format_type"]
@ -170,14 +174,14 @@ def export_query():
f.seek(0)
frappe.response['result'] = text_type(f.read(), 'utf-8')
frappe.response['type'] = 'csv'
frappe.response['doctype'] = doctype
frappe.response['doctype'] = title
elif file_format_type == "Excel":
from frappe.utils.xlsxutils import make_xlsx
xlsx_file = make_xlsx(data, doctype)
frappe.response['filename'] = doctype + '.xlsx'
frappe.response['filename'] = title + '.xlsx'
frappe.response['filecontent'] = xlsx_file.getvalue()
frappe.response['type'] = 'binary'

3
frappe/public/js/frappe/views/reports/report_view.js
View file

@ -1169,7 +1169,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
}
frappe.ui.get_print_settings(false, (print_settings) => {
var title = __(this.doctype);
var title = this.report_name || __(this.doctype);
frappe.render_grid({
title: title,
subtitle: this.get_filters_html_for_print(),
@ -1252,6 +1252,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
primary_action: (data) => {
args.cmd = 'frappe.desk.reportview.export_query';
args.file_format_type = data.file_format_type;
args.title = this.report_name || this.doctype;
if(this.add_totals_row) {
args.add_totals_row = 1;