diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2009-12-22 22:22:43 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2009-12-22 22:22:43 +0100 |
| commit | 99fe46f0cbcdce71bb9ce2bc0429a3c76cab7774 (patch) | |
| tree | a449d2b6347e415ce7e6babbbf2cfe75454dde7e /bin | |
| parent | 89be98debf3ff15b80dfc4231c7d2831e47c1da7 (diff) | |
[FIX] multi company, speed improvement
bzr revid: fp@tinyerp.com-20091222212243-jptdo5hwmj3pah54
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/osv/fields.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/osv/fields.py b/bin/osv/fields.py index 8ecdd8eb407..432f5cde680 100644 --- a/bin/osv/fields.py +++ b/bin/osv/fields.py @@ -508,7 +508,7 @@ class many2many(_column): d1, d2, tables = obj.pool.get('ir.rule').domain_get(cr, user, obj._name, context=context) if d1: - d1 = ' and ' + d1 + d1 = ' and ' + ' and '.join(d1) cr.execute('SELECT '+self._rel+'.'+self._id2+','+self._rel+'.'+self._id1+' \ FROM '+self._rel+' , '+(','.join(tables))+' \ @@ -546,7 +546,7 @@ class many2many(_column): d1, d2,tables = obj.pool.get('ir.rule').domain_get(cr, user, obj._name, context=context) if d1: - d1 = ' and ' + d1 + d1 = ' and ' + ' and '.join(d1) cr.execute('delete from '+self._rel+' where '+self._id1+'=%s AND '+self._id2+' IN (SELECT '+self._rel+'.'+self._id2+' FROM '+self._rel+', '+','.join(tables)+' WHERE '+self._rel+'.'+self._id1+'=%s AND '+self._rel+'.'+self._id2+' = '+obj._table+'.id '+ d1 +')', [id, id]+d2) for act_nbr in act[2]: |