From 6ea8851fd07c3cdf216e0695f0a5aba987e7e625 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 3 Feb 2014 14:33:31 +0100
Subject: [PATCH] [ADD] test read_group on a column of _inherits model and
 group on right field

bzr revid: mat@openerp.com-20140203133331-mujvv812zd971ci2
---
 openerp/addons/base/tests/test_base.py | 17 +++++++++++++++++
 openerp/osv/orm.py                     |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/tests/test_base.py b/openerp/addons/base/tests/test_base.py
index 7403c884410..2036f41be43 100644
--- a/openerp/addons/base/tests/test_base.py
+++ b/openerp/addons/base/tests/test_base.py
@@ -8,6 +8,7 @@ class test_base(common.TransactionCase):
     def setUp(self):
         super(test_base,self).setUp()
         self.res_partner = self.registry('res.partner')
+        self.res_users = self.registry('res.users')
 
         # samples use effective TLDs from the Mozilla public suffix
         # list at http://publicsuffix.org
@@ -282,6 +283,22 @@ class test_base(common.TransactionCase):
         p0.refresh()
         self.assertEquals(p0.vat, sunhelmvat2, 'Commercial fields must be automatically synced')
 
+    def test_60_read_group(self):
+        cr, uid = self.cr, self.uid
+        company_id = self.registry("ir.model.data").get_object_reference(cr, uid, "base", "main_company")[1]
+        for user_data in [
+          {'name': 'Alice', 'login': 'alice', 'color': 1, 'function': 'Friend'},
+          {'name': 'Bob', 'login': 'bob', 'color': 2, 'function': 'Friend'},
+          {'name': 'Eve', 'login': 'eve', 'color': 3, 'function': 'Eavesdropper'},
+        ]:
+          self.res_users.create(cr, uid, user_data)
+
+        groups_data = self.res_users.read_group(cr, uid, domain=[('login', 'in', ('alice', 'bob', 'eve'))], fields=['name', 'color', 'function'], groupby='function')
+        self.assertEqual(len(groups_data), 2, "Incorrect number of results when grouping on a field")
+        for group_data in groups_data:
+          self.assertIn('color', group_data, "Aggregated data for the column 'color' is not present in read_group return values")
+          self.assertEqual(group_data['color'], 3, "Incorrect sum for aggregated data for the column 'color' not present in read_group return values")
+
 class test_partner_recursion(common.TransactionCase):
 
     def setUp(self):
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c8e7c92b1d8..7f8748aa05b 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2675,7 +2675,7 @@ class BaseModel(object):
             group_operator = fget[f].get('group_operator', 'sum')
             if flist:
                 flist += ', '
-            qualified_field = self._inherits_join_calc(groupby, query)
+            qualified_field = self._inherits_join_calc(f, query)
             flist += "%s(%s) AS %s" % (group_operator, qualified_field, f)
 
         gb = groupby and (' GROUP BY ' + qualified_groupby_field) or ''