From 8dff24709692b6ba61d19a60815200220aad77fc Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 9 Sep 2014 16:45:42 +0200 Subject: [PATCH] [FIX] orm, read_group: read_group_fill_results handle no_leaf --- openerp/osv/orm.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 00093999bca..cd625bc2009 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -2568,13 +2568,19 @@ class BaseModel(object): # same ordering, and can be merged in one pass. result = [] known_values = {} + + if len(groupby_list) < 2 and context.get('group_by_no_leaf'): + count_attr = '_' + else: + count_attr = groupby + count_attr += '_count' + def append_left(left_side): grouped_value = left_side[groupby] and left_side[groupby][0] if not grouped_value in known_values: result.append(left_side) known_values[grouped_value] = left_side else: - count_attr = groupby + '_count' known_values[grouped_value].update({count_attr: left_side[count_attr]}) def append_right(right_side): grouped_value = right_side[0]