diff --git a/crm_job_position/README.rst b/crm_job_position/README.rst
deleted file mode 100644
index 31fbf7ba6..000000000
--- a/crm_job_position/README.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-Job positions in CRM
-====================
-
-This module adds the concept of job position to the CRM main objects (lead,
-opportunity, partner), and propagate them through the workflow.
-
-Credits
-=======
-
-Contributors
-------------
-* Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
-* Antonio Espinosa <antonioea@antiun.com>
diff --git a/crm_job_position/__init__.py b/crm_job_position/__init__.py
deleted file mode 100644
index 054c8853d..000000000
--- a/crm_job_position/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-# For copyright and license notices, see __openerp__.py file in root directory
-##############################################################################
-
-from . import models
diff --git a/crm_job_position/__openerp__.py b/crm_job_position/__openerp__.py
deleted file mode 100644
index 6fdcdf3a0..000000000
--- a/crm_job_position/__openerp__.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Odoo Source Management Solution
-#    Copyright (c) 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com)
-#                       Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
-#    Copyright (c) 2015 Antiun Ingeniería S.L. (http://www.antiun.com)
-#                       Antonio Espinosa <antonioea@antiun.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 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': 'Job positions in CRM',
-    'version': '8.0.1.1.0',
-    'category': 'Customer Relationship Management',
-    'author': 'Serv. Tecnol. Avanzados - Pedro M. Baeza, '
-              'Antiun Ingeniería S.L.',
-    'website': 'http://www.serviciosbaeza.com, http://www.antiun.com',
-    'depends': [
-        'crm',
-    ],
-    'data': [
-        'views/crm_job_position_view.xml',
-        'views/crm_lead_view.xml',
-        'views/res_partner_view.xml',
-        'security/ir.model.access.csv',
-    ],
-    "installable": True,
-}
diff --git a/crm_job_position/i18n/crm_job_position.pot b/crm_job_position/i18n/crm_job_position.pot
deleted file mode 100644
index f8b374a6b..000000000
--- a/crm_job_position/i18n/crm_job_position.pot
+++ /dev/null
@@ -1,116 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* crm_job_position
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-16 10:18+0000\n"
-"PO-Revision-Date: 2015-11-16 10:18+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: crm_job_position
-#: field:crm.job_position,children:0
-msgid "Children"
-msgstr ""
-
-#. module: crm_job_position
-#: field:crm.job_position,create_uid:0
-msgid "Created by"
-msgstr ""
-
-#. module: crm_job_position
-#: field:crm.job_position,create_date:0
-msgid "Created on"
-msgstr ""
-
-#. module: crm_job_position
-#: field:crm.job_position,id:0
-msgid "ID"
-msgstr ""
-
-#. module: crm_job_position
-#: view:crm.lead:crm_job_position.crm_case_form_view_leads_job_position
-#: view:crm.lead:crm_job_position.crm_case_form_view_oppor_job_position
-#: view:crm.lead:crm_job_position.view_crm_case_opportunities_filter_job_position
-#: field:crm.lead,job_position:0
-#: model:ir.model,name:crm_job_position.model_crm_job_position
-#: view:res.partner:crm_job_position.view_partner_form_job_position
-#: view:res.partner:crm_job_position.view_res_partner_filter_job_position
-#: field:res.partner,job_position:0
-msgid "Job position"
-msgstr ""
-
-#. module: crm_job_position
-#: view:crm.job_position:crm_job_position.crm_job_position_tree_view
-#: model:ir.actions.act_window,name:crm_job_position.crm_job_position_action
-#: model:ir.ui.menu,name:crm_job_position.menu_crm_job_position
-msgid "Job positions"
-msgstr ""
-
-#. module: crm_job_position
-#: field:crm.job_position,write_uid:0
-msgid "Last Updated by"
-msgstr ""
-
-#. module: crm_job_position
-#: field:crm.job_position,write_date:0
-msgid "Last Updated on"
-msgstr ""
-
-#. module: crm_job_position
-#: model:ir.model,name:crm_job_position.model_crm_lead
-msgid "Lead/Opportunity"
-msgstr ""
-
-#. module: crm_job_position
-#: field:crm.job_position,name:0
-msgid "Name"
-msgstr ""
-
-#. module: crm_job_position
-#: field:crm.job_position,parent_left:0
-msgid "Parent Left"
-msgstr ""
-
-#. module: crm_job_position
-#: field:crm.job_position,parent_right:0
-msgid "Parent Right"
-msgstr ""
-
-#. module: crm_job_position
-#: field:crm.job_position,parent_id:0
-msgid "Parent id"
-msgstr ""
-
-#. module: crm_job_position
-#: model:ir.model,name:crm_job_position.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: crm_job_position
-#: view:crm.lead:crm_job_position.view_crm_case_leads_filter_job_position
-#: view:crm.lead:crm_job_position.view_crm_case_opportunities_filter_job_position
-msgid "Sales Team"
-msgstr ""
-
-#. module: crm_job_position
-#: view:res.partner:crm_job_position.view_res_partner_filter_job_position
-msgid "Salesperson"
-msgstr ""
-
-#. module: crm_job_position
-#: view:crm.lead:crm_job_position.view_crm_case_leads_filter_job_position
-msgid "job_position"
-msgstr ""
-
-#. module: crm_job_position
-#: field:res.partner,function:0
-msgid "Detailed job position"
-msgstr ""
diff --git a/crm_job_position/i18n/es.po b/crm_job_position/i18n/es.po
deleted file mode 100644
index 40c6d18fc..000000000
--- a/crm_job_position/i18n/es.po
+++ /dev/null
@@ -1,116 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* crm_job_position
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 8.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-16 10:18+0000\n"
-"PO-Revision-Date: 2015-11-16 10:18+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: crm_job_position
-#: field:crm.job_position,children:0
-msgid "Children"
-msgstr "Hijos"
-
-#. module: crm_job_position
-#: field:crm.job_position,create_uid:0
-msgid "Created by"
-msgstr "Creado por"
-
-#. module: crm_job_position
-#: field:crm.job_position,create_date:0
-msgid "Created on"
-msgstr "Creado en"
-
-#. module: crm_job_position
-#: field:crm.job_position,id:0
-msgid "ID"
-msgstr "ID"
-
-#. module: crm_job_position
-#: view:crm.lead:crm_job_position.crm_case_form_view_leads_job_position
-#: view:crm.lead:crm_job_position.crm_case_form_view_oppor_job_position
-#: view:crm.lead:crm_job_position.view_crm_case_opportunities_filter_job_position
-#: field:crm.lead,job_position:0
-#: model:ir.model,name:crm_job_position.model_crm_job_position
-#: view:res.partner:crm_job_position.view_partner_form_job_position
-#: view:res.partner:crm_job_position.view_res_partner_filter_job_position
-#: field:res.partner,job_position:0
-msgid "Job position"
-msgstr "Puesto de trabajo"
-
-#. module: crm_job_position
-#: view:crm.job_position:crm_job_position.crm_job_position_tree_view
-#: model:ir.actions.act_window,name:crm_job_position.crm_job_position_action
-#: model:ir.ui.menu,name:crm_job_position.menu_crm_job_position
-msgid "Job positions"
-msgstr "Puestos de trabajo"
-
-#. module: crm_job_position
-#: field:crm.job_position,write_uid:0
-msgid "Last Updated by"
-msgstr "Última actualización por"
-
-#. module: crm_job_position
-#: field:crm.job_position,write_date:0
-msgid "Last Updated on"
-msgstr "Última actualización en"
-
-#. module: crm_job_position
-#: model:ir.model,name:crm_job_position.model_crm_lead
-msgid "Lead/Opportunity"
-msgstr "Iniciativa/Oportunidad"
-
-#. module: crm_job_position
-#: field:crm.job_position,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: crm_job_position
-#: field:crm.job_position,parent_left:0
-msgid "Parent Left"
-msgstr "Padre izquierdo"
-
-#. module: crm_job_position
-#: field:crm.job_position,parent_right:0
-msgid "Parent Right"
-msgstr "Padre derecho"
-
-#. module: crm_job_position
-#: field:crm.job_position,parent_id:0
-msgid "Parent id"
-msgstr "ID del padre"
-
-#. module: crm_job_position
-#: model:ir.model,name:crm_job_position.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: crm_job_position
-#: view:crm.lead:crm_job_position.view_crm_case_leads_filter_job_position
-#: view:crm.lead:crm_job_position.view_crm_case_opportunities_filter_job_position
-msgid "Sales Team"
-msgstr "Equipo de ventas"
-
-#. module: crm_job_position
-#: view:res.partner:crm_job_position.view_res_partner_filter_job_position
-msgid "Salesperson"
-msgstr "Comercial"
-
-#. module: crm_job_position
-#: view:crm.lead:crm_job_position.view_crm_case_leads_filter_job_position
-msgid "job_position"
-msgstr ""
-
-#. module: crm_job_position
-#: field:res.partner,function:0
-msgid "Detailed job position"
-msgstr "Puesto de trabajo detallado"
diff --git a/crm_job_position/models/__init__.py b/crm_job_position/models/__init__.py
deleted file mode 100644
index 0ab7c4ce5..000000000
--- a/crm_job_position/models/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-# For copyright and license notices, see __openerp__.py file in root directory
-##############################################################################
-
-from . import crm_job_position
-from . import crm_lead
-from . import res_partner
diff --git a/crm_job_position/models/crm_job_position.py b/crm_job_position/models/crm_job_position.py
deleted file mode 100644
index e03ba74f4..000000000
--- a/crm_job_position/models/crm_job_position.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-# For copyright and license notices, see __openerp__.py file in root directory
-##############################################################################
-from openerp import models, fields
-
-
-class CrmJobPosition(models.Model):
-    _name = 'crm.job_position'
-    _order = "parent_left"
-    _parent_order = "name"
-    _parent_store = True
-    _description = "Job position"
-
-    name = fields.Char(required=True, translate=True)
-    parent_id = fields.Many2one(comodel_name='crm.job_position')
-    children = fields.One2many(comodel_name='crm.job_position',
-                               inverse_name='parent_id')
-    parent_left = fields.Integer('Parent Left', select=True)
-    parent_right = fields.Integer('Parent Right', select=True)
diff --git a/crm_job_position/models/crm_lead.py b/crm_job_position/models/crm_lead.py
deleted file mode 100644
index 1fecc91ed..000000000
--- a/crm_job_position/models/crm_lead.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-# For copyright and license notices, see __openerp__.py file in root directory
-##############################################################################
-from openerp import models, fields
-
-
-class CrmLead(models.Model):
-    _inherit = 'crm.lead'
-
-    function = fields.Char(string="Detailed job position")
-    job_position = fields.Many2one(comodel_name='crm.job_position',
-                                   string="Job position")
-
-    def _lead_create_contact(self, cr, uid, lead, name, is_company,
-                             parent_id=False, context=None):
-        """
-        Propagate job_position to created partner.
-        """
-        partner_id = super(CrmLead, self)._lead_create_contact(
-            cr, uid, lead, name, is_company, parent_id=parent_id,
-            context=context)
-        self.pool['res.partner'].write(
-            cr, uid, partner_id, {'job_position': lead.job_position.id},
-            context=context)
-        return partner_id
diff --git a/crm_job_position/models/res_partner.py b/crm_job_position/models/res_partner.py
deleted file mode 100644
index 5a76412d1..000000000
--- a/crm_job_position/models/res_partner.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-# For copyright and license notices, see __openerp__.py file in root directory
-##############################################################################
-from openerp import models, fields
-
-
-class ResPartner(models.Model):
-    _inherit = 'res.partner'
-
-    function = fields.Char(string="Detailed job position")
-    job_position = fields.Many2one(comodel_name='crm.job_position',
-                                   string="Job position")
diff --git a/crm_job_position/security/ir.model.access.csv b/crm_job_position/security/ir.model.access.csv
deleted file mode 100644
index bd53556bd..000000000
--- a/crm_job_position/security/ir.model.access.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_crm_job_position_public","crm_job_position group_public","model_crm_job_position","base.group_public",1,0,0,0
-"access_crm_job_position_portal","crm_job_position group_portal","model_crm_job_position","base.group_portal",1,0,0,0
-"access_crm_job_position_group_partner_manager","crm_job_position group_partner_manager","model_crm_job_position","base.group_partner_manager",1,1,1,1
-"access_crm_job_position_group_user","crm_job_position group_user","model_crm_job_position","base.group_user",1,0,0,0
diff --git a/crm_job_position/views/crm_job_position_view.xml b/crm_job_position/views/crm_job_position_view.xml
deleted file mode 100644
index 330890340..000000000
--- a/crm_job_position/views/crm_job_position_view.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-
-<record id="crm_job_position_action" model="ir.actions.act_window">
-    <field name="name">Job positions</field>
-    <field name="res_model">crm.job_position</field>
-    <field name="view_type">form</field>
-    <field name="view_mode">tree</field>
-</record>
-
-<record id="crm_job_position_tree_view" model="ir.ui.view">
-    <field name="name">CRM job_position tree</field>
-    <field name="model">crm.job_position</field>
-    <field name="arch" type="xml">
-        <tree string="Job positions" editable="top">
-            <field name="name"/>
-            <field name="parent_id"/>
-        </tree>
-    </field>
-</record>
-
-<menuitem action="crm_job_position_action"
-          id="menu_crm_job_position"
-          name="Job positions"
-          parent="base.menu_crm_config_lead"
-          sequence="3"/>
-
-</data>
-</openerp>
\ No newline at end of file
diff --git a/crm_job_position/views/crm_lead_view.xml b/crm_job_position/views/crm_lead_view.xml
deleted file mode 100644
index 0ed1cfd46..000000000
--- a/crm_job_position/views/crm_lead_view.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-
-<record model="ir.ui.view" id="crm_case_form_view_leads_job_position">
-    <field name="name">CRM - Leads Form with job positions</field>
-    <field name="model">crm.lead</field>
-    <field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
-    <field name="arch" type="xml">
-        <field name="function" position="before">
-            <field name="job_position" placeholder="Job position"
-                   options='{"no_open": True}'/>
-        </field>
-    </field>
-</record>
-
-<!-- Uncomment this to add a new column to tree view
-<record model="ir.ui.view" id="crm_case_tree_view_leads_job_position">
-    <field name="name">Leads with job_position</field>
-    <field name="model">crm.lead</field>
-    <field name="inherit_id" ref="crm.crm_case_tree_view_leads"/>
-    <field name="arch" type="xml">
-        <field name="function" position="before">
-            <field name="job_position"/>
-        </field>
-    </field>
-</record>
--->
-
-<record model="ir.ui.view" id="view_crm_case_leads_filter_job_position">
-    <field name="name">CRM - Leads Search with job positions</field>
-    <field name="model">crm.lead</field>
-    <field name="inherit_id" ref="crm.view_crm_case_leads_filter"/>
-    <field name="arch" type="xml">
-        <field name="section_id" position="after">
-            <field name="job_position"/>
-        </field>
-        <filter string="Sales Team" position="after">
-            <filter string="job_position"
-                    domain="[]"
-                    context="{'group_by': 'job_position'}"/>
-        </filter>
-    </field>
-</record>
-
-<record model="ir.ui.view" id="crm_case_form_view_oppor_job_position">
-    <field name="name">CRM - Leads Form with job position</field>
-    <field name="model">crm.lead</field>
-    <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
-    <field name="arch" type="xml">
-        <field name="function" position="before">
-            <field name="job_position" placeholder="Job position"
-                   options='{"no_open": True}'/>
-        </field>
-    </field>
-</record>
-
-<!-- Uncomment this to add a new column to tree view
-<record model="ir.ui.view" id="crm_case_tree_view_oppor_job_position">
-    <field name="name">Leads with job position</field>
-    <field name="model">crm.lead</field>
-    <field name="inherit_id" ref="crm.crm_case_tree_view_oppor"/>
-    <field name="arch" type="xml">
-        <field name="section_id" position="after">
-            <field name="job_position"/>
-        </field>
-    </field>
-</record>
--->
-
-<record model="ir.ui.view" id="view_crm_case_opportunities_filter_job_position">
-    <field name="name">CRM - Leads Search with job positions</field>
-    <field name="model">crm.lead</field>
-    <field name="inherit_id" ref="crm.view_crm_case_opportunities_filter"/>
-    <field name="arch" type="xml">
-        <field name="section_id" position="after">
-            <field name="job_position"/>
-        </field>
-        <filter string="Sales Team" position="after">
-            <filter string="Job position"
-                    domain="[]"
-                    context="{'group_by': 'job_position'}"/>
-        </filter>
-    </field>
-</record>
-
-</data>
-</openerp>
\ No newline at end of file
diff --git a/partner_contact_job_position/README.rst b/partner_contact_job_position/README.rst
new file mode 100644
index 000000000..00f2706d0
--- /dev/null
+++ b/partner_contact_job_position/README.rst
@@ -0,0 +1,74 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+====================
+Partner job position
+====================
+
+This module extends the functionality of partners job position to support
+having them categorized in tree form and allow you to choose a categorized job
+position for your contacts in addition to the current custom string for job
+position.
+
+Configuration
+=============
+
+To configure job positions, you need to:
+
+* Go to *Sales > Configuration > Address Book > Job Positions*.
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Go to any partner's form.
+* Use the new *Categorized job position* field.
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/134/8.0
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/partner-contact/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smashing it by providing a detailed and welcomed `feedback
+<https://github.com/OCA/
+partner-contact/issues/new?body=module:%20
+{module_name}%0Aversion:%20
+8.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Credits
+=======
+
+Images
+------
+
+* `Antiun Ingeniería S.L. <http://www.antiun.com>`_: Icon.
+
+Contributors
+------------
+
+* Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
+* Antonio Espinosa <antonioea@antiun.com>
+* Rafael Blasco <rafabn@antiun.com>
+* Jairo Llopis <yajo.sk8@gmail.com>
+
+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 https://odoo-community.org.
diff --git a/partner_contact_job_position/__init__.py b/partner_contact_job_position/__init__.py
new file mode 100644
index 000000000..9af8488e4
--- /dev/null
+++ b/partner_contact_job_position/__init__.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+#    Copyright (c) 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com)
+#                       Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
+#    Copyright (c) 2015 Antiun Ingeniería S.L. (http://www.antiun.com)
+#                       Antonio Espinosa <antonioea@antiun.com>
+# © 2015 Antiun Ingeniería S.L. - Jairo Llopis
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from . import models
diff --git a/partner_contact_job_position/__openerp__.py b/partner_contact_job_position/__openerp__.py
new file mode 100644
index 000000000..3e4521aad
--- /dev/null
+++ b/partner_contact_job_position/__openerp__.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+#    Copyright (c) 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com)
+#                       Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
+#    Copyright (c) 2015 Antiun Ingeniería S.L. (http://www.antiun.com)
+#                       Antonio Espinosa <antonioea@antiun.com>
+# © 2015 Antiun Ingeniería S.L. - Jairo Llopis
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Partner job position",
+    "summary": "Categorize job positions for contacts",
+    "version": "8.0.1.0.0",
+    'category': 'Customer Relationship Management',
+    "website": "http://www.antiun.com",
+    'author': 'Serv. Tecnolog. Avanzados - Pedro M. Baeza, '
+              'Antiun Ingeniería S.L., '
+              "Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "application": False,
+    "installable": True,
+    "depends": [
+        "base",
+    ],
+    "data": [
+        'security/ir.model.access.csv',
+        'views/res_partner_job_position_view.xml',
+        'views/res_partner_view.xml',
+    ],
+}
diff --git a/partner_contact_job_position/i18n/es.po b/partner_contact_job_position/i18n/es.po
new file mode 100644
index 000000000..93f2409ab
--- /dev/null
+++ b/partner_contact_job_position/i18n/es.po
@@ -0,0 +1,101 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#   * crm_job_position
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-18 18:22+0100\n"
+"PO-Revision-Date: 2015-12-18 18:22+0100\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"Language: es\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.8.5\n"
+
+#. module: partner_contact_job_position
+#: field:res.partner,job_position_id:0
+msgid "Categorized job position"
+msgstr "Puesto de trabajo categorizado"
+
+#. module: partner_contact_job_position
+#: field:res.partner.job_position,child_ids:0
+msgid "Children"
+msgstr "Hijos"
+
+#. module: partner_contact_job_position
+#: field:res.partner.job_position,create_uid:0
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: partner_contact_job_position
+#: field:res.partner.job_position,create_date:0
+msgid "Created on"
+msgstr "Creado en"
+
+#. module: partner_contact_job_position
+#: field:res.partner.job_position,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: partner_contact_job_position
+#: model:ir.actions.act_window,name:partner_contact_job_position.res_partner_job_position_action
+#: model:ir.ui.menu,name:partner_contact_job_position.menu_res_partner_job_position
+msgid "Job Positions"
+msgstr "Puestos de trabajo"
+
+#. module: partner_contact_job_position
+#: model:ir.model,name:partner_contact_job_position.model_res_partner_job_position
+#: view:res.partner:partner_contact_job_position.view_res_partner_filter_job_position
+msgid "Job position"
+msgstr "Puesto de trabajo"
+
+#. module: partner_contact_job_position
+#: view:res.partner.job_position:partner_contact_job_position.res_partner_job_position_form_view
+#: view:res.partner.job_position:partner_contact_job_position.res_partner_job_position_tree_view
+msgid "Job positions"
+msgstr "Puestos de trabajo"
+
+#. module: partner_contact_job_position
+#: field:res.partner.job_position,write_uid:0
+msgid "Last Updated by"
+msgstr "Última actualización por"
+
+#. module: partner_contact_job_position
+#: field:res.partner.job_position,write_date:0
+msgid "Last Updated on"
+msgstr "Última actualización en"
+
+#. module: partner_contact_job_position
+#: field:res.partner.job_position,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: partner_contact_job_position
+#: field:res.partner.job_position,parent_id:0
+msgid "Parent"
+msgstr "Padre"
+
+#. module: partner_contact_job_position
+#: field:res.partner.job_position,parent_left:0
+msgid "Parent left"
+msgstr "Padre izquierdo"
+
+#. module: partner_contact_job_position
+#: field:res.partner.job_position,parent_right:0
+msgid "Parent right"
+msgstr "Padre derecho"
+
+#. module: partner_contact_job_position
+#: model:ir.model,name:partner_contact_job_position.model_res_partner
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: partner_contact_job_position
+#: view:res.partner:partner_contact_job_position.view_res_partner_filter_job_position
+msgid "Salesperson"
+msgstr "Comercial"
diff --git a/partner_contact_job_position/models/__init__.py b/partner_contact_job_position/models/__init__.py
new file mode 100644
index 000000000..213b25fdc
--- /dev/null
+++ b/partner_contact_job_position/models/__init__.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+#    Copyright (c) 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com)
+#                       Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
+#    Copyright (c) 2015 Antiun Ingeniería S.L. (http://www.antiun.com)
+#                       Antonio Espinosa <antonioea@antiun.com>
+# © 2015 Antiun Ingeniería S.L. - Jairo Llopis
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from . import res_partner
diff --git a/partner_contact_job_position/models/res_partner.py b/partner_contact_job_position/models/res_partner.py
new file mode 100644
index 000000000..abb6863fa
--- /dev/null
+++ b/partner_contact_job_position/models/res_partner.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+#    Copyright (c) 2014 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com)
+#                       Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
+#    Copyright (c) 2015 Antiun Ingeniería S.L. (http://www.antiun.com)
+#                       Antonio Espinosa <antonioea@antiun.com>
+# © 2015 Antiun Ingeniería S.L. - Jairo Llopis
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from openerp import models, fields
+
+
+class ResPartner(models.Model):
+    _inherit = 'res.partner'
+
+    job_position_id = fields.Many2one(
+        "res.partner.job_position",
+        "Categorized job position",
+        oldname="job_position")
+
+
+class ResPartnerJobPosition(models.Model):
+    _name = "res.partner.job_position"
+    _order = "parent_left"
+    _parent_order = "name"
+    _parent_store = True
+    _description = "Job position"
+
+    name = fields.Char(required=True, translate=True)
+    parent_id = fields.Many2one(
+        "res.partner.job_position",
+        "Parent")
+    child_ids = fields.One2many(
+        "res.partner.job_position",
+        "parent_id",
+        "Children",
+        oldname="children")
+    parent_left = fields.Integer(index=True)
+    parent_right = fields.Integer(index=True)
diff --git a/partner_contact_job_position/security/ir.model.access.csv b/partner_contact_job_position/security/ir.model.access.csv
new file mode 100644
index 000000000..93930fc92
--- /dev/null
+++ b/partner_contact_job_position/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_res_partner_job_position_public","res_partner_job_position group_public","model_res_partner_job_position","base.group_public",1,0,0,0
+"access_res_partner_job_position_portal","res_partner_job_position group_portal","model_res_partner_job_position","base.group_portal",1,0,0,0
+"access_res_partner_job_position_group_partner_manager","res_partner_job_position group_partner_manager","model_res_partner_job_position","base.group_partner_manager",1,1,1,1
+"access_res_partner_job_position_group_user","res_partner_job_position group_user","model_res_partner_job_position","base.group_user",1,0,0,0
diff --git a/crm_job_position/static/description/icon.png b/partner_contact_job_position/static/description/icon.png
similarity index 100%
rename from crm_job_position/static/description/icon.png
rename to partner_contact_job_position/static/description/icon.png
diff --git a/partner_contact_job_position/views/res_partner_job_position_view.xml b/partner_contact_job_position/views/res_partner_job_position_view.xml
new file mode 100644
index 000000000..e70b45a91
--- /dev/null
+++ b/partner_contact_job_position/views/res_partner_job_position_view.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+<record id="res_partner_job_position_action" model="ir.actions.act_window">
+    <field name="name">Job Positions</field>
+    <field name="res_model">res.partner.job_position</field>
+    <field name="view_type">form</field>
+    <field name="view_mode">tree</field>
+</record>
+
+<record id="res_partner_job_position_tree_view" model="ir.ui.view">
+    <field name="name">Job position tree</field>
+    <field name="model">res.partner.job_position</field>
+    <field name="arch" type="xml">
+        <tree string="Job positions" editable="top">
+            <field name="name"/>
+            <field name="parent_id"/>
+        </tree>
+    </field>
+</record>
+
+<record id="res_partner_job_position_form_view" model="ir.ui.view">
+    <field name="name">Job position form</field>
+    <field name="model">res.partner.job_position</field>
+    <field name="arch" type="xml">
+        <form string="Job positions">
+            <group>
+                <field name="name"/>
+                <field name="parent_id"/>
+                <field name="child_ids"/>
+            </group>
+        </form>
+    </field>
+</record>
+
+<menuitem action="res_partner_job_position_action"
+          id="menu_res_partner_job_position"
+          parent="base.menu_config_address_book"/>
+
+</data>
+</openerp>
diff --git a/crm_job_position/views/res_partner_view.xml b/partner_contact_job_position/views/res_partner_view.xml
similarity index 56%
rename from crm_job_position/views/res_partner_view.xml
rename to partner_contact_job_position/views/res_partner_view.xml
index 6ca9186b4..f1a2a0e45 100644
--- a/crm_job_position/views/res_partner_view.xml
+++ b/partner_contact_job_position/views/res_partner_view.xml
@@ -8,48 +8,34 @@
     <field name="inherit_id" ref="base.view_partner_form"/>
     <field name="arch" type="xml">
         <field name="function" position="before">
-            <field name="job_position"
-                   placeholder="Job position"
+            <field name="job_position_id"
                    attrs="{'invisible': [('is_company','=', True)]}"
-                   options="{'no_open': True, 'no_create': True}"/>
+                   options='{"no_open": True}'/>
         </field>
-        <xpath expr="//field[@name='child_ids']/form//field[@name='function']" position="before">
-            <field name="job_position"
-                   placeholder="Job position"
+        <xpath expr="//field[@name='child_ids']/form//field[@name='function']"
+               position="before">
+            <field name="job_position_id"
                    attrs="{'invisible': [('is_company','=', True)]}"
-                   options="{'no_open': True, 'no_create': True}"/>
+                   options='{"no_open": True}'/>
         </xpath>
     </field>
 </record>
 
-<!-- Uncomment this to add a new column to tree view
-<record model="ir.ui.view" id="view_partner_tree_job_position">
-    <field name="name">Partner tree with job position</field>
-    <field name="model">res.partner</field>
-    <field name="inherit_id" ref="base.view_partner_tree"/>
-    <field name="arch" type="xml">
-        <field name="email" position="after">
-            <field name="job_position"/>
-        </field>
-    </field>
-</record>
--->
-
 <record model="ir.ui.view" id="view_res_partner_filter_job_position">
     <field name="name">Partner search with job position</field>
     <field name="model">res.partner</field>
     <field name="inherit_id" ref="base.view_res_partner_filter"/>
     <field name="arch" type="xml">
         <field name="category_id" position="after">
-            <field name="job_position"/>
+            <field name="job_position_id"/>
         </field>
         <filter string="Salesperson" position="after">
             <filter string="Job position"
                     domain="[('is_company','=', True)]"
-                    context="{'group_by': 'job_position'}"/>
+                    context="{'group_by': 'job_position_id'}"/>
         </filter>
     </field>
 </record>
 
 </data>
-</openerp>
\ No newline at end of file
+</openerp>