Merge pull request #284 from yelizariev/8.0

[FIX] account_move_batch_validate: Protect connector import, define empty decorator if needed. Fixes #280
This commit is contained in:
Alexandre Fayolle
2015-09-04 07:56:50 +02:00
2 changed files with 26 additions and 6 deletions

View File

@@ -25,12 +25,20 @@ import logging
from openerp.osv import fields, orm
from openerp.tools.translate import _
from openerp.addons.connector.queue.job import job
from openerp.addons.connector.session import ConnectorSession
from openerp.addons.connector.queue.job import OpenERPJobStorage
_logger = logging.getLogger(__name__)
try:
from openerp.addons.connector.queue.job import job
from openerp.addons.connector.session import ConnectorSession
from openerp.addons.connector.queue.job import OpenERPJobStorage
except ImportError:
_logger.debug('Can not `import connector`.')
import functools
def empty_decorator_factory(*argv, **kwargs):
return functools.partial
job = empty_decorator_factory
# do a massive write on account moves BLOCK_SIZE at a time
BLOCK_SIZE = 1000

View File

@@ -20,9 +20,21 @@
###############################################################################
"""Wizards for batch posting."""
import logging
from openerp.osv import fields, orm
from openerp.addons.connector.session import ConnectorSession
from openerp.addons.connector.queue.job import job
_logger = logging.getLogger(__name__)
try:
from openerp.addons.connector.session import ConnectorSession
from openerp.addons.connector.queue.job import job
except ImportError:
_logger.debug('Can not `import connector`.')
def empty_decorator(func):
return func
job = empty_decorator
class AccountMoveMarker(orm.TransientModel):