From 4969c586b4898b1ca1e9cf112985ce89f6030ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 24 Aug 2012 10:53:42 +0200 Subject: [PATCH] [FIX] mail_mail: temp fix, commented headers propagation; mail_followers: send emails accordign to email preferences was not correct. bzr revid: tde@openerp.com-20120824085342-aa9s1ojl2j3v85fk --- addons/mail/mail_followers.py | 13 +++++++------ addons/mail/mail_mail.py | 4 +++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py index 671e2405b49..f73478f3a6f 100644 --- a/addons/mail/mail_followers.py +++ b/addons/mail/mail_followers.py @@ -72,6 +72,7 @@ class mail_notification(osv.Model): """ Send by email the notification depending on the user preferences """ context = context or {} partner_obj = self.pool.get('res.partner') + mail_mail_obj = self.pool.get('mail.mail') notification_obj = self.pool.get('mail.notification') msg_obj = self.pool.get('mail.message') msg = msg_obj.browse(cr, uid, msg_id, context=context) @@ -89,20 +90,20 @@ class mail_notification(osv.Model): if partner.notification_email_pref=='none' or not partner.email: continue # Partners want to receive only emails and comments - if partner.notification_email_pref=='comment' and msg.type in ('email','comment'): + if partner.notification_email_pref=='comment' and msg.type not in ('email','comment'): continue towrite['state'] = 'outgoing' if partner.email not in towrite['email_to']: towrite['email_to'].append(partner.email) - if towrite.get('state', False) and not context.get('noemail', False): - if towrite.get('subject', False): + if towrite.get('state') and not context.get('noemail'): + if towrite.get('subject'): towrite['subject'] = msg.name_get()[0][1] towrite['message_id'] = msg.id towrite['email_to'] = ', '.join(towrite['email_to']) - mail_message_obj = self.pool.get('mail.mail') - newid = mail_message_obj.create(cr, uid, towrite, context=context) - mail_message_obj.send(cr, uid, [newid], context=context) + + email_notif_id = mail_mail_obj.create(cr, uid, towrite, context=context) + mail_mail_obj.send(cr, uid, [email_notif_id], context=context) return True diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py index bd0bfbf33c0..c5a062054f3 100644 --- a/addons/mail/mail_mail.py +++ b/addons/mail/mail_mail.py @@ -185,7 +185,9 @@ class mail_mail(osv.Model): object_id=message.res_id and ('%s-%s' % (message.res_id,message.model)), subtype=message.content_subtype, subtype_alternative=content_subtype_alternative, - headers=message.headers and ast.literal_eval(message.headers)) + # TDE FIXME: what to do with headers ? currently ycommented to avoid bugs + # headers=message.headers and ast.literal_eval(message.headers)) + ) res = ir_mail_server.send_email(cr, uid, msg, mail_server_id=message.mail_server_id.id, context=context)