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 4d97a706ba..fe0c557161 100644
--- a/__init__.py
+++ b/__init__.py
@@ -2,13 +2,9 @@
 # this repository contains the full copyright notices and license terms.
 
 from trytond.pool import Pool
-from . import order_point
-from . import ir
-from . import product
-from . import purchase_request
-from . import shipment
-from . import location
-from . import stock
+
+from . import (
+    ir, location, order_point, product, purchase_request, shipment, stock)
 
 
 def register():
diff --git a/location.py b/location.py
index 9499396cc5..f0bba38f0f 100644
--- a/location.py
+++ b/location.py
@@ -2,8 +2,8 @@
 # this repository contains the full copyright notices and license terms.
 import datetime
 
-from trytond.pool import PoolMeta, Pool
 from trytond.model import fields
+from trytond.pool import Pool, PoolMeta
 from trytond.pyson import Eval
 
 
diff --git a/order_point.py b/order_point.py
index 7ae2b24b21..a9c16409b8 100644
--- a/order_point.py
+++ b/order_point.py
@@ -3,9 +3,9 @@
 from sql import Null
 
 from trytond.i18n import gettext
-from trytond.model import ModelView, ModelSQL, fields
+from trytond.model import ModelSQL, ModelView, fields
 from trytond.pool import Pool
-from trytond.pyson import If, Equal, Eval, Not, In
+from trytond.pyson import Equal, Eval, If, In, Not
 from trytond.transaction import Transaction
 
 from .exceptions import OrderPointValidationError
diff --git a/product.py b/product.py
index f9af1b4113..e4b2feb19e 100644
--- a/product.py
+++ b/product.py
@@ -3,7 +3,7 @@
 import datetime
 
 from trytond.model import fields
-from trytond.pool import PoolMeta, Pool
+from trytond.pool import Pool, PoolMeta
 
 
 class Product(metaclass=PoolMeta):
diff --git a/purchase_request.py b/purchase_request.py
index 28de07885a..7a22709924 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -5,9 +5,9 @@ import operator
 from collections import defaultdict
 
 from trytond.model import ModelSQL, ValueMixin, fields
-from trytond.transaction import Transaction
 from trytond.pool import Pool, PoolMeta
 from trytond.tools import grouped_slice
+from trytond.transaction import Transaction
 
 supply_period = fields.TimeDelta("Supply Period")
 
diff --git a/setup.py b/setup.py
index bc8e69143e..28d14e2557 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/shipment.py b/shipment.py
index 7b1351336e..3983730f04 100644
--- a/shipment.py
+++ b/shipment.py
@@ -3,10 +3,10 @@
 import datetime
 from collections import defaultdict
 
-from trytond.model import ModelView, ModelSQL
+from trytond.model import ModelSQL, ModelView
+from trytond.pool import Pool
 from trytond.tools import grouped_slice
 from trytond.transaction import Transaction
-from trytond.pool import Pool
 
 
 class ShipmentInternal(ModelSQL, ModelView):
diff --git a/stock.py b/stock.py
index a5614d5e26..f9de0d9898 100644
--- a/stock.py
+++ b/stock.py
@@ -1,11 +1,11 @@
 # 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.i18n import gettext
-from trytond.pool import Pool
 from trytond.model import ModelView
+from trytond.pool import Pool
 from trytond.transaction import Transaction
-from trytond.wizard import (Wizard, StateView, StateAction, StateTransition,
-    Button)
+from trytond.wizard import (
+    Button, StateAction, StateTransition, StateView, Wizard)
 
 from .exceptions import SupplyWarning
 
diff --git a/tests/test_stock_supply.py b/tests/test_stock_supply.py
index 02b8eb33c5..40ce482467 100644
--- a/tests/test_stock_supply.py
+++ b/tests/test_stock_supply.py
@@ -1,18 +1,17 @@
 # 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 datetime
+import doctest
+import unittest
 from decimal import Decimal
-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.modules.company.tests import (
-    create_company, set_company, CompanyTestMixin)
+import trytond.tests.test_tryton
 from trytond.modules.account.tests import create_chart
+from trytond.modules.company.tests import (
+    CompanyTestMixin, create_company, set_company)
+from trytond.pool import Pool
+from trytond.tests.test_tryton import (
+    ModuleTestCase, doctest_checker, doctest_teardown, with_transaction)
 
 DATES = [
     # purchase date, lead time, supply date