From 6ad50067c0ab399c2388da4b287c7832de89d7ad Mon Sep 17 00:00:00 2001
From: Denis Leemann <denis.leemann@camptocamp.com>
Date: Mon, 25 Jan 2016 13:13:05 +0100
Subject: [PATCH] Making the 'personal contact' informations depentens of the
 module 'personal_contact_information'

---
 partner_contact_birthdate/__openerp__.py      |  2 +-
 .../views/res_partner.xml                     | 21 +----------------
 partner_contact_gender/views/res_partner.xml  | 20 +---------------
 .../__openerp__.py                            |  3 ++-
 .../views/res_partner.xml                     | 21 +----------------
 partner_contact_nationality/__openerp__.py    |  2 +-
 .../views/res_partner.xml                     | 23 +------------------
 7 files changed, 8 insertions(+), 84 deletions(-)

diff --git a/partner_contact_birthdate/__openerp__.py b/partner_contact_birthdate/__openerp__.py
index a34b5c669..a8ab0cc18 100644
--- a/partner_contact_birthdate/__openerp__.py
+++ b/partner_contact_birthdate/__openerp__.py
@@ -9,7 +9,7 @@
     "category": "Customer Relationship Management",
     "website": "https://odoo-community.org/",
     "depends": [
-        "base",
+        "partner_contact_personal_information_page",
     ],
     "data": [
         "views/res_partner.xml",
diff --git a/partner_contact_birthdate/views/res_partner.xml b/partner_contact_birthdate/views/res_partner.xml
index ebe1e8a08..49c636171 100644
--- a/partner_contact_birthdate/views/res_partner.xml
+++ b/partner_contact_birthdate/views/res_partner.xml
@@ -4,29 +4,10 @@
      
 <odoo>
 
-<!-- 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>
-    <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.view_partner_form"/>
-    <field name="priority">2</field>
-    <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="view_personal_information_birthdate_date" model="ir.ui.view">
     <field name="name">Birthdate Date field</field>
     <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.personal_contact_information"/>
+    <field name="inherit_id" ref="partner_contact_personal_information_page.personal_information"/>
     <field name="arch" type="xml">
         <data>
             <xpath expr="//group[@name='personal_information_group']">
diff --git a/partner_contact_gender/views/res_partner.xml b/partner_contact_gender/views/res_partner.xml
index ed23db953..d71d0630a 100644
--- a/partner_contact_gender/views/res_partner.xml
+++ b/partner_contact_gender/views/res_partner.xml
@@ -5,25 +5,7 @@
 <record id="view_personal_information_gender" model="ir.ui.view">
     <field name="name">Partner gender: personal info</field>
     <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.view_partner_form"/>
-    <field name="priority">2</field>
-    <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 gender: personal info</field>
-    <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.personal_contact_information"/>
+    <field name="inherit_id" ref="partner_contact_personal_information_page.personal_information"/>
     <field name="arch" type="xml">
         <data>
             <xpath expr="//page[@name='personal_information_page']/group[@name='personal_information_group']">
diff --git a/partner_contact_in_several_companies/__openerp__.py b/partner_contact_in_several_companies/__openerp__.py
index a668001fc..7dde7c792 100644
--- a/partner_contact_in_several_companies/__openerp__.py
+++ b/partner_contact_in_several_companies/__openerp__.py
@@ -23,7 +23,8 @@
     'installable': True,
     'auto_install': False,
     "depends": [
-        "base"
+        "base",
+        "partner_contact_personal_information_page",
     ],
     "data": [
         "views/res_partner.xml",
diff --git a/partner_contact_in_several_companies/views/res_partner.xml b/partner_contact_in_several_companies/views/res_partner.xml
index 2e4fcaab4..a56bb51b3 100644
--- a/partner_contact_in_several_companies/views/res_partner.xml
+++ b/partner_contact_in_several_companies/views/res_partner.xml
@@ -2,25 +2,6 @@
 <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>
-    <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.view_partner_form"/>
-    <field name="priority">2</field>
-    <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="view_res_partner_filter_contact" model="ir.ui.view">
     <field name="name">res.partner.select.contact</field>
     <field name="model">res.partner</field>
@@ -162,7 +143,7 @@
 <record id="personal_contact_information" model="ir.ui.view">
     <field name="name">Contacts in several partners: personal info</field>
     <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.personal_contact_information"/>
+    <field name="inherit_id" ref="partner_contact_personal_information_page.personal_information"/>
     <field name="arch" type="xml">
         <data>
             <xpath expr="//page[@name='personal_information_page']/group[@name='personal_information_group']"
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 8d2678db4..d5c00fafd 100644
--- a/partner_contact_nationality/views/res_partner.xml
+++ b/partner_contact_nationality/views/res_partner.xml
@@ -1,30 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-<data>
 
-<!-- Declared the same in every module that may need it -->
 <record id="view_personal_information_page_nationality" model="ir.ui.view">
     <field name="name">Partner nationality: personal info</field>
     <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.view_partner_form"/>
-    <field name="priority">2</field>
-    <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="inherit_id" ref="partner_contact_personal_information_page.personal_information"/>
     <field name="arch" type="xml">
         <data>
             <xpath expr="//page[@name='personal_information_page']/group[@name='personal_information_group']">
@@ -34,5 +14,4 @@
     </field>
 </record>
 
-</data>
 </odoo>