From 8078e0bfb9b187c51982e67585e69a0bb4ab2d1f Mon Sep 17 00:00:00 2001
From: Eugene Molotov <molotov@it-projects.info>
Date: Wed, 27 Oct 2021 15:11:27 +0500
Subject: [PATCH] [FIX] report_xlsx: correctly handle exceptions, when
 generating report

Before this commit, when exception is raised while generating report,
on browser window instead of python traceback nothing was shown
on production environment or werkzeug's "Console locked" message
on development environment.
---
 report_xlsx/controllers/main.py     | 17 +++++++++++++----
 report_xlsx/readme/CONTRIBUTORS.rst |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/report_xlsx/controllers/main.py b/report_xlsx/controllers/main.py
index 25c79fe2b..01674c223 100644
--- a/report_xlsx/controllers/main.py
+++ b/report_xlsx/controllers/main.py
@@ -3,7 +3,8 @@
 
 import json
 
-from odoo.http import content_disposition, request, route
+from odoo.http import content_disposition, request, route, serialize_exception
+from odoo.tools import html_escape
 from odoo.tools.safe_eval import safe_eval
 
 from odoo.addons.web.controllers import main as report
@@ -13,6 +14,13 @@ class ReportController(report.ReportController):
     @route()
     def report_routes(self, reportname, docids=None, converter=None, **data):
         if converter == "xlsx":
+            return self._report_routes_xlsx(reportname, docids, converter, **data)
+        return super(ReportController, self).report_routes(
+            reportname, docids, converter, **data
+        )
+
+    def _report_routes_xlsx(self, reportname, docids=None, converter=None, **data):
+        try:
             report = request.env["ir.actions.report"]._get_report_from_name(reportname)
             context = dict(request.env.context)
             if docids:
@@ -42,6 +50,7 @@ class ReportController(report.ReportController):
                 ("Content-Disposition", content_disposition(report_name + ".xlsx")),
             ]
             return request.make_response(xlsx, headers=xlsxhttpheaders)
-        return super(ReportController, self).report_routes(
-            reportname, docids, converter, **data
-        )
+        except Exception as e:
+            se = serialize_exception(e)
+            error = {"code": 200, "message": "Odoo Server Error", "data": se}
+            return request.make_response(html_escape(json.dumps(error)))
diff --git a/report_xlsx/readme/CONTRIBUTORS.rst b/report_xlsx/readme/CONTRIBUTORS.rst
index 682ff3127..6a4690063 100644
--- a/report_xlsx/readme/CONTRIBUTORS.rst
+++ b/report_xlsx/readme/CONTRIBUTORS.rst
@@ -5,3 +5,4 @@
 * Graeme Gellatly <gdgellatly@gmail.com>
 * Cristian Salamea <cs@prisehub.com>
 * Rod Schouteden <rod.schouteden@dynapps.be>
+* Eugene Molotov <molotov@it-projects.info>