From 9ac22d2db74c55379049099059630fa2c50b83c7 Mon Sep 17 00:00:00 2001
From: emagdalenaC2i <emagdalena@c2i.es>
Date: Sat, 1 Jan 2022 16:25:45 +0100
Subject: [PATCH] [MIG] mass_mailing_partner: Migration to 15.0

---
 mass_mailing_partner/__manifest__.py          |  2 +-
 mass_mailing_partner/hooks.py                 | 33 +++++++++----------
 .../views/mailing_trace_view.xml              |  4 +--
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/mass_mailing_partner/__manifest__.py b/mass_mailing_partner/__manifest__.py
index a9d2276..297089e 100644
--- a/mass_mailing_partner/__manifest__.py
+++ b/mass_mailing_partner/__manifest__.py
@@ -6,7 +6,7 @@
 
 {
     "name": "Link partners with mass-mailing",
-    "version": "14.0.1.0.1",
+    "version": "15.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
index f2fe4aa..5b5bc70 100644
--- a/mass_mailing_partner/hooks.py
+++ b/mass_mailing_partner/hooks.py
@@ -13,21 +13,18 @@ _logger = logging.getLogger(__name__)
 
 
 def post_init_hook(cr, registry):
-    with api.Environment.manage():
-        env = api.Environment(cr, SUPERUSER_ID, {})
-        # ACTION 1: Match existing contacts
-        contact_model = env["mailing.contact"]
-        partner_model = env["res.partner"]
-        contacts = contact_model.search([("email", "!=", False)])
-        _logger.info("Trying to match %d contacts to partner by email", len(contacts))
-        for contact in contacts:
-            partners = partner_model.search(
-                [("email", "=ilike", contact.email)], limit=1
-            )
-            if partners:
-                contact.write({"partner_id": partners.id})
-        # ACTION 2: Match existing statistics
-        stat_model = env["mailing.trace"]
-        stats = stat_model.search([("model", "!=", False), ("res_id", "!=", False)])
-        _logger.info("Trying to link %d mass mailing statistics to partner", len(stats))
-        stats.partner_link()
+    env = api.Environment(cr, SUPERUSER_ID, {})
+    # ACTION 1: Match existing contacts
+    contact_model = env["mailing.contact"]
+    partner_model = env["res.partner"]
+    contacts = contact_model.search([("email", "!=", False)])
+    _logger.info("Trying to match %d contacts to partner by email", len(contacts))
+    for contact in contacts:
+        partners = partner_model.search([("email", "=ilike", contact.email)], limit=1)
+        if partners:
+            contact.write({"partner_id": partners.id})
+    # ACTION 2: Match existing statistics
+    stat_model = env["mailing.trace"]
+    stats = stat_model.search([("model", "!=", False), ("res_id", "!=", False)])
+    _logger.info("Trying to link %d mass mailing statistics to partner", len(stats))
+    stats.partner_link()
diff --git a/mass_mailing_partner/views/mailing_trace_view.xml b/mass_mailing_partner/views/mailing_trace_view.xml
index 9d091bd..2a9320d 100644
--- a/mass_mailing_partner/views/mailing_trace_view.xml
+++ b/mass_mailing_partner/views/mailing_trace_view.xml
@@ -9,7 +9,7 @@
     <field name="model">mailing.trace</field>
     <field name="inherit_id" ref="mass_mailing.mailing_trace_view_form" />
     <field name="arch" type="xml">
-        <field name="res_id" position="after">
+        <field name="message_id" position="after">
             <field name="partner_id" />
         </field>
     </field>
@@ -20,7 +20,7 @@
     <field name="model">mailing.trace</field>
     <field name="inherit_id" ref="mass_mailing.mailing_trace_view_tree" />
     <field name="arch" type="xml">
-        <field name="sent" position="before">
+        <field name="sent_datetime" position="before">
             <field name="partner_id" />
         </field>
     </field>