diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-01-09 16:30:50 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-01-09 16:30:50 +0100 |
| commit | 4c410ee6a17a454e2653cc2ce9aadad64c87a86b (patch) | |
| tree | 74b717148c873e9bd8a43c7bafb776efec045976 /addons/mail/static/src/xml/activity.xml | |
| parent | f483768983b99526386b501f8b2ec414f3af0fb8 (diff) | |
| parent | 38b201abce19e95e2fdeddc1cf020da2cb260c62 (diff) | |
[MERGE] forward port branch saas-15 up to 38b201abce1
Diffstat (limited to 'addons/mail/static/src/xml/activity.xml')
| -rw-r--r-- | addons/mail/static/src/xml/activity.xml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml index 4cab7bff9ad..ba81df81a20 100644 --- a/addons/mail/static/src/xml/activity.xml +++ b/addons/mail/static/src/xml/activity.xml @@ -21,10 +21,7 @@ <strong> <span t-attf-class="o_activity_date o_activity_color_#{activity.state}"><t t-esc="activity.label_delay" /> (<t t-esc="activity.date_deadline"/>) </span> </strong> - planned by <t t-esc="activity.create_uid[1]" /> - <t t-if="activity.create_uid[0] != activity.user_id[0]"> - for <t t-esc="activity.user_id[1]" /> - </t> + planned by <t t-esc="activity.user_id[1]" /> - <t t-esc="activity.time_ago"/> <div class="pull-right"> <a href="#" class="o_activity_edit o_activity_link" t-att-data-activity-id="activity.id">Edit</a> | |