From 9a21bc6f80e0a4fd66a8e200cb597fba5d956a67 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Thu, 19 May 2011 14:13:36 +0200
Subject: [PATCH] [REF] removed any use of the ir module, also removed some
 unused imports.

bzr revid: vmt@openerp.com-20110519121336-zby128e15q9ffhhh
---
 addons/audittrail/audittrail.py                      | 4 ++--
 addons/crm/report/report_businessopp.py              | 4 ----
 addons/delivery/wizard/delivery_sale_order.py        | 1 -
 addons/report_webkit/wizard/report_webkit_actions.py | 8 +++++---
 addons/stock/partner.py                              | 3 +--
 addons/stock_location/stock_location.py              | 3 ---
 6 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index cbe31f46d9c..ffda564cb8e 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -22,7 +22,6 @@
 from osv import fields, osv
 from osv.osv import osv_pool, object_proxy
 from tools.translate import _
-import ir
 import pooler
 import time
 import tools
@@ -118,7 +117,8 @@ class audittrail_rule(osv.osv):
                 value = "ir.actions.act_window" + ',' + str(w_id[0])
             val_id = ir_values_obj.search(cr, uid, [('model', '=', thisrule.object_id.model), ('value', '=', value)])
             if val_id:
-                res = ir.ir_del(cr, uid, val_id[0])
+                ir_values_obj = pooler.get_pool(cr.dbname).get('ir.values')
+                res = ir_values_obj.unlink(cr, uid, [val_id[0]])
             self.write(cr, uid, [thisrule.id], {"state": "draft"})
         #End Loop
         return True
diff --git a/addons/crm/report/report_businessopp.py b/addons/crm/report/report_businessopp.py
index 4ebdd3cc81a..e417e241af1 100644
--- a/addons/crm/report/report_businessopp.py
+++ b/addons/crm/report/report_businessopp.py
@@ -19,16 +19,12 @@
 #
 ##############################################################################
 
-import ir
 import os, time
 import netsvc
 
 import random
 import StringIO
 
-import tools
-import pooler
-
 from report.render import render
 from report.interface import report_int
 from pychart import *
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index f8bb87cf38c..685917e8bd9 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import time
-import ir
 from tools.translate import _
 
 from osv import osv, fields
diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py
index a0572abd463..79426f8d159 100644
--- a/addons/report_webkit/wizard/report_webkit_actions.py
+++ b/addons/report_webkit/wizard/report_webkit_actions.py
@@ -29,9 +29,9 @@
 #
 ##############################################################################
 
-import ir
 from tools.translate import _
 from osv import fields, osv
+import pooler
 
 class report_webkit_actions(osv.osv_memory):
     _name = "report.webkit.actions"
@@ -106,7 +106,8 @@ class report_webkit_actions(osv.osv_memory):
                                                         context=context
                                                     )
             if current.print_button:
-                res = ir.ir_set(
+                ir_values_obj = pooler.get_pool(cr.dbname).get('ir.values')
+                res = ir_values_obj.set(
                                 cr, 
                                 uid, 
                                 'action', 
@@ -117,7 +118,8 @@ class report_webkit_actions(osv.osv_memory):
                                  isobject=True
                                 )
             else:
-                res = ir.ir_set(
+                ir_values_obj = pooler.get_pool(cr.dbname).get('ir.values')
+                res = ir_values_obj.set(
                                     cr, 
                                     uid, 
                                     'action', 
diff --git a/addons/stock/partner.py b/addons/stock/partner.py
index ae7307577ec..7a7ac058936 100644
--- a/addons/stock/partner.py
+++ b/addons/stock/partner.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 from osv import fields, osv
-import ir
 
 class res_partner(osv.osv):
     _inherit = 'res.partner'
@@ -46,4 +45,4 @@ class res_partner(osv.osv):
 
 res_partner()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 091054dbefb..16bf0501f36 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -20,9 +20,6 @@
 ##############################################################################
 
 from osv import fields,osv
-import tools
-import ir
-import pooler
 
 class stock_location_path(osv.osv):
     _name = "stock.location.path"