diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index d0647c03226..5e29ced9ba8 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -67,73 +67,58 @@ -
|
- % if ctx.get('button_access'):
- ${ctx['button_access']['title']}
- % endif
-
- % if ctx.get('button_follow'):
- ${ctx['button_follow']['title']}
-
- % elif ctx.get('button_unfollow'):
- ${ctx['button_unfollow']['title']}
- % endif
-
- % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):
- - About ${ctx['model_name']} - % if ctx.get('record_name'): - : ${ctx['record_name']} - % endif - - - % endif + |
+
|
- + |
% if ctx.get('actions'): % for action in ctx['actions']: - ${action['title']} - %if len(ctx['actions']) > 1 and loop.index < len(ctx['actions']): - | - % endif + ${action['title']} % endfor - % else: - Sent by - % if ctx.get('website_url'): - % endif - ${ctx.get('company_name')} - % if ctx.get('website_url'): - + + % if ctx.get('button_follow'): + % if ctx.get('actions'): + | % endif - using - Odoo + ${ctx['button_follow']['title']} + % elif ctx.get('button_unfollow'): + % if ctx.get('actions'): + | % endif + ${ctx['button_unfollow']['title']} + % endif + + % if ctx.get('button_access') or ctx.get('button_follow') or ctx.get('button_unfollow'): + % if ctx.get('actions'): + | + % endif + ${ctx['button_access']['title']} + % endif + |
|
-
-
- - |
-
|
+
+
+ + |
+
| + | ${object.body | safe} % if ctx.get('tracking'): % for tracking in ctx['tracking'] @@ -144,22 +129,33 @@ |
|
-
+
+
-% endif]]>
+
| |
| + Sent by + % if ctx.get('website_url'): + + % endif + ${ctx.get('company_name')} + % if ctx.get('website_url'): + + % endif + using + Odoo + | +