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>
142 lines
7.5 KiB
XML
142 lines
7.5 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<odoo>
|
|
<data noupdate="1">
|
|
<record id="badge_good_job" model="gamification.badge">
|
|
<field name="name">Good Job</field>
|
|
<field name="description">You did great at your job.</field>
|
|
<field name="rule_auth">everyone</field>
|
|
<field name="image_1920" type="base64" file="gamification/static/img/badge_good_job-image.png"/>
|
|
</record>
|
|
|
|
<record id="badge_problem_solver" model="gamification.badge">
|
|
<field name="name">Problem Solver</field>
|
|
<field name="description">No one can solve challenges like you do.</field>
|
|
<field name="rule_auth">everyone</field>
|
|
<field name="image_1920" type="base64" file="gamification/static/img/badge_problem_solver-image.png"/>
|
|
</record>
|
|
|
|
<record id="badge_hidden" model="gamification.badge">
|
|
<field name="name">Hidden</field>
|
|
<field name="description">You have found the hidden badge</field>
|
|
<field name="rule_auth">nobody</field>
|
|
<field name="image_1920" type="base64" file="gamification/static/img/badge_hidden-image.png"/>
|
|
<field name="active" eval="False" />
|
|
</record>
|
|
|
|
<record id="badge_idea" model="gamification.badge">
|
|
<field name="name">Brilliant</field>
|
|
<field name="description">With your brilliant ideas, you are an inspiration to others.</field>
|
|
<field name="rule_auth">everyone</field>
|
|
<field name="rule_max">True</field>
|
|
<field name="rule_max_number">2</field>
|
|
<field name="image_1920" type="base64" file="gamification/static/img/badge_idea-image.png"/>
|
|
</record>
|
|
|
|
<record id="email_template_badge_received" model="mail.template">
|
|
<field name="name">Received Badge</field>
|
|
<field name="subject">New badge ${object.badge_id.name} granted</field>
|
|
<field name="model_id" ref="gamification.model_gamification_badge_user"/>
|
|
<field name="partner_to">${object.user_id.partner_id.id}</field>
|
|
<field name="body_html" type="xml">
|
|
<table border="0" cellpadding="0" style="padding-top: 16px; background-color: #F1F1F1; color: #454748; width: 100%; border-collapse:separate;"><tr><td align="center">
|
|
<table border="0" width="590" cellpadding="0" style="padding: 16px; background-color: white; color: #454748; border-collapse:separate;" summary="o_mail_notification">
|
|
<tbody>
|
|
<!-- HEADER -->
|
|
<tr>
|
|
<td align="center" style="min-width: 590px;">
|
|
<table width="590" border="0" cellpadding="0" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
|
|
<tr><td valign="middle">
|
|
<span style="font-size: 10px;">Your Badge</span><br/>
|
|
<span style="font-size: 20px; font-weight: bold;">
|
|
${object.badge_id.name}
|
|
</span>
|
|
</td><td valign="middle" align="right">
|
|
<img src="/logo.png?company=${object.user_id.company_id.id}" style="padding: 0px; margin: 0px; height: auto; width: 80px;" alt="${object.user_id.company_id.name}"/>
|
|
</td></tr>
|
|
<tr><td colspan="2" style="text-align:center;">
|
|
<hr width="100%" 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 0px;"/>
|
|
</td></tr>
|
|
</table>
|
|
</td>
|
|
</tr>
|
|
<!-- CONTENT -->
|
|
<tr>
|
|
<td align="center" style="min-width: 590px;">
|
|
<table width="590" border="0" cellpadding="0" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
|
|
<tr><td valign="top" style="font-size: 14px;">
|
|
<div>
|
|
Congratulations ${object.user_id.name} !<br/>
|
|
You just received badge <strong>${object.badge_id.name}</strong> !<br/>
|
|
% if object.badge_id.description
|
|
<table cellspacing="0" cellpadding="0" border="0" style="width: 560px; margin-top: 5px;">
|
|
<tbody><tr>
|
|
<td valign="center">
|
|
<img src="/web/image/gamification.badge/${object.badge_id.id}/image_128/80x80" style="padding: 0px; margin: 0px; height: auto; width: 80px;" alt="${user.company_id.name}"/>
|
|
</td>
|
|
<td valign="center">
|
|
<cite>${object.badge_id.description}</cite>
|
|
</td>
|
|
</tr></tbody>
|
|
</table>
|
|
% endif
|
|
<br/>
|
|
% if object.sender_id
|
|
This badge was granted by <strong>${object.sender_id.name}</strong>.
|
|
% endif
|
|
<br/>
|
|
% if object.comment
|
|
${object.comment}
|
|
% endif
|
|
<br/><br/>
|
|
Thank you,
|
|
% if object.sender_id.signature:
|
|
<br />
|
|
${object.sender_id.signature | safe}
|
|
% endif
|
|
</div>
|
|
</td></tr>
|
|
<tr><td style="text-align:center;">
|
|
<hr width="100%" 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 0px;"/>
|
|
</td></tr>
|
|
</table>
|
|
</td>
|
|
</tr>
|
|
<!-- FOOTER -->
|
|
<tr>
|
|
<td align="center" style="min-width: 590px;">
|
|
<table width="590" border="0" cellpadding="0" style="min-width: 590px; background-color: white; font-size: 12px; padding: 0px 8px 0px 8px; border-collapse:separate;">
|
|
<tr><td valign="middle" align="left">
|
|
${object.user_id.company_id.name}
|
|
</td></tr>
|
|
<tr><td valign="middle" align="left" style="opacity: 0.7;">
|
|
${object.user_id.company_id.phone}
|
|
% if object.user_id.company_id.email
|
|
| <a href="'mailto:%s' % ${object.user_id.company_id.email}" style="text-decoration:none; color: #454748;">${object.user_id.company_id.email}</a>
|
|
% endif
|
|
% if object.user_id.company_id.website
|
|
| <a href="'%s' % ${object.user_id.company_id.website}" style="text-decoration:none; color: #454748;">
|
|
${object.user_id.company_id.website}
|
|
</a>
|
|
% endif
|
|
</td></tr>
|
|
</table>
|
|
</td>
|
|
</tr>
|
|
</tbody>
|
|
</table>
|
|
</td></tr>
|
|
<!-- POWERED BY -->
|
|
<tr><td align="center" style="min-width: 590px;">
|
|
<table width="590" border="0" cellpadding="0" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
|
|
<tr><td style="text-align: center; font-size: 14px;">
|
|
Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&utm_medium=gamification" style="color: #875A7B;">Odoo</a>
|
|
</td></tr>
|
|
</table>
|
|
</td></tr>
|
|
</table></field>
|
|
<field name="lang">${object.user_id.lang}</field>
|
|
<field name="auto_delete" eval="True"/>
|
|
</record>
|
|
</data>
|
|
</odoo>
|