changeset 49e2b5a9a8c0 in modules/marketing_email:default
details:
https://hg.tryton.org/modules/marketing_email?cmd=changeset;node=49e2b5a9a8c0
description:
Allow distinct FROM addresses for envelope and header
issue9948
review324741004
diffstat:
CHANGELOG | 4 +++-
marketing.py | 21 +++++++++------------
2 files changed, 12 insertions(+), 13 deletions(-)
diffs (74 lines):
diff -r b6009062418e -r 49e2b5a9a8c0 CHANGELOG
--- a/CHANGELOG Sat Dec 19 17:08:45 2020 +0100
+++ b/CHANGELOG Wed Feb 03 23:26:07 2021 +0100
@@ -1,2 +1,4 @@
+* Allow different FROM per language
+
Version 5.8.0 - 2020-11-02
-* Initial release
\ No newline at end of file
+* Initial release
diff -r b6009062418e -r 49e2b5a9a8c0 marketing.py
--- a/marketing.py Sat Dec 19 17:08:45 2020 +0100
+++ b/marketing.py Wed Feb 03 23:26:07 2021 +0100
@@ -271,14 +271,13 @@
else:
record, = records
if not record.active:
- from_ = (from_
- or config.get('marketing', 'email_from')
+ from_cfg = (config.get('marketing', 'email_from')
or config.get('email', 'from'))
msg, title = record.get_email_subscribe()
- msg['From'] = from_
+ msg['From'] = from_ or from_cfg
msg['To'] = record.email
msg['Subject'] = Header(title, 'utf-8')
- sendmail_transactional(from_, [record.email], msg)
+ sendmail_transactional(from_cfg, [record.email], msg)
def request_unsubscribe(self, email, from_=None):
pool = Pool()
@@ -297,14 +296,13 @@
if records:
record, = records
if record.active:
- from_ = (from_
- or config.get('marketing', 'email_from')
+ from_cfg = (config.get('marketing', 'email_from')
or config.get('email', 'from'))
msg, title = record.get_email_unsubscribe()
- msg['From'] = from_
+ msg['From'] = from_ or from_cfg
msg['To'] = record.email
msg['Subject'] = Header(title, 'utf-8')
- sendmail_transactional(from_, [record.email], msg)
+ sendmail_transactional(from_cfg, [record.email], msg)
class Message(Workflow, ModelSQL, ModelView):
@@ -460,13 +458,12 @@
.render())
name = email.party.rec_name if email.party else ''
- from_ = (message.from_
- or config.get('marketing', 'email_from')
+ from_cfg = (config.get('marketing', 'email_from')
or config.get('email', 'from'))
to = _formataddr(name, email.email)
msg = MIMEMultipart('alternative')
- msg['From'] = from_
+ msg['From'] = message.from_ or from_cfg
msg['To'] = to
msg['Subject'] = Header(message.title, 'utf-8')
if html2text:
@@ -478,7 +475,7 @@
msg.attach(part)
sendmail_transactional(
- from_, getaddresses([to]), msg,
+ from_cfg, getaddresses([to]), msg,
datamanager=smtpd_datamanager)
if not emails:
cls.sent(messages)
