diff --git a/partner_address_version/models/__init__.py b/partner_address_version/models/__init__.py
index 5c14864bb..6e8677380 100644
--- a/partner_address_version/models/__init__.py
+++ b/partner_address_version/models/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2018 Akretion - Benoît Guillot
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
diff --git a/partner_address_version/models/res_partner.py b/partner_address_version/models/res_partner.py
index 9d5aa518c..f174e04e8 100644
--- a/partner_address_version/models/res_partner.py
+++ b/partner_address_version/models/res_partner.py
@@ -1,10 +1,11 @@
 # Copyright 2018 Akretion - Benoît Guillot
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models, api, exceptions, _
 import hashlib
 from collections import OrderedDict
 
+from odoo import _, exceptions, fields, models
+
 
 class ResPartner(models.Model):
     _inherit = "res.partner"
diff --git a/partner_address_version/tests/__init__.py b/partner_address_version/tests/__init__.py
index 6af5be9a1..97dd0437c 100644
--- a/partner_address_version/tests/__init__.py
+++ b/partner_address_version/tests/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2018 Akretion - Benoît Guillot
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
diff --git a/partner_address_version/tests/test_address_version.py b/partner_address_version/tests/test_address_version.py
index 3d90d5e1f..84619c9c1 100644
--- a/partner_address_version/tests/test_address_version.py
+++ b/partner_address_version/tests/test_address_version.py
@@ -1,10 +1,11 @@
 # Copyright 2018 Akretion - Benoît Guillot
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo.tests import SavepointCase
-from collections import OrderedDict
 import hashlib
+from collections import OrderedDict
+
 from odoo.exceptions import UserError
+from odoo.tests import SavepointCase
 
 
 class TestAddressVersion(SavepointCase):
diff --git a/partner_address_version/wizards/base_partner_merge.py b/partner_address_version/wizards/base_partner_merge.py
index 4c535c3ce..cb6890180 100644
--- a/partner_address_version/wizards/base_partner_merge.py
+++ b/partner_address_version/wizards/base_partner_merge.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright 2020 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
diff --git a/setup/partner_address_version/odoo/addons/partner_address_version b/setup/partner_address_version/odoo/addons/partner_address_version
new file mode 120000
index 000000000..671837ddf
--- /dev/null
+++ b/setup/partner_address_version/odoo/addons/partner_address_version
@@ -0,0 +1 @@
+../../../../partner_address_version
\ No newline at end of file
diff --git a/setup/partner_address_version/setup.py b/setup/partner_address_version/setup.py
new file mode 100644
index 000000000..28c57bb64
--- /dev/null
+++ b/setup/partner_address_version/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)