From 8dd086725f9498d70ce8d9f941bc0d89b3d42904 Mon Sep 17 00:00:00 2001 From: Kitti U Date: Fri, 9 Aug 2019 13:46:53 +0700 Subject: [PATCH] [12.0][IMP] report_xlsx, make sure print_report_name works --- report_xlsx/controllers/main.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/report_xlsx/controllers/main.py b/report_xlsx/controllers/main.py index 79cabdb9..b3f0ecbd 100644 --- a/report_xlsx/controllers/main.py +++ b/report_xlsx/controllers/main.py @@ -3,8 +3,10 @@ from odoo.addons.web.controllers import main as report from odoo.http import content_disposition, route, request +from odoo.tools.safe_eval import safe_eval import json +import time class ReportController(report.ReportController): @@ -29,13 +31,18 @@ class ReportController(report.ReportController): xlsx = report.with_context(context).render_xlsx( docids, data=data )[0] + report_name = report.report_file + if report.print_report_name and not len(docids) > 1: + obj = request.env[report.model].browse(docids[0]) + report_name = safe_eval(report.print_report_name, + {'object': obj, 'time': time}) xlsxhttpheaders = [ ('Content-Type', 'application/vnd.openxmlformats-' 'officedocument.spreadsheetml.sheet'), ('Content-Length', len(xlsx)), ( 'Content-Disposition', - content_disposition(report.report_file + '.xlsx') + content_disposition(report_name + '.xlsx') ) ] return request.make_response(xlsx, headers=xlsxhttpheaders)