[IMP]check condition
bzr revid: pja@tinyerp.com-20121008061146-jz78eocp772xztob
This commit is contained in:
parent
70ec007c16
commit
e676beaa38
|
@ -81,8 +81,11 @@ class mail_compose_message(osv.TransientModel):
|
|||
elif composition_mode == 'comment' and model and res_id:
|
||||
vals = self.get_record_data(cr, uid, model, res_id, context=context)
|
||||
elif composition_mode == 'mass_mail' and model and active_ids:
|
||||
vals = self.pool.get('email.template').generate_email(cr, uid, context.get('default_template_id'), res_id, context=context)
|
||||
vals.update({'content_subtype': 'html'})
|
||||
if context.get('default_template_id'):
|
||||
vals = email_template_obj.generate_email(cr, uid, context.get('default_template_id'), res_id, context=context)
|
||||
vals.update({'content_subtype': 'html'})
|
||||
else:
|
||||
vals = {'model': model, 'res_id': res_id, 'content_subtype': 'html'}
|
||||
else:
|
||||
vals = {'model': model, 'res_id': res_id}
|
||||
if composition_mode:
|
||||
|
|
Loading…
Reference in New Issue