From 1ef967e5aa7070788a546e05759221d15a83e465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 30 Jan 2013 14:44:47 +0100 Subject: [PATCH] [FIX] mail: notification email: email_from is now correctly set (alias of the author if user and alias configured; author email; or email_from of the mail.message). bzr revid: tde@openerp.com-20130130134447-nu4lt7jb7db5aprh --- addons/mail/mail_followers.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py index db46e3a03d1..a9d33f4585d 100644 --- a/addons/mail/mail_followers.py +++ b/addons/mail/mail_followers.py @@ -126,11 +126,20 @@ class mail_notification(osv.Model): if signature: body_html = tools.append_content_to_html(body_html, signature, plaintext=True, container_tag='div') + # email_from: partner-user alias or partner email or mail.message email_from + if msg.author_id and msg.author_id.user_ids and msg.author_id.user_ids[0].alias_domain and msg.author_id.user_ids[0].alias_name: + email_from = '%s <%s@%s>' % (msg.author_id.name, msg.author_id.user_ids[0].alias_name, msg.author_id.user_ids[0].alias_domain) + elif msg.author_id: + email_from = '%s <%s>' % (msg.author_id.name, msg.author_id.email) + else: + email_from = msg.email_from + mail_values = { 'mail_message_id': msg.id, 'email_to': [], 'auto_delete': True, 'body_html': body_html, + 'email_from': email_from, 'state': 'outgoing', } mail_values['email_to'] = ', '.join(mail_values['email_to'])