summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/xml/thread.xml
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-06-15 12:40:59 +0200
committerChristophe Simonis <chs@odoo.com>2016-06-15 12:40:59 +0200
commitbaf494c67ba7ecba331b24bcfa5eed9bde8a16da (patch)
tree3b2c9ec3cacabcf0a5b0fb78a667d5e1b27505dc /addons/mail/static/src/xml/thread.xml
parent133490b4d0e347d75bab20da8e5e0ad1f95d3a2d (diff)
parent1d81bb06a47b1aee1b7a0dcdaa03084ddedf8b7b (diff)
[MERGE] forward port of branch saas-9 up to 1d81bb0
# Conflicts: # addons/account_extra_reports/i18n/ca.po # addons/account_extra_reports/i18n/fi.po # addons/account_extra_reports/i18n/pl.po # addons/account_extra_reports/i18n/te.po # addons/account_extra_reports/i18n/zh_CN.po # addons/account_full_reconcile/i18n/hu.po # addons/account_full_reconcile/i18n/pl.po # addons/crm/crm_lead_menu.xml # addons/crm_claim/i18n/es_PE.po # addons/crm_claim/i18n/hu.po # addons/crm_claim/i18n/ja.po # addons/crm_claim/i18n/pl.po # addons/delivery/views/delivery_view.xml # addons/product/product_view.xml # addons/project_timesheet/i18n/es_PE.po # addons/stock/stock_view.xml
Diffstat (limited to 'addons/mail/static/src/xml/thread.xml')
-rw-r--r--addons/mail/static/src/xml/thread.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml
index df1dfadb04d..9896cb0ce6e 100644
--- a/addons/mail/static/src/xml/thread.xml
+++ b/addons/mail/static/src/xml/thread.xml
@@ -138,10 +138,10 @@
<li>
<t t-esc="value.changed_field"/>:
<t t-if="value.old_value">
- <span> <t t-esc="value.old_value"/> </span>
+ <span> <t t-esc="value.old_value || ((value.field_type !== 'boolean') and '')"/> </span>
<span class="fa fa-long-arrow-right"/>
</t>
- <span> <t t-esc="value.new_value"/> </span>
+ <span> <t t-esc="value.new_value || ((value.field_type !== 'boolean') and '')"/> </span>
</li>
</t>
</ul>