Merge lp:~openerp-dev/openobject-server/trunk-bug-712254-ysa into lp:openobject-server

[Yogesh (SerpentCS)]

[Vo Minh Thu (thu)]

- You are computing the company_id with

  company_id = obj.pool.get('res.users').browse(cr, uid, uid, context).company_id.id

but later in _fnct_write, it is computed with

  cid = company._company_default_get(cr, uid, obj._name, def_id, context=context)

Did you choose the former for a specific reason?

- You have made twice the same modification. Please refactor the code when you see duplicated code.

[lp:~openerp-dev/openobject-server/trunk-bug-712254-ysa]

3481. By Yogesh (SerpentCS) on 2011-06-27

[FIX+IMP] improvement in fnct_write and fnct_read method of property class.

[Yogesh (SerpentCS) (yogesh-serpentcs)]

Hello sir,

I have improve the code. Please check it.

Thanks,

review: Needs Resubmitting

[Vo Minh Thu (thu)]

Actually, the call to _company_default_get shouldn't be there (it is unrelated to the property field). We also want to make the read/write function be much simpler, with the main work being done in ir.properties.

qdp will work on it (next week I think) as part of some larger rework, so I will reject this merge proposal.

Part of the reason it needs a rework is that at creation time, the company is chosen (wrongly) by _company_default_get. Later when we want to read the property, we have no idea of the company that was chosen and cannot decide which property is the right one.

Unmerged revisions

3481. By Yogesh (SerpentCS) on 2011-06-27

[FIX+IMP] improvement in fnct_write and fnct_read method of property class.

3480. By Yogesh (SerpentCS) on 2011-06-27

[FIX] add domain comapny_id = current user comapny in fnct_read and _get_by_id method in fields.property class.

=== modified file 'openerp/osv/fields.py'
--- openerp/osv/fields.py	2011-06-24 14:01:03 +0000
+++ openerp/osv/fields.py	2011-06-27 10:13:32 +0000
@@ -1026,11 +1026,11 @@
                 replaces[value._name][value.id] = True
         return default_value, replaces
 
-    def _get_by_id(self, obj, cr, uid, prop_name, ids, context=None):
+    def _get_by_id(self, obj, cr, uid, prop_name, ids, company_id=False, context=None):
         prop = obj.pool.get('ir.property')
         vids = [obj._name + ',' + str(oid) for oid in  ids]
 
-        domain = [('fields_id.model', '=', obj._name), ('fields_id.name','in',prop_name)]
+        domain = [('fields_id.model', '=', obj._name), ('fields_id.name','in',prop_name), ('company_id','=', company_id)]
         #domain = prop._get_domain(cr, uid, prop_name, obj._name, context)
         if vids:
             domain = [('res_id', 'in', vids)] + domain
@@ -1040,18 +1040,16 @@
     def _fnct_write(self, obj, cr, uid, id, prop_name, id_val, obj_dest, context=None):
         if context is None:
             context = {}
-
-        nids = self._get_by_id(obj, cr, uid, [prop_name], [id], context)
+        def_id = self._field_get(cr, uid, obj._name, prop_name)
+        company_id = obj.pool.get('res.company')._company_default_get(cr, uid, obj._name,
+                                            def_id, context=context)
+        nids = self._get_by_id(obj, cr, uid, [prop_name], [id], company_id, context)
         if nids:
             cr.execute('DELETE FROM ir_property WHERE id IN %s', (tuple(nids),))
 
         default_val = self._get_default(obj, cr, uid, prop_name, context)
 
         if id_val is not default_val:
-            def_id = self._field_get(cr, uid, obj._name, prop_name)
-            company = obj.pool.get('res.company')
-            cid = company._company_default_get(cr, uid, obj._name, def_id,
-                                               context=context)
             propdef = obj.pool.get('ir.model.fields').browse(cr, uid, def_id,
                                                              context=context)
             prop = obj.pool.get('ir.property')
@@ -1059,7 +1057,7 @@
                 'name': propdef.name,
                 'value': id_val,
                 'res_id': obj._name+','+str(id),
-                'company_id': cid,
+                'company_id': company_id,
                 'fields_id': def_id,
                 'type': self._type,
             }, context=context)
@@ -1068,7 +1066,14 @@
 
     def _fnct_read(self, obj, cr, uid, ids, prop_name, obj_dest, context=None):
         properties = obj.pool.get('ir.property')
-        domain = [('fields_id.model', '=', obj._name), ('fields_id.name','in',prop_name)]
+        company_obj = obj.pool.get('res.company')
+        company_id = []
+        for prop in prop_name:
+            def_id = self._field_get(cr, uid, obj._name, prop)
+            company_id.append(company_obj._company_default_get(cr, uid, obj._name,
+                                                def_id, context=context))
+        domain = [('fields_id.model', '=', obj._name), ('fields_id.name','in',prop_name),
+                                      ('company_id','in', company_id)]
         domain += [('res_id','in', [obj._name + ',' + str(oid) for oid in  ids])]
         nids = properties.search(cr, uid, domain, context=context)
         default_val,replaces = self._get_defaults(obj, cr, uid, prop_name, context)