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 0c86b0e706..a924298066 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 sale -from . import product -from . import stock -from . import configuration -from . import invoice -from . import party -from . import sale_reporting + +from . import ( + configuration, invoice, party, product, sale, sale_reporting, stock) def register(): diff --git a/configuration.py b/configuration.py index 6a1ec87a77..01712faa08 100644 --- a/configuration.py +++ b/configuration.py @@ -1,13 +1,13 @@ # 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 import backend -from trytond.model import (ModelView, ModelSQL, ModelSingleton, ValueMixin, - fields) +from trytond.model import ( + ModelSingleton, ModelSQL, ModelView, ValueMixin, fields) +from trytond.modules.company.model import ( + CompanyMultiValueMixin, CompanyValueMixin) from trytond.pool import Pool from trytond.pyson import Eval, Id from trytond.tools.multivalue import migrate_property -from trytond.modules.company.model import ( - CompanyMultiValueMixin, CompanyValueMixin) sale_invoice_method = fields.Selection( 'get_sale_invoice_methods', "Sale Invoice Method") diff --git a/party.py b/party.py index 3ddb07612b..58f4ce4f39 100644 --- a/party.py +++ b/party.py @@ -2,13 +2,12 @@ # this repository contains the full copyright notices and license terms. from trytond.i18n import gettext from trytond.model import ModelSQL, fields -from trytond.pool import PoolMeta, Pool -from trytond.pyson import Eval -from trytond.transaction import Transaction - from trytond.modules.company.model import ( CompanyMultiValueMixin, CompanyValueMixin) from trytond.modules.party.exceptions import EraseError +from trytond.pool import Pool, PoolMeta +from trytond.pyson import Eval +from trytond.transaction import Transaction def get_sale_methods(field_name): diff --git a/product.py b/product.py index fbc76892a2..11e5eedd2e 100644 --- a/product.py +++ b/product.py @@ -3,12 +3,12 @@ import datetime from trytond.model import ModelSQL, ModelView, fields -from trytond.pyson import Eval -from trytond.pool import Pool, PoolMeta -from trytond.transaction import Transaction from trytond.modules.company.model import CompanyValueMixin from trytond.modules.currency.fields import Monetary from trytond.modules.product import price_digits +from trytond.pool import Pool, PoolMeta +from trytond.pyson import Eval +from trytond.transaction import Transaction class Configuration(metaclass=PoolMeta): diff --git a/sale.py b/sale.py index 497ca269bb..56c4c7ef35 100644 --- a/sale.py +++ b/sale.py @@ -3,32 +3,31 @@ import datetime from collections import defaultdict from decimal import Decimal -from itertools import groupby, chain from functools import partial +from itertools import chain, groupby from trytond.i18n import gettext -from trytond.model import Workflow, Model, ModelView, ModelSQL, fields, \ - sequence_ordered, Unique -from trytond.model.exceptions import AccessError -from trytond.modules.company import CompanyReport -from trytond.wizard import Wizard, StateAction, StateView, StateTransition, \ - Button -from trytond.pyson import If, Eval, Bool, PYSONEncoder -from trytond.transaction import Transaction -from trytond.tools import sortable_values, firstline -from trytond.pool import Pool - from trytond.ir.attachment import AttachmentCopyMixin from trytond.ir.note import NoteCopyMixin +from trytond.model import ( + Model, ModelSQL, ModelView, Unique, Workflow, fields, sequence_ordered) +from trytond.model.exceptions import AccessError from trytond.modules.account.tax import TaxableMixin from trytond.modules.account_product.exceptions import AccountError +from trytond.modules.company import CompanyReport from trytond.modules.company.model import ( - employee_field, set_employee, reset_employee) + employee_field, reset_employee, set_employee) from trytond.modules.currency.fields import Monetary from trytond.modules.product import price_digits, round_price +from trytond.pool import Pool +from trytond.pyson import Bool, Eval, If, PYSONEncoder +from trytond.tools import firstline, sortable_values +from trytond.transaction import Transaction +from trytond.wizard import ( + Button, StateAction, StateTransition, StateView, Wizard) from .exceptions import ( - SaleValidationError, SaleQuotationError, PartyLocationError) + PartyLocationError, SaleQuotationError, SaleValidationError) def get_shipments_returns(model_name): diff --git a/sale_reporting.py b/sale_reporting.py index fd7fed28ae..9da6a1d106 100644 --- a/sale_reporting.py +++ b/sale_reporting.py @@ -8,20 +8,19 @@ try: except ImportError: pygal = None from dateutil.relativedelta import relativedelta -from sql import Null, Literal, Column, With -from sql.aggregate import Sum, Max, Min, Count +from sql import Column, Literal, Null, With +from sql.aggregate import Count, Max, Min, Sum from sql.conditionals import Coalesce -from sql.functions import CurrentTimestamp, DateTrunc, Power, Ceil, Log +from sql.functions import Ceil, CurrentTimestamp, DateTrunc, Log, Power -from trytond.pool import Pool +from trytond.i18n import lazy_gettext from trytond.model import ModelSQL, ModelView, UnionMixin, fields +from trytond.modules.currency.fields import Monetary +from trytond.pool import Pool +from trytond.pyson import Eval, If from trytond.tools import grouped_slice, reduce_ids from trytond.transaction import Transaction -from trytond.pyson import Eval, If -from trytond.wizard import Wizard, StateTransition, StateAction -from trytond.i18n import lazy_gettext - -from trytond.modules.currency.fields import Monetary +from trytond.wizard import StateAction, StateTransition, Wizard def pairwise(iterable): diff --git a/setup.py b/setup.py index bff76c956b..f2522c30d0 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/stock.py b/stock.py index b461142a04..833e75702f 100644 --- a/stock.py +++ b/stock.py @@ -4,12 +4,11 @@ from decimal import Decimal from functools import wraps from trytond.i18n import gettext -from trytond.model import Workflow, ModelView, fields +from trytond.model import ModelView, Workflow, fields from trytond.model.exceptions import AccessError -from trytond.transaction import Transaction -from trytond.pool import Pool, PoolMeta - from trytond.modules.product import round_price +from trytond.pool import Pool, PoolMeta +from trytond.transaction import Transaction def process_sale(moves_field): diff --git a/tests/test_sale.py b/tests/test_sale.py index 0fa1d57b20..10f449ec88 100644 --- a/tests/test_sale.py +++ b/tests/test_sale.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 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, doctest_checker -from trytond.transaction import Transaction -from trytond.pool import Pool - from trytond.modules.account.tests import create_chart from trytond.modules.company.tests import ( - create_company, set_company, PartyCompanyCheckEraseMixin, CompanyTestMixin) + CompanyTestMixin, PartyCompanyCheckEraseMixin, create_company, set_company) +from trytond.pool import Pool +from trytond.tests.test_tryton import ( + ModuleTestCase, doctest_checker, doctest_teardown, with_transaction) +from trytond.transaction import Transaction class SaleTestCase(