changeset 0f75b81f4ae6 in modules/marketing_automation:default
details:
https://hg.tryton.org/modules/marketing_automation?cmd=changeset;node=0f75b81f4ae6
description:
Allow distinct FROM addresses for envelope and header
issue9948
review324741004
diffstat:
CHANGELOG | 1 +
marketing_automation.py | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diffs (43 lines):
diff -r c273889a9329 -r 0f75b81f4ae6 CHANGELOG
--- a/CHANGELOG Sun Dec 27 00:19:30 2020 +0100
+++ b/CHANGELOG Wed Feb 03 23:26:07 2021 +0100
@@ -1,3 +1,4 @@
+* Allow different FROM per language
* Add format methods from Report to email rendering context
Version 5.8.0 - 2020-11-02
diff -r c273889a9329 -r 0f75b81f4ae6 marketing_automation.py
--- a/marketing_automation.py Sun Dec 27 00:19:30 2020 +0100
+++ b/marketing_automation.py Wed Feb 03 23:26:07 2021 +0100
@@ -299,7 +299,7 @@
], "Action")
# Send E-mail
- email_from = fields.Char("From",
+ email_from = fields.Char("From", translate=True,
states={
'invisible': Eval('action') != 'send_email',
},
@@ -596,10 +596,10 @@
.filter(convert_href)
.render())
+ from_ = (config.get('marketing', 'email_from')
+ or config.get('email', 'from'))
msg = MIMEMultipart('alternative')
- msg['From'] = (self.email_from
- or config.get('marketing', 'email_from')
- or config.get('email', 'from'))
+ msg['From'] = translated.email_from or from_
msg['To'] = to
msg['Subject'] = Header(title, 'utf-8')
if html2text:
@@ -613,7 +613,7 @@
to_addrs = [a for _, a in getaddresses([to])]
if to_addrs:
sendmail_transactional(
- self.email_from, to_addrs, msg, datamanager=smtpd_datamanager)
+ from_, to_addrs, msg, datamanager=smtpd_datamanager)
def email_context(self, record):
return {
