merge

bzr revid: fp@tinyerp.com-20100123102232-xgr7qe01cladih5d
2010-01-23 11:22:32 +01:00 · 2010-01-23 11:22:32 +01:00 · 79dff3cc69
parent 73b1e19c81
commit 79dff3cc69
1 changed files with 1 additions and 1 deletions
--- 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']