[MERGE] forward port branch saas-15 up to 0ef5cedebb

addons/mail/models/mail_tracking_value.py

@@ -60,8 +60,8 @@ class MailTracking(models.Model):
             values.update({
                 'old_value_integer': initial_value and initial_value.id or 0,
                 'new_value_integer': new_value and new_value.id or 0,
-                'old_value_char': initial_value and initial_value.name_get()[0][1] or '',
-                'new_value_char': new_value and new_value.name_get()[0][1] or ''
+                'old_value_char': initial_value and initial_value.sudo().name_get()[0][1] or '',
+                'new_value_char': new_value and new_value.sudo().name_get()[0][1] or ''
             })
         else:
             tracked = False

addons/mail/views/mail_templates.xml

@@ -63,7 +63,7 @@
         </template>
 
         <template id="message_user_assigned">
-            <p>Dear <t t-esc="object.user_id.name"/>,</p>
+            <p>Dear <t t-esc="object.user_id.sudo().name"/>,</p>
             <p>You have been assigned to the <t t-esc="object._description.lower()"/> <t t-esc="object.name_get()[0][1]"/>.</p>
             <p>
                 <a t-att-href="'/mail/view?model=%s&amp;res_id=%s' % (object._name, object.id)"

odoo/addons/base/res/res_country_data.xml

@@ -1733,7 +1733,7 @@
             <field file="base/static/img/country_flags/vn.png" name="image" type="base64" />
             <field name="currency_id" ref="VND" />
             <field eval="84" name="phone_code" />
-            <field eval="'%(street)s\n%(street2)s\n%(city)s\n%(name)s %(zip)s %(country_name)s'" name="address_format" />
+            <field eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s %(country_name)s'" name="address_format" />
         </record>
         <record id="vu" model="res.country">
             <field name="name">Vanuatu</field>