From 3971de251e0c2f3e5f3303942a4715256d267b71 Mon Sep 17 00:00:00 2001 From: sergiocorato Date: Wed, 31 May 2023 11:10:12 +0200 Subject: [PATCH] [14.0][FIX] assets_management view html report --- assets_management/report/asset_journal.py | 20 +++---------------- assets_management/report/asset_previsional.py | 20 +++---------------- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/assets_management/report/asset_journal.py b/assets_management/report/asset_journal.py index b4ebc76a366a..05edf1301acf 100644 --- a/assets_management/report/asset_journal.py +++ b/assets_management/report/asset_journal.py @@ -95,10 +95,8 @@ def print_report(self, report_type=None): """ self.ensure_one() report_type = report_type or "qweb-pdf" - if report_type in ("qweb-pdf", "xlsx"): + if report_type in ("qweb-pdf", "xlsx", "qweb-html"): res = self.do_print(report_type) - elif report_type == "qweb-html": - res = self.view_report() elif report_type: raise ValidationError( _("No report has been defined for type `{}`.").format(report_type) @@ -113,25 +111,13 @@ def do_print(self, report_type): self.ensure_one() if report_type == "qweb-pdf": xml_id = "assets_management.report_asset_journal_pdf" + elif report_type == "qweb-html": + xml_id = "assets_management.report_asset_journal_html" else: xml_id = "assets_management.report_asset_journal_xlsx" report = self.env.ref(xml_id) return report.report_action(self) - def view_report(self): - """Launches view for HTML report""" - self.ensure_one() - xmlid = "assets_management.act_client_asset_journal_report" - [act] = self.env.ref(xmlid).read() - ctx = act.get("context", {}) - if isinstance(ctx, str): - ctx = safe_eval(ctx) - # Call update twice to force 'active_id(s)' values to be overridden - ctx.update(dict(self._context)) - ctx.update(active_id=self.id, active_ids=self.ids) - act["context"] = ctx - return act - @api.model def get_html(self, given_context=None): """Method needed from JavaScript widget to render HTML view""" diff --git a/assets_management/report/asset_previsional.py b/assets_management/report/asset_previsional.py index 20e7efa5ce32..435af1b89ecd 100644 --- a/assets_management/report/asset_previsional.py +++ b/assets_management/report/asset_previsional.py @@ -100,10 +100,8 @@ def print_report(self, report_type=None): """ self.ensure_one() report_type = report_type or "qweb-pdf" - if report_type in ("qweb-pdf", "xlsx"): + if report_type in ("qweb-pdf", "xlsx", "qweb-html"): res = self.do_print(report_type) - elif report_type == "qweb-html": - res = self.view_report() elif report_type: raise ValidationError( _("No report has been defined for type `{}`.").format(report_type) @@ -118,25 +116,13 @@ def do_print(self, report_type): self.ensure_one() if report_type == "qweb-pdf": xml_id = "assets_management.report_asset_previsional_pdf" + elif report_type == "qweb-html": + xml_id = "assets_management.report_asset_previsional_html" else: xml_id = "assets_management.report_asset_previsional_xlsx" report = self.env.ref(xml_id) return report.report_action(self) - def view_report(self): - """Launches view for HTML report""" - self.ensure_one() - xmlid = "assets_management.act_client_asset_previsional_report" - [act] = self.env.ref(xmlid).read() - ctx = act.get("context", {}) - if isinstance(ctx, str): - ctx = safe_eval(ctx) - # Call update twice to force 'active_id(s)' values to be overridden - ctx.update(dict(self._context)) - ctx.update(active_id=self.id, active_ids=self.ids) - act["context"] = ctx - return act - @api.model def get_html(self, given_context=None): """Method needed from JavaScript widget to render HTML view"""