Odoo Server (MOVED TO GITHUB)

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

  1. trunk-bug-712254
  2. Merge into trunk
Proposed by Antony Lesuisse (OpenERP)
Status: Work in progress
Proposed branch: lp:~openerp-dev/openobject-server/trunk-bug-712254
Merge into: lp:openobject-server
Diff against target: 40 lines (+7/-6)
1 file modified
openerp/osv/fields.py (+7/-6)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-bug-712254
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+93051@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vo Minh Thu (thu) wrote :

I guess you want to pass cid to _get_by_id() ?

Reply

Unmerged revisions

4060. By Fabien (Open ERP)

[FIX] bug 712254

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/osv/fields.py'
2--- openerp/osv/fields.py 2012-02-14 12:57:25 +0000
3+++ openerp/osv/fields.py 2012-02-14 19:15:37 +0000
4@@ -1393,11 +1393,11 @@
5 res[prop_name] = prop.get(cr, uid, prop_name, obj._name, context=context)
6 return res
7
8- def _get_by_id(self, obj, cr, uid, prop_name, ids, context=None):
9+ def _get_by_id(self, obj, cr, uid, prop_name, ids, context=None, company_id=False):
10 prop = obj.pool.get('ir.property')
11 vids = [obj._name + ',' + str(oid) for oid in ids]
12
13- domain = [('fields_id.model', '=', obj._name), ('fields_id.name', 'in', prop_name)]
14+ domain = [('fields_id.model', '=', obj._name), ('fields_id.name', 'in', prop_name), ('company_id','=',company_id)]
15 #domain = prop._get_domain(cr, uid, prop_name, obj._name, context)
16 if vids:
17 domain = [('res_id', 'in', vids)] + domain
18@@ -1408,6 +1408,11 @@
19 if context is None:
20 context = {}
21
22+ def_id = self._field_get(cr, uid, obj._name, prop_name)
23+ company = obj.pool.get('res.company')
24+ cid = company._company_default_get(cr, uid, obj._name, def_id,
25+ context=context)
26+
27 nids = self._get_by_id(obj, cr, uid, [prop_name], [id], context)
28 if nids:
29 cr.execute('DELETE FROM ir_property WHERE id IN %s', (tuple(nids),))
30@@ -1422,10 +1427,6 @@
31 property_create = True
32
33 if property_create:
34- def_id = self._field_get(cr, uid, obj._name, prop_name)
35- company = obj.pool.get('res.company')
36- cid = company._company_default_get(cr, uid, obj._name, def_id,
37- context=context)
38 propdef = obj.pool.get('ir.model.fields').browse(cr, uid, def_id,
39 context=context)
40 prop = obj.pool.get('ir.property')