openerp-dev-web team mailing list archive

["Vo Minh Thu \(OpenERP\)" <vmt@xxxxxxxxxxx>]

Vo Minh Thu (OpenERP) has proposed merging lp:~openerp-dev/openobject-server/trunk-ir-vmt into lp:openobject-server.

Requested reviews:
  OpenERP Core Team (openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-ir-vmt/+merge/62103
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-ir-vmt/+merge/62103
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/trunk-ir-vmt.

=== modified file 'openerp/__init__.py'
--- openerp/__init__.py	2011-02-08 09:29:23 +0000
+++ openerp/__init__.py	2011-05-24 10:21:37 +0000
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import addons
-import ir
 import loglevels
 import netsvc
 import osv

=== modified file 'openerp/addons/base/ir/ir_model.py'
--- openerp/addons/base/ir/ir_model.py	2011-04-11 10:13:27 +0000
+++ openerp/addons/base/ir/ir_model.py	2011-05-24 10:21:37 +0000
@@ -24,7 +24,6 @@
 from operator import itemgetter
 
 from osv import fields,osv
-import ir
 import netsvc
 from osv.orm import except_orm, browse_record
 import tools
@@ -746,7 +745,8 @@
         cr.execute('select * from ir_values where model=%s and key=%s and name=%s'+where,(model, key, name))
         res = cr.fetchone()
         if not res:
-            res = ir.ir_set(cr, uid, key, key2, name, models, value, replace, isobject, meta)
+            ir_values_obj = pooler.get_pool(cr.dbname).get('ir.values')
+            res = ir_values_obj.set(cr, uid, key, key2, name, models, value, replace, isobject, meta)
         elif xml_id:
             cr.execute('UPDATE ir_values set value=%s WHERE model=%s and key=%s and name=%s'+where,(value, model, key, name))
         return True

=== modified file 'openerp/addons/base/ir/ir_values.py'
--- openerp/addons/base/ir/ir_values.py	2011-05-17 14:15:52 +0000
+++ openerp/addons/base/ir/ir_values.py	2011-05-24 10:21:37 +0000
@@ -144,7 +144,9 @@
             ids_res.append(self.create(cr, uid, vals))
         return ids_res
 
-    def get(self, cr, uid, key, key2, models, meta=False, context={}, res_id_req=False, without_user=True, key2_req=True):
+    def get(self, cr, uid, key, key2, models, meta=False, context=None, res_id_req=False, without_user=True, key2_req=True):
+        if context is None:
+            context = {}
         result = []
         for m in models:
             if isinstance(m, (list, tuple)):

=== modified file 'openerp/addons/base/res/res_currency.py'
--- openerp/addons/base/res/res_currency.py	2011-04-19 13:11:54 +0000
+++ openerp/addons/base/res/res_currency.py	2011-05-24 10:21:37 +0000
@@ -21,7 +21,6 @@
 import time
 import netsvc
 from osv import fields, osv
-import ir
 
 from tools.misc import currency
 from tools.translate import _

=== removed file 'openerp/ir/ir.py'
--- openerp/ir/ir.py	2011-05-16 15:05:34 +0000
+++ openerp/ir/ir.py	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import pickle
-import openerp.osv as osv
-import openerp.pooler as pooler
-
-def ir_set(cr, uid, key, key2, name, models, value, replace=True, isobject=False, meta=None):
-    ir_values_obj = pooler.get_pool(cr.dbname).get('ir.values')
-    return ir_values_obj.set(cr, uid, key, key2, name, models, value, replace, isobject, meta)
-
-def ir_del(cr, uid, id):
-    ir_values_obj = pooler.get_pool(cr.dbname).get('ir.values')
-    return ir_values_obj.unlink(cr, uid, [id])
-
-def ir_get(cr, uid, key, key2, models, meta=False, context=None, res_id_req=False):
-    ir_values_obj = pooler.get_pool(cr.dbname).get('ir.values')
-    res = ir_values_obj.get(cr, uid, key, key2, models, meta=meta, context=context, res_id_req=res_id_req)
-    return res
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== modified file 'openerp/service/web_services.py'
--- openerp/service/web_services.py	2011-02-07 12:57:23 +0000
+++ openerp/service/web_services.py	2011-05-24 10:21:37 +0000
@@ -29,7 +29,6 @@
 import platform
 from openerp.tools.translate import _
 import openerp.addons as addons
-import openerp.ir
 import openerp.netsvc as netsvc
 import openerp.pooler as pooler
 import openerp.release as release
@@ -369,8 +368,6 @@
 
     def dispatch(self, method, auth, params):
         logger = netsvc.Logger()
-        if method in [ 'ir_set','ir_del', 'ir_get' ]:
-            return self.common_dispatch(method,auth,params)
         if method == 'login':
             # At this old dispatcher, we do NOT update the auth proxy
             res = security.login(params[0], params[1], params[2])
@@ -401,22 +398,6 @@
     def new_dispatch(self,method,auth,params):
         pass
 
-    def exp_ir_set(self, cr, uid, keys, args, name, value, replace=True, isobject=False):
-        res = ir.ir_set(cr,uid, keys, args, name, value, replace, isobject)
-        return res
-
-    def exp_ir_del(self, cr, uid, id):
-        res = ir.ir_del(cr,uid, id)
-        return res
-
-    def exp_ir_get(self, cr, uid, keys, args=None, meta=None, context=None):
-        if not args:
-            args=[]
-        if not context:
-            context={}
-        res = ir.ir_get(cr,uid, keys, args, meta, context)
-        return res
-
     def exp_about(self, extended=False):
         """Return information about the OpenERP Server.
 

=== modified file 'openerp/wizard/__init__.py'
--- openerp/wizard/__init__.py	2011-02-07 12:57:23 +0000
+++ openerp/wizard/__init__.py	2011-05-24 10:21:37 +0000
@@ -25,7 +25,6 @@
 from openerp.tools.translate import translate
 from lxml import etree
 
-import openerp.ir as ir
 import openerp.pooler as pooler
 
 from openerp.osv.osv import except_osv
@@ -90,7 +89,8 @@
                     arch = arch.string
 
                 # fetch user-set defaut values for the field... shouldn't we pass it the uid?
-                defaults = ir.ir_get(cr, uid, 'default', False, [('wizard.'+self.wiz_name, False)])
+                ir_values_obj = pooler.get_pool(cr.dbname).get('ir.values')
+                defaults = ir_values_obj.get(cr, uid, 'default', False, [('wizard.'+self.wiz_name, False)])
                 default_values = dict([(x[1], x[2]) for x in defaults])
                 for val in fields.keys():
                     if 'default' in fields[val]: