pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX][IMP] various: improve lang computation in mail templates

Browse Source 
Purpose: add lang definition on templates where it is missing

Related to task 1972615
Linked to PR #32872
This commit is contained in:
Thibault Delavallée
2019-04-23 14:26:50 +00:00
parent 0b74c9ab6e
commit 678e04c19d
11 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/auth_signup/data/auth_signup_data.xml
+3
View File
@@ -92,6 +92,7 @@
</td></tr>
</table>
</field>
<field name="lang">${object.lang}</field>
<field name="auto_delete" eval="True"/>
<field name="user_signature" eval="False"/>
</record>
@@ -189,6 +190,7 @@
</table>
</td></tr>
</table></field>
<field name="lang">${object.lang}</field>
<field name="auto_delete" eval="True"/>
<field name="user_signature" eval="False"/>
</record>
@@ -281,6 +283,7 @@
</table>
</td></tr>
</table></field>
<field name="lang">${object.lang}</field>
<field name="auto_delete" eval="True"/>
<field name="user_signature" eval="False"/>
</record>
addons/calendar/data/mail_data.xml
+3
View File
@@ -80,6 +80,7 @@
% endif
</div>
</field>
<field name="lang">${object.partner_id.lang}</field>
<field name="auto_delete" eval="True"/>
<field name="user_signature" eval="False"/>
</record>
@@ -163,6 +164,7 @@
% endif
</div>
</field>
<field name="lang">${object.partner_id.lang}</field>
<field name="auto_delete" eval="True"/>
<field name="user_signature" eval="False"/>
</record>
@@ -246,6 +248,7 @@
% endif
</div>
</field>
<field name="lang">${object.partner_id.lang}</field>
<field name="auto_delete" eval="True"/>
<field name="user_signature" eval="False"/>
</record>
addons/crm/data/crm_lead_data.xml
+3 -2
View File
@@ -64,12 +64,13 @@
Used to give a basis for email recipients, name and to ease the definition of a further
elaborated template. -->
<record id="email_template_opportunity_mail" model="mail.template">
<field name="name">Lead/Opportunity Mass Mail</field>
<field name="name">Lead/Opportunity: Mass Mail</field>
<field name="model_id" ref="crm.model_crm_lead"/>
<field name="auto_delete" eval="True"/>
<field name="partner_to">${object.partner_id != False and object.partner_id.id}</field>
<field name="email_to">${(not object.partner_id and object.email_from)|safe}</field>
<field name="body_html"></field>
<field name="lang">${object.partner_id.lang}</field>
<field name="auto_delete" eval="True"/>
</record>
</data>
addons/mail/views/res_partner_views.xml
+1
View File
@@ -66,6 +66,7 @@
<field name="model_id" ref="base.model_res_partner"/>
<field name="auto_delete" eval="True"/>
<field name="partner_to">${object.id}</field>
<field name="lang">${object.lang}</field>
</record>
<!-- Add mail-defined activity view to standard action on partners to manage activities related to partner model -->
addons/project/data/project_mail_template_data.xml
+2
View File
@@ -17,6 +17,7 @@
<br/>
</div>
</field>
<field name="lang">${object.partner_id.lang}</field>
<field name="auto_delete" eval="True"/>
<field name="user_signature" eval="True"/>
</record>
@@ -85,6 +86,7 @@
</table>
</div>
</field>
<field name="lang">${object.rating_get_partner_id().lang}</field>
<field name="auto_delete" eval="True"/>
<field name="user_signature" eval="False"/>
</record>
addons/survey/data/mail_template_data.xml
+6 -4
View File
@@ -32,6 +32,7 @@
</p>
</div>
</field>
<field name="lang">${object.partner_id.lang}</field>
<field name="auto_delete" eval="True"/>
<field name="user_signature" eval="False"/>
</record>
@@ -42,10 +43,6 @@
<field name="model_id" ref="survey.model_survey_user_input"/>
<field name="subject">Certification: ${object.survey_id.display_name}</field>
<field name="email_to">${(object.partner_id.email_formatted or object.email) |safe}</field>
<field name="report_template" ref="certification_report"/>
<field name="report_name">Certification Document</field>
<field name="lang">${object.partner_id.lang}</field>
<field name="auto_delete" eval="True"/>
<field name="body_html" type="xml">
<div style="background:#F0F0F0;color:#515166;padding:10px 0px;font-family:Arial,Helvetica,sans-serif;font-size:14px;">
<table style="width:600px;margin:5px auto;">
@@ -72,6 +69,11 @@
</table>
</div>
</field>
<field name="report_template" ref="certification_report"/>
<field name="report_name">Certification Document</field>
<field name="lang">${object.partner_id.lang}</field>
<field name="auto_delete" eval="True"/>
<field name="user_signature" eval="False"/>
</record>
</data>
</odoo>
addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
+1
View File
@@ -116,6 +116,7 @@
</td></tr>
</table>
</field>
<field name="lang">${ctx['partner_id'].lang}</field>
<field name="auto_delete" eval="True"/>
</record>
</data>
addons/website_event_track/data/event_track_data.xml
+1
View File
@@ -23,6 +23,7 @@
Thank you,
</div>
</field>
<field name="lang">${object.partner_id.lang}</field>
<field name="user_signature" eval="True"/>
<field name="auto_delete" eval="True"/>
</record>
addons/website_profile/data/profile_data.xml
+1
View File
@@ -101,6 +101,7 @@
</td></tr>
</table>
</field>
<field name="lang">${object.lang}</field>
</record>
</data>
</odoo>
addons/website_slides/data/mail_data.xml
+1
View File
@@ -82,6 +82,7 @@
</p>
</div>
</field>
<field name="lang">${object.partner_id.lang}</field>
<field name="auto_delete" eval="True"/>
<field name="user_signature" eval="False"/>
</record>
addons/website_slides_survey/data/mail_template_data.xml
+1
View File
@@ -22,6 +22,7 @@
</p>
</div>
</field>
<field name="lang">${object.partner_id.lang}</field>
<field name="auto_delete" eval="True"/>
<field name="user_signature" eval="False"/>
</record>