Skip to content

[16.0][FIX] mail_composer_cc_bcc: email_to must be a list, not a joined string #1887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luciaavanzosc wants to merge 1 commit into
base: 16.0
Choose a base branch
from
+15 −14
Open

[16.0][FIX] mail_composer_cc_bcc: email_to must be a list, not a joined string #1887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions mail_composer_cc_bcc/models/mail_mail.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,15 @@


def format_emails(partners):
emails = [
tools.formataddr(
(
p.name or "False",
p.email and tools.mail._normalize_email(p.email) or "False",
)
)
return [
tools.formataddr((p.name or "", tools.mail._normalize_email(p.email)))
for p in partners
if p.email
]
return ", ".join(emails)


def format_emails_str(partners):
return ", ".join(format_emails(partners))


class MailMail(models.Model):
Expand Down Expand Up @@ -294,10 +293,12 @@ def _send_prepare_values(self, partner=None):
partner_to_ids = [r.id for r in self.recipient_ids if r not in partners_cc_bcc]
partner_to = self.env["res.partner"].browse(partner_to_ids)
res["email_to"] = format_emails(partner_to)
res["email_cc"] = format_emails(self.recipient_cc_ids)
res["email_bcc"] = format_emails(self.recipient_bcc_ids)
res["email_cc"] = format_emails_str(self.recipient_cc_ids)
res["email_bcc"] = format_emails_str(self.recipient_bcc_ids)
if res.get("email_to"):
res["email_to_normalized"] += tools.email_normalize_all(res["email_to"])
res["email_to_normalized"] += tools.email_normalize_all(
format_emails_str(partner_to)
)
if res.get("email_cc"):
res["email_to_normalized"] += tools.email_normalize_all(res["email_cc"])
if res.get("email_bcc"):
Expand Down
6 changes: 3 additions & 3 deletions mail_composer_cc_bcc/models/mail_thread.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from odoo import models

from .mail_mail import format_emails
from .mail_mail import format_emails_str


class MailThread(models.AbstractModel):
Expand Down Expand Up @@ -32,10 +32,10 @@ def _notify_by_email_get_base_mail_values(self, message, additional_values=None)
)
partners_cc = context.get("partner_cc_ids", None)
if partners_cc:
res["email_cc"] = format_emails(partners_cc)
res["email_cc"] = format_emails_str(partners_cc)
partners_bcc = context.get("partner_bcc_ids", None)
if partners_bcc:
res["email_bcc"] = format_emails(partners_bcc)
res["email_bcc"] = format_emails_str(partners_bcc)
return res

def _notify_get_recipients(self, message, msg_vals, **kwargs):
Expand Down
Loading