From 1866ce2654a295ad8cfa055fc9b505585db94a5e Mon Sep 17 00:00:00 2001
From: Wolfgang Pichler <wpichler@callino.at>
Date: Mon, 6 Jan 2025 09:37:51 +0100
Subject: [PATCH] [MIG] base_report_to_printer_mail: Migration to 18.0

---
 .../models/mail_template.py                   |  9 ++--
 base_report_to_printer_mail/readme/CREDITS.md |  3 +-
 .../tests/test_mail.py                        | 50 +++++++++----------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/base_report_to_printer_mail/models/mail_template.py b/base_report_to_printer_mail/models/mail_template.py
index 0a8f13a00c0..c2e1ad3027e 100644
--- a/base_report_to_printer_mail/models/mail_template.py
+++ b/base_report_to_printer_mail/models/mail_template.py
@@ -4,7 +4,8 @@
 class MailTemplate(models.Model):
     _inherit = "mail.template"
 
-    def generate_email(self, res_ids, fields=None):
-        return super(
-            MailTemplate, self.with_context(must_skip_send_to_printer=True)
-        ).generate_email(res_ids, fields=fields)
+    def _generate_template(self, res_ids, render_fields, find_or_create_partners=False):
+        self = self.with_context(must_skip_send_to_printer=True)
+        return super()._generate_template(
+            res_ids, render_fields, find_or_create_partners=find_or_create_partners
+        )
diff --git a/base_report_to_printer_mail/readme/CREDITS.md b/base_report_to_printer_mail/readme/CREDITS.md
index 291e14c81e2..8b137891791 100644
--- a/base_report_to_printer_mail/readme/CREDITS.md
+++ b/base_report_to_printer_mail/readme/CREDITS.md
@@ -1,2 +1 @@
-The migration of this module from 15.0 to 16.0 was financially supported
-by Camptocamp
+
diff --git a/base_report_to_printer_mail/tests/test_mail.py b/base_report_to_printer_mail/tests/test_mail.py
index e5dd65cff18..8c5e252cbc1 100644
--- a/base_report_to_printer_mail/tests/test_mail.py
+++ b/base_report_to_printer_mail/tests/test_mail.py
@@ -2,39 +2,39 @@
 
 from unittest import mock
 
+from odoo.tests import tagged
 from odoo.tests.common import HttpCase
 
 test_xml_id = "base_report_to_printer.test"
 
 
+@tagged("post_install", "-at_install")
 class TestMail(HttpCase):
-    at_install = False
-    post_install = True
-
-    def setUp(self):
-        super().setUp()
-        self.Model = self.env["ir.model"]
-        self.report_obj = self.env["ir.actions.report"]
-        self.partner_obj = self.env["res.partner"]
-        self.mail_template_obj = self.env["mail.template"]
-        self.res_partner_model = self.Model.search([("model", "=", "res.partner")])
-        self.server = self.env["printing.server"].create({})
-        self.report_imd = self.env["ir.model.data"].create(
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.Model = cls.env["ir.model"]
+        cls.report_obj = cls.env["ir.actions.report"]
+        cls.partner_obj = cls.env["res.partner"]
+        cls.mail_template_obj = cls.env["mail.template"]
+        cls.res_partner_model = cls.Model.search([("model", "=", "res.partner")])
+        cls.server = cls.env["printing.server"].create({})
+        cls.report_imd = cls.env["ir.model.data"].create(
             {"name": "test", "module": "base_report_to_printer", "model": "ir.ui.view"}
         )
-        self.report_view = self.env["ir.ui.view"].create(
+        cls.report_view = cls.env["ir.ui.view"].create(
             {
                 "name": "Test",
                 "type": "qweb",
                 "xml_id": test_xml_id,
-                "model_data_id": self.report_imd.id,
+                "model_data_id": cls.report_imd.id,
                 "arch": f"""<t t-name="{test_xml_id}">
                 <div>Test</div>
             </t>""",
             }
         )
-        self.report_imd.res_id = self.report_view.id
-        self.report = self.report_obj.create(
+        cls.report_imd.res_id = cls.report_view.id
+        cls.report = cls.report_obj.create(
             {
                 "name": "Test",
                 "report_type": "qweb-pdf",
@@ -42,21 +42,21 @@ def setUp(self):
                 "report_name": test_xml_id,
             }
         )
-        self.test_partner = self.partner_obj.create(
+        cls.test_partner = cls.partner_obj.create(
             {"name": "TestingPartner", "city": "OrigCity"}
         )
-        self.email_template = self.mail_template_obj.create(
+        cls.email_template = cls.mail_template_obj.create(
             {
                 "name": "TestTemplate",
-                "email_from": "myself@example.com",
+                "email_from": "mycls@example.com",
                 "email_to": "brigitte@example.com",
-                "partner_to": str(self.test_partner.id),
-                "model_id": self.res_partner_model.id,
+                "partner_to": str(cls.test_partner.id),
+                "model_id": cls.res_partner_model.id,
                 "subject": "About ${object.name}",
                 "body_html": "<p>Dear ${object.name}, "
                 "your parent is ${object.parent_id and "
                 'object.parent_id.name or "False"}</p>',
-                "report_template": self.report.id,
+                "report_template_ids": [(4, cls.report.id)],
             }
         )
 
@@ -89,9 +89,9 @@ def test_generate_email(self):
             "printing_printer.PrintingPrinter."
             "print_document"
         ) as print_document:
-            self.email_template.generate_email(
-                self.test_partner.id,
-                fields=[
+            self.email_template._generate_template(
+                [self.test_partner.id],
+                render_fields=[
                     "name",
                     "email_from",
                     "email_to",