From 292a8a18e42118f48ac017d9fedca3daa9ef3e2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 3 Feb 2021 23:26:07 +0100
Subject: [PATCH] Allow distinct FROM addresses for envelope and header

issue9948
review324741004
---
 CHANGELOG               |  1 +
 marketing_automation.py | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6471083b80..03f2227a1b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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 --git a/marketing_automation.py b/marketing_automation.py
index 6003bf7983..0a3f3a0d70 100644
--- a/marketing_automation.py
+++ b/marketing_automation.py
@@ -299,7 +299,7 @@ class Activity(ModelSQL, ModelView):
             ], "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 @@ class Activity(ModelSQL, ModelView):
             .filter(convert_href)
             .render())
 
-        msg = MIMEMultipart('alternative')
-        msg['From'] = (self.email_from
-            or config.get('marketing', 'email_from')
+        from_ = (config.get('marketing', 'email_from')
             or config.get('email', 'from'))
+        msg = MIMEMultipart('alternative')
+        msg['From'] = translated.email_from or from_
         msg['To'] = to
         msg['Subject'] = Header(title, 'utf-8')
         if html2text:
@@ -613,7 +613,7 @@ class Activity(ModelSQL, ModelView):
         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 {