Merge PR #1628 into 16.0

Signed-off-by trisdoan

Author: OCA-git-bot

mail_composer_cc_bcc/models/mail_mail.py

@@ -81,7 +81,7 @@ def _send(  # noqa: max-complexity: 4
             email = mail._send_prepare_values()
             # ===== Same with native Odoo =====
             # headers
-            headers = {"X-Odoo-Message-Id": mail.message_id}
+            headers = {}
             bounce_alias = ICP.get_param("mail.bounce.alias")
             catchall_domain = ICP.get_param("mail.catchall.domain")
             if bounce_alias and catchall_domain:

mail_composer_cc_bcc/tests/test_mail_cc_bcc.py

@@ -10,13 +10,19 @@
 from odoo.addons.mail.models.mail_mail import MailMail as upstream
 from odoo.addons.mail.tests.test_mail_composer import TestMailComposer
 
+# When Odoo upstream function _send in the mall.mail model, that has been fully
+# overwritten in this module changes, we might have to reflect those changes
+# in our version. The change is detected by computing the hash on the upstream code.
+# To check what needs to be done, look at the commits in Odoo:
+#   git log --oneline -- addons/mail/models/mail_mail.py
 VALID_HASHES = [
     "d52cb36b88b33abc9556f7be6718d93f",
     "461467cd5b356072fc054468c75f6e26",
     "5d1ab352416f5074e131f35f20098d5b",
     "46172c91183f2cb50b22a6b3b5e3869b",
     "8f26c4084cc7fc300e64d19ccdc944fe",
     "db6cc0d3513a0c85bd716e4cb0a4d09c",
+    "458982c6cb3a347b13008f7d8130f633",  # 2025-04-08, odoo commit 3af276804101
 ]