From 0a1f7add4f806efda639b0e2484a657926591bf4 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@serviciosbaeza.com>
Date: Wed, 31 Jul 2013 17:02:17 +0200
Subject: [PATCH] [FIX] base_location: Changed partner view to avoid extrange
 behaviour when company country is filled.

---
 base_location/partner_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/base_location/partner_view.xml b/base_location/partner_view.xml
index cc6b29301..5a11016b0 100644
--- a/base_location/partner_view.xml
+++ b/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>