diff options
| author | Denis Ledoux <dle@odoo.com> | 2014-12-11 14:11:33 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2014-12-11 14:11:33 +0100 |
| commit | a6212d2d206adb44de28ebd8a5194069bbbef2ae (patch) | |
| tree | 98a5219095c356c8deea2d93d74dbc663ada28de /addons/email_template/wizard | |
| parent | d347e9c28cf6ef617f68ef08212b61d8c244af42 (diff) | |
| parent | e11d1c2b7ac37d03c4567355dc007a7e414c08ae (diff) | |
[MERGE] forward port of branch saas-3 up to e11d1c2
Diffstat (limited to 'addons/email_template/wizard')
| -rw-r--r-- | addons/email_template/wizard/mail_compose_message.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py index 14cdecd89c6..1a5a915dfe2 100644 --- a/addons/email_template/wizard/mail_compose_message.py +++ b/addons/email_template/wizard/mail_compose_message.py @@ -129,7 +129,7 @@ class mail_compose_message(osv.TransientModel): email_template = self.pool.get('email.template') ir_model_pool = self.pool.get('ir.model') for record in self.browse(cr, uid, ids, context=context): - model_ids = ir_model_pool.search(cr, uid, [('model', '=', record.model)], context=context) + model_ids = ir_model_pool.search(cr, uid, [('model', '=', record.model or 'mail.message')], context=context) model_id = model_ids and model_ids[0] or False model_name = '' if model_id: |