diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py index ffda564cb8e..bfa6bca8f34 100644 --- a/addons/audittrail/audittrail.py +++ b/addons/audittrail/audittrail.py @@ -20,7 +20,7 @@ ############################################################################## from osv import fields, osv -from osv.osv import osv_pool, object_proxy +from osv.osv import object_proxy from tools.translate import _ import pooler import time diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 22bc7f3a089..7a9dc780af5 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -26,47 +26,6 @@ import pooler import string import tools -class recording_objects_proxy(osv_pool): - def execute(self, *args, **argv): - if args[3] == 'create': - _old_args = args[4].copy() - elif args[3] == 'write': - _old_args = args[5].copy() - elif len(args) >= 5 and isinstance(args[4], dict): - _old_args = args[4].copy() - elif len(args) > 5 and args[3] != 'write' and isinstance(args[5], dict): - _old_args = args[5].copy() - else: - _old_args = None - res = super(recording_objects_proxy, self).execute(*args, **argv) - pool = pooler.get_pool(args[0]) - mod = pool.get('ir.module.record') - - if mod and mod.recording: - if args[3] not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc', 'unlink'): - if _old_args is not None: - if args[3] != 'write' and args[3] != 'create' and len(args) > 5 and isinstance(args[5], dict): - args=list(args) - args[5]=_old_args - args=tuple(args) - mod.recording_data.append(('osv_memory_action', args, argv ,None)) - else: - if args[3] == 'create': - args[4].update(_old_args) - elif args[3] == 'write': - args[5].update(_old_args) - mod.recording_data.append(('query', args, argv,res)) - return res - - def exec_workflow(self, *args, **argv): - res = super(recording_objects_proxy, self).exec_workflow(*args, **argv) - pool = pooler.get_pool(args[0]) - mod = pool.get('ir.module.record') - if mod and mod.recording: - mod.recording_data.append(('workflow', args, argv)) - return res - -recording_objects_proxy() class xElement(minidom.Element): """dom.Element with compact print