odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] mail: fixed get_default_recipient, trying to call a method even if the target model do not have it; also fixed default recipients generation on the contact model; sending a mass mailing when not having recipient now raise a warning.

This commit is contained in:
Thibault Delavallée 2014-05-27 13:33:10 +02:00
parent a26a0e6d30
commit c93d169fde
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/mail/mail_thread.py
View File

@ -662,9 +662,10 @@ class mail_thread(osv.AbstractModel):
def message_get_default_recipients(self, cr, uid, ids, context=None): def message_get_default_recipients(self, cr, uid, ids, context=None):
if context and context.get('thread_model') and context['thread_model'] in self.pool and context['thread_model'] != self._name: if context and context.get('thread_model') and context['thread_model'] in self.pool and context['thread_model'] != self._name:
sub_ctx = dict(context) if hasattr(self.pool[context['thread_model']], 'message_get_default_recipients'):
sub_ctx.pop('thread_model') sub_ctx = dict(context)
return self.pool[context['thread_model']].message_get_default_recipients(cr, uid, ids, context=sub_ctx) sub_ctx.pop('thread_model')
return self.pool[context['thread_model']].message_get_default_recipients(cr, uid, ids, context=sub_ctx)
res = {} res = {}
for record in self.browse(cr, SUPERUSER_ID, ids, context=context): for record in self.browse(cr, SUPERUSER_ID, ids, context=context):
recipient_ids, email_to, email_cc = set(), False, False recipient_ids, email_to, email_cc = set(), False, False

11
addons/mass_mailing/models/mass_mailing.py
View File

@ -4,10 +4,9 @@ from datetime import datetime
from dateutil import relativedelta from dateutil import relativedelta
import json import json
import random import random
import urllib
import urlparse
from openerp import tools from openerp import tools
from openerp.exceptions import Warning
from openerp.tools.safe_eval import safe_eval as eval from openerp.tools.safe_eval import safe_eval as eval
from openerp.tools.translate import _ from openerp.tools.translate import _
from openerp.osv import osv, fields from openerp.osv import osv, fields
@ -62,6 +61,12 @@ class MassMailingContact(osv.Model):
rec_id = self.create(cr, uid, {'name': name, 'email': email}, context=context) rec_id = self.create(cr, uid, {'name': name, 'email': email}, context=context)
return self.name_get(cr, uid, [rec_id], context)[0] return self.name_get(cr, uid, [rec_id], context)[0]
def message_get_default_recipients(self, cr, uid, ids, context=None):
res = {}
for record in self.browse(cr, uid, ids, context=context):
res[record.id] = {'partner_ids': [], 'email_to': record.email, 'email_cc': False}
return res
class MassMailingList(osv.Model): class MassMailingList(osv.Model):
"""Model of a contact list. """ """Model of a contact list. """
@ -549,6 +554,8 @@ class MassMailing(osv.Model):
for mailing in self.browse(cr, uid, ids, context=context): for mailing in self.browse(cr, uid, ids, context=context):
# instantiate an email composer + send emails # instantiate an email composer + send emails
res_ids = self.get_recipients(cr, uid, mailing, context=context) res_ids = self.get_recipients(cr, uid, mailing, context=context)
if not res_ids:
raise Warning('Please select recipients.')
comp_ctx = dict(context, active_ids=res_ids) comp_ctx = dict(context, active_ids=res_ids)
composer_values = { composer_values = {
'author_id': author_id, 'author_id': author_id,