diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-10-30 11:45:18 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-10-30 11:45:18 +0100 |
| commit | ca3a1f51d83db4befac0836c5d6e377d6266c753 (patch) | |
| tree | f24fa365289ac4efb9690ebfe739a1b405de550e /addons/mail/static/src/xml/thread.xml | |
| parent | a299517f8327e9cd6036dbd0920ed5d3e9dac75a (diff) | |
| parent | 4f3a20bb33d5c7c217e2c595a89588effb1425eb (diff) | |
[MERGE] forward port branch saas-11.3 up to 4f3a20bb33d
Diffstat (limited to 'addons/mail/static/src/xml/thread.xml')
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 325f274f958..e4bb5b43e8e 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -217,6 +217,7 @@ </span> </p> <div class="o_thread_message_content"> + <t t-raw="message.body"/> <t t-if="message.tracking_value_ids and message.tracking_value_ids.length > 0"> <t t-if="message.subtype_description"> <p><t t-esc="message.subtype_description"/></p> @@ -224,9 +225,6 @@ <t t-call="mail.ChatThread.MessageTracking"/> </t> <p t-if="options.display_subject and message.display_subject" class="o_mail_subject">Subject: <t t-esc="message.subject"/></p> - <t t-if="!(message.tracking_value_ids and message.tracking_value_ids.length > 0)"> - <t t-raw="message.body"/> - </t> <t t-if="message.attachment_ids.length > 0"> <div t-if="message.images.length > 0" class="o_attachments_previews"> <t t-foreach="message.images" t-as="attachment"> |