diff --git a/l10n_it_asset_management/__manifest__.py b/l10n_it_asset_management/__manifest__.py index fdcc3f9fec01..d928cb9b21ee 100644 --- a/l10n_it_asset_management/__manifest__.py +++ b/l10n_it_asset_management/__manifest__.py @@ -27,7 +27,6 @@ "report/templates/asset_journal.xml", "report/templates/asset_previsional.xml", "report/reports.xml", - "views/action_client.xml", "views/asset_menuitems.xml", "views/account_move.xml", "views/asset.xml", diff --git a/l10n_it_asset_management/report/asset_journal.py b/l10n_it_asset_management/report/asset_journal.py index ece898d5881c..0081ae7a197b 100644 --- a/l10n_it_asset_management/report/asset_journal.py +++ b/l10n_it_asset_management/report/asset_journal.py @@ -7,7 +7,6 @@ from odoo import _, api, fields, models from odoo.exceptions import ValidationError from odoo.tools.misc import format_amount -from odoo.tools.safe_eval import safe_eval def format_date(rec, field_name, fmt): @@ -95,10 +94,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 +110,11 @@ def do_print(self, report_type): self.ensure_one() if report_type == "qweb-pdf": xml_id = "l10n_it_asset_management.report_asset_journal_pdf" - else: - xml_id = "l10n_it_asset_management.report_asset_journal_xlsx" + elif report_type == "qweb-html": + xml_id = "l10n_it_asset_management.report_asset_journal_html" report = self.env.ref(xml_id) return report.report_action(self) - def view_report(self): - """Launches view for HTML report""" - self.ensure_one() - xmlid = "l10n_it_asset_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/l10n_it_asset_management/report/asset_previsional.py b/l10n_it_asset_management/report/asset_previsional.py index 755c45918567..09d9ad9f4fbd 100644 --- a/l10n_it_asset_management/report/asset_previsional.py +++ b/l10n_it_asset_management/report/asset_previsional.py @@ -8,7 +8,6 @@ from odoo.exceptions import ValidationError from odoo.tools.float_utils import float_is_zero from odoo.tools.misc import format_amount -from odoo.tools.safe_eval import safe_eval def format_date(rec, field_name, fmt): @@ -100,10 +99,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 +115,11 @@ def do_print(self, report_type): self.ensure_one() if report_type == "qweb-pdf": xml_id = "l10n_it_asset_management.report_asset_previsional_pdf" - else: - xml_id = "l10n_it_asset_management.report_asset_previsional_xlsx" + elif report_type == "qweb-html": + xml_id = "l10n_it_asset_management.report_asset_previsional_html" report = self.env.ref(xml_id) return report.report_action(self) - def view_report(self): - """Launches view for HTML report""" - self.ensure_one() - xmlid = "l10n_it_asset_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""" diff --git a/l10n_it_asset_management/views/action_client.xml b/l10n_it_asset_management/views/action_client.xml deleted file mode 100644 index 6b3d82f7b73a..000000000000 --- a/l10n_it_asset_management/views/action_client.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - Asset Journal Report - account_financial_report_backend - - - - - Asset Previsional Report - account_financial_report_backend - - - -