Merge PR #327 into 11.0

Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2019-10-17 13:54:28 +00:00

View File

@@ -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 docids 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)