Migrate to python 3.
This commit is contained in:
parent
3b5d682f41
commit
130003f5e2
|
@ -6,8 +6,7 @@ from . import party
|
||||||
__all__ = ['Activity']
|
__all__ = ['Activity']
|
||||||
|
|
||||||
|
|
||||||
class Activity(party.PartyCompanyMixin):
|
class Activity(party.PartyCompanyMixin, metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = "activity.activity"
|
__name__ = "activity.activity"
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
6
bank.py
6
bank.py
|
@ -7,13 +7,11 @@ from . import party
|
||||||
__all__ = ['Bank', 'BankAccount']
|
__all__ = ['Bank', 'BankAccount']
|
||||||
|
|
||||||
|
|
||||||
class Bank(party.PartyCompanyMixin):
|
class Bank(party.PartyCompanyMixin, metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = "bank"
|
__name__ = "bank"
|
||||||
|
|
||||||
|
|
||||||
class BankAccount:
|
class BankAccount(metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = 'bank.account'
|
__name__ = 'bank.account'
|
||||||
companies = fields.Function(fields.One2Many('company.company', None,
|
companies = fields.Function(fields.One2Many('company.company', None,
|
||||||
'Companies'), 'get_companies', searcher='search_companies')
|
'Companies'), 'get_companies', searcher='search_companies')
|
||||||
|
|
|
@ -6,6 +6,5 @@ from . import party
|
||||||
__all__ = ['Carrier']
|
__all__ = ['Carrier']
|
||||||
|
|
||||||
|
|
||||||
class Carrier(party.PartyCompanyMixin):
|
class Carrier(party.PartyCompanyMixin, metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = 'carrier'
|
__name__ = 'carrier'
|
||||||
|
|
|
@ -5,8 +5,7 @@ from trytond.pyson import Eval, If
|
||||||
|
|
||||||
__all__ = ['Employee']
|
__all__ = ['Employee']
|
||||||
|
|
||||||
class Employee:
|
class Employee(metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = 'company.employee'
|
__name__ = 'company.employee'
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
12
party.py
12
party.py
|
@ -12,9 +12,8 @@ __all__ = ['PartyCompany', 'Party', 'Address', 'PartyIdentifier',
|
||||||
'ContactMechanism']
|
'ContactMechanism']
|
||||||
|
|
||||||
|
|
||||||
class Party:
|
class Party(metaclass=PoolMeta):
|
||||||
__name__ = 'party.party'
|
__name__ = 'party.party'
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
companies = fields.Function(fields.Many2Many('party.party-company.company',
|
companies = fields.Function(fields.Many2Many('party.party-company.company',
|
||||||
'party', 'company', 'Companies', domain=[
|
'party', 'company', 'Companies', domain=[
|
||||||
('id', 'in', Eval('context', {}).get('companies', [])),
|
('id', 'in', Eval('context', {}).get('companies', [])),
|
||||||
|
@ -231,18 +230,15 @@ class PartyCompanyMixin(object):
|
||||||
return [('party.companies',) + tuple(clause[1:])]
|
return [('party.companies',) + tuple(clause[1:])]
|
||||||
|
|
||||||
|
|
||||||
class Address(PartyCompanyMixin):
|
class Address(PartyCompanyMixin, metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = 'party.address'
|
__name__ = 'party.address'
|
||||||
|
|
||||||
|
|
||||||
class PartyIdentifier(PartyCompanyMixin):
|
class PartyIdentifier(PartyCompanyMixin, metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = 'party.identifier'
|
__name__ = 'party.identifier'
|
||||||
|
|
||||||
|
|
||||||
class ContactMechanism(PartyCompanyMixin):
|
class ContactMechanism(PartyCompanyMixin, metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = 'party.contact_mechanism'
|
__name__ = 'party.contact_mechanism'
|
||||||
|
|
||||||
|
|
||||||
|
|
5
setup.py
5
setup.py
|
@ -5,10 +5,7 @@ from setuptools import setup
|
||||||
import re
|
import re
|
||||||
import os
|
import os
|
||||||
import io
|
import io
|
||||||
try:
|
from configparser import ConfigParser
|
||||||
from configparser import ConfigParser
|
|
||||||
except ImportError:
|
|
||||||
from ConfigParser import ConfigParser
|
|
||||||
|
|
||||||
MODULE = 'party_company'
|
MODULE = 'party_company'
|
||||||
PREFIX = 'nantic'
|
PREFIX = 'nantic'
|
||||||
|
|
|
@ -35,7 +35,7 @@ class PartyCompanyTestCase(ModuleTestCase):
|
||||||
party1, = Party.create([{
|
party1, = Party.create([{
|
||||||
'name': 'Party 1',
|
'name': 'Party 1',
|
||||||
}])
|
}])
|
||||||
self.assert_(party1.id)
|
self.assertTrue(party1.id)
|
||||||
self.assertEqual(party1.companies, ())
|
self.assertEqual(party1.companies, ())
|
||||||
|
|
||||||
@with_transaction()
|
@with_transaction()
|
||||||
|
@ -52,7 +52,7 @@ class PartyCompanyTestCase(ModuleTestCase):
|
||||||
party.name = 'Party 2'
|
party.name = 'Party 2'
|
||||||
party.companies = [company]
|
party.companies = [company]
|
||||||
party.save()
|
party.save()
|
||||||
self.assert_(party.id)
|
self.assertTrue(party.id)
|
||||||
self.assertEqual(len(party.companies), 1)
|
self.assertEqual(len(party.companies), 1)
|
||||||
address, = Address.create([{
|
address, = Address.create([{
|
||||||
'party': party.id,
|
'party': party.id,
|
||||||
|
|
7
user.py
7
user.py
|
@ -12,8 +12,7 @@ from sql.functions import CurrentTimestamp
|
||||||
__all__ = ['User', 'UserCompany']
|
__all__ = ['User', 'UserCompany']
|
||||||
|
|
||||||
|
|
||||||
class User:
|
class User(metaclass=PoolMeta):
|
||||||
__metaclass__ = PoolMeta
|
|
||||||
__name__ = 'res.user'
|
__name__ = 'res.user'
|
||||||
main_companies = fields.Many2Many('res.user-company.company', 'user',
|
main_companies = fields.Many2Many('res.user-company.company', 'user',
|
||||||
'company', 'Main Companies')
|
'company', 'Main Companies')
|
||||||
|
@ -50,9 +49,9 @@ class User:
|
||||||
if company in company_childs:
|
if company in company_childs:
|
||||||
company_ids = company_childs[company]
|
company_ids = company_childs[company]
|
||||||
else:
|
else:
|
||||||
company_ids = map(int, Company.search([
|
company_ids = list(map(int, Company.search([
|
||||||
('parent', 'child_of', [company.id]),
|
('parent', 'child_of', [company.id]),
|
||||||
]))
|
])))
|
||||||
company_childs[company] = company_ids
|
company_childs[company] = company_ids
|
||||||
if company_ids:
|
if company_ids:
|
||||||
companies[user.id].extend(company_ids)
|
companies[user.id].extend(company_ids)
|
||||||
|
|
Loading…
Reference in New Issue