From c1e0acf4c61efb33f620ad3bd339a31d7f17b249 Mon Sep 17 00:00:00 2001
From: dht-odoo <dht@odoo.com>
Date: Thu, 24 Jun 2021 08:38:05 +0000
Subject: [PATCH] [FIX] base: fix create contact view

Before commit[1] there was only one field image_1920 in group with 'colspan=1'.
In commit[1] a new invisible field avatar_128 is added in this group. But due
to this an empty 'tr' element is added in view and it breaks the view.

With this commit we move avatar_128 field outside of the group and placed it
with other invisible fields, so it doesn't break view. And also adding comment
field in new group because it is html field now so it displays nicely.

Followup of odoo/odoo@cb4f597410bcb08208ee277144d755bef8b6d688 and odoo/enterprise@971f3ed9ae89e965e4c6d2d0b6d26719d694ddc1

commit[1]: c53724ebc35150d9111e165ef5089beb26bedc29

LINKS

Task Id-2558824
PR odoo/odoo#74795
PR odoo/enterprise#2011
---
 odoo/addons/base/views/res_partner_views.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml
index d793383daa7..9c69312c26b 100644
--- a/odoo/addons/base/views/res_partner_views.xml
+++ b/odoo/addons/base/views/res_partner_views.xml
@@ -318,7 +318,6 @@
                                                         <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
                                                     </div>
                                                 </div>
-                                                <field name="comment" placeholder="Internal notes..."/>
                                             </group>
                                             <group colspan="5">
                                                 <field name="email" widget="email"/>
@@ -327,13 +326,16 @@
                                                 <field name="company_id" invisible="1"/>
                                             </group>
                                             <group colspan="1">
-                                                <field name="avatar_128" invisible="1"/>
                                                 <field name="image_1920" widget="image" class="oe_avatar" nolabel="1" options="{'image_preview': 'avatar_128'}"/>
                                             </group>
                                         </group>
+                                        <group>
+                                            <field name="comment" placeholder="Internal notes..."/>
+                                        </group>
                                         <field name="lang" invisible="True"/>
                                         <field name="user_id" invisible="True"/>
                                         <field name="image_128" invisible="1"/>
+                                        <field name="avatar_128" invisible="1"/>
                                     </sheet>
                                 </form>
                             </field>