From 6b32b822f6150aed83eb0717f6db48d9aa26f5a3 Mon Sep 17 00:00:00 2001 From: Atte Isopuro Date: Thu, 25 Nov 2021 14:35:47 +0200 Subject: [PATCH] [IMP] report_xml: black, isort, prettier --- report_xml/controllers/main.py | 7 +++++-- report_xml/reports/report_report_xml_abstract.py | 2 +- requirements.txt | 1 + setup/report_xml/odoo/addons/report_xml | 1 + setup/report_xml/setup.py | 6 ++++++ 5 files changed, 14 insertions(+), 3 deletions(-) create mode 120000 setup/report_xml/odoo/addons/report_xml create mode 100644 setup/report_xml/setup.py diff --git a/report_xml/controllers/main.py b/report_xml/controllers/main.py index 84725d326..f8cc0905b 100644 --- a/report_xml/controllers/main.py +++ b/report_xml/controllers/main.py @@ -32,7 +32,7 @@ class ReportController(report.ReportController): del data["context"]["lang"] context.update(data["context"]) - xml = report.with_context(context)._render_qweb_xml(docids, data=data)[0] + xml = report.with_context(**context)._render_qweb_xml(docids, data=data)[0] xmlhttpheaders = [ ("Content-Type", "text/xml"), ("Content-Length", len(xml)), @@ -56,7 +56,10 @@ class ReportController(report.ReportController): if docids: # Generic report: response = self.report_routes( - reportname, docids=docids, converter="xml", context=context + reportname, + docids=docids, + converter="xml", + context=context, ) else: # Particular report: diff --git a/report_xml/reports/report_report_xml_abstract.py b/report_xml/reports/report_report_xml_abstract.py index bb3f2e356..8875b9cb4 100644 --- a/report_xml/reports/report_report_xml_abstract.py +++ b/report_xml/reports/report_report_xml_abstract.py @@ -103,7 +103,7 @@ class ReportXmlAbstract(models.AbstractModel): # check content etree.fromstring(content, parser) except etree.XMLSyntaxError as error: - raise ValidationError(error.msg) + raise ValidationError(error.msg) from error return True @api.model diff --git a/requirements.txt b/requirements.txt index c208f5bc3..4cdf72bb1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ # generated from manifests external_dependencies +lxml xlrd xlsxwriter diff --git a/setup/report_xml/odoo/addons/report_xml b/setup/report_xml/odoo/addons/report_xml new file mode 120000 index 000000000..f09525560 --- /dev/null +++ b/setup/report_xml/odoo/addons/report_xml @@ -0,0 +1 @@ +../../../../report_xml \ No newline at end of file diff --git a/setup/report_xml/setup.py b/setup/report_xml/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/report_xml/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)