From ac08e2ba53297b303c00be25ba46af3e727db625 Mon Sep 17 00:00:00 2001
From: Olivier Colson <oco@odoo.com>
Date: Fri, 26 Oct 2018 11:31:58 +0200
Subject: [PATCH] [FIX] mail: display both tracking values and body of the
 messages in mail thread

Before that, the body of the message was never displayed if the message had tracking values. This was annoying for account_asset module, were we prompt the user for some justification when she modifies the depreciation data of an asset, and then call message_post with this text as body, and tracking values reflecting the change that was made.
---
 addons/mail/static/src/xml/thread.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml
index b9579be0790..5ec1d754100 100644
--- a/addons/mail/static/src/xml/thread.xml
+++ b/addons/mail/static/src/xml/thread.xml
@@ -121,6 +121,7 @@
                            t-att-data-message-id="message.id" title="Mark as Read"/>
                     </span>
                 </p>
+                <t t-raw="message.body"/>
                 <t t-if="message.tracking_value_ids &amp;&amp; message.tracking_value_ids.length &gt; 0">
                     <t t-if="message.subtype_description">
                         <p t-esc="message.subtype_description"/>
@@ -128,9 +129,6 @@
                     <t t-call="mail.ChatThread.MessageTracking"/>
                 </t>
                 <p t-if="options.display_subject &amp;&amp; message.display_subject" class="o_mail_subject">Subject: <t t-esc="message.subject"/></p>
-                <t t-if="!(message.tracking_value_ids &amp;&amp; message.tracking_value_ids.length &gt; 0)">
-                    <t t-raw="message.body"/>
-                </t>
                 <t t-foreach="message.attachment_ids" t-as="attachment">
                     <t t-call="mail.Attachment"/>
                 </t>