From 43cc0540485f1fa4bdaf28e1a91cd944f5905265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 17 Mar 2014 14:22:27 +0100 Subject: [PATCH] [FIX] mail_compose_message: create Re subject only when having a parent bzr revid: tde@openerp.com-20140317132227-mcey6ywjr1g6pe9g --- addons/mail/wizard/mail_compose_message.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index 5e235dd0010..367597d347a 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -204,16 +204,15 @@ class mail_compose_message(osv.TransientModel): partner_ids += [partner.id for partner in message_data.partner_ids] if context.get('is_private') and message_data.author_id: # check message is private then add author also in partner list. partner_ids += [message_data.author_id.id] + # create subject + re_prefix = _('Re:') + if not (subject.startswith('Re:') or subject.startswith(re_prefix)): + subject = "%s %s" % (re_prefix, subject) elif model and res_id: doc_name_get = self.pool[model].name_get(cr, uid, [res_id], context=context) record_name = doc_name_get and doc_name_get[0][1] or '' subject = tools.ustr(record_name) - # create subject - re_prefix = _('Re:') - if not (subject.startswith('Re:') or subject.startswith(re_prefix)): - subject = "%s %s" % (re_prefix, subject) - return { 'record_name': record_name, 'subject': subject,