diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-02-08 15:24:41 +0100 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-02-08 15:24:41 +0100 |
| commit | 0fd2e8ea33af1bccf6dfa0351efccaa5696bd01d (patch) | |
| tree | 0a88a3b07e3148c71bb08e51d69793f4b7cafb97 /addons/email_template/wizard | |
| parent | 75e1bf1787385187b66a3a0b34d223b8685fd511 (diff) | |
| parent | a5819a49d297bf5f6c4bab83485f9bc7600c7e75 (diff) | |
[MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20120208142441-r51m3wxvpp6673dk
Diffstat (limited to 'addons/email_template/wizard')
| -rw-r--r-- | addons/email_template/wizard/mail_compose_message.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py index beb59ba1eea..ef4572429a1 100644 --- a/addons/email_template/wizard/mail_compose_message.py +++ b/addons/email_template/wizard/mail_compose_message.py @@ -69,6 +69,10 @@ class mail_compose_message(osv.osv_memory): size=-1 # means we want an int db column ), } + + _defaults = { + 'template_id' : lambda self, cr, uid, context={} : context.get('mail.compose.template_id', False) + } def on_change_template(self, cr, uid, ids, use_template, template_id, email_from=None, email_to=None, context=None): if context is None: |