diff --git a/.isort.cfg b/.isort.cfg
new file mode 100644
index 0000000000..e1c6495da9
--- /dev/null
+++ b/.isort.cfg
@@ -0,0 +1,3 @@
+[settings]
+multi_line_output=4
+known_first_party=trytond
diff --git a/__init__.py b/__init__.py
index 85ab3b6f42..330316c105 100644
--- a/__init__.py
+++ b/__init__.py
@@ -2,12 +2,8 @@
 # this repository contains the full copyright notices and license terms.
 
 from trytond.pool import Pool
-from . import category
-from . import party
-from . import address
-from . import contact_mechanism
-from . import configuration
-from . import ir
+
+from . import address, category, configuration, contact_mechanism, ir, party
 
 
 def register():
diff --git a/address.py b/address.py
index 830b090338..373abc387b 100644
--- a/address.py
+++ b/address.py
@@ -8,16 +8,17 @@ from sql.conditionals import Coalesce
 from sql.functions import Substring
 from sql.operators import Concat, Equal
 
+from trytond.cache import Cache
 from trytond.i18n import gettext
 from trytond.model import (
-    ModelView, ModelSQL, MatchMixin, DeactivableMixin, fields,
-    sequence_ordered, Exclude)
+    DeactivableMixin, Exclude, MatchMixin, ModelSQL, ModelView, fields,
+    sequence_ordered)
 from trytond.model.exceptions import AccessError
-from trytond.pyson import Eval, If
 from trytond.pool import Pool
+from trytond.pyson import Eval, If
 from trytond.rpc import RPC
 from trytond.transaction import Transaction
-from trytond.cache import Cache
+
 from .exceptions import InvalidFormat
 
 
diff --git a/category.py b/category.py
index a35b8795bf..230a236809 100644
--- a/category.py
+++ b/category.py
@@ -4,7 +4,7 @@ from sql.conditionals import Coalesce
 from sql.operators import Equal
 
 from trytond.model import (
-    ModelView, ModelSQL, DeactivableMixin, fields, Exclude, tree)
+    DeactivableMixin, Exclude, ModelSQL, ModelView, fields, tree)
 
 
 class Category(DeactivableMixin, tree(separator=' / '), ModelSQL, ModelView):
diff --git a/configuration.py b/configuration.py
index e3ec556168..eb9d7a8984 100644
--- a/configuration.py
+++ b/configuration.py
@@ -2,12 +2,12 @@
 # this repository contains the full copyright notices and license terms.
 from trytond import backend
 from trytond.i18n import gettext
-from trytond.model import ModelView, ModelSQL, ModelSingleton, fields
-from trytond.model import MultiValueMixin, ValueMixin
+from trytond.model import (
+    ModelSingleton, ModelSQL, ModelView, MultiValueMixin, ValueMixin, fields)
 from trytond.model.exceptions import AccessError
 from trytond.pool import Pool
-from trytond.tools.multivalue import migrate_property
 from trytond.pyson import Id
+from trytond.tools.multivalue import migrate_property
 
 from .party import IDENTIFIER_TYPES
 
diff --git a/contact_mechanism.py b/contact_mechanism.py
index 31a40e7793..077127958c 100644
--- a/contact_mechanism.py
+++ b/contact_mechanism.py
@@ -1,15 +1,16 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 from itertools import chain
+
 try:
     import phonenumbers
-    from phonenumbers import PhoneNumberFormat, NumberParseException
+    from phonenumbers import NumberParseException, PhoneNumberFormat
 except ImportError:
     phonenumbers = None
 
 from trytond.i18n import gettext
 from trytond.model import (
-    ModelView, ModelSQL, DeactivableMixin, MultiValueMixin, ValueMixin, fields,
+    DeactivableMixin, ModelSQL, ModelView, MultiValueMixin, ValueMixin, fields,
     sequence_ordered)
 from trytond.model.exceptions import AccessError
 from trytond.pyson import Eval
diff --git a/ir.py b/ir.py
index 3196ae5ff4..d975976292 100644
--- a/ir.py
+++ b/ir.py
@@ -1,7 +1,7 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 from trytond.model import fields
-from trytond.pool import PoolMeta, Pool
+from trytond.pool import Pool, PoolMeta
 from trytond.tools import escape_wildcard
 from trytond.transaction import Transaction
 
diff --git a/party.py b/party.py
index fd6a638144..d842db3492 100644
--- a/party.py
+++ b/party.py
@@ -1,26 +1,27 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-from stdnum import get_cc_module
 import stdnum.exceptions
-from sql import Null, Column, Literal
+from sql import Column, Literal, Null
 from sql.aggregate import Min
-from sql.functions import CharLength, Substring, Position
+from sql.functions import CharLength, Position, Substring
+from stdnum import get_cc_module
 
-from trytond.i18n import gettext
-from trytond.model import (ModelView, ModelSQL, MultiValueMixin, ValueMixin,
-    DeactivableMixin, fields, Unique, sequence_ordered)
-from trytond.model.exceptions import AccessError
-from trytond.wizard import Wizard, StateTransition, StateView, Button
-from trytond.pyson import Eval, Bool
-from trytond.transaction import Transaction
-from trytond.pool import Pool
 from trytond import backend
-from trytond.tools.multivalue import migrate_property
+from trytond.i18n import gettext
+from trytond.model import (
+    DeactivableMixin, ModelSQL, ModelView, MultiValueMixin, Unique, ValueMixin,
+    fields, sequence_ordered)
+from trytond.model.exceptions import AccessError
+from trytond.pool import Pool
+from trytond.pyson import Bool, Eval
 from trytond.tools import lstrip_wildcard
-from .exceptions import (
-    InvalidIdentifierCode, VIESUnavailable, SimilarityWarning, EraseError)
+from trytond.tools.multivalue import migrate_property
+from trytond.transaction import Transaction
+from trytond.wizard import Button, StateTransition, StateView, Wizard
 
 from .contact_mechanism import _PHONE_TYPES
+from .exceptions import (
+    EraseError, InvalidIdentifierCode, SimilarityWarning, VIESUnavailable)
 
 
 class Party(DeactivableMixin, ModelSQL, ModelView, MultiValueMixin):
diff --git a/setup.py b/setup.py
index 1d3c476b08..8efc1d74a9 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,8 @@ import io
 import os
 import re
 from configparser import ConfigParser
-from setuptools import setup, find_packages
+
+from setuptools import find_packages, setup
 
 
 def read(fname):
diff --git a/tests/__init__.py b/tests/__init__.py
index 79050b9ed5..45f83d9005 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -3,8 +3,8 @@
 
 try:
     from trytond.modules.party.tests.test_party import (
-        suite, PartyCheckEraseMixin)
+        PartyCheckEraseMixin, suite)
 except ImportError:
-    from .test_party import suite, PartyCheckEraseMixin
+    from .test_party import PartyCheckEraseMixin, suite
 
 __all__ = ['suite', 'PartyCheckEraseMixin']
diff --git a/tests/test_party.py b/tests/test_party.py
index 4d7c4e9dec..843334c2a5 100644
--- a/tests/test_party.py
+++ b/tests/test_party.py
@@ -1,19 +1,19 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-import unittest
 import doctest
+import unittest
+
 try:
     import phonenumbers
 except ImportError:
     phonenumbers = None
 
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase, with_transaction
-from trytond.tests.test_tryton import doctest_teardown
-from trytond.tests.test_tryton import doctest_checker
-from trytond.pool import Pool
 from trytond.exceptions import UserError
 from trytond.model.exceptions import AccessError
+from trytond.pool import Pool
+from trytond.tests.test_tryton import (
+    ModuleTestCase, doctest_checker, doctest_teardown, with_transaction)
 from trytond.transaction import Transaction
 
 from ..party import IDENTIFIER_TYPES