Merge lp:~openerp-dev/openobject-server/trunk-bug-817430-nch into lp:openobject-server

[Naresh(OpenERP)]

[Olivier Dony (Odoo) (odo-openerp)]

I'm closing this merge proposal, has it is now superseded by the ir.values refactoring branch at https://code.launchpad.net/~openerp-dev/openobject-server/trunk-cleanup-ir-values/+merge/73809
Thanks!

Unmerged revisions

3559. By Naresh(OpenERP) on 2011-08-30

[FIX]:ir values for multicompany environment

=== modified file 'openerp/addons/base/ir/ir_values.py'
--- openerp/addons/base/ir/ir_values.py	2011-06-10 10:19:24 +0000
+++ openerp/addons/base/ir/ir_values.py	2011-08-30 13:12:24 +0000
@@ -107,6 +107,10 @@
         if meta:
             meta = pickle.dumps(meta)
         assert isinstance(models, (list, tuple)), models
+        assert not company or isinstance(company, int), "Parameter 'company' must be an integer (company ID)!"
+        if company and company is True:
+            current_user_obj = self.pool.get('res.users').browse(cr, uid, uid, context={})
+            company = current_user_obj.company_id.id
         ids_res = []
         for model in models:
             if isinstance(model, (list, tuple)):
@@ -119,7 +123,8 @@
                     ('key2', '=', key2),
                     ('model', '=', model),
                     ('res_id', '=', res_id),
-                    ('user_id', '=', preserve_user and uid)
+                    ('user_id', '=', preserve_user and uid),
+                    ('company_id' ,'=', company)
                 ]
                 if key in ('meta', 'default'):
                     search_criteria.append(('name', '=', name))
@@ -136,12 +141,10 @@
                 'key2': key2 and key2[:200],
                 'meta': meta,
                 'user_id': preserve_user and uid,
+                'company_id':company
             }
-            if company:
-                cid = self.pool.get('res.users').browse(cr, uid, uid, context={}).company_id.id
-                vals['company_id']=cid
             if res_id:
-                vals['res_id']= res_id
+                vals['res_id'] = res_id
             ids_res.append(self.create(cr, uid, vals))
         return ids_res
 
@@ -184,9 +187,11 @@
                 # value for any given name. The 'order by' will put the null
                 # values last; this may be postgres specific (it is the
                 # behavior in postgres at least since 8.2).
-                order = 'user_id'
-            where.append('(user_id=%s or (user_id IS NULL)) order by '+ order)
-            params.append(uid)
+                order = 'user_id, company_id'
+            where.append('''(user_id=%s or (user_id IS NULL))
+                        and (company_id is null or
+                        company_id = (SELECT company_id FROM res_users WHERE id = %s)) order by '''+ order)
+            params += [uid, uid]
             clause = ' and '.join(where)
             cr.execute('select id,name,value,object,meta, key from ir_values where ' + clause, params)
             result = cr.fetchall()