From 326506db2c5115644eacf43dd266d28b068af338 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 11 Apr 2013 20:22:26 +0200
Subject: [PATCH 1/3] [FIX] mail: mail composer: Use a text field instead of a
 html field

html fields are sanitized just before saving data into the database.
In the composer, this cause the sanitization of the templated
message (for mass mailing messages) before the rendering, forbidding
the use of templated html links.
The html of the message is sanitized by  message_post()

bzr revid: chs@openerp.com-20130411182226-lwnpkh4tmyswjjnc
---
 addons/mail/wizard/mail_compose_message.py       | 1 +
 addons/mail/wizard/mail_compose_message_view.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 301dff515b3..16cfc99c513 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -116,6 +116,7 @@ class mail_compose_message(osv.TransientModel):
             'mail_compose_message_ir_attachments_rel',
             'wizard_id', 'attachment_id', 'Attachments'),
         'filter_id': fields.many2one('ir.filters', 'Filters'),
+        'body': fields.text('Contents'),
     }
 
     _defaults = {
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 00ba33a6d6f..73c16713718 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -30,7 +30,7 @@
                         </div>
                         <field name="subject" placeholder="Subject..."/>
                     </group>
-                    <field name="body"/>
+                    <field name="body" widget='html'/>
                     <field name="attachment_ids" widget="many2many_binary"/>
                     <footer>
                         <button string="Send" name="send_mail" type="object" class="oe_highlight"/>

From 8a7fad6b228b568c845467ba4a5b8f2118518b7f Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 11 Apr 2013 21:04:01 +0200
Subject: [PATCH 2/3] [FIX] email_template/tests/test_mail.py: compose.body is
 not htmlized anymore

bzr revid: chs@openerp.com-20130411190401-0ajvlapuyxop0zhn
---
 addons/email_template/tests/test_mail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index a4ecb9b6f91..68ddbe7dbbd 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -155,7 +155,7 @@ class test_message_compose(TestMailBase):
         message_pids = [partner.id for partner in compose.partner_ids]
         partner_ids = [p_a_id]
         self.assertEqual(compose.subject, '${object.name}', 'mail.compose.message subject incorrect')
-        self.assertEqual(compose.body, '<p>${object.description}</p>', 'mail.compose.message body incorrect')
+        self.assertEqual(compose.body, '${object.description}', 'mail.compose.message body incorrect')
         self.assertEqual(set(message_pids), set(partner_ids), 'mail.compose.message partner_ids incorrect')
 
         # 2. Post the comment, get created message

From b2d6c8056991c3a2ef2085dcde87a2a1018f0181 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 12 Apr 2013 15:22:31 +0200
Subject: [PATCH 3/3] [IMP] mail/wizard/mail_compose_message.py: add comment
 explaining why we use a text field for the body

bzr revid: chs@openerp.com-20130412132231-84wz56s2r4ordxw1
---
 addons/mail/wizard/mail_compose_message.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 16cfc99c513..3a12920c951 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -116,6 +116,12 @@ class mail_compose_message(osv.TransientModel):
             'mail_compose_message_ir_attachments_rel',
             'wizard_id', 'attachment_id', 'Attachments'),
         'filter_id': fields.many2one('ir.filters', 'Filters'),
+
+        # Replace `body` with a text field because html fields are sanitized
+        # just before saving data into the database. This cause the
+        # sanitization of the templated messages (for mass mailing messages)
+        # before the rendering, forbidding the use of templated html links.
+        # The html of the message will be sanitized by message_post()
         'body': fields.text('Contents'),
     }