From 5d8a39c156531926a6c82cecc8d967fa64675bd7 Mon Sep 17 00:00:00 2001 From: trisdoan Date: Mon, 16 Dec 2024 09:55:27 +0700 Subject: [PATCH] [FIX] mail_composer_cc_bcc: adapt to changes from upstream --- mail_composer_cc_bcc/README.rst | 1 + mail_composer_cc_bcc/models/mail_mail.py | 4 ++-- mail_composer_cc_bcc/readme/CONTRIBUTORS.rst | 1 + mail_composer_cc_bcc/static/description/index.html | 1 + mail_composer_cc_bcc/tests/test_mail_cc_bcc.py | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mail_composer_cc_bcc/README.rst b/mail_composer_cc_bcc/README.rst index 5c8fef9206..e2cc9508b0 100644 --- a/mail_composer_cc_bcc/README.rst +++ b/mail_composer_cc_bcc/README.rst @@ -106,6 +106,7 @@ Contributors * Hai N. Le * Son Ho + * Tris Doan * `Therp BV `_: diff --git a/mail_composer_cc_bcc/models/mail_mail.py b/mail_composer_cc_bcc/models/mail_mail.py index 29e906780b..29ab4d6e3f 100644 --- a/mail_composer_cc_bcc/models/mail_mail.py +++ b/mail_composer_cc_bcc/models/mail_mail.py @@ -54,7 +54,7 @@ def _send( # noqa: max-complexity: 4 success_pids = [] failure_type = None # ===== Same with native Odoo ===== - # https://github.com/odoo/odoo/blob/2baa481e14ca705f4c6d3d4d900daf24442a4aa5 + # https://github.com/odoo/odoo/blob/55c165dc8777514afa4f1476b82ef6b50b8a7651 # /addons/mail/models/mail_mail.py#L463 try: if mail.state != "outgoing": @@ -81,7 +81,7 @@ def _send( # noqa: max-complexity: 4 email = mail._send_prepare_values() # ===== Same with native Odoo ===== # headers - headers = {} + headers = {"X-Odoo-Message-Id": mail.message_id} bounce_alias = ICP.get_param("mail.bounce.alias") catchall_domain = ICP.get_param("mail.catchall.domain") if bounce_alias and catchall_domain: diff --git a/mail_composer_cc_bcc/readme/CONTRIBUTORS.rst b/mail_composer_cc_bcc/readme/CONTRIBUTORS.rst index 707d8e429d..bd3e5b1bfb 100644 --- a/mail_composer_cc_bcc/readme/CONTRIBUTORS.rst +++ b/mail_composer_cc_bcc/readme/CONTRIBUTORS.rst @@ -2,6 +2,7 @@ * Hai N. Le * Son Ho + * Tris Doan * `Therp BV `_: diff --git a/mail_composer_cc_bcc/static/description/index.html b/mail_composer_cc_bcc/static/description/index.html index 2bc3f0a903..48b16cbb4e 100644 --- a/mail_composer_cc_bcc/static/description/index.html +++ b/mail_composer_cc_bcc/static/description/index.html @@ -452,6 +452,7 @@

Contributors

diff --git a/mail_composer_cc_bcc/tests/test_mail_cc_bcc.py b/mail_composer_cc_bcc/tests/test_mail_cc_bcc.py index 36bf2005cd..90f0d6d254 100644 --- a/mail_composer_cc_bcc/tests/test_mail_cc_bcc.py +++ b/mail_composer_cc_bcc/tests/test_mail_cc_bcc.py @@ -15,6 +15,7 @@ "461467cd5b356072fc054468c75f6e26", "5d1ab352416f5074e131f35f20098d5b", "46172c91183f2cb50b22a6b3b5e3869b", + "8f26c4084cc7fc300e64d19ccdc944fe", ]