summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorFabien Pinckaers <fp@tinyerp.com>2010-01-23 11:22:32 +0100
committerFabien Pinckaers <fp@tinyerp.com>2010-01-23 11:22:32 +0100
commit79dff3cc69f7956fd689a8d5945f67f8a9fd7320 (patch)
tree750c3ea257669c40513b63261c5e7c5bc0b83382 /bin
parent73b1e19c8117113811891dd953ac2024a986a5b9 (diff)
merge
bzr revid: fp@tinyerp.com-20100123102232-xgr7qe01cladih5d
Diffstat (limited to 'bin')
-rw-r--r--bin/osv/orm.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index cdcff57b9cc..f249313be81 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1832,7 +1832,7 @@ class orm(orm_template):
data = self.read(cr, uid, alldata.keys(), [groupby], context=context)
for d in data:
- d['__domain'] = [(groupby,'=',alldata[d['id']][groupby] or False)]
+ d['__domain'] = [(groupby,'=',alldata[d['id']][groupby] or False)] + domain
del alldata[d['id']][groupby]
d.update(alldata[d['id']])
del d['id']