Merge pull request #502 from OCA/15.0

Syncing from upstream OCA/reporting-engine (15.0)

README.md

@@ -33,7 +33,7 @@ addon | version | maintainers | summary
 [report_qweb_parameter](report_qweb_parameter/) | 15.0.1.0.0 |  | Add new parameters for qweb templates in order to reduce field length and check minimal length
 [report_qweb_pdf_watermark](report_qweb_pdf_watermark/) | 15.0.1.0.0 |  | Add watermarks to your QWEB PDF reports
 [report_wkhtmltopdf_param](report_wkhtmltopdf_param/) | 15.0.1.0.0 |  | Add new parameters for a paper format to be used by wkhtmltopdf command as arguments.
-[report_xlsx](report_xlsx/) | 15.0.1.1.1 |  | Base module to create xlsx report
+[report_xlsx](report_xlsx/) | 15.0.1.1.3 |  | Base module to create xlsx report
 [report_xlsx_helper](report_xlsx_helper/) | 15.0.1.0.1 |  | Report xlsx helpers
 [report_xml](report_xml/) | 15.0.1.0.1 |  | Allow to generate XML reports
 [sql_export](sql_export/) | 15.0.1.0.0 |  | Export data in csv file with SQL requests

report_xlsx/__manifest__.py

@@ -6,7 +6,7 @@
     "author": "ACSONE SA/NV," "Creu Blanca," "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/reporting-engine",
     "category": "Reporting",
-    "version": "15.0.1.1.1",
+    "version": "15.0.1.1.3",
     "development_status": "Mature",
     "license": "AGPL-3",
     "external_dependencies": {"python": ["xlsxwriter", "xlrd"]},

report_xlsx/controllers/main.py

@@ -52,8 +52,9 @@ def report_routes(self, reportname, docids=None, converter=None, **data):
     def report_download(self, data, context=None):
         requestcontent = json.loads(data)
         url, report_type = requestcontent[0], requestcontent[1]
-        try:
-            if report_type == "xlsx":
+        if report_type == "xlsx":
+            reportname = url
+            try:
                 reportname = url.split("/report/xlsx/")[1].split("?")[0]
                 docids = None
                 if "/" in reportname:
@@ -95,10 +96,9 @@ def report_download(self, data, context=None):
                         "Content-Disposition", content_disposition(filename)
                     )
                 return response
-            else:
-                return super(ReportController, self).report_download(data, context)
-        except Exception as e:
-            _logger.exception("Error while generating report %s", reportname)
-            se = _serialize_exception(e)
-            error = {"code": 200, "message": "Odoo Server Error", "data": se}
-            return request.make_response(html_escape(json.dumps(error)))
+            except Exception as e:
+                _logger.exception("Error while generating report %s", reportname)
+                se = _serialize_exception(e)
+                error = {"code": 200, "message": "Odoo Server Error", "data": se}
+                return request.make_response(html_escape(json.dumps(error)))
+        return super(ReportController, self).report_download(data, context)