diff --git a/proteus/__init__.py b/proteus/__init__.py index 97d8baf492..4af05d6e8b 100644 --- a/proteus/__init__.py +++ b/proteus/__init__.py @@ -351,6 +351,7 @@ class MetaModelFactory(object): 'reference': ReferenceDescriptor, 'date': DateDescriptor, 'datetime': DateTimeDescriptor, + 'timestamp': DateTimeDescriptor, 'time': TimeDescriptor, 'dict': DictDescriptor, 'many2one': Many2OneDescriptor, diff --git a/proteus/config.py b/proteus/config.py index 436ce8ecb6..c87dbc1f8f 100644 --- a/proteus/config.py +++ b/proteus/config.py @@ -181,7 +181,7 @@ class TrytondConfig(Config): if database_type is not None: CONFIG['db_type'] = database_type from trytond.pool import Pool - from trytond.backend import Database + from trytond import backend from trytond.protocols.dispatcher import create from trytond.cache import Cache from trytond.transaction import Transaction @@ -197,7 +197,7 @@ class TrytondConfig(Config): Pool.start() - database = Database().connect() + database = backend.get('Database')().connect() cursor = database.cursor() try: databases = database.list(cursor)