mcm-odooandThibault Delavallée
de1743ab12
RATIONALE
Mail template model holds a field telling odoo mail engine to automatically
add the current user's signature to the body. Its use depends on the use
case
* using the template in the composer on a single record: it is displayed
in the rendered template in the composer, meaning people could change it.
This behavior is interesting as it allows to see the email content;
* using the template in the composer in mass mail mode: it is not displayed
as only the raw jinja is displayed. It is therefore not obvious that it
will be appended to the body of the mail. People could add it manually and
have 2 signatures as a result;
A mechanism automatically adding a signature to sent emails when posting a
message is already implemented and is based on template existence. If a
template has been used when posting, no signature is added in sent emails.
Otherwise it is automatically added. This behavior should not change.
Behavior will therefore be
* use a template -> specify signature usage in it manually through jinja;
* do not use a template -> signature added in sent emails;
SPECIFICATIONS
Remove user_signature.
Update template body accordingly. In customer oriented templates that are using
it and do not already contain it, manually add a call to user.signature within
the jinja code. When set to False, just remove its declaration.
Quickly clean some signature integration.
LINKS
Task ID 2089252
Community PR odoo/odoo#39482
Enterprise PR odoo/enterprise#6459
Upgrade PR odoo/upgrate#761
Related: odoo/enterprise#6459
Related: odoo/upgrade#761
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Co-authored-by: Michaël Mattiello <mcm@odoo.com>
Co-authored-by: Thibault Delavallée <tde@odoo.com>
165 lines
13 KiB
XML
165 lines
13 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<odoo>
|
|
<record id="digest_mail_template" model="mail.template">
|
|
<field name="name">Digest: Default main template</field>
|
|
<field name="model_id" ref="digest.model_digest_digest"/>
|
|
<field name="subject">${'%s: %s' % (ctx.get('user', user).company_id.name, object.name)}</field>
|
|
<field name="email_from">${('%s' % (object.company_id.partner_id.email_formatted or user.email_formatted))|safe}</field>
|
|
<field name="body_html" type="html">
|
|
<table style="width: 100%; border-spacing: 0; font-family: Helvetica,Arial,Verdana,sans-serif;">
|
|
<tr>
|
|
<td align="center" valign="top" style="border-collapse: collapse; padding: 0">
|
|
% set user = ctx.get('user', user)
|
|
% set company = user.company_id
|
|
% set data = object.compute_kpis(company, user)
|
|
% set tips = object.compute_tips(company, user)
|
|
% set kpi_actions = object.compute_kpis_actions(company, user)
|
|
% set kpis = data.yesterday.keys()
|
|
<table style="width: 100%; max-width: 600px; border-spacing: 0; border: 1px solid #e7e7e7; border-bottom: none; color: #6e7172; line-height: 23px; text-align: left;">
|
|
<tr>
|
|
<td style="border-collapse: collapse; padding: 10px 20px; text-align: left;">
|
|
<strong style="color: #000000; font-size: 22px; line-height: 32px;">${object.name}</strong>
|
|
<div style="color: #000000; font-size: 15px;">${datetime.date.today().strftime('%B %d, %Y')}</div>
|
|
</td>
|
|
<td style="text-align: right; padding: 10px 20px">
|
|
<img style="padding: 0px; margin: 0px; height: auto; width: 80px;" src="/logo.png?company=${company.id}"/>
|
|
<div style="padding-top: 5px;">
|
|
<a href="/web/login" style="background-color: #875A7B; margin-left: 5px; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;">Connect</a>
|
|
</div>
|
|
</td>
|
|
</tr>
|
|
<tr><td colspan="2" style="text-align: center;">
|
|
<hr width="95%" style="background-color: rgb(204,204,204); border: medium none; clear: both; display: block; font-size: 0px; min-height: 1px; line-height: 0; margin: 16px 0px 16px 14px;"/>
|
|
</td></tr>
|
|
</table>
|
|
% for kpi in kpis:
|
|
<table style="border-spacing: 0; width: 100%; max-width: 600px;">
|
|
<tr>
|
|
<td style="border-collapse: collapse; background-color: #ffffff; border-left: 1px solid #e7e7e7; border-right: 1px solid #e7e7e7; line-height: 21px; padding: 0 20px 10px 20px; text-align: left;"><br/>
|
|
<span style="color: #3d466e; font-size: 18px; font-weight: 500; line-height: 23px;">${object.fields_get()[kpi]['string']}</span>
|
|
%if kpi in kpi_actions:
|
|
<span style="float: right;">
|
|
<a href="/web#action=${kpi_actions[kpi]}">View more</a>
|
|
</span>
|
|
%endif
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td style="border-collapse: collapse; margin: 0; padding:0;">
|
|
<table style="width: 100%; border-spacing: 0; background-color: #f9f9f9; border: 1px solid #e7e7e7; border-top: none;">
|
|
<tr>
|
|
<td style="border-collapse: collapse; margin: 0; padding: 0; display: block; border-top: 2px solid #56b3b5;">
|
|
<table style="width: 100%; max-width: 199px; border-spacing: 0;">
|
|
<tr>
|
|
<td style="border-collapse: collapse; padding: 20px; text-align: center;">
|
|
<span style="color: #56b3b5; font-size: 35px; font-weight: bold; text-decoration: none; line-height: 36px;">${data['yesterday'][kpi][kpi]}</span><br/>
|
|
<span style="color: #888888; display: inline-block; font-size: 12px; line-height: 18px; text-transform: uppercase;">Yesterday</span>
|
|
% if data['yesterday'][kpi]['margin'] != 0.0:
|
|
<span style="color: #888888; display: block; font-size: 12px; line-height: 18px; text-transform: uppercase;">
|
|
% if data['yesterday'][kpi]['margin'] is greaterthan(0.0):
|
|
<span style="color: #0bbc22;">▲</span>${"%.2f" % data['yesterday'][kpi]['margin']} %
|
|
% endif
|
|
% if data['yesterday'][kpi]['margin'] is lessthan(0.0):
|
|
<span style="color: #ff0000;">▼</span>${"%.2f" % data['yesterday'][kpi]['margin']} %
|
|
% endif
|
|
</span>
|
|
% endif
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
</td>
|
|
<td style="border-collapse: collapse; margin: 0; padding: 0; border-top: 2px solid #9a5b82;">
|
|
<table style="width: 100%; max-width: 199px; border-spacing: 0; margin: 0; padding: 0;">
|
|
<tr>
|
|
<td style="border-collapse: collapse; padding: 20px; text-align: center;">
|
|
<span style="color: #9a5b82; font-size: 35px; font-weight: bold; text-decoration: none; line-height: 36px;">${data['lastweek'][kpi][kpi]}</span><br/>
|
|
<span style="color: #888888; display: inline-block; font-size: 12px; line-height: 18px; text-transform: uppercase;">Last 7 Days</span>
|
|
% if data['lastweek'][kpi]['margin'] != 0.0:
|
|
<span style="color: #888888; display: block; font-size: 12px; line-height: 18px; text-transform: uppercase;">
|
|
% if data['lastweek'][kpi]['margin'] is greaterthan(0.0):
|
|
<span style="color: #0bbc22;">▲</span>${"%.2f" % data['lastweek'][kpi]['margin']} %
|
|
% endif
|
|
% if data['lastweek'][kpi]['margin'] is lessthan(0.0):
|
|
<span style="color: #ff0000;">▼</span>${"%.2f" % data['lastweek'][kpi]['margin']} %
|
|
%endif
|
|
</span>
|
|
%endif
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
</td>
|
|
<td style="border-collapse: collapse; margin: 0; padding: 15px; border-top: 2px solid #56b3b5;">
|
|
<table style="width: 100%; max-width: 199px; border-spacing: 0; margin: 0; padding: 0;">
|
|
<tr>
|
|
<td style="border-collapse: collapse; margin: 0; text-align: center;">
|
|
<span style="color: #56b3b5; font-size: 35px; font-weight: bold; text-decoration: none; line-height: 36px">${data['lastmonth'][kpi][kpi]}</span><br/>
|
|
<span style="color: #888888; display: inline-block; font-size: 12px; line-height: 18px; text-transform: uppercase;">Last 30 Days</span>
|
|
% if data['lastmonth'][kpi]['margin'] != 0.0:
|
|
<span style="color: #888888; display: block; font-size: 12px; line-height: 18px; text-transform: uppercase;">
|
|
% if data['lastmonth'][kpi]['margin'] is greaterthan(0.0):
|
|
<span style="color: #0bbc22;">▲</span>${"%.2f" % data['lastmonth'][kpi]['margin']} %
|
|
% endif
|
|
% if data['lastmonth'][kpi]['margin'] is lessthan(0.0):
|
|
<span style="color: #ff0000;">▼</span>${"%.2f" % data['lastmonth'][kpi]['margin']} %
|
|
%endif
|
|
</span>
|
|
%endif
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
% endfor
|
|
% if tips:
|
|
<table style="width: 100%; max-width: 600px; margin-top: 5px; border: 1px solid #e7e7e7;">
|
|
<tr>
|
|
<td style="border-collapse: collapse; background-color: #ffffff; line-height: 21px; padding: 0px 20px 20px;"><br/>
|
|
<div style="color: #3d466e; line-height: 23px;">${tips | safe}</div>
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
% endif
|
|
<table style="width: 100%; max-width: 600px; margin-top: 5px; border: 1px solid #e7e7e7;">
|
|
<tr>
|
|
<td style="border-collapse: collapse; background-color: #ffffff; line-height: 21px; padding: 0 20px 10px 20px; text-align: center;"><br/>
|
|
<div style="color: #3d466e; font-size: 16px; font-weight: 600; line-height: 23px;">Run your business from anywhere with Odoo Mobile.</div>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td style="padding-bottom:20px;">
|
|
<div style="text-align: center;"><a href="https://play.google.com/store/apps/details?id=com.odoo.mobile" target="_blank"><img src="/digest/static/src/img/google_play.png" style="display: inline-block; height: 30px; margin-left: auto; margin-right: 12px;"/></a><a href="https://itunes.apple.com/us/app/odoo/id1272543640" target="_blank"><img src="/digest/static/src/img/app_store.png" style="display: inline-block; height: 30px; margin-left: 12px; margin-right: auto;"/></a>
|
|
</div>
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
<table style="margin-top: 5px; border: 1px solid #e7e7e7; font-size: 15px; width: 100%; max-width: 600px;">
|
|
<tr>
|
|
<td style="border-collapse: collapse; margin: 0; padding: 10px 20px;">
|
|
% if user.has_group('base.group_system'):
|
|
<div style="margin-top: 20px;">
|
|
Want to customize this email?
|
|
<a href="/web#view_type=form&model=digest.digest&id=${object.id}" target="_blank" style="color: #875A7B;">Choose the metrics you care about</a>
|
|
</div>
|
|
<br />
|
|
% endif
|
|
<p style="font-size: 11px; margin-top: 10px;">
|
|
<strong>
|
|
Sent by
|
|
<a href="https://www.odoo.com" style="text-decoration: none; color: #875A7B;">Odoo</a> - <a href="/web#view_type=form&model=digest.digest&id=${object.id}" target="_blank" style="color: #888888;">Unsubscribe</a>
|
|
</strong>
|
|
</p>
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
</td>
|
|
</tr>
|
|
</table></field>
|
|
<field name="lang">${user.lang}</field>
|
|
<field name="auto_delete" eval="True"/>
|
|
</record>
|
|
</odoo>
|