diff --git a/portal_partner_merge/LICENSE/LICENSE b/portal_partner_merge/LICENSE/LICENSE
new file mode 100644
index 000000000..d0f1fd1c2
--- /dev/null
+++ b/portal_partner_merge/LICENSE/LICENSE
@@ -0,0 +1,15 @@
+    Author: Yannick Vaucher
+    Copyright 2013 Camptocamp SA
+
+    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/>.
\ No newline at end of file
diff --git a/portal_partner_merge/README.rst b/portal_partner_merge/README.rst
new file mode 100644
index 000000000..3b457fb8d
--- /dev/null
+++ b/portal_partner_merge/README.rst
@@ -0,0 +1,69 @@
+.. 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
+
+====================
+Portal Partner Merge
+====================
+
+This module extends the warning message which appears upon failing to assign users to the portal group.
+
+
+Installation
+============
+
+To install this module, you need to have base_partner_merge module installed.
+
+
+Usage
+=====
+
+You can access the wizard by going in a list of contacts, selecting one or multiple.
+
+.. 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/11.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.
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+
+
+Contributors
+------------
+
+* Serpent Consulting Services Pvt. Ltd. <jay.vora@serpentcs.com>
+
+
+Author
+------
+
+* Yannick Vaucher <yannick.vaucher@camptocamp.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/portal_partner_merge/__init__.py b/portal_partner_merge/__init__.py
index 23c6553cd..19d7d3c4c 100644
--- a/portal_partner_merge/__init__.py
+++ b/portal_partner_merge/__init__.py
@@ -1,22 +1,2 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Yannick Vaucher
-#    Copyright 2013 Camptocamp SA
-#
-#    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/>.
-#
-##############################################################################
-
+# See LICENSE file for full copyright and licensing details.
 from . import wizard
diff --git a/portal_partner_merge/__manifest__.py b/portal_partner_merge/__manifest__.py
index 48726577d..937adb78e 100644
--- a/portal_partner_merge/__manifest__.py
+++ b/portal_partner_merge/__manifest__.py
@@ -1,36 +1,15 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Yannick Vaucher
-#    Copyright 2013 Camptocamp SA
-#
-#    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/>.
-#
-##############################################################################
+# See LICENSE file for full copyright and licensing details.
 {'name': 'Portal Partner Merge',
- 'version': '8.0.1.0.0',
+ 'version': '11.0.1.0.0',
  'category': 'Hidden',
- 'description': """
-Link module for base_partner_merge which extract portal dependency
- """,
  'author': "Camptocamp,Odoo Community Association (OCA)",
  'maintainer': 'Camptocamp',
+ 'license': 'AGPL-3',
  'website': 'http://www.camptocamp.com/',
  'depends': ['portal', 'base_partner_merge'],
  'data': [],
  'test': [],
- 'installable': False,
- 'auto_install': True,
+ 'installable': True,
+ 'auto_install': False,
  'application': False,
  }
diff --git a/portal_partner_merge/wizard/__init__.py b/portal_partner_merge/wizard/__init__.py
index 2ca6034e0..892e98c1e 100644
--- a/portal_partner_merge/wizard/__init__.py
+++ b/portal_partner_merge/wizard/__init__.py
@@ -1,22 +1,2 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Business Applications
-#    Copyright (c) 2013 OpenERP S.A. <http://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
-#    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/>.
-#
-##############################################################################
-
+# See LICENSE file for full copyright and licensing details.
 from . import portal_wizard
diff --git a/portal_partner_merge/wizard/portal_wizard.py b/portal_partner_merge/wizard/portal_wizard.py
index a5f5d5394..242dffceb 100644
--- a/portal_partner_merge/wizard/portal_wizard.py
+++ b/portal_partner_merge/wizard/portal_wizard.py
@@ -1,38 +1,18 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Business Applications
-#    Copyright (c) 2013 OpenERP S.A. <http://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
-#    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/>.
-#
-##############################################################################
+# See LICENSE file for full copyright and licensing details.
 
-from openerp.osv import orm
-from openerp.tools.translate import _
+from odoo import api, models, _
 
 
-class wizard_user(orm.TransientModel):
+class PortalWizardUser(models.TransientModel):
     _inherit = 'portal.wizard.user'
 
-    def get_error_messages(self, cr, uid, ids, context=None):
-        error_msg = super(wizard_user, self
-                          ).get_error_messages(cr, uid, ids, context=context)
+    @api.multi
+    def get_error_messages(self):
+        error_msg = super(PortalWizardUser, self).get_error_messages()
         if error_msg:
             error_msg[-1] = '%s\n%s' % (
                 error_msg[-1],
                 _("- Merge existing contacts together using the Automatic "
-                  "Merge wizard, available in the More menu after selecting "
+                  "Merge wizard, available in the Action menu after selecting "
                   "several contacts in the Customers list"))
         return error_msg