diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-05 16:20:48 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-05 16:20:48 +0100 |
| commit | eefca5d492d6f35dd4b063a294b6b8a0a576e83e (patch) | |
| tree | 0776e0015aaca70d5d71986846391466a12516e4 /addons/mail/static/src | |
| parent | 1ed7f219a59a2ff036bcaf72cb423b961a39802c (diff) | |
| parent | 73610ff99216ff31eedb6c0a587846ce9209e095 (diff) | |
[MERGE] forward port branch saas-11.1 up to 73610ff9921
Diffstat (limited to 'addons/mail/static/src')
| -rw-r--r-- | addons/mail/static/src/js/activity.js | 3 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/activity.xml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/addons/mail/static/src/js/activity.js b/addons/mail/static/src/js/activity.js index 2798a8364a3..37903e3861f 100644 --- a/addons/mail/static/src/js/activity.js +++ b/addons/mail/static/src/js/activity.js @@ -141,7 +141,8 @@ var Activity = AbstractActivityField.extend({ nbPlannedActivities: nbActivities.planned, nbTodayActivities: nbActivities.today, nbOverdueActivities: nbActivities.overdue, - date_format: time.getLangDatetimeFormat(), + date_format: time.getLangDateFormat(), + datetime_format: time.getLangDatetimeFormat(), })); } else { self.$el.empty(); diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml index da3e63772a6..fadb93dfa7d 100644 --- a/addons/mail/static/src/xml/activity.xml +++ b/addons/mail/static/src/xml/activity.xml @@ -40,7 +40,7 @@ </dd> <dt>Created on</dt> <dd class="mb8"> - <t t-esc="activity.create_date.format(date_format)"/> + <t t-esc="activity.create_date.format(datetime_format)"/> </dd> <dt>Assigned to</dt> <dd class="mb8"> |