diff --git a/base_contact/README.rst b/base_contact/README.rst
index b71305d94..82bf6105b 100644
--- a/base_contact/README.rst
+++ b/base_contact/README.rst
@@ -4,8 +4,8 @@ Contacts Management
 This module was written to extend the contact management functionality. It
 allows you to:
 
-    - set several job positions in different companies per contact,
-    - set some extra informations like birthdate and nationality.
+- set several job positions in different companies per contact,
+- set some extra informations like birthdate and nationality.
 
 Usage
 =====
@@ -20,7 +20,18 @@ For further information, please visit:
 Known issues / Roadmap
 ======================
 
- * Migrate to the new API
+.. warning::
+    **DEPRECATED!!**
+
+    This module is deprecated and **will be removed in Odoo 9.0**.
+
+    Its functionality has been split in 3 separate modules:
+
+    - partner_contact_birthdate_
+    - partner_contact_in_several_companies_
+    - partner_contact_nationality_
+
+    You should consider using those instead.
 
 Credits
 =======
@@ -34,6 +45,7 @@ Contributors
 * Sandy Carter <bwrsandman@gmail.com>
 * Rudolf Schnapka <rs@techno-flex.de>
 * Sebastien Alix <sebastien.alix@osiell.com>
+* Jairo Llopis <j.llopis@grupoesoc.es>
 
 Maintainer
 ----------
@@ -47,3 +59,8 @@ This module is maintained by the OCA.
 OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.
 
 To contribute to this module, please visit http://odoo-community.org.
+
+
+.. _partner_contact_birthdate: https://github.com/OCA/partner-contact/tree/8.0/partner_contact_birthdate
+.. _partner_contact_in_several_companies: https://github.com/OCA/partner-contact/tree/8.0/partner_contact_in_several_companies
+.. _partner_contact_nationality: https://github.com/OCA/partner-contact/tree/8.0/partner_contact_nationality
diff --git a/base_contact/__init__.py b/base_contact/__init__.py
index c68500207..fa24c3336 100644
--- a/base_contact/__init__.py
+++ b/base_contact/__init__.py
@@ -1,8 +1,9 @@
-# -*- coding: utf-8 -*-
+# -*- encoding: utf-8 -*-
+
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013-TODAY OpenERP SA (<http://www.openerp.com>).
+-#    Copyright (C) 2013-TODAY OpenERP SA (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,4 +20,7 @@
 #
 ##############################################################################
 
-from . import base_contact
+import logging
+
+
+logging.getLogger(__name__).warn("This module is DEPRECATED. See README.")
diff --git a/base_contact/__openerp__.py b/base_contact/__openerp__.py
index d5ac8aee6..0155a35e2 100644
--- a/base_contact/__openerp__.py
+++ b/base_contact/__openerp__.py
@@ -21,24 +21,14 @@
 
 {
     'name': 'Contacts Management',
-    'summary': u"Manage your contacts separately",
-    'version': '1.0',
+    'summary': u"[DEPRECATED] Manage your contacts separately",
+    'version': '2.0.0',
     'author': "OpenERP SA,Odoo Community Association (OCA)",
     'website': 'http://www.openerp.com',
     'category': 'Customer Relationship Management',
-    'complexity': "expert",
     'depends': [
-        'base',
+        'partner_contact_birthdate',
+        'partner_contact_in_several_companies',
+        'partner_contact_nationality',
     ],
-    'external_dependencies': {},
-    'data': [
-        'base_contact_view.xml',
-    ],
-    'demo': [
-        'base_contact_demo.xml',
-    ],
-    'test': [],
-    'installable': True,
-    'auto_install': False,
-    'images': [],
 }
diff --git a/base_contact/i18n/base_contact.pot b/base_contact/i18n/base_contact.pot
deleted file mode 100644
index d6c25da1d..000000000
--- a/base_contact/i18n/base_contact.pot
+++ /dev/null
@@ -1,186 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 22:10+0000\n"
-"PO-Revision-Date: 2014-09-19 18:10-0500\n"
-"Last-Translator: EL Hadji DEM <elhadji.dem@savoirfairelinux.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-"X-Generator: Poedit 1.5.4\n"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "City"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "other position"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Contacts"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid ""
-"To see personal information about this contact, please go to to the his "
-"person form:"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Street..."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "State"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "at"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Tags..."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Other Positions"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Phone:"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Company"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner,contact_id:0
-msgid "Main Contact"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Fax:"
-msgstr ""
-
-#. module: base_contact
-#: code:addons/base_contact/base_contact.py:31
-#, python-format
-msgid "Standalone Contact"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner,nationality_id:0
-msgid "Nationality."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Address"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner,nationality_id:0
-msgid "Nationality"
-msgstr ""
-
-#. module: base_contact
-#: code:addons/base_contact/base_contact.py:32
-#, python-format
-msgid "Attached to existing Contact"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "ZIP"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Country"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner,birthdate_date:0
-msgid "Birthdate"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Person"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Contact"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Mobile:"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "All partner positions"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "All positions"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_ir_actions_act_window
-msgid "ir.actions.act_window"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "other positions"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner,contact_type:0
-msgid "Contact Type"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner,other_contact_ids:0
-msgid "Others Positions"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Personal Information"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "e.g. Sales Director"
-msgstr ""
diff --git a/base_contact/i18n/de.po b/base_contact/i18n/de.po
deleted file mode 100644
index 702587fae..000000000
--- a/base_contact/i18n/de.po
+++ /dev/null
@@ -1,191 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* base_contact
-#
-# Rudolf Schnapka <schnapkar@golive-saar.de>, 2014.
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 22:10+0000\n"
-"PO-Revision-Date: 2014-12-30 18:14+0100\n"
-"Last-Translator: Rudolf Schnapka <schnapkar@golive-saar.de>\n"
-"Language-Team: German <kde-i18n-de@kde.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-"X-Generator: Lokalize 1.5\n"
-"Language: de\n"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "City"
-msgstr "Stadt"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "other position"
-msgstr "andere Position"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Contacts"
-msgstr "Kontakte"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid ""
-"To see personal information about this contact, please go to to the his "
-"person form:"
-msgstr ""
-"Um persönliche Auskunft zu diesem Kontakt zu erhalten, gehen Sie bitte auf "
-"die Seite persönlich:"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Street..."
-msgstr "Straße..."
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "State"
-msgstr "Bundesland"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "at"
-msgstr "bei"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Tags..."
-msgstr "Schlagworte..."
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Other Positions"
-msgstr "Andere Positionen"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Phone:"
-msgstr "Telefon:"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Company"
-msgstr "Unternehmen"
-
-#. module: base_contact
-#: field:res.partner,contact_id:0
-msgid "Main Contact"
-msgstr "Hauptkontakt"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Fax:"
-msgstr "Fax:"
-
-#. module: base_contact
-#: code:addons/base_contact/base_contact.py:31
-#, python-format
-msgid "Standalone Contact"
-msgstr "Alleinstehender Kontakt"
-
-#. module: base_contact
-#: help:res.partner,nationality_id:0
-msgid "Nationality."
-msgstr "Nationalität."
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Address"
-msgstr "Anschrift"
-
-#. module: base_contact
-#: field:res.partner,nationality_id:0
-msgid "Nationality"
-msgstr "Nationalität"
-
-#. module: base_contact
-#: code:addons/base_contact/base_contact.py:32
-#, python-format
-msgid "Attached to existing Contact"
-msgstr "Mit bestehendem Kontakt verknüpft"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "ZIP"
-msgstr "PLZ"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Country"
-msgstr "Land"
-
-#. module: base_contact
-#: field:res.partner,birthdate_date:0
-msgid "Birthdate"
-msgstr "Geburtsdatum"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Person"
-msgstr "Person"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Contact"
-msgstr "Kontakt"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Mobile:"
-msgstr "Mobil:"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "All partner positions"
-msgstr "Alle Positionen des Partners"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "All positions"
-msgstr "Alle Positionen"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_ir_actions_act_window
-msgid "ir.actions.act_window"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "other positions"
-msgstr "andere Positionen"
-
-#. module: base_contact
-#: field:res.partner,contact_type:0
-msgid "Contact Type"
-msgstr "Kontaktart"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: field:res.partner,other_contact_ids:0
-msgid "Others Positions"
-msgstr "Andere Positionen"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Personal Information"
-msgstr "Persönliche Auskunft"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "e.g. Sales Director"
-msgstr "z. B. Verkaufsleiter"
-
diff --git a/base_contact/i18n/es.po b/base_contact/i18n/es.po
deleted file mode 100644
index 59e2dbf71..000000000
--- a/base_contact/i18n/es.po
+++ /dev/null
@@ -1,189 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 22:10+0000\n"
-"PO-Revision-Date: 2015-05-18 13:01+0100\n"
-"Last-Translator: Jairo Llopis <j.llopis@grupoesoc.es>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.7.6\n"
-"Language: es_ES\n"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "City"
-msgstr "Ciudad"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "other position"
-msgstr "otra posición"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Contacts"
-msgstr "Contactos"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid ""
-"To see personal information about this contact, please go to to the his "
-"person form:"
-msgstr ""
-"Para ver la información personal de este contacto, por favor vaya a su "
-"formulario personal:"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Street..."
-msgstr "Calle..."
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "State"
-msgstr "Provincia"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "at"
-msgstr "en"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Tags..."
-msgstr "Etiquetas..."
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Other Positions"
-msgstr "Otras posiciones"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Phone:"
-msgstr "Teléfono:"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: base_contact
-#: field:res.partner,contact_id:0
-msgid "Main Contact"
-msgstr "Contacto principal"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Fax:"
-msgstr "Fax:"
-
-#. module: base_contact
-#: code:addons/base_contact/base_contact.py:31
-#, python-format
-msgid "Standalone Contact"
-msgstr "Contacto independiente"
-
-#. module: base_contact
-#: help:res.partner,nationality_id:0
-msgid "Nationality."
-msgstr "Nacionalidad."
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Address"
-msgstr "Dirección"
-
-#. module: base_contact
-#: field:res.partner,nationality_id:0
-msgid "Nationality"
-msgstr "Nacionalidad"
-
-#. module: base_contact
-#: code:addons/base_contact/base_contact.py:32
-#, python-format
-msgid "Attached to existing Contact"
-msgstr "Anexado a un contacto existente"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "ZIP"
-msgstr "C.P."
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Country"
-msgstr "País"
-
-#. module: base_contact
-#: field:res.partner,birthdate_date:0
-msgid "Birthdate"
-msgstr "Fecha de nacimiento"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Person"
-msgstr "Persona"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Mobile:"
-msgstr "Teléfono móvil:"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "All partner positions"
-msgstr "Todas las posiciones de empresa"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "All positions"
-msgstr "Todas las posiciones"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_ir_actions_act_window
-msgid "ir.actions.act_window"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "other positions"
-msgstr "otras posiciones"
-
-#. module: base_contact
-#: field:res.partner,contact_type:0
-msgid "Contact Type"
-msgstr "Tipo de contacto"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: base_contact
-#: field:res.partner,other_contact_ids:0
-msgid "Others Positions"
-msgstr "Otras posiciones"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Personal Information"
-msgstr "Información personal"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "e.g. Sales Director"
-msgstr "ej.: Director de ventas"
diff --git a/base_contact/i18n/fr.po b/base_contact/i18n/fr.po
deleted file mode 100644
index 6348d5b61..000000000
--- a/base_contact/i18n/fr.po
+++ /dev/null
@@ -1,188 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* base_contact
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 22:11+0000\n"
-"PO-Revision-Date: 2014-09-19 18:18-0500\n"
-"Last-Translator: EL Hadji DEM <elhadji.dem@savoirfairelinux.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-"X-Generator: Poedit 1.5.4\n"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "City"
-msgstr "Ville"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "other position"
-msgstr "fonction"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Contacts"
-msgstr "Contacts"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid ""
-"To see personal information about this contact, please go to to the his "
-"person form:"
-msgstr ""
-"Pour voir des informations personnelles sur ce contact, s'il vous plaît "
-"aller au formulaire de la personne:"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Street..."
-msgstr "Rue..."
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "State"
-msgstr "État"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "at"
-msgstr "à"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Tags..."
-msgstr "Étiquettes..."
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Other Positions"
-msgstr "Fonctions"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Phone:"
-msgstr "Téléphone:"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Company"
-msgstr "Organisme"
-
-#. module: base_contact
-#: field:res.partner,contact_id:0
-msgid "Main Contact"
-msgstr "Principal contact"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Fax:"
-msgstr "Fax :"
-
-#. module: base_contact
-#: code:addons/base_contact/base_contact.py:31
-#, python-format
-msgid "Standalone Contact"
-msgstr "Contact autonome"
-
-#. module: base_contact
-#: help:res.partner,nationality_id:0
-msgid "Nationality."
-msgstr "Nationalité."
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Address"
-msgstr "Adresse"
-
-#. module: base_contact
-#: field:res.partner,nationality_id:0
-msgid "Nationality"
-msgstr "Nationalité"
-
-#. module: base_contact
-#: code:addons/base_contact/base_contact.py:32
-#, python-format
-msgid "Attached to existing Contact"
-msgstr "Contact rattaché à un contact existant"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "ZIP"
-msgstr "Code postal"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Country"
-msgstr "Pays"
-
-#. module: base_contact
-#: field:res.partner,birthdate_date:0
-msgid "Birthdate"
-msgstr "Date de naissance"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Person"
-msgstr "Personne"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Contact"
-msgstr "Contact"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Mobile:"
-msgstr "Portable :"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "All partner positions"
-msgstr "Tous les contacts"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "All positions"
-msgstr "Tous les contacts"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_ir_actions_act_window
-msgid "ir.actions.act_window"
-msgstr "ir.actions.act_window"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "other positions"
-msgstr "fonctions"
-
-#. module: base_contact
-#: field:res.partner,contact_type:0
-msgid "Contact Type"
-msgstr "Type de contact"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
-
-#. module: base_contact
-#: field:res.partner,other_contact_ids:0
-msgid "Others Positions"
-msgstr "Fonctions"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Personal Information"
-msgstr "Informations personnelles"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "e.g. Sales Director"
-msgstr "ex: Directeur des ventes"
diff --git a/base_contact/i18n/sl.po b/base_contact/i18n/sl.po
deleted file mode 100644
index 3e8e6c367..000000000
--- a/base_contact/i18n/sl.po
+++ /dev/null
@@ -1,191 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* base_contact
-#
-# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015.
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 22:10+0000\n"
-"PO-Revision-Date: 2015-03-20 08:34+0100\n"
-"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
-"Language-Team: Slovenian <translate@matmoz.si>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-"X-Generator: Lokalize 1.5\n"
-"Language: sl\n"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "City"
-msgstr "Kraj"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "other position"
-msgstr "drug položaj"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Contacts"
-msgstr "Stiki"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid ""
-"To see personal information about this contact, please go to to the his "
-"person form:"
-msgstr ""
-"Za ogled osebnih podatkov o tem stiku pojdite na njegov glavni "
-"obrazec:"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Street..."
-msgstr "Ulica..."
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "State"
-msgstr "Zvezna država"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "at"
-msgstr "pri"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Tags..."
-msgstr "Oznake..."
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Other Positions"
-msgstr "Drugi položaji"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Phone:"
-msgstr "Telefon:"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Company"
-msgstr "Družba"
-
-#. module: base_contact
-#: field:res.partner,contact_id:0
-msgid "Main Contact"
-msgstr "Glavni stik"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Fax:"
-msgstr "Faks:"
-
-#. module: base_contact
-#: code:addons/base_contact/base_contact.py:31
-#, python-format
-msgid "Standalone Contact"
-msgstr "Samostojni stik"
-
-#. module: base_contact
-#: help:res.partner,nationality_id:0
-msgid "Nationality."
-msgstr "Nacionalnost"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Address"
-msgstr "Naslov"
-
-#. module: base_contact
-#: field:res.partner,nationality_id:0
-msgid "Nationality"
-msgstr "Nacionalnost"
-
-#. module: base_contact
-#: code:addons/base_contact/base_contact.py:32
-#, python-format
-msgid "Attached to existing Contact"
-msgstr "Pripeto obstoječemu stiku"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "ZIP"
-msgstr "Poštna številka"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Country"
-msgstr "Država"
-
-#. module: base_contact
-#: field:res.partner,birthdate_date:0
-msgid "Birthdate"
-msgstr "Rojstni datum"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Person"
-msgstr "Oseba"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Contact"
-msgstr "Stik"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Mobile:"
-msgstr "Mobilni telefon:"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "All partner positions"
-msgstr "Vsi partnerjevi položaji"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "All positions"
-msgstr "Vsi položaji"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_ir_actions_act_window
-msgid "ir.actions.act_window"
-msgstr "ir.actions.act_window"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "other positions"
-msgstr "drugi položaji"
-
-#. module: base_contact
-#: field:res.partner,contact_type:0
-msgid "Contact Type"
-msgstr "Tip stika"
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner
-msgid "Partner"
-msgstr "Partner"
-
-#. module: base_contact
-#: field:res.partner,other_contact_ids:0
-msgid "Others Positions"
-msgstr "Drugi položaji"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Personal Information"
-msgstr "Osebni podatki"
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "e.g. Sales Director"
-msgstr "npr. vodja prodaje"
-
diff --git a/partner_contact_in_several_companies/README.rst b/partner_contact_in_several_companies/README.rst
new file mode 100644
index 000000000..2c9d9dc91
--- /dev/null
+++ b/partner_contact_in_several_companies/README.rst
@@ -0,0 +1,68 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+    :alt: License: AGPL-3
+
+Module name
+===========
+
+This module was written to extend the contact management functionality. It
+allows you to set several job positions in different companies per contact.
+
+Installation
+============
+
+To install this module, you need to:
+
+* Install the OCA repository `partner-contact`_.
+
+Configuration
+=============
+
+No configuration is needed.
+
+Usage
+=====
+
+New tabs 'Other Positions' and 'Personal Information' are available on the
+contact form.
+
+For further information, please visit:
+
+* https://www.odoo.com/forum/help-1
+* https://github.com/OCA/partner-contact/
+
+Known issues / Roadmap
+======================
+
+* Update to v8 API.
+
+Credits
+=======
+
+Contributors
+------------
+
+* Xavier ALT <xal@openerp.com> (original author)
+* EL HADJI DEM <elhadji.dem@savoirfairelinux.com>
+* TheCloneMaster <the.clone.master@gmail.com>
+* Sandy Carter <bwrsandman@gmail.com>
+* Rudolf Schnapka <rs@techno-flex.de>
+* Sebastien Alix <sebastien.alix@osiell.com>
+* Jairo Llopis <j.llopis@grupoesoc.es>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit http://odoo-community.org.
+
+
+.. _partner-contact: https://github.com/OCA/partner-contact/
diff --git a/partner_contact_in_several_companies/__init__.py b/partner_contact_in_several_companies/__init__.py
new file mode 100644
index 000000000..685080d25
--- /dev/null
+++ b/partner_contact_in_several_companies/__init__.py
@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+
+# Odoo, Open Source Management Solution
+# Copyright (C) 2014-2015  Grupo ESOC <www.grupoesoc.es>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from . import models
diff --git a/partner_contact_in_several_companies/__openerp__.py b/partner_contact_in_several_companies/__openerp__.py
new file mode 100644
index 000000000..eaa91a0c0
--- /dev/null
+++ b/partner_contact_in_several_companies/__openerp__.py
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+
+# Odoo, Open Source Management Solution
+# Copyright (C) 2014-2015  Grupo ESOC <www.grupoesoc.es>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+{
+    "name": "Contacts in several partners",
+    "summary": "Allow to have one contact in several partners",
+    "version": "1.0.0",
+    "author": "Odoo Community Association (OCA)",
+    "category": "Customer Relationship Management",
+    "website": "https://odoo-community.org/",
+    "depends": [
+        "partner_contact_personal_information_page",
+    ],
+    "data": [
+        "views/res_partner.xml",
+    ],
+    "demo": [
+        "demo/res_partner.xml",
+    ],
+}
diff --git a/base_contact/base_contact_demo.xml b/partner_contact_in_several_companies/demo/res_partner.xml
similarity index 100%
rename from base_contact/base_contact_demo.xml
rename to partner_contact_in_several_companies/demo/res_partner.xml
diff --git a/partner_contact_in_several_companies/i18n/de.po b/partner_contact_in_several_companies/i18n/de.po
new file mode 100644
index 000000000..ef513dde0
--- /dev/null
+++ b/partner_contact_in_several_companies/i18n/de.po
@@ -0,0 +1,171 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* base_contact
+#
+# Rudolf Schnapka <schnapkar@golive-saar.de>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-20 09:26+0000\n"
+"PO-Revision-Date: 2015-05-20 11:27+0100\n"
+"Last-Translator: Rudolf Schnapka <schnapkar@golive-saar.de>\n"
+"Language-Team: German <kde-i18n-de@kde.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.7.6\n"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Address"
+msgstr "Anschrift"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "All partner positions"
+msgstr "Alle Positionen des Partners"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "All positions"
+msgstr "Alle Positionen"
+
+#. module: partner_contact_in_several_companies
+#: code:addons/partner_contact_in_several_companies/models.py:32
+#, python-format
+msgid "Attached to existing Contact"
+msgstr "Mit bestehendem Kontakt verknüpft"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "City"
+msgstr "Stadt"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Company"
+msgstr "Unternehmen"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,contact_type:0
+msgid "Contact Type"
+msgstr "Kontaktart"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Contacts"
+msgstr "Kontakte"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Country"
+msgstr "Land"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Fax:"
+msgstr "Fax:"
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,contact_id:0
+msgid "Main Contact"
+msgstr "Hauptkontakt"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Mobile:"
+msgstr "Mobil:"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Other Positions"
+msgstr "Andere Positionen"
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,other_contact_ids:0
+msgid "Others Positions"
+msgstr "Andere Positionen"
+
+#. module: partner_contact_in_several_companies
+#: model:ir.model,name:partner_contact_in_several_companies.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "Person"
+msgstr "Person"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Phone:"
+msgstr "Telefon:"
+
+#. module: partner_contact_in_several_companies
+#: code:addons/partner_contact_in_several_companies/models.py:31
+#, python-format
+msgid "Standalone Contact"
+msgstr "Alleinstehender Kontakt"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "State"
+msgstr "Bundesland"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Street..."
+msgstr "Straße..."
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Tags..."
+msgstr "Schlagworte..."
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_personal_information
+#, fuzzy
+msgid ""
+"To see personal information about this contact, please\n"
+"                        go to to the his person form:"
+msgstr ""
+"Um persönliche Auskunft zu diesem Kontakt zu erhalten, gehen Sie bitte auf "
+"die Seite persönlich:"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "ZIP"
+msgstr "PLZ"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "at"
+msgstr "bei"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "e.g. Sales Director"
+msgstr "z. B. Verkaufsleiter"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_kanban_contact
+msgid "other position"
+msgstr "andere Position"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_kanban_contact
+msgid "other positions"
+msgstr "andere Positionen"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "{'invisible': [('contact_type','=','attached')]}"
+msgstr ""
diff --git a/partner_contact_in_several_companies/i18n/es.po b/partner_contact_in_several_companies/i18n/es.po
new file mode 100644
index 000000000..55cfe0228
--- /dev/null
+++ b/partner_contact_in_several_companies/i18n/es.po
@@ -0,0 +1,170 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* base_contact
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-20 09:26+0000\n"
+"PO-Revision-Date: 2015-05-20 11:33+0100\n"
+"Last-Translator: Jairo Llopis <j.llopis@grupoesoc.es>\n"
+"Language-Team: \n"
+"Language: es_ES\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.7.6\n"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Address"
+msgstr "Dirección"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "All partner positions"
+msgstr "Todas las posiciones de empresa"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "All positions"
+msgstr "Todas las posiciones"
+
+#. module: partner_contact_in_several_companies
+#: code:addons/partner_contact_in_several_companies/models.py:32
+#, python-format
+msgid "Attached to existing Contact"
+msgstr "Anexado a un contacto existente"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "City"
+msgstr "Ciudad"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Company"
+msgstr "Compañía"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,contact_type:0
+msgid "Contact Type"
+msgstr "Tipo de contacto"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Contacts"
+msgstr "Contactos"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Country"
+msgstr "País"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Fax:"
+msgstr "Fax:"
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,contact_id:0
+msgid "Main Contact"
+msgstr "Contacto principal"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Mobile:"
+msgstr "Teléfono móvil:"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Other Positions"
+msgstr "Otras posiciones"
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,other_contact_ids:0
+msgid "Others Positions"
+msgstr "Otras posiciones"
+
+#. module: partner_contact_in_several_companies
+#: model:ir.model,name:partner_contact_in_several_companies.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "Person"
+msgstr "Persona"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Phone:"
+msgstr "Teléfono:"
+
+#. module: partner_contact_in_several_companies
+#: code:addons/partner_contact_in_several_companies/models.py:31
+#, python-format
+msgid "Standalone Contact"
+msgstr "Contacto independiente"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "State"
+msgstr "Provincia"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Street..."
+msgstr "Calle..."
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Tags..."
+msgstr "Etiquetas..."
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_personal_information
+#, fuzzy
+msgid ""
+"To see personal information about this contact, please\n"
+"                        go to to the his person form:"
+msgstr ""
+"Para ver la información personal de este contacto, por favor vaya a su "
+"formulario personal:"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "ZIP"
+msgstr "C.P."
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "at"
+msgstr "en"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "e.g. Sales Director"
+msgstr "ej.: Director de ventas"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_kanban_contact
+msgid "other position"
+msgstr "otra posición"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_kanban_contact
+msgid "other positions"
+msgstr "otras posiciones"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "{'invisible': [('contact_type','=','attached')]}"
+msgstr ""
diff --git a/partner_contact_in_several_companies/i18n/fr.po b/partner_contact_in_several_companies/i18n/fr.po
new file mode 100644
index 000000000..811c3c8ca
--- /dev/null
+++ b/partner_contact_in_several_companies/i18n/fr.po
@@ -0,0 +1,170 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* base_contact
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-20 09:26+0000\n"
+"PO-Revision-Date: 2015-05-20 11:28+0100\n"
+"Last-Translator: EL Hadji DEM <elhadji.dem@savoirfairelinux.com>\n"
+"Language-Team: \n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.7.6\n"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Address"
+msgstr "Adresse"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "All partner positions"
+msgstr "Tous les contacts"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "All positions"
+msgstr "Tous les contacts"
+
+#. module: partner_contact_in_several_companies
+#: code:addons/partner_contact_in_several_companies/models.py:32
+#, python-format
+msgid "Attached to existing Contact"
+msgstr "Contact rattaché à un contact existant"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "City"
+msgstr "Ville"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Company"
+msgstr "Organisme"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Contact"
+msgstr "Contact"
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,contact_type:0
+msgid "Contact Type"
+msgstr "Type de contact"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Contacts"
+msgstr "Contacts"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Country"
+msgstr "Pays"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Fax:"
+msgstr "Fax :"
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,contact_id:0
+msgid "Main Contact"
+msgstr "Principal contact"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Mobile:"
+msgstr "Portable :"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Other Positions"
+msgstr "Fonctions"
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,other_contact_ids:0
+msgid "Others Positions"
+msgstr "Fonctions"
+
+#. module: partner_contact_in_several_companies
+#: model:ir.model,name:partner_contact_in_several_companies.model_res_partner
+msgid "Partner"
+msgstr "Partenaire"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "Person"
+msgstr "Personne"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Phone:"
+msgstr "Téléphone:"
+
+#. module: partner_contact_in_several_companies
+#: code:addons/partner_contact_in_several_companies/models.py:31
+#, python-format
+msgid "Standalone Contact"
+msgstr "Contact autonome"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "State"
+msgstr "État"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Street..."
+msgstr "Rue..."
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Tags..."
+msgstr "Étiquettes..."
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_personal_information
+#, fuzzy
+msgid ""
+"To see personal information about this contact, please\n"
+"                        go to to the his person form:"
+msgstr ""
+"Pour voir des informations personnelles sur ce contact, s'il vous plaît "
+"aller au formulaire de la personne:"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "ZIP"
+msgstr "Code postal"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "at"
+msgstr "à"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "e.g. Sales Director"
+msgstr "ex: Directeur des ventes"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_kanban_contact
+msgid "other position"
+msgstr "fonction"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_kanban_contact
+msgid "other positions"
+msgstr "fonctions"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "{'invisible': [('contact_type','=','attached')]}"
+msgstr ""
diff --git a/partner_contact_in_several_companies/i18n/partner_contact_in_several_companies.pot b/partner_contact_in_several_companies/i18n/partner_contact_in_several_companies.pot
new file mode 100644
index 000000000..4d75f72b7
--- /dev/null
+++ b/partner_contact_in_several_companies/i18n/partner_contact_in_several_companies.pot
@@ -0,0 +1,165 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* partner_contact_in_several_companies
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0-20150514\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-20 09:26+0000\n"
+"PO-Revision-Date: 2015-05-20 09:26+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Address"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "All partner positions"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "All positions"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: code:addons/partner_contact_in_several_companies/models.py:32
+#, python-format
+msgid "Attached to existing Contact"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "City"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Company"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Contact"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,contact_type:0
+msgid "Contact Type"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Contacts"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Country"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Fax:"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,contact_id:0
+msgid "Main Contact"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Mobile:"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Other Positions"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,other_contact_ids:0
+msgid "Others Positions"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: model:ir.model,name:partner_contact_in_several_companies.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "Person"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Phone:"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: code:addons/partner_contact_in_several_companies/models.py:31
+#, python-format
+msgid "Standalone Contact"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "State"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Street..."
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Tags..."
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_personal_information
+msgid "To see personal information about this contact, please\n"
+"                        go to to the his person form:"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "ZIP"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "at"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "e.g. Sales Director"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_kanban_contact
+msgid "other position"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_kanban_contact
+msgid "other positions"
+msgstr ""
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "{'invisible': [('contact_type','=','attached')]}"
+msgstr ""
+
diff --git a/partner_contact_in_several_companies/i18n/sl.po b/partner_contact_in_several_companies/i18n/sl.po
new file mode 100644
index 000000000..ff4753dc9
--- /dev/null
+++ b/partner_contact_in_several_companies/i18n/sl.po
@@ -0,0 +1,169 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* base_contact
+#
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-20 09:26+0000\n"
+"PO-Revision-Date: 2015-05-20 11:28+0100\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
+"Language-Team: Slovenian <translate@matmoz.si>\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.7.6\n"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Address"
+msgstr "Naslov"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "All partner positions"
+msgstr "Vsi partnerjevi položaji"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "All positions"
+msgstr "Vsi položaji"
+
+#. module: partner_contact_in_several_companies
+#: code:addons/partner_contact_in_several_companies/models.py:32
+#, python-format
+msgid "Attached to existing Contact"
+msgstr "Pripeto obstoječemu stiku"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "City"
+msgstr "Kraj"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Company"
+msgstr "Družba"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Contact"
+msgstr "Stik"
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,contact_type:0
+msgid "Contact Type"
+msgstr "Tip stika"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Contacts"
+msgstr "Stiki"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Country"
+msgstr "Država"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Fax:"
+msgstr "Faks:"
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,contact_id:0
+msgid "Main Contact"
+msgstr "Glavni stik"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Mobile:"
+msgstr "Mobilni telefon:"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Other Positions"
+msgstr "Drugi položaji"
+
+#. module: partner_contact_in_several_companies
+#: field:res.partner,other_contact_ids:0
+msgid "Others Positions"
+msgstr "Drugi položaji"
+
+#. module: partner_contact_in_several_companies
+#: model:ir.model,name:partner_contact_in_several_companies.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_filter_contact
+msgid "Person"
+msgstr "Oseba"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Phone:"
+msgstr "Telefon:"
+
+#. module: partner_contact_in_several_companies
+#: code:addons/partner_contact_in_several_companies/models.py:31
+#, python-format
+msgid "Standalone Contact"
+msgstr "Samostojni stik"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "State"
+msgstr "Zvezna država"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Street..."
+msgstr "Ulica..."
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "Tags..."
+msgstr "Oznake..."
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_personal_information
+#, fuzzy
+msgid ""
+"To see personal information about this contact, please\n"
+"                        go to to the his person form:"
+msgstr "Za ogled osebnih podatkov o tem stiku pojdite na njegov glavni obrazec:"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "ZIP"
+msgstr "Poštna številka"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "at"
+msgstr "pri"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "e.g. Sales Director"
+msgstr "npr. vodja prodaje"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_kanban_contact
+msgid "other position"
+msgstr "drug položaj"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_res_partner_kanban_contact
+msgid "other positions"
+msgstr "drugi položaji"
+
+#. module: partner_contact_in_several_companies
+#: view:res.partner:partner_contact_in_several_companies.view_partner_form_inherit
+msgid "{'invisible': [('contact_type','=','attached')]}"
+msgstr ""
diff --git a/base_contact/base_contact.py b/partner_contact_in_several_companies/models.py
similarity index 97%
rename from base_contact/base_contact.py
rename to partner_contact_in_several_companies/models.py
index 00300db57..2493dc023 100644
--- a/base_contact/base_contact.py
+++ b/partner_contact_in_several_companies/models.py
@@ -62,12 +62,6 @@ class res_partner(orm.Model):
             'contact_id',
             'Others Positions',
         ),
-
-        # Person specific fields
-        # add a 'birthdate' as date field, i.e different from char
-        # 'birthdate' introduced v6.1!
-        'birthdate_date': fields.date('Birthdate'),
-        'nationality_id': fields.many2one('res.country', 'Nationality'),
     }
 
     _defaults = {
diff --git a/base_contact/tests/__init__.py b/partner_contact_in_several_companies/tests/__init__.py
similarity index 93%
rename from base_contact/tests/__init__.py
rename to partner_contact_in_several_companies/tests/__init__.py
index fbadb7091..bcbea6801 100644
--- a/base_contact/tests/__init__.py
+++ b/partner_contact_in_several_companies/tests/__init__.py
@@ -19,8 +19,4 @@
 #
 ##############################################################################
 
-from . import test_base_contact
-
-checks = [
-    test_base_contact,
-]
+from . import test_partner_contact_in_several_companies
diff --git a/base_contact/tests/test_base_contact.py b/partner_contact_in_several_companies/tests/test_partner_contact_in_several_companies.py
similarity index 92%
rename from base_contact/tests/test_base_contact.py
rename to partner_contact_in_several_companies/tests/test_partner_contact_in_several_companies.py
index f395979f4..fef06fd58 100644
--- a/base_contact/tests/test_base_contact.py
+++ b/partner_contact_in_several_companies/tests/test_partner_contact_in_several_companies.py
@@ -22,11 +22,11 @@
 from openerp.tests import common
 
 
-class Test_Base_Contact(common.TransactionCase):
+class PartnerContactInSeveralCompaniesCase(common.TransactionCase):
 
     def setUp(self):
         """*****setUp*****"""
-        super(Test_Base_Contact, self).setUp()
+        super(PartnerContactInSeveralCompaniesCase, self).setUp()
         cr, uid = self.cr, self.uid
         ModelData = self.registry('ir.model.data')
         self.partner = self.registry('res.partner')
@@ -34,12 +34,16 @@ class Test_Base_Contact(common.TransactionCase):
         # Get test records reference
         for attr, module, name in [
                 ('main_partner_id', 'base', 'main_partner'),
-                ('bob_contact_id', 'base_contact', 'res_partner_contact1'),
-                ('bob_job1_id', 'base_contact',
-                    'res_partner_contact1_work_position1'),
+                ('bob_contact_id',
+                 'partner_contact_in_several_companies',
+                 'res_partner_contact1'),
+                ('bob_job1_id',
+                 'partner_contact_in_several_companies',
+                 'res_partner_contact1_work_position1'),
                 ('roger_contact_id', 'base', 'res_partner_main2'),
-                ('roger_job2_id', 'base_contact',
-                    'res_partner_main2_position_consultant')]:
+                ('roger_job2_id',
+                 'partner_contact_in_several_companies',
+                 'res_partner_main2_position_consultant')]:
             r = ModelData.get_object_reference(cr, uid, module, name)
             setattr(self, attr, r[1] if r else False)
 
diff --git a/base_contact/base_contact_view.xml b/partner_contact_in_several_companies/views/res_partner.xml
similarity index 93%
rename from base_contact/base_contact_view.xml
rename to partner_contact_in_several_companies/views/res_partner.xml
index 749a36087..9026d1f96 100644
--- a/base_contact/base_contact_view.xml
+++ b/partner_contact_in_several_companies/views/res_partner.xml
@@ -151,16 +151,6 @@
                         </form>
                     </field>
                 </page>
-                <page name="personal-info" string="Personal Information" attrs="{'invisible': ['|',('is_company','=',True)]}">
-                    <p attrs="{'invisible': [('contact_id','=',False)]}">
-                        To see personal information about this contact, please go to to the his person form: <field name="contact_id" class="oe_inline" domain="[('contact_type','!=','attached')]" context="{'show_address': 1}"
-                        on_change="onchange_contact_id(contact_id)" options="{'always_reload': True}"/>
-                    </p>
-                    <group attrs="{'invisible': [('contact_id','!=',False)]}">
-                        <field name="birthdate_date"/>
-                        <field name="nationality_id"/>
-                    </group>
-                </page>
             </page>
             <xpath expr="//form[@string='Contact']/sheet//field[@name='category_id']" position="before">
                 <group>
@@ -178,6 +168,27 @@
         </field>
     </record>
 
+    <record id="view_res_partner_personal_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="arch" type="xml">
+            <data>
+                <xpath expr="//page[@name='personal_information_page']">
+                    <p attrs="{'invisible': [('contact_id','=',False)]}">
+                        To see personal information about this contact, please
+                        go to to the his person form:
+                        <field name="contact_id" class="oe_inline"
+                               domain="[('contact_type','!=','attached')]"
+                               context="{'show_address': 1}"
+                               on_change="onchange_contact_id(contact_id)"
+                               options="{'always_reload': True}"/>
+                    </p>
+                </xpath>
+            </data>
+      </field>
+    </record>
+
     <record model="ir.ui.view" id="view_res_partner_kanban_contact">
         <field name="name">res.partner.kanban.contact</field>
         <field name="model">res.partner</field>