Merged with diagram server

bzr revid: hda@tinyerp.com-20100406104457-k5l60gj690d041bj
2010-04-06 16:14:57 +05:30
parent 91a88a3f8d 0c160b815b
commit c6669f3cb1
1 changed files with 2 additions and 1 deletions
@@ -2013,7 +2013,8 @@ class orm(orm_template):

        for d in data:
            d['__domain'] = [(groupby,'=',alldata[d['id']][groupby] or False)] + domain
-            d['__context'] = {'group_by':groupby_list[1:]}
+            if not isinstance(groupby_list,(str, unicode)):
+                d['__context'] = {'group_by':groupby_list[1:]}
            if fget.has_key(groupby):
                if d[groupby] and fget[groupby]['type'] in ('date','datetime'):
                   dt = datetime.datetime.strptime(alldata[d['id']][groupby][:7],'%Y-%m')