From e2c7bfc88cf603e8a73b3638b09f32a3aa639ba7 Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Wed, 13 Apr 2011 17:06:33 +0530 Subject: [PATCH] [FIX] email.compose.message: set signature and auto_delete on change of template bzr revid: rha@tinyerp.com-20110413113633-un3xkrbhlfaof585 --- addons/email_template/wizard/email_compose_message.py | 9 ++++++--- addons/mail/wizard/email_compose_message.py | 3 ++- addons/mail/wizard/email_compose_message_view.xml | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/email_template/wizard/email_compose_message.py b/addons/email_template/wizard/email_compose_message.py index 4ca04b2d154..4086a4b1aee 100644 --- a/addons/email_template/wizard/email_compose_message.py +++ b/addons/email_template/wizard/email_compose_message.py @@ -139,12 +139,15 @@ class email_compose_message(osv.osv_memory): vals.update(self.get_template_data(cr, uid, resource_id, template_id, context)) else: vals.update({'attachment_ids' : []}) + email_temp_pool = self.pool.get('email.template') - if context.get('active_model') and context.get('active_id') and email_temp_pool.browse(cr, uid, template_id, context=context).user_signature: + template_data = email_temp_pool.browse(cr, uid, template_id, context=context) + vals.update({'auto_delete': template_data.auto_delete}) + if context.get('active_model') and context.get('active_id') and template_data.user_signature: model_pool = self.pool.get(context['active_model']) user = model_pool.browse(cr, uid, context['active_id'], context=context).user_id - signature = user and user.signature - vals['body'] = _('%s\n%s') %(vals['body'], signature or '') + signature = user and user.signature or '' + vals['body'] = vals['body'] + '\n' + signature return {'value': vals} email_compose_message() diff --git a/addons/mail/wizard/email_compose_message.py b/addons/mail/wizard/email_compose_message.py index 3f528f4732e..4f6e810ac28 100644 --- a/addons/mail/wizard/email_compose_message.py +++ b/addons/mail/wizard/email_compose_message.py @@ -207,7 +207,8 @@ class email_compose_message(osv.osv_memory): email_id = email_message_pool.schedule_with_attach(cr, uid, mail.email_from, mail.email_to, mail.subject, mail.body, model=mail.model, email_cc=mail.email_cc, email_bcc=mail.email_bcc, reply_to=mail.reply_to, attach=attachment, message_id=message_id, references=references, openobject_id=int(mail.res_id), - subtype=mail.sub_type, x_headers=mail.headers, priority=mail.priority, smtp_server_id=mail.smtp_server_id and mail.smtp_server_id.id, context=context) + subtype=mail.sub_type, x_headers=mail.headers, priority=mail.priority, smtp_server_id=mail.smtp_server_id and mail.smtp_server_id.id, + auto_delete=mail.auto_delete or False, context=context) email_ids.append(email_id) return email_ids diff --git a/addons/mail/wizard/email_compose_message_view.xml b/addons/mail/wizard/email_compose_message_view.xml index 71fe82fb7e6..92d2ed35594 100644 --- a/addons/mail/wizard/email_compose_message_view.xml +++ b/addons/mail/wizard/email_compose_message_view.xml @@ -17,6 +17,7 @@ +