From 678e04c19dbfefaadd8ab6207b0bb560a3d3bfe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Mon, 8 Apr 2019 08:04:52 +0000
Subject: [PATCH] [FIX][IMP] various: improve lang computation in mail
 templates

Purpose: add lang definition on templates where it is missing

Related to task 1972615
Linked to PR #32872
---
 addons/auth_signup/data/auth_signup_data.xml           |  3 +++
 addons/calendar/data/mail_data.xml                     |  3 +++
 addons/crm/data/crm_lead_data.xml                      |  5 +++--
 addons/mail/views/res_partner_views.xml                |  1 +
 addons/project/data/project_mail_template_data.xml     |  2 ++
 addons/survey/data/mail_template_data.xml              | 10 ++++++----
 .../data/crm_partner_assign_data.xml                   |  1 +
 addons/website_event_track/data/event_track_data.xml   |  1 +
 addons/website_profile/data/profile_data.xml           |  1 +
 addons/website_slides/data/mail_data.xml               |  1 +
 .../website_slides_survey/data/mail_template_data.xml  |  1 +
 11 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/addons/auth_signup/data/auth_signup_data.xml b/addons/auth_signup/data/auth_signup_data.xml
index f035cdc8b81..80a52001d49 100644
--- a/addons/auth_signup/data/auth_signup_data.xml
+++ b/addons/auth_signup/data/auth_signup_data.xml
@@ -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>
diff --git a/addons/calendar/data/mail_data.xml b/addons/calendar/data/mail_data.xml
index 95940cd34c7..bfc4efd42dd 100644
--- a/addons/calendar/data/mail_data.xml
+++ b/addons/calendar/data/mail_data.xml
@@ -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>
diff --git a/addons/crm/data/crm_lead_data.xml b/addons/crm/data/crm_lead_data.xml
index 914fd3f167f..b654c1b6028 100644
--- a/addons/crm/data/crm_lead_data.xml
+++ b/addons/crm/data/crm_lead_data.xml
@@ -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>
diff --git a/addons/mail/views/res_partner_views.xml b/addons/mail/views/res_partner_views.xml
index 4a9bda24395..8b7b8a3eac0 100644
--- a/addons/mail/views/res_partner_views.xml
+++ b/addons/mail/views/res_partner_views.xml
@@ -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 -->
diff --git a/addons/project/data/project_mail_template_data.xml b/addons/project/data/project_mail_template_data.xml
index f590d34ed65..6a9fb6377e9 100644
--- a/addons/project/data/project_mail_template_data.xml
+++ b/addons/project/data/project_mail_template_data.xml
@@ -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>
diff --git a/addons/survey/data/mail_template_data.xml b/addons/survey/data/mail_template_data.xml
index 5e2fca9ed0c..42ed3ee42f3 100644
--- a/addons/survey/data/mail_template_data.xml
+++ b/addons/survey/data/mail_template_data.xml
@@ -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>
\ No newline at end of file
diff --git a/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml b/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
index 4716b762575..0461884d845 100644
--- a/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
+++ b/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
@@ -116,6 +116,7 @@
 </td></tr>
 </table>
             </field>
+            <field name="lang">${ctx['partner_id'].lang}</field>
             <field name="auto_delete" eval="True"/>
         </record>
     </data>
diff --git a/addons/website_event_track/data/event_track_data.xml b/addons/website_event_track/data/event_track_data.xml
index c5c0569a1ab..8cb0d19115d 100644
--- a/addons/website_event_track/data/event_track_data.xml
+++ b/addons/website_event_track/data/event_track_data.xml
@@ -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>
diff --git a/addons/website_profile/data/profile_data.xml b/addons/website_profile/data/profile_data.xml
index 119f613af6c..ca26a121326 100644
--- a/addons/website_profile/data/profile_data.xml
+++ b/addons/website_profile/data/profile_data.xml
@@ -101,6 +101,7 @@
 </td></tr>
 </table>
             </field>
+            <field name="lang">${object.lang}</field>
         </record>
     </data>
 </odoo>
diff --git a/addons/website_slides/data/mail_data.xml b/addons/website_slides/data/mail_data.xml
index 7913374723e..246fec87e28 100644
--- a/addons/website_slides/data/mail_data.xml
+++ b/addons/website_slides/data/mail_data.xml
@@ -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>
diff --git a/addons/website_slides_survey/data/mail_template_data.xml b/addons/website_slides_survey/data/mail_template_data.xml
index d423412f296..49f1b72206a 100644
--- a/addons/website_slides_survey/data/mail_template_data.xml
+++ b/addons/website_slides_survey/data/mail_template_data.xml
@@ -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>