Techsystech
/
social
mirror of https://github.com/OCA/social.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #1628 into 16.0 

Signed-off-by trisdoan
pull/1620/head
OCA-git-bot 2025-04-09 09:12:25 +00:00
parent cb194b6602 88212b2504
commit f5c4912a5c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail_composer_cc_bcc/models/mail_mail.py
View File

@ -81,7 +81,7 @@ class MailMail(models.Model):
email = mail._send_prepare_values() email = mail._send_prepare_values()
# ===== Same with native Odoo ===== # ===== Same with native Odoo =====
# headers # headers
headers = {"X-Odoo-Message-Id": mail.message_id} headers = {}
bounce_alias = ICP.get_param("mail.bounce.alias") bounce_alias = ICP.get_param("mail.bounce.alias")
catchall_domain = ICP.get_param("mail.catchall.domain") catchall_domain = ICP.get_param("mail.catchall.domain")
if bounce_alias and catchall_domain: if bounce_alias and catchall_domain:

6
mail_composer_cc_bcc/tests/test_mail_cc_bcc.py
View File

@ -10,6 +10,11 @@ from odoo.tests import Form
from odoo.addons.mail.models.mail_mail import MailMail as upstream from odoo.addons.mail.models.mail_mail import MailMail as upstream
from odoo.addons.mail.tests.test_mail_composer import TestMailComposer 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 = [ VALID_HASHES = [
"d52cb36b88b33abc9556f7be6718d93f", "d52cb36b88b33abc9556f7be6718d93f",
"461467cd5b356072fc054468c75f6e26", "461467cd5b356072fc054468c75f6e26",
@ -17,6 +22,7 @@ VALID_HASHES = [
"46172c91183f2cb50b22a6b3b5e3869b", "46172c91183f2cb50b22a6b3b5e3869b",
"8f26c4084cc7fc300e64d19ccdc944fe", "8f26c4084cc7fc300e64d19ccdc944fe",
"db6cc0d3513a0c85bd716e4cb0a4d09c", "db6cc0d3513a0c85bd716e4cb0a4d09c",
"458982c6cb3a347b13008f7d8130f633", # 2025-04-08, odoo commit 3af276804101
] ]