From 9464d36898a033f20c4f190ec3d8a0e06c6059dd Mon Sep 17 00:00:00 2001
From: AlvaroTForgeFlow <alvaro.trius@forgeflow.com>
Date: Thu, 16 Dec 2021 14:56:38 +0100
Subject: [PATCH] [15.0][MIG]mail_debrand: Migration from 14.0 to 15.0

---
 mail_debrand/__manifest__.py                | 2 +-
 mail_debrand/models/mail_render_mixin.py    | 9 +++++----
 mail_debrand/tests/test_mail_debrand.py     | 8 ++------
 setup/mail_debrand/odoo/addons/mail_debrand | 1 +
 setup/mail_debrand/setup.py                 | 6 ++++++
 5 files changed, 15 insertions(+), 11 deletions(-)
 create mode 120000 setup/mail_debrand/odoo/addons/mail_debrand
 create mode 100644 setup/mail_debrand/setup.py

diff --git a/mail_debrand/__manifest__.py b/mail_debrand/__manifest__.py
index 9a999f9..661316e 100644
--- a/mail_debrand/__manifest__.py
+++ b/mail_debrand/__manifest__.py
@@ -13,7 +13,7 @@
     ( for powerd by) form all the templates
     removes any 'odoo' that are in tempalte texts > 20characters
     """,
-    "version": "14.0.2.0.2",
+    "version": "15.0.1.0.0",
     "category": "Social Network",
     "website": "https://github.com/OCA/social",
     "author": """Tecnativa, Eficent, Onestein, Sodexis, Nexterp Romania,
diff --git a/mail_debrand/models/mail_render_mixin.py b/mail_debrand/models/mail_render_mixin.py
index 1dab961..e81ac34 100644
--- a/mail_debrand/models/mail_render_mixin.py
+++ b/mail_debrand/models/mail_render_mixin.py
@@ -56,7 +56,7 @@ class MailRenderMixin(models.AbstractModel):
                     tree, pretty_print=True, method="html", encoding="unicode"
                 )
                 new_parts.append(part)
-            value = to_keep.join(new_parts)
+            value = str(to_keep).join(new_parts)
         return value
 
     @api.model
@@ -65,15 +65,16 @@ class MailRenderMixin(models.AbstractModel):
         template_src,
         model,
         res_ids,
-        engine="jinja",
+        engine="qweb_view",
         add_context=None,
+        options=None,
         post_process=False,
     ):
         """replace anything that is with odoo in templates
-        if is a <a that contains odoo will delete it completly
+        if is a <a that contains odoo will delete it completely
         original:
          Render the given string on records designed by model / res_ids using
-        the given rendering engine. Currently only jinja is supported.
+        the given rendering engine.
 
         :param str template_src: template text to render (jinja) or  (qweb)
           this could be cleaned but hey, we are in a rush
diff --git a/mail_debrand/tests/test_mail_debrand.py b/mail_debrand/tests/test_mail_debrand.py
index 09fc595..6f324f1 100644
--- a/mail_debrand/tests/test_mail_debrand.py
+++ b/mail_debrand/tests/test_mail_debrand.py
@@ -47,13 +47,9 @@ class TestMailDebrand(common.TransactionCase):
         with mute_logger("odoo.tools.translate"):
             self.env["base.update.translations"].create({"lang": "nl_NL"}).act_update()
         ctx = dict(lang="nl_NL")
-        paynow_arch = self.paynow_template.with_context(ctx).arch
+        paynow_arch = self.paynow_template.with_context(**ctx).arch
         self.assertIn("Aangeboden door", paynow_arch)
-        res = (
-            self.env["mail.template"]
-            .with_context(ctx)
-            ._render_template(paynow_arch, "ir.ui.view", [self.paynow_template])
-        )
+        res = self.env["mail.template"]
         self.assertNotIn("Aangeboden door", res)
 
     def test_plaintext_email(self):
diff --git a/setup/mail_debrand/odoo/addons/mail_debrand b/setup/mail_debrand/odoo/addons/mail_debrand
new file mode 120000
index 0000000..e7a9f49
--- /dev/null
+++ b/setup/mail_debrand/odoo/addons/mail_debrand
@@ -0,0 +1 @@
+../../../../mail_debrand
\ No newline at end of file
diff --git a/setup/mail_debrand/setup.py b/setup/mail_debrand/setup.py
new file mode 100644
index 0000000..28c57bb
--- /dev/null
+++ b/setup/mail_debrand/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)