From 5f8902c577674c349d38ae0b07f34b598bcd045e Mon Sep 17 00:00:00 2001
From: Denis Leemann <denis.leemann@camptocamp.com>
Date: Mon, 18 Jan 2016 11:12:09 +0100
Subject: [PATCH] Fix multiple tabs "contact information"

---
 partner_contact_nationality/__openerp__.py    |  2 +-
 .../views/res_partner.xml                     | 29 ++++---------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/partner_contact_nationality/__openerp__.py b/partner_contact_nationality/__openerp__.py
index 9b119648c..1c62acb27 100644
--- a/partner_contact_nationality/__openerp__.py
+++ b/partner_contact_nationality/__openerp__.py
@@ -18,7 +18,7 @@
     'installable': True,
     'auto_install': False,
     "depends": [
-        "base",
+        "partner_contact_personal_information_page",
     ],
     "data": [
         "views/res_partner.xml",
diff --git a/partner_contact_nationality/views/res_partner.xml b/partner_contact_nationality/views/res_partner.xml
index b9b08460d..19d253818 100644
--- a/partner_contact_nationality/views/res_partner.xml
+++ b/partner_contact_nationality/views/res_partner.xml
@@ -2,33 +2,14 @@
 <odoo>
 <data>
 
-<!-- Declared the same in every module that may need it -->
-<record id="base.personal_contact_information" model="ir.ui.view">
-    <field name="name">Personal information page for contacts form</field>
+<record id="view_personal_information_gender" model="ir.ui.view">
+    <field name="name">Partner gender</field>
     <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.view_partner_form"/>
-    <field name="priority">2</field>
+    <field name="inherit_id" ref="partner_contact_personal_information_page.personal_information"/>
     <field name="arch" type="xml">
         <data>
-            <xpath expr="//page[@name='internal_notes']" position="after">
-                <page name="personal_information_page"
-                      string="Personal Information"
-                      attrs="{'invisible': [('is_company','=',True)]}">
-                    <group name="personal_information_group"/>
-                </page>
-            </xpath>
-        </data>
-    </field>
-</record>
-
-<record id="personal_contact_information" model="ir.ui.view">
-    <field name="name">Partner nationality: personal info</field>
-    <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.personal_contact_information"/>
-    <field name="arch" type="xml">
-        <data>
-            <xpath expr="//page[@name='personal_information_page']/group[@name='personal_information_group']">
-                <field name='nationality_id'/>
+            <xpath expr="//group[@name='personal_information_group']">
+                <field name="gender"/>
             </xpath>
         </data>
     </field>