[IMP] Update code to match with v19

Author: imlopes

mail_composer_cc_bcc/README.rst

@@ -45,11 +45,11 @@ all headers (To, Cc, Bcc) in all emails
 Features
 --------
 
-- Add Cc and Bcc fields to company form to use them as default in mail
-  composer form.
-- Add Bcc field to mail template form. Use Cc and Bcc fields to lookup
-  partners by email then add them to corresponding fields in mail
-  composer form.
+-  Add Cc and Bcc fields to company form to use them as default in mail
+   composer form.
+-  Add Bcc field to mail template form. Use Cc and Bcc fields to lookup
+   partners by email then add them to corresponding fields in mail
+   composer form.
 
 .. IMPORTANT::
    This is an alpha version, the data model and design can change at any time without warning.
@@ -113,13 +113,18 @@ Authors
 Contributors
 ------------
 
-- `Trobz <https://www.trobz.com>`__:
+-  `Trobz <https://www.trobz.com>`__:
 
-     - Hai N. Le <hailn@trobz.com>
-     - Son Ho <sonhd@trobz.com>
-     - Tri Doan <tridm@trobz.com>
+      -  Hai N. Le <hailn@trobz.com>
+      -  Son Ho <sonhd@trobz.com>
+      -  Tri Doan <tridm@trobz.com>
 
-- Alberto Nieto alberto.nieto@braintec.com (https://braintec.com)
+-  Alberto Nieto alberto.nieto@braintec.com (https://braintec.com)
+
+-  `Camptocamp <https://www.camptocamp.com>`__:
+
+      -  Cyril Jeanneret <cyril.jeanneret@camptocam.com>
+      -  Italo Lopes <italo.lopes@camptocam.com>
 
 Other credits
 -------------

mail_composer_cc_bcc/models/ir_mail_server.py

@@ -11,7 +11,7 @@
 class IrMailServer(models.Model):
     _inherit = "ir.mail_server"
 
-    def _prepare_email_message(self, message, smtp_session):
+    def _prepare_email_message__(self, message, smtp_session):
         """
         Define smtp_to based on context instead of To+Cc+Bcc
         """
@@ -22,13 +22,13 @@ def _prepare_email_message(self, message, smtp_session):
         if x_odoo_bcc_value:
             message["Bcc"] = x_odoo_bcc_value
 
-        smtp_from, smtp_to_list, message = super()._prepare_email_message(
+        smtp_from, smtp_to_list, message = super()._prepare_email_message__(
             message, smtp_session
         )
 
         is_from_composer = self.env.context.get("is_from_composer", False)
-        if is_from_composer and self.env.context.get("recipients", False):
-            smtp_to = self.env.context["recipients"].pop(0)
+        if is_from_composer and self.env.context.get("recipients_ids", False):
+            smtp_to = self.env.context["recipients_ids"].pop(0)
             _logger.debug("smtp_to: %s", smtp_to)
             smtp_to_list = [smtp_to]
 

mail_composer_cc_bcc/models/mail_mail.py

@@ -25,10 +25,6 @@ class MailMail(models.Model):
 
     email_bcc = fields.Char("Bcc", help="Blind Cc message recipients")
 
-    # this method change on odoo 19.0
-    #  def _prepare_outgoing_list(self, mail_server=False, doc_to_followers=None):
-    # TODO verify the code with the change doc_to_followers
-
     def _prepare_outgoing_list(self, mail_server=False, doc_to_followers=None):
         # First, return if we're not coming from the Mail Composer
         res = super()._prepare_outgoing_list(
@@ -82,7 +78,7 @@ def _prepare_outgoing_list(self, mail_server=False, doc_to_followers=None):
                 }
             )
 
-        self.env.context = {**self.env.context, "recipients": list(recipients)}
+        self = self.with_context(recipients=list(recipients))
 
         if len(res) > len(recipients):
             res.pop()

mail_composer_cc_bcc/models/mail_thread.py

@@ -25,11 +25,6 @@ def _get_message_create_valid_field_names(self):
     # NOTIFICATION API
     # ------------------------------------------------------
 
-    # this method change on odoo 19.0
-    # def _notify_by_email_get_base_mail_values(self, message,
-    #   recipients_data, additional_values=None):
-    # TODO verify the code with the change doc_to_followers
-
     def _notify_by_email_get_base_mail_values(
         self, message, recipients_data, additional_values=None
     ):
@@ -96,13 +91,12 @@ def _notify_get_recipients(self, message, msg_vals=False, **kwargs):
                 pdata = {
                     "id": data.get("id"),
                     "active": data.get("active"),
-                    "share": data.get("share"),
                     "notif": data.get("notif") and data.get("notif") or notif,
                     "type": msg_type,
                     "is_follower": data.get("is_follower"),
-                    "uid": False,
                 }
-                rdata.append(pdata)
+                data.update(pdata)
+                rdata.append(data)
         return rdata
 
     def _notify_get_recipients_classify(
@@ -116,19 +110,15 @@ def _notify_get_recipients_classify(
         if not is_from_composer or skip_adding_cc_bcc:
             return res
         ids = []
-        customer_data = None
+        customer_data = []
         for rcpt_data in res:
             if rcpt_data["notification_group_name"] == "customer":
-                customer_data = rcpt_data
-            else:
-                ids += rcpt_data["recipients"]
+                customer_data.append(rcpt_data)
         if not customer_data:
             customer_data = res[0]
             customer_data["notification_group_name"] = "customer"
-            customer_data["recipients"] = ids
-        else:
-            customer_data["recipients"] += ids
-        return [customer_data]
+            customer_data["recipients_ids"] = ids
+        return customer_data
 
     def _notify_thread(self, message, msg_vals=False, **kwargs):
         if message.message_type == "notification":

mail_composer_cc_bcc/readme/CONTRIBUTORS.md

@@ -5,3 +5,8 @@
   > - Tri Doan \<<tridm@trobz.com>\>
 
 * Alberto Nieto <alberto.nieto@braintec.com> (https://braintec.com)
+- [Camptocamp](https://www.camptocamp.com):
+
+  > - Cyril Jeanneret \<<cyril.jeanneret@camptocam.com>\>
+  > - Italo Lopes \<<italo.lopes@camptocam.com>\>
+

mail_composer_cc_bcc/static/description/index.html

@@ -456,6 +456,14 @@ <h2>Contributors</h2>
 </li>
 <li><p class="first">Alberto Nieto <a class="reference external" href="mailto:alberto.nieto&#64;braintec.com">alberto.nieto&#64;braintec.com</a> (<a class="reference external" href="https://braintec.com">https://braintec.com</a>)</p>
 </li>
+<li><p class="first"><a class="reference external" href="https://www.camptocamp.com">Camptocamp</a>:</p>
+<blockquote>
+<ul class="simple">
+<li>Cyril Jeanneret &lt;<a class="reference external" href="mailto:cyril.jeanneret&#64;camptocam.com">cyril.jeanneret&#64;camptocam.com</a>&gt;</li>
+<li>Italo Lopes &lt;<a class="reference external" href="mailto:italo.lopes&#64;camptocam.com">italo.lopes&#64;camptocam.com</a>&gt;</li>
+</ul>
+</blockquote>
+</li>
 </ul>
 </div>
 <div class="section" id="other-credits">