[MIG] mass_mailing_partner: Migration to 17.0

OCA · Mar 27, 2024 · f4fd2b3 · f4fd2b3
1 parent 9266bf3
commit f4fd2b3
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 33 deletions.
diff --git a/mass_mailing_partner/__manifest__.py b/mass_mailing_partner/__manifest__.py
@@ -6,7 +6,7 @@
 
 {
     "name": "Link partners with mass-mailing",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "author": "Tecnativa, " "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/social",
     "license": "AGPL-3",

diff --git a/mass_mailing_partner/hooks.py b/mass_mailing_partner/hooks.py
@@ -7,13 +7,10 @@
 
 import logging
 
-from odoo import SUPERUSER_ID, api
-
 _logger = logging.getLogger(__name__)
 
 
-def post_init_hook(cr, registry):
-    env = api.Environment(cr, SUPERUSER_ID, {})
+def post_init_hook(env):
     # ACTION 1: Match existing contacts
     contact_model = env["mailing.contact"]
     partner_model = env["res.partner"]

diff --git a/mass_mailing_partner/models/mailing_contact.py b/mass_mailing_partner/models/mailing_contact.py
@@ -61,7 +61,7 @@ def _get_contact_vals(self, origin_vals):
         record._onchange_partner_mass_mailing_partner()
         new_vals = record._convert_to_write(record._cache)
         new_vals.update(
-            subscription_list_ids=origin_vals.get("subscription_list_ids", []),
+            subscription_ids=origin_vals.get("subscription_ids", []),
             list_ids=origin_vals.get("list_ids", []),
         )
         if new_vals.get("partner_id") and "tag_ids" in new_vals:
@@ -89,7 +89,7 @@ def _get_categories(self):
         ca_ids = (
             self.tag_ids.ids
             + self.list_ids.mapped("partner_category.id")
-            + self.subscription_list_ids.mapped("list_id.partner_category.id")
+            + self.subscription_ids.mapped("list_id.partner_category.id")
         )
         return [[6, 0, ca_ids]]
 
@@ -116,7 +116,7 @@ def _set_partner(self):
             # Partner found
             self.partner_id = partner
         else:
-            lts = self.subscription_list_ids.mapped("list_id") | self.list_ids
+            lts = self.subscription_ids.mapped("list_id") | self.list_ids
             if lts.filtered("partner_mandatory"):
                 # Create partner
                 partner_vals = self._prepare_partner()

diff --git a/mass_mailing_partner/models/mailing_contact_subscription.py b/mass_mailing_partner/models/mailing_contact_subscription.py
@@ -7,7 +7,7 @@
 
 
 class MailingContactSubscription(models.Model):
-    _inherit = "mailing.contact.subscription"
+    _inherit = "mailing.subscription"
 
     @api.constrains("contact_id", "list_id")
     def _check_contact_id_partner_id_list_id(self):

diff --git a/mass_mailing_partner/tests/base.py b/mass_mailing_partner/tests/base.py
@@ -9,7 +9,7 @@
 
 class BaseCase(TransactionCase):
     def setUp(self):
-        super(BaseCase, self).setUp()
+        super().setUp()
 
         self.main_company = self.env.ref("base.main_company")
         self.country_es = self.env.ref("base.es")

diff --git a/mass_mailing_partner/tests/test_mail_mass_mailing_contact.py b/mass_mailing_partner/tests/test_mail_mass_mailing_contact.py
@@ -15,7 +15,7 @@ def test_match_existing_contacts(self):
         contact = self.create_mailing_contact(
             {"email": "[email protected]", "list_ids": [(6, 0, self.mailing_list.ids)]}
         )
-        post_init_hook(self.cr, self.registry)
+        post_init_hook(self.env)
         self.assertEqual(contact.partner_id.id, self.partner.id)
         self.check_mailing_contact_partner(contact)
 
@@ -55,7 +55,7 @@ def test_create_mass_mailing_contact_with_subscription(self):
             "company_name": "TestCompany",
             "country_id": country_cu.id,
             "tag_ids": [(6, 0, (category_8 | category_11).ids)],
-            "subscription_list_ids": [
+            "subscription_ids": [
                 (0, 0, {"list_id": self.mailing_list.id}),
                 (0, 0, {"list_id": self.mailing_list2.id}),
             ],
@@ -66,9 +66,7 @@ def test_create_mass_mailing_contact_with_subscription(self):
             self.create_mailing_contact(
                 {
                     "email": "[email protected]",
-                    "subscription_list_ids": [
-                        (0, 0, {"list_id": self.mailing_list2.id})
-                    ],
+                    "subscription_ids": [(0, 0, {"list_id": self.mailing_list2.id})],
                 }
             )
 

diff --git a/mass_mailing_partner/views/mailing_contact_view.xml b/mass_mailing_partner/views/mailing_contact_view.xml
@@ -27,34 +27,22 @@
                 <field name="partner_id" />
             </xpath>
             <field name="title_id" position="attributes">
-                <attribute
-                    name="attrs"
-                >{'readonly': [('partner_id', '!=', False)]}</attribute>
+                <attribute name="readonly">partner_id</attribute>
             </field>
             <field name="email" position="attributes">
-                <attribute
-                    name="attrs"
-                >{'readonly': [('partner_id', '!=', False)]}</attribute>
+                <attribute name="readonly">partner_id</attribute>
             </field>
             <field name="name" position="attributes">
-                <attribute
-                    name="attrs"
-                >{'readonly': [('partner_id', '!=', False)]}</attribute>
+                <attribute name="readonly">partner_id</attribute>
             </field>
             <field name="company_name" position="attributes">
-                <attribute
-                    name="attrs"
-                >{'readonly': [('partner_id', '!=', False)]}</attribute>
+                <attribute name="readonly">partner_id</attribute>
             </field>
             <field name="country_id" position="attributes">
-                <attribute
-                    name="attrs"
-                >{'readonly': [('partner_id', '!=', False)]}</attribute>
+                <attribute name="readonly">partner_id</attribute>
             </field>
             <field name="tag_ids" position="attributes">
-                <attribute
-                    name="attrs"
-                >{'readonly': [('partner_id', '!=', False)]}</attribute>
+                <attribute name="readonly">partner_id</attribute>
             </field>
         </field>
     </record>