From 31965cf97a090a8d47a893e4f6c53fb2ea96e410 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 25 Oct 2012 11:59:23 +0200 Subject: [IMP] mail: insert message post, and no quote for reply bzr revid: chm@openerp.com-20121025095923-7urqi5he10q3z1i6 --- addons/mail/wizard/mail_compose_message.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'addons/mail/wizard/mail_compose_message.py') diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index b68aae14521..b93f6eea7a9 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -157,11 +157,7 @@ class mail_compose_message(osv.TransientModel): if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)) and message_data.subject: reply_subject = "%s %s" % (re_prefix, reply_subject) # create the reply in the body - reply_body = _('
On %(date)s, %(sender_name)s wrote:
%(body)s
') % { - 'date': message_data.date if message_data.date else '', - 'sender_name': message_data.author_id.name, - 'body': message_data.body, - } + reply_body = (context and context.get('default_body') or '') # get partner_ids from original message partner_ids = [partner.id for partner in message_data.partner_ids] if message_data.partner_ids else [] -- cgit v1.2.3 From cbf55bc07d979dac915a3d7314ee0979ec4d17ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 29 Oct 2012 11:09:10 +0100 Subject: [IMP] [FIX] mail: replying with the wizard does not quote the original message anymore. Updated tests. bzr revid: tde@openerp.com-20121029100910-c0y6tl1zg2qsqfv5 --- addons/mail/wizard/mail_compose_message.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'addons/mail/wizard/mail_compose_message.py') diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index b93f6eea7a9..1bcbb0c2efc 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -156,8 +156,6 @@ class mail_compose_message(osv.TransientModel): reply_subject = tools.ustr(message_data.subject 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) - # create the reply in the body - reply_body = (context and context.get('default_body') or '') # get partner_ids from original message partner_ids = [partner.id for partner in message_data.partner_ids] if message_data.partner_ids else [] @@ -166,7 +164,6 @@ class mail_compose_message(osv.TransientModel): 'model': message_data.model, 'res_id': message_data.res_id, 'parent_id': message_data.id, - 'body': reply_body, 'subject': reply_subject, 'partner_ids': partner_ids, 'content_subtype': 'html', -- cgit v1.2.3