From 3412db6c867c8369f5fbdd6d422c7dcf28efab17 Mon Sep 17 00:00:00 2001 From: Atchuthan Ubendran Date: Thu, 12 Oct 2023 18:52:43 +0530 Subject: [PATCH 1/2] [FIX] report_qweb_encrypt: report_ref in base provides recordset instead of reportname --- report_qweb_encrypt/models/ir_actions_report.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/report_qweb_encrypt/models/ir_actions_report.py b/report_qweb_encrypt/models/ir_actions_report.py index 4d3e367d2..f50647d60 100644 --- a/report_qweb_encrypt/models/ir_actions_report.py +++ b/report_qweb_encrypt/models/ir_actions_report.py @@ -25,13 +25,14 @@ class IrActionsReport(models.Model): help="Python code syntax to gnerate password.", ) - def _render_qweb_pdf(self, reportname, res_ids=None, data=None): + def _render_qweb_pdf(self, report_ref, res_ids=None, data=None): document, ttype = super()._render_qweb_pdf( - reportname, res_ids=res_ids, data=data + report_ref, res_ids=res_ids, data=data ) + report = self._get_report(report_ref) if res_ids: encrypt_password = self._context.get("encrypt_password") - report = self._get_report(reportname).with_context( + report = self._get_report_from_name(report.report_name).with_context( encrypt_password=encrypt_password ) password = report._get_pdf_password(res_ids[:1]) From c1e2921762c9f85d7c4d32fe50983f53eb80c8af Mon Sep 17 00:00:00 2001 From: SodexisTeam Date: Thu, 12 Oct 2023 18:16:39 +0530 Subject: [PATCH 2/2] [FIX] report_substitute: support for email --- report_substitute/models/ir_actions_report.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/report_substitute/models/ir_actions_report.py b/report_substitute/models/ir_actions_report.py index 61d432eba..47ea0a3b1 100644 --- a/report_substitute/models/ir_actions_report.py +++ b/report_substitute/models/ir_actions_report.py @@ -57,6 +57,13 @@ class IrActionReport(models.Model): substitution_report.report_name, res_ids, data=data ) + def _render_qweb_pdf(self, report_ref, res_ids=None, data=None): + report = self._get_report(report_ref) + substitution_report = report.get_substitution_report(res_ids) + return super(IrActionReport, self)._render_qweb_pdf( + substitution_report, res_ids=res_ids, data=data + ) + def report_action(self, docids, data=None, config=True): if docids: if isinstance(docids, models.Model):