From f307221f04ed89e4b0de5268c70601818da577e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 27 Mar 2013 12:17:50 +0100 Subject: [PATCH] [IMP] Cleaned the fix. bzr revid: tde@openerp.com-20130327111750-auc217sdkg4gieci --- addons/mail/wizard/mail_compose_message.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index 0d036e9402c..e475baf82ae 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -165,16 +165,17 @@ class mail_compose_message(osv.TransientModel): :param int res_id: id of the document record this mail is related to """ doc_name_get = self.pool.get(model).name_get(cr, uid, [res_id], context=context) + record_name = False if doc_name_get: record_name = doc_name_get[0][1] - else: - record_name = False - return { + values = { 'model': model, 'res_id': res_id, 'record_name': record_name, - 'subject': 'Re: %s' % record_name, } + if record_name: + values['subject'] = 'Re: %s' % record_name + return values def get_message_data(self, cr, uid, message_id, context=None): """ Returns a defaults-like dict with initial values for the composition @@ -192,6 +193,8 @@ class mail_compose_message(osv.TransientModel): # create subject re_prefix = _('Re:') + if message_data.subject: + reply_subject = tools.ustr(message_data.subject or tools.ustr(message_data.record_name or '') or '') if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)) and message_data.subject: reply_subject = "%s %s" % (re_prefix, reply_subject)