diff options
| author | Yannick Tivisse <yti@odoo.com> | 2016-02-09 10:24:57 +0100 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2016-03-07 15:55:53 +0100 |
| commit | f6c0418a80740da04a64672385f3af0ec6980c53 (patch) | |
| tree | 7babcfaca0bc15d080cf6841c236a7212b1d25f8 /addons/mail/data/mail_data.xml | |
| parent | 8a2f4e7d3fc4abe4bf449123f8b9598bb4a48d14 (diff) | |
[IMP] mail: Send plaintext emails on discussion with external user/partner
When there are no available action buttons on the email (as Follow, View Task,
Convert to Opportunity), i.e. when the user/partner is not an employee, and
when the message subtype is 'Discussion', send a plaintext mail instead of
a formatted one.
Use case: Strange to receive a mail like this when you're on a lead and you
receive formatted mails.
Diffstat (limited to 'addons/mail/data/mail_data.xml')
| -rw-r--r-- | addons/mail/data/mail_data.xml | 86 |
1 files changed, 69 insertions, 17 deletions
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index ea5610a4976..7eac088b669 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -67,6 +67,7 @@ <meta itemprop="name" content="View ${ctx['model_name']}"/> </div> </div> +% if not ctx['is_discussion'] or not len(ctx['actions']) == 0: <div summary="o_mail_notification" style="padding:0px; width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777"> <table cellspacing="0" cellpadding="0" style="width:600px; border-collapse:collapse; background:inherit; color:inherit"> <tbody><tr> @@ -116,31 +117,66 @@ </table> </div> <div style="padding:0px; width:600px; max-width:600px; margin:0 auto; background: #FFFFFF repeat top /100%; color:#777777"> +% else: +<div style="padding:0px; width:600px; max-width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;> +% endif <table cellspacing="0" cellpadding="0" style="width:600px ;text-align:justify; margin:0 auto; border-collapse:collapse; background:inherit; color:inherit"> - <tbody><tr> - <td style="padding:0px 10px 5px 5px;font-size: 14px;"> - ${object.body | safe} - % if ctx.get('tracking'): - <ul> - % for tracking in ctx['tracking'] - <li>${tracking[0]} : ${tracking[1]} -> ${tracking[2]}</li> - % endfor - </ul> - % endif - </td> - </tr></tbody> + + <tbody> + % if not ctx['is_discussion'] or not len(ctx['actions']) == 0: + <tr> + <td style="padding:0px 10px 5px 5px;font-size: 14px;"> + ${object.body | safe} + % if ctx.get('tracking'): + <ul> + % for tracking in ctx['tracking'] + <li>${tracking[0]} : ${tracking[1]} -> ${tracking[2]}</li> + % endfor + </ul> + % endif + </td> + </tr> + % else: + <tr> + <td style="font-size: 14px;"> + ${object.body | safe} + % if ctx.get('tracking'): + <ul> + % for tracking in ctx['tracking'] + <li>${tracking[0]} : ${tracking[1]} -> ${tracking[2]}</li> + % endfor + </ul> + % endif + </td> + </tr> + % endif + </tbody> </table> </div> +% if not ctx['is_discussion'] or not len(ctx['actions']) == 0: <div style="padding:0px; width:600px; max-width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;color:#777777"> +% else: +<div style="padding:0px; width:600px; max-width:600px; margin:0 auto; background: #FFFFFF repeat top /100%;> +% endif <table cellspacing="0" cellpadding="0" style="width:600px ;text-align:justify; margin:0 auto; border-collapse:collapse; background:inherit; color:inherit"> <tbody> % if ctx.get('signature'): - <tr> - <td style="padding:0px 10px 5px 5px;font-size: 14px; text-align: left;"> - ${ctx['signature'] | safe} - </td> - </tr> + % if not ctx['is_discussion'] or not len(ctx['actions']) == 0: + <tr> + <td style="padding:0px 10px 5px 5px;font-size: 14px; text-align: left;"> + ${ctx['signature'] | safe} + </td> + </tr> + % else: + <tr> + <td style="font-size: 14px; text-align: left;"> + ${ctx['signature'] | safe} + </td> + </tr> + % endif % endif + + % if not ctx['is_discussion'] or not len(ctx['actions']) == 0: <tr> <td style="padding:0px 10px 5px 5px;font-size: 11px; text-align: left;"> <strong>Sent by</strong> @@ -155,6 +191,22 @@ <a href="https://www.odoo.com" style="text-decoration:none; color: #a24689;"><strong>Odoo</strong></a> </td> </tr> + % else: + <tr> + <td style="font-size: 14px; text-align: left;"> + <strong>Sent by</strong> + % if ctx.get('website_url'): + <a href="${ctx['website_url']}" style="text-decoration:none;"> + % endif + <strong>${ctx.get('company_name')}</strong> + % if ctx.get('website_url'): + </a> + % endif + <strong>using</strong> + <a href="https://www.odoo.com" style="text-decoration:none;"><strong>Odoo</strong></a> + </td> + </tr> + % endif </tbody> </table> </div>]]></field> |