From 988d81173bdd6cf43fbac46ac8591217767bea83 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Thu, 18 Feb 2010 14:36:21 +0100
Subject: [PATCH] [FIX] audittrail: correct dependencies [FIX] audittrail:
 ensure cursor is closed

bzr revid: chs@tinyerp.com-20100218133621-2x9nhq3y7nity6a2
---
 addons/audittrail/__terp__.py   |    2 +-
 addons/audittrail/audittrail.py |   25 ++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/addons/audittrail/__terp__.py b/addons/audittrail/__terp__.py
index 122bd6d..5ab7a0b 100644
--- a/addons/audittrail/__terp__.py
+++ b/addons/audittrail/__terp__.py
@@ -29,7 +29,7 @@
     Subscribe Rules for read, write, create and delete on objects and check logs""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'account', 'purchase', 'mrp'],
+    'depends': ['base'],
     'init_xml': [],
     'update_xml': [
         'audittrail_view.xml',
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 8467355..1bf6153 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -25,8 +25,7 @@ import ir
 from osv import fields,osv
 import netsvc
 import pooler
-import string
-import time,copy
+import time
 from tools.translate import _
 
 class audittrail_rule(osv.osv):
@@ -313,14 +312,14 @@ class audittrail_objects_proxy(objects_proxy):
     def execute(self, db, uid, passwd, object, method, *args):
         pool = pooler.get_pool(db)
         cr = pooler.get_db(db).cursor()
-        cr.autocommit(True)
-        obj=pool.get(object)
-        logged_uids = []
-        object_name=obj._name
-       
-        fct_src = super(audittrail_objects_proxy, self).execute
-        
-        def my_fct(db, uid, passwd, object, method, *args):
+        try:
+            cr.autocommit(True)
+            obj = pool.get(object)
+            logged_uids = []
+            object_name = obj._name
+
+            fct_src = super(audittrail_objects_proxy, self).execute
+
             field = method
             rule = False
             obj_ids= pool.get('ir.model').search(cr, uid,[('model','=',object_name)])
@@ -343,9 +342,9 @@ class audittrail_objects_proxy(objects_proxy):
                         if getattr(thisrule, 'log_'+field):
                             return self.log_fct(db, uid, passwd, object, method, fct_src, *args)
                 return fct_src(db, uid, passwd, object, method, *args)
-        res = my_fct(db, uid, passwd, object, method, *args)
-        cr.close()
-        return res
+        finally:
+            cr.close()
+            pass
 
 audittrail_objects_proxy()
 
-- 
1.7.10.4