Yogesh(Open ERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-bug-712254-ysa into
lp:openobject-server.
Requested reviews:
Naresh(OpenERP) (nch-openerp)
Related bugs:
Bug #712254 in OpenERP Server: "[stable 6.0][trunk]property fields deleted
for other companies if Admin user in multiple companies"
https://bugs.launchpad.net/openobject-server/+bug/712254
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-712254-ysa/+merge/65941
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-712254-ysa/+merge/65941
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-bug-712254-ysa.
=== modified file 'openerp/osv/fields.py'
--- openerp/osv/fields.py 2011-06-24 14:01:03 +0000
+++ openerp/osv/fields.py 2011-06-27 07:26:35 +0000
@@ -1030,7 +1030,8 @@
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)]
+ company_id = obj.pool.get('res.users').browse(cr, uid, uid, context).company_id.id
+ 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
@@ -1068,7 +1069,8 @@
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_id = obj.pool.get('res.users').browse(cr, uid, uid, context).company_id.id
+ domain = [('fields_id.model', '=', obj._name), ('fields_id.name','in',prop_name), ('company_id','=', 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)
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
