From bcd76a1cf1e80e02c375b40a600d8e6ba2b2c9bc Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Wed, 14 Oct 2015 15:16:52 +0200
Subject: [PATCH] base_location - Adapt views to 9.0

---
 base_location/views/better_zip_view.xml |  2 +-
 base_location/views/partner_view.xml    | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/base_location/views/better_zip_view.xml b/base_location/views/better_zip_view.xml
index d0e1782a7..cfe13bc52 100644
--- a/base_location/views/better_zip_view.xml
+++ b/base_location/views/better_zip_view.xml
@@ -6,7 +6,7 @@
             <field name="name">res.better.zip.form</field>
             <field name="model">res.better.zip</field>
             <field name="arch" type="xml">
-                <form string="ZIP" version="7.0">
+                <form string="ZIP">
                     <group col="4">
                     <field name="name"/>
                     <field name="code"/>
diff --git a/base_location/views/partner_view.xml b/base_location/views/partner_view.xml
index 517a179e9..cade97e03 100644
--- a/base_location/views/partner_view.xml
+++ b/base_location/views/partner_view.xml
@@ -7,17 +7,16 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form" />
             <field name="arch" type="xml">
-                <div class="address_format" position="before">
+                <field name="city" position="before">
                     <field name="zip_id"
-                        options="{'create_name_field': 'city'}"
+                        options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}"
                         placeholder="City completion"
-                        attrs="{'invisible': [('use_parent_address','=',True)]}"
                         class="oe_edit_only" />
-                </div>
-                <xpath expr="//field[@name='child_ids']/form//div[@class='address_format']" position="before">
-                    <field name="zip_id" options="{'create_name_field': 'city'}"
+                </field>
+                <xpath expr="//field[@name='child_ids']/form//field[@name='city']" position="before">
+                    <field name="zip_id"
+                        options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}"
                         placeholder="City completion"
-                        attrs="{'invisible': [('use_parent_address','=',True)]}"
                         class="oe_edit_only" />
                 </xpath>
             </field>