diff --git a/product_customer_code/README.rst b/product_customer_code/README.rst
new file mode 100644
index 00000000000..128eca89ed9
--- /dev/null
+++ b/product_customer_code/README.rst
@@ -0,0 +1,66 @@
+.. 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
+
+==========================
+Customer codes in product
+==========================
+
+This module does just like the product.supplierinfo but for customers instead.
+For instance it allows to have different references for the same product
+according to the customer.
+
+.. figure:: product_customer_code/static/src/img/screenshot1.png
+   :alt: alternative description
+   :width: 600 px
+
+Installation
+============
+
+To install this module, you need to:
+
+Install some of the Apps which enable the product menu to
+see this module in action, like Sales, Purchase or Warehouse Management
+
+Known issues / Roadmap
+======================
+
+None
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/{project_repo}/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smash it by providing detailed and welcomed feedback.
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+
+Contributors
+------------
+
+* Vauxoo - http://www.vauxoo.com
+* el_rodo_1 <rodo@vauxoo.com>
+* Paul Catinean <pca@pledra.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/product_customer_code/__init__.py b/product_customer_code/__init__.py
index df5910868b4..21ff7c22f3c 100644
--- a/product_customer_code/__init__.py
+++ b/product_customer_code/__init__.py
@@ -1,2 +1,3 @@
-import product_customer_code
-import product
+# -*- encoding: utf-8 -*-
+
+from . import models
diff --git a/product_customer_code/__manifest__.py b/product_customer_code/__manifest__.py
index af8cd13e819..cc51f1e39d7 100644
--- a/product_customer_code/__manifest__.py
+++ b/product_customer_code/__manifest__.py
@@ -1,60 +1,23 @@
-# -*- encoding: utf-8 -*-
-###########################################################################
-#    Module Writen to OpenERP, Open Source Management Solution
-#
-#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com/
-#    All Rights Reserved.
-#    info Vauxoo (info@vauxoo.com)
-############################################################################
-#    Coded by: el_rodo_1 (rodo@vauxoo.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/>.
-#
-##############################################################################
+# -*- coding: utf-8 -*-
+# Copyright 2012 Vauxoo - http://www.vauxoo.com
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Products Customer Code",
-    "version": "1.0",
+    'version': '10.0.1.0.0',
     "author": "Vauxoo,Odoo Community Association (OCA)",
     "website": "http://www.vauxoo.com/",
     "license": "AGPL-3",
     "category": "Generic Modules/Product",
     "summary": "Add many Customers' Codes in product",
     "depends": [
-            "base",
-            "product",
+        "product",
     ],
-    "description": """
-Customer' codes in product
-==========================
-
-This module does just like the product.supplierinfo but for customers instead. For instance it
-allows to have different references for the same product according to the customer.
-
-.. image:: product_customer_code/static/src/img/screenshot1.png
-
-.. tip::
-
-    You will need install some of the Apps which enable the product menu to see this module in
-    action, like Sales, Purchase or Warehouse Management
-     """,
     "data": [
         "security/product_customer_code_security.xml",
         "security/ir.model.access.csv",
-        "product_customer_code_view.xml",
-        "product_product_view.xml",
+        "views/product_customer_code_view.xml",
+        "views/product_product_view.xml",
+        "views/res_partner_view.xml",
     ],
-    "active": False,
-    'installable': False,
+    'installable': True,
 }
diff --git a/product_customer_code/models/__init__.py b/product_customer_code/models/__init__.py
new file mode 100644
index 00000000000..67911682a2b
--- /dev/null
+++ b/product_customer_code/models/__init__.py
@@ -0,0 +1,5 @@
+# -*- encoding: utf-8 -*-
+
+from . import product_customer_code
+from . import product
+from . import res_partner
diff --git a/product_customer_code/models/product.py b/product_customer_code/models/product.py
new file mode 100644
index 00000000000..10fe948f974
--- /dev/null
+++ b/product_customer_code/models/product.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Copyright 2012 Vauxoo - http://www.vauxoo.com
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class ProductProduct(models.Model):
+    _inherit = "product.product"
+
+    product_customer_code_ids = fields.One2many(
+        comodel_name='product.customer.code',
+        inverse_name='product_id',
+        string='Customer Codes',
+        copy=False
+    )
+
+    @api.model
+    def name_search(self, name='', args=None, operator='ilike', limit=100):
+        res = super(ProductProduct, self).name_search(
+            name=name, args=args, operator=operator, limit=limit)
+        if (len(res) < limit):
+            partner_id = self._context.get('partner_id')
+            if partner_id:
+                product_customer_code_obj = self.env['product.customer.code']
+                product_codes = product_customer_code_obj.search([
+                    ('product_code', operator, name),
+                    ('partner_id', '=', partner_id)
+                ], limit=limit)
+                res.extend(product_codes.mapped('product_id').name_get())
+        return res
diff --git a/product_customer_code/models/product_customer_code.py b/product_customer_code/models/product_customer_code.py
new file mode 100644
index 00000000000..c6637ab0208
--- /dev/null
+++ b/product_customer_code/models/product_customer_code.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# Copyright 2012 Vauxoo - http://www.vauxoo.com
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class ProductCustomerCode(models.Model):
+    _name = "product.customer.code"
+    _description = "Add multiple product customer codes"
+
+    _rec_name = 'product_code'
+
+    product_code = fields.Char(
+        string='Customer Product Code',
+        required=True,
+        help="This customer's product code will be used when searching into"
+             "a request for quotation.",
+    )
+
+    product_name = fields.Char(
+        string='Customer Product Name',
+        help="This customer's product name will be used when searching into"
+             "a request for quotation.",
+    )
+
+    product_id = fields.Many2one(
+        comodel_name='product.product',
+        string='Product',
+        required=True,
+    )
+
+    partner_id = fields.Many2one(
+        comodel_name='res.partner',
+        string='Customer',
+        required=True,
+        index=True,
+    )
+
+    company_id = fields.Many2one(
+        comodel_name='res.company',
+        string='Company',
+        required=False,
+        default=lambda self: self.env['res.company']._company_default_get(),
+    )
+
+    _sql_constraints = [
+        ('unique_code', 'unique(product_code,company_id,partner_id)',
+         'Product customer code must be unique'),
+    ]
diff --git a/product_customer_code/models/res_partner.py b/product_customer_code/models/res_partner.py
new file mode 100644
index 00000000000..a55c95c4220
--- /dev/null
+++ b/product_customer_code/models/res_partner.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+from odoo import fields, models
+
+
+class ResPartner(models.Model):
+    _inherit = 'res.partner'
+
+    product_code_ids = fields.One2many(
+        comodel_name='product.customer.code',
+        inverse_name='partner_id',
+        string='Products',
+    )
diff --git a/product_customer_code/product.py b/product_customer_code/product.py
deleted file mode 100644
index 350a66f23db..00000000000
--- a/product_customer_code/product.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# -*- coding: utf-8 -*-
-###########################################################################
-#    Module Writen to OpenERP, Open Source Management Solution
-#
-#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
-#    All Rights Reserved.
-#    info@vauxoo.com
-############################################################################
-#    Coded by: Rodo (rodo@vauxoo.com),Moy (moylop260@vauxoo.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/>.
-#
-##############################################################################
-from openerp.osv import orm, fields
-from openerp.tools.translate import _
-
-
-class product_product(orm.Model):
-    _inherit = "product.product"
-
-    _columns = {
-        'product_customer_code_ids': fields.one2many('product.customer.code',
-                                                     'product_id',
-                                                     'Customer Codes'),
-    }
-
-    def copy(self, cr, uid, id, default=None, context=None):
-        if not default:
-            default = {}
-        default['product_customer_code_ids'] = False
-        res = super(product_product, self).copy(
-            cr, uid, id, default=default, context=context)
-        return res
-
-    def name_search(self, cr, user, name='', args=None, operator='ilike',
-                    context=None, limit=80):
-        res = super(product_product, self).name_search(
-            cr, user, name, args, operator, context, limit)
-        if not context:
-            context = {}
-        product_customer_code_obj = self.pool.get('product.customer.code')
-        if not res:
-            ids = []
-            partner_id = context.get('partner_id', False)
-            if partner_id:
-                id_prod_code = \
-                    product_customer_code_obj.search(cr, user,
-                                                     [('product_code',
-                                                       '=', name),
-                                                      ('partner_id', '=',
-                                                       partner_id)],
-                                                     limit=limit,
-                                                     context=context)
-                # TODO: Search for product customer name
-                id_prod = id_prod_code and product_customer_code_obj.browse(
-                    cr, user, id_prod_code, context=context) or []
-                for ppu in id_prod:
-                    ids.append(ppu.product_id.id)
-            if ids:
-                res = self.name_get(cr, user, ids, context)
-        return res
diff --git a/product_customer_code/product_customer_code.py b/product_customer_code/product_customer_code.py
deleted file mode 100644
index d3593891a20..00000000000
--- a/product_customer_code/product_customer_code.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*- coding: utf-8 -*-
-###########################################################################
-#    Module Writen to OpenERP, Open Source Management Solution
-#
-#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
-#    All Rights Reserved.
-#    info@vauxoo.com
-############################################################################
-#    Coded by: Rodo (rodo@vauxoo.com),Moy (moylop260@vauxoo.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/>.
-#
-##############################################################################
-from openerp.osv import orm, fields
-from openerp.tools.translate import _
-
-
-class product_customer_code(orm.Model):
-    _name = "product.customer.code"
-    _description = "Add manies Code of Customer's"
-
-    _rec_name = 'product_code'
-
-    _columns = {
-        'product_code': fields.char('Customer Product Code', size=64,
-                                    required=True,
-                                    help="""This customer's product code
-                                            will be used when searching into
-                                            a request for quotation."""),
-        'product_name': fields.char('Customer Product Name', size=128,
-                                    help="""This customer's product name will
-                                            be used when searching into a
-                                            request for quotation."""),
-        'product_id': fields.many2one('product.product', 'Product',
-                                      required=True),
-        'partner_id': fields.many2one('res.partner', 'Customer',
-                                      required=True),
-        'company_id': fields.many2one('res.company', 'Company',
-                                      required=False),
-    }
-
-    _defaults = {
-        'company_id': lambda s, cr,
-        uid, c: s.pool.get('res.company').
-        _company_default_get(cr, uid,
-                             'product.customer.code',
-                             context=c),
-    }
-
-    _sql_constraints = [
-        ('unique_code', 'unique(product_code,company_id,partner_id)',
-         'Product Code of customer must be unique'),
-    ]
-
-    # TODO: Add index to product_code, partner_id
diff --git a/product_customer_code/product_customer_code_view.xml b/product_customer_code/product_customer_code_view.xml
deleted file mode 100644
index 0fddfd30f01..00000000000
--- a/product_customer_code/product_customer_code_view.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<openerp>
-    <data>
-    
-        <record model="ir.ui.view" id="view_product_customer_code_form">
-            <field name="name">view.product.customer.code.form</field>
-            <field name="model">product.customer.code</field>
-            <field name="arch" type="xml">
-                <form string="Product Customer Code" version="7.0">
-                    <field name="product_code"/>
-                    <field name="partner_id"/>
-                    <field name="product_id"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_product_customer_code_tree">
-            <field name="name">view.product.customer.code.tree</field>
-            <field name="model">product.customer.code</field>
-            <field name="arch" type="xml">
-                <tree string="Product Customer Code">
-                    <field name="product_code"/>
-                    <field name="partner_id"/>
-                    <field name="company_id"/>
-                    <field name="product_id"/>
-                </tree>
-            </field>
-        </record>
-        
-        <record id="action_product_customer_code_tree" model="ir.actions.act_window">
-            <field name="name">Product Customer Code</field>
-            <field name="res_model">product.customer.code</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_product_customer_code_tree"/>
-        </record>
-        
-        <record id="view_product_customer_code_search" model="ir.ui.view">
-            <field name="name">view.product.customer.code.certificate.search</field>
-            <field name="model">product.customer.code</field>
-            <field name="arch" type="xml">
-                <search string="Product Customer Code">
-                    <field name="product_code"/>
-                    <field name="partner_id"/>
-                    <field name="company_id"/>
-                    <field name="product_id"/>
-                    <newline/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Company" icon="terp-partner" domain="[]" context="{'group_by':'company_id'}"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <separator orientation="vertical"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-        
-         <menuitem action="action_product_customer_code_tree" id="menu_product_customer_code" sequence="50" parent="product.prod_config_main" groups="group_product_customer_code_manager"/>
-
-    </data>
-</openerp>
diff --git a/product_customer_code/product_product_view.xml b/product_customer_code/product_product_view.xml
deleted file mode 100644
index 3aec998b591..00000000000
--- a/product_customer_code/product_product_view.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<openerp>
-    <data>
-        
-        <record model="ir.ui.view" id="product_normal_form_inh_product_customer_code_01">
-            <field name="name">product.normal.form.inh.product.customer.code.01</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <page string="Information" position="after">
-                    <page string="Customer Code">
-                         <field name="product_customer_code_ids" nolabel="1" colspan="4" widget="one2many_list">
-                            <tree string="Product Customer Code" editable="bottom">
-                                <field name="product_code"/>
-                                <field name="partner_id"/>
-<!--
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
--->
-                            </tree>
-                            <form string="Product Customer Code" version="7.0">
-                                <field name="product_code"/>
-                                <field name="partner_id"/>
-                            </form> 
-                        </field>
-                    </page>
-                </page>
-            </field>
-        </record>
-        
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/product_customer_code/security/product_customer_code_security.xml b/product_customer_code/security/product_customer_code_security.xml
index ebc3b409efc..089bfebc95f 100644
--- a/product_customer_code/security/product_customer_code_security.xml
+++ b/product_customer_code/security/product_customer_code_security.xml
@@ -1,14 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<openerp>
-    <data noupdate="1">
+<odoo noupdate="1">
 
-            <record id="group_product_customer_code_manager" model="res.groups">
-                <field name="name">Product_Customer / Manager</field>
-            </record>
+    <record id="group_product_customer_code_manager" model="res.groups">
+        <field name="name">Product_Customer / Manager</field>
+    </record>
 
-            <record id="group_product_customer_code_user" model="res.groups">
-                <field name="name">Product_Customer / User</field>
-            </record>
+    <record id="group_product_customer_code_user" model="res.groups">
+        <field name="name">Product_Customer / User</field>
+    </record>
 
-    </data>
-</openerp>
+</odoo>
diff --git a/product_customer_code/views/product_customer_code_view.xml b/product_customer_code/views/product_customer_code_view.xml
new file mode 100644
index 00000000000..1aac35dd425
--- /dev/null
+++ b/product_customer_code/views/product_customer_code_view.xml
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<odoo>
+
+    <record model="ir.ui.view" id="view_product_customer_code_form">
+        <field name="name">view.product.customer.code.form</field>
+        <field name="model">product.customer.code</field>
+        <field name="arch" type="xml">
+            <form string="Product Customer Code">
+                <field name="product_code"/>
+                <field name="partner_id"/>
+                <field name="product_id"/>
+                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_product_customer_code_tree">
+        <field name="name">view.product.customer.code.tree</field>
+        <field name="model">product.customer.code</field>
+        <field name="arch" type="xml">
+            <tree string="Product Customer Code">
+                <field name="product_code"/>
+                <field name="partner_id"/>
+                <field name="product_id"/>
+                <field name="company_id"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="action_product_customer_code_tree" model="ir.actions.act_window">
+        <field name="name">Product Customer Code</field>
+        <field name="res_model">product.customer.code</field>
+        <field name="view_type">form</field>
+        <field name="view_id" ref="view_product_customer_code_tree"/>
+    </record>
+
+    <record id="view_product_customer_code_search" model="ir.ui.view">
+        <field name="name">view.product.customer.code.certificate.search</field>
+        <field name="model">product.customer.code</field>
+        <field name="arch" type="xml">
+            <search string="Product Customer Code">
+                <field name="product_code"/>
+                <field name="partner_id"/>
+                <field name="company_id"/>
+                <field name="product_id"/>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Company" icon="terp-partner" domain="[]" context="{'group_by':'company'}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product'}"/>
+                    <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner'}"/>
+                    <separator orientation="vertical"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+     <!-- <menuitem action="action_product_customer_code_tree" id="menu_product_customer_code" sequence="50" parent="product.menu_root" groups="group_product_customer_code_manager"/> -->
+
+</odoo>
diff --git a/product_customer_code/views/product_product_view.xml b/product_customer_code/views/product_product_view.xml
new file mode 100644
index 00000000000..1b948412f1c
--- /dev/null
+++ b/product_customer_code/views/product_product_view.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<odoo>
+
+    <record model="ir.ui.view" id="product_normal_form_inh_product_customer_code_01">
+        <field name="name">product.normal.form.inh.product.customer.code.01</field>
+        <field name="model">product.product</field>
+        <field name="inherit_id" ref="product.product_normal_form_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page[@name='general_information']" position="after">
+                <page string="Customer Code" name="customer_code">
+                     <field name="product_customer_code_ids" nolabel="1">
+                        <tree string="Product Customer Code" editable="bottom">
+                            <field name="product_code"/>
+                            <field name="partner_id"/>
+                        </tree>
+                        <form string="Product Customer Code">
+                            <group>
+                                <field name="product_code"/>
+                                <field name="partner_id"/>
+                            </group>
+                        </form>
+                    </field>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/product_customer_code/views/res_partner_view.xml b/product_customer_code/views/res_partner_view.xml
new file mode 100644
index 00000000000..79fb17924c3
--- /dev/null
+++ b/product_customer_code/views/res_partner_view.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="product_codes_view_partner_form" model="ir.ui.view">
+        <field name="name">product.customer.code.partner.form.view.inherit</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page[@name='sales_purchases']" position="after">
+                <page string="Product Codes" name="product_codes">
+                    <field name="product_code_ids" nolabel="1">
+                        <tree string="Product Customer Code" editable="bottom">
+                            <field name="product_id"/>
+                            <field name="product_code"/>
+                        </tree>
+                        <form string="Product Customer Code">
+                            <group>
+                                <field name="product_id"/>
+                                <field name="product_code"/>
+                            </group>
+                        </form>
+                    </field>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>