[FIX] base_location: Changed partner view to avoid extrange behaviour when company country is filled.

base_location/partner_view.xml

@@ -6,10 +6,12 @@
       <field name="model">res.partner</field>
       <field name="inherit_id" ref="base.view_partner_form"/>
       <field name="arch" type="xml">
-        <field name="city" position="before">
+        <field name="street2" position="after">
           <field name="zip_id"
                  on_change="onchange_zip_id(zip_id)"
-                 placeholder="City completion"/>
+                 placeholder="City completion"
+			     attrs="{'invisible': [('use_parent_address','=',True)]}"
+			     />
         </field>
       </field>
     </record>