summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/xml
diff options
context:
space:
mode:
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>2012-07-06 15:49:34 +0530
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>2012-07-06 15:49:34 +0530
commit230f6be2b05f9dae8d3f6190c0942cf2495a9a8b (patch)
tree3164abd60cce6586acf16febf645cd3aef6848fd /addons/mail/static/src/xml
parent1be34826ff31300768e5e9abd145bce30fc4f757 (diff)
parentffa03f03b4ebaf6de958d7de837018aca80bc706 (diff)
[MERGE]merge with parent branch
bzr revid: cha@tinyerp.com-20120706101934-kfpu0vozzp2yr838
Diffstat (limited to 'addons/mail/static/src/xml')
-rw-r--r--addons/mail/static/src/xml/mail.xml5
1 files changed, 1 insertions, 4 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 34445c48f8d..2eb3a390933 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -91,10 +91,7 @@
</div>
<div class="oe_mail_msg_body">
<a href="#" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}' class="oe_mail_internal_link"><t t-raw="record.user_id[1]"/></a>
- <t t-raw="record.body_head"/>
- <t t-if="record.body_tail"><a href="#" class="oe_mail_msg_more">... See more</a>
- <span class="oe_mail_msg_tail"><t t-raw="record.body_tail"/></span>
- </t>
+ <t t-raw="record.body"/>
</div>
<ul class="oe_mail_msg_footer">
<li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>