Merge PR #631 into 15.0

Signed-off-by thomaspaulb

report_xlsx/controllers/main.py

@@ -90,6 +90,7 @@ class ReportController(report.ReportController):
                             report.print_report_name, {"object": obj, "time": time}
                         )
                         filename = "%s.%s" % (report_name, "xlsx")
+                if not response.headers.get("Content-Disposition"):
                     response.headers.add(
                         "Content-Disposition", content_disposition(filename)
                     )