diff --git a/extra-addons b/extra-addons
index efa6138b7..b8744e469 160000
--- a/extra-addons
+++ b/extra-addons
@@ -1 +1 @@
-Subproject commit efa6138b7f3baa97f89eff2726d1bc1b3ba83c56
+Subproject commit b8744e469f9c98baad38f49a7b37a25934ff1c0b
diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml
index 34ad023a1..878ca13bf 100644
--- a/odoo/addons/base/views/res_partner_views.xml
+++ b/odoo/addons/base/views/res_partner_views.xml
@@ -180,20 +180,20 @@
                                 <span invisible="not is_company">Address</span>
                             </span>
                             <div class="o_address_format">
-                                <field name="street" placeholder="Street..." class="o_address_street"
-                                    readonly="type == 'contact' and parent_id"/>
-                                <field name="street2" placeholder="Street 2..." class="o_address_street"
-                                    readonly="type == 'contact' and parent_id"/>
-                                <field name="city" placeholder="City" class="o_address_city"
-                                    readonly="type == 'contact' and parent_id"/>
-                                <field name="state_id" class="o_address_state" placeholder="State" options="{'no_open': True, 'no_quick_create': True}"
-                                    readonly="type == 'contact' and parent_id" context="{'country_id': country_id, 'default_country_id': country_id, 'zip': zip}"/>
-                                <field name="zip" placeholder="ZIP" class="o_address_zip"
-                                    readonly="type == 'contact' and parent_id"/>
                                 <div name="partner_address_country" class="d-flex justify-content-between">
                                     <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'
                                         readonly="type == 'contact' and parent_id"/>
                                 </div>
+                                <field name="state_id" class="o_address_state" placeholder="State" options="{'no_open': True, 'no_quick_create': True}"
+                                    readonly="type == 'contact' and parent_id" context="{'country_id': country_id, 'default_country_id': country_id, 'zip': zip}"/>
+                                <field name="zip" placeholder="ZIP" class="o_address_zip"
+                                    readonly="type == 'contact' and parent_id"/>
+                                <field name="city" placeholder="City" class="o_address_city"
+                                    readonly="type == 'contact' and parent_id"/>
+                                <field name="street" placeholder="Street..." class="o_address_street"
+                                    readonly="type == 'contact' and parent_id"/>
+                                <field name="street2" placeholder="Street 2..." class="o_address_street"
+                                    readonly="type == 'contact' and parent_id"/>
                             </div>
                             <field name="vat" placeholder="e.g. BE0477472701" readonly="parent_id"/>
                         </group>
@@ -271,12 +271,12 @@
                                                 <label for="street" string="Address" invisible="type == 'contact'"/>
                                                 <div invisible="type == 'contact'">
                                                     <div class="o_address_format" name="div_address">
-                                                        <field name="street" placeholder="Street..." class="o_address_street"/>
-                                                        <field name="street2" placeholder="Street 2..." class="o_address_street"/>
-                                                        <field name="city" placeholder="City" class="o_address_city"/>
+                                                        <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
                                                         <field name="state_id" class="o_address_state" placeholder="State" options="{'no_open': True, 'no_quick_create': True}" context="{'country_id': country_id, 'default_country_id': country_id, 'zip': zip}"/>
                                                         <field name="zip" placeholder="ZIP" class="o_address_zip"/>
-                                                        <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
+                                                        <field name="city" placeholder="City" class="o_address_city"/>
+                                                        <field name="street" placeholder="Street..." class="o_address_street"/>
+                                                        <field name="street2" placeholder="Street 2..." class="o_address_street"/>
                                                     </div>
                                                 </div>
                                             </group>
@@ -336,12 +336,12 @@
                                 <label for="street" string="Address"/>
                                 <div>
                                     <div class="o_address_format" name="div_address">
+                                        <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
+                                        <field name="state_id" class="o_address_state" placeholder="State" options="{'no_open': True, 'no_quick_create': True}" context="{'country_id': country_id, 'default_country_id': country_id, 'zip': zip}"/>
+                                        <field name="zip" placeholder="ZIP" class="o_address_zip"/> 
+                                        <field name="city" placeholder="City" class="o_address_city"/>
                                         <field name="street" placeholder="Street..." class="o_address_street"/>
                                         <field name="street2" placeholder="Street 2..." class="o_address_street"/>
-                                        <field name="city" placeholder="City" class="o_address_city"/>
-                                        <field name="state_id" class="o_address_state" placeholder="State" options="{'no_open': True, 'no_quick_create': True}" context="{'country_id': country_id, 'default_country_id': country_id, 'zip': zip}"/>
-                                        <field name="zip" placeholder="ZIP" class="o_address_zip"/>
-                                        <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
                                     </div>
                                 </div>
                             </group>