From 53b30b5db6b0cfce406fcc74bf2fbaa21c579b03 Mon Sep 17 00:00:00 2001
From: Denis Leemann <denis.leemann@camptocamp.com>
Date: Mon, 18 Jan 2016 13:26:27 +0100
Subject: [PATCH] Remove unuseful changes

---
 partner_contact_gender/views/res_partner.xml  | 29 +++++++++++++++----
 .../__openerp__.py                            |  2 +-
 .../views/res_partner.xml                     | 21 +++++++++++++-
 partner_contact_nationality/__openerp__.py    |  2 +-
 .../views/res_partner.xml                     | 29 +++++++++++++++----
 5 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/partner_contact_gender/views/res_partner.xml b/partner_contact_gender/views/res_partner.xml
index afb29bf22..01b71a253 100644
--- a/partner_contact_gender/views/res_partner.xml
+++ b/partner_contact_gender/views/res_partner.xml
@@ -2,14 +2,33 @@
 <odoo>
 <data>
 
-<record id="view_personal_information_gender" model="ir.ui.view">
-    <field name="name">Partner gender</field>
+<!-- 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="partner_contact_personal_information_page.personal_information"/>
+    <field name="inherit_id" ref="base.view_partner_form"/>
+    <field name="priority">2</field>
     <field name="arch" type="xml">
         <data>
-            <xpath expr="//group[@name='personal_information_group']">
-                <field name="gender"/>
+            <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="arch" type="xml">
+        <data>
+            <xpath expr="//page[@name='personal_information_page']/group[@name='personal_information_group']">
+                <field name='gender'/>
             </xpath>
         </data>
     </field>
diff --git a/partner_contact_in_several_companies/__openerp__.py b/partner_contact_in_several_companies/__openerp__.py
index 36f192de9..a668001fc 100644
--- a/partner_contact_in_several_companies/__openerp__.py
+++ b/partner_contact_in_several_companies/__openerp__.py
@@ -23,7 +23,7 @@
     'installable': True,
     'auto_install': False,
     "depends": [
-        "partner_contact_personal_information_page"
+        "base"
     ],
     "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 a56bb51b3..2e4fcaab4 100644
--- a/partner_contact_in_several_companies/views/res_partner.xml
+++ b/partner_contact_in_several_companies/views/res_partner.xml
@@ -2,6 +2,25 @@
 <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>
@@ -143,7 +162,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="partner_contact_personal_information_page.personal_information"/>
+    <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']"
diff --git a/partner_contact_nationality/__openerp__.py b/partner_contact_nationality/__openerp__.py
index 1c62acb27..9b119648c 100644
--- a/partner_contact_nationality/__openerp__.py
+++ b/partner_contact_nationality/__openerp__.py
@@ -18,7 +18,7 @@
     'installable': True,
     'auto_install': False,
     "depends": [
-        "partner_contact_personal_information_page",
+        "base",
     ],
     "data": [
         "views/res_partner.xml",
diff --git a/partner_contact_nationality/views/res_partner.xml b/partner_contact_nationality/views/res_partner.xml
index 1164e17f1..b9b08460d 100644
--- a/partner_contact_nationality/views/res_partner.xml
+++ b/partner_contact_nationality/views/res_partner.xml
@@ -2,14 +2,33 @@
 <odoo>
 <data>
 
-<record id="view_personal_information_page_nationality" model="ir.ui.view">
-    <field name="name">Partner nationality</field>
+<!-- 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="partner_contact_personal_information_page.personal_information"/>
+    <field name="inherit_id" ref="base.view_partner_form"/>
+    <field name="priority">2</field>
     <field name="arch" type="xml">
         <data>
-            <xpath expr="//group[@name='personal_information_group']">
-                <field name="nationality_id"/>
+            <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>
         </data>
     </field>