diff --git a/.flake8 b/.flake8 new file mode 100644 index 0000000000..bb03d08a82 --- /dev/null +++ b/.flake8 @@ -0,0 +1,2 @@ +[flake8] +ignore=E123,E124,E126,E128,W503 diff --git a/__init__.py b/__init__.py index ed915a6a5f..f2dd73b0b5 100644 --- a/__init__.py +++ b/__init__.py @@ -25,15 +25,15 @@ def register(): ir.Cron, ir.CronCompany, party.Configuration, - party.PartyConfigurationLang, + party.ConfigurationLang, party.Party, party.PartyLang, party.ContactMechanism, module='company', type_='model') Pool.register( company.CompanyConfig, - party.PartyReplace, - party.PartyErase, + party.Replace, + party.Erase, module='company', type_='wizard') Pool.register( party.LetterReport, diff --git a/party.py b/party.py index b543d6b250..5468279bc5 100644 --- a/party.py +++ b/party.py @@ -8,15 +8,12 @@ from trytond.transaction import Transaction from .company import CompanyReport from .model import CompanyMultiValueMixin, CompanyValueMixin -__all__ = ['Configuration', 'PartyConfigurationLang', 'Party', 'PartyLang', - 'PartyReplace', 'PartyErase', 'ContactMechanism'] - class Configuration(CompanyMultiValueMixin, metaclass=PoolMeta): __name__ = 'party.configuration' -class PartyConfigurationLang(CompanyValueMixin, metaclass=PoolMeta): +class ConfigurationLang(CompanyValueMixin, metaclass=PoolMeta): __name__ = 'party.configuration.party_lang' @classmethod @@ -26,7 +23,7 @@ class PartyConfigurationLang(CompanyValueMixin, metaclass=PoolMeta): table = cls.__table_handler__(module_name) exist &= table.column_exist('company') - super(PartyConfigurationLang, cls).__register__(module_name) + super().__register__(module_name) if not exist: # Re-migrate with company @@ -62,18 +59,18 @@ class PartyLang(CompanyValueMixin, metaclass=PoolMeta): field_names, value_names, fields) -class PartyReplace(metaclass=PoolMeta): +class Replace(metaclass=PoolMeta): __name__ = 'party.replace' @classmethod def fields_to_replace(cls): - return super(PartyReplace, cls).fields_to_replace() + [ + return super().fields_to_replace() + [ ('company.company', 'party'), ('company.employee', 'party'), ] -class PartyErase(metaclass=PoolMeta): +class Erase(metaclass=PoolMeta): __name__ = 'party.erase' def check_erase(self, party): @@ -81,7 +78,7 @@ class PartyErase(metaclass=PoolMeta): Party = pool.get('party.party') Company = pool.get('company.company') - super(PartyErase, self).check_erase(party) + super().check_erase(party) with Transaction().set_user(0): companies = Company.search([]) diff --git a/res.py b/res.py index 1586b39ebf..6e6d9b2897 100644 --- a/res.py +++ b/res.py @@ -160,7 +160,8 @@ class User(metaclass=PoolMeta): user_id = Transaction().context['user'] result = super(User, cls).read(ids, fields_names=fields_names) if (fields_names - and (('company' in fields_names + and (( + 'company' in fields_names and 'company' in Transaction().context) or ('employee' in fields_names and 'employee' in Transaction().context))): diff --git a/setup.py b/setup.py index aba9a7c204..7abc37078b 100755 --- a/setup.py +++ b/setup.py @@ -78,8 +78,8 @@ setup(name=name, keywords='tryton company employee', package_dir={'trytond.modules.company': '.'}, packages=( - ['trytond.modules.company'] + - ['trytond.modules.company.%s' % p for p in find_packages()] + ['trytond.modules.company'] + + ['trytond.modules.company.%s' % p for p in find_packages()] ), package_data={ 'trytond.modules.company': (info.get('xml', []) @@ -94,7 +94,8 @@ setup(name=name, 'Intended Audience :: Financial and Insurance Industry', 'Intended Audience :: Legal Industry', 'Intended Audience :: Manufacturing', - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', + 'License :: OSI Approved :: ' + 'GNU General Public License v3 or later (GPLv3+)', 'Natural Language :: Bulgarian', 'Natural Language :: Catalan', 'Natural Language :: Chinese (Simplified)',