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

Merge PR #1223 into 15.0 

Signed-off-by etobella
pull/1222/head
OCA-git-bot 2023-10-09 09:44:28 +00:00
parent 0084ea1e58 57120ad511
commit 059c7d2285
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mail_composer_cc_bcc/models/mail_mail.py
View File

@ -44,8 +44,8 @@ class MailMail(models.Model):
success_pids = [] success_pids = []
failure_type = None failure_type = None
# ===== Same with native Odoo ===== # ===== Same with native Odoo =====
# https://github.com/odoo/odoo/blob/6ec4ba7ba22626219ddd09241c274b09a21fac0b # https://github.com/odoo/odoo/blob/0a3fc96cd51c0aab024207a4608f6ba32d49da36
# /addons/mail/models/mail_mail.py#L375 # /addons/mail/models/mail_mail.py#L384
try: try:
if mail.state != "outgoing": if mail.state != "outgoing":
if mail.state != "exception" and mail.auto_delete: if mail.state != "exception" and mail.auto_delete:
@ -125,11 +125,16 @@ class MailMail(models.Model):
records=notifs, records=notifs,
) )
# protect against ill-formatted email_from when formataddr was used on an already formatted email # noqa: B950
emails_from = tools.email_split_and_format(mail.email_from)
email_from = emails_from[0] if emails_from else mail.email_from
# build an RFC2822 email.message.Message object and send it without queuing # build an RFC2822 email.message.Message object and send it without queuing
res = None res = None
# TDE note: could be great to pre-detect missing to/cc and skip sending it # TDE note: could be great to pre-detect missing to/cc and skip sending it
# to go directly to failed state update # to go directly to failed state update
# ===== Different than native Odoo ===== # ===== Different than native Odoo =====
email["email_from"] = email_from
msg = self.build_email( msg = self.build_email(
email, email,
attachments=attachments, attachments=attachments,
@ -230,12 +235,13 @@ class MailMail(models.Model):
def build_email(self, email, attachments=None, headers=None): def build_email(self, email, attachments=None, headers=None):
env = self.env env = self.env
mail = self mail = self
email_from = email.get("email_from")
IrMailServer = env["ir.mail_server"] IrMailServer = env["ir.mail_server"]
# ===== Same with native Odoo ===== # ===== Same with native Odoo =====
# https://github.com/odoo/odoo/blob/6ec4ba7ba22626219ddd09241c274b09a21fac0b # https://github.com/odoo/odoo/blob/0a3fc96cd51c0aab024207a4608f6ba32d49da36
# /addons/mail/models/mail_mail.py#L447 # /addons/mail/models/mail_mail.py#L458
msg = IrMailServer.build_email( msg = IrMailServer.build_email(
email_from=mail.email_from, email_from=email_from,
email_to=email.get("email_to"), email_to=email.get("email_to"),
subject=mail.subject, subject=mail.subject,
body=email.get("body"), body=email.get("body"),

2
mail_composer_cc_bcc/tests/test_mail_cc_bcc.py
View File

@ -10,7 +10,7 @@ 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
VALID_HASHES = ["5f8b9bd28ccfe4f4ef1702002b2ab3fc"] VALID_HASHES = ["5f8b9bd28ccfe4f4ef1702002b2ab3fc", "0e47779dfd6e70de1cc1457792c68c0f"]
class TestMailCcBcc(TestMailComposer): class TestMailCcBcc(TestMailComposer):