Merge lp:~openerp-dev/openobject-server/6.1-opw-584504-rgo into lp:openobject-server/6.1

[Ravi Gohil (OpenERP)]

Hello,

Scenario to reproduce the issue:
Say for example, I have an object 'res.country.region' object with 'name' and 'code' fields and an m2o field 'region_id' in 'res.country' object and I have a stored functional field 'region_id' in 'res.partner.address' object which takes region from the country assigned to the address(like address.country_id.region_id.id).

Now if I create a new record in 'res.partner.address' object and assign a country to it, respective 'region_id' will be stored in db for 'res_partner_address' table. This works fine.

But, if I have few addresses created with a country assigned to it, and if some user assigns 'region_id' to that country from 'res.country' object itself, you will be able to see that region in 'res.partner.address' object(as the function will calculate the value and show it), but the table 'res_partner_address' will not have value written for that 'region_id'.(To trigger store, one needs to change country and save the record).

This creates problems when someone groups addresses by region, it will show wrong grouping of records.

What this fix will do, it will put the records, which actually don't have value in database, under 'undefined' group.

Thanks.

Unmerged revisions

4335. By Ravi Gohil (OpenERP) on 2013-01-31

[FIX] Incase, stored functional field doesn't have value in database, grouping the records on that field will result in incorrect grouping. (Maintenance Case: 584687)

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2012-09-24 14:00:07 +0000
+++ openerp/osv/orm.py	2013-01-31 13:02:25 +0000
@@ -2556,9 +2556,12 @@
         cr.execute('SELECT min(%s.id) AS id, count(%s.id) AS %s_count' % (self._table, self._table, group_count) + (flist and ',') + flist + ' FROM ' + from_clause + where_clause + gb + limit_str + offset_str, where_clause_params)
         alldata = {}
         groupby = group_by
+        undefined = 0
         for r in cr.dictfetchall():
             for fld, val in r.items():
-                if val == None: r[fld] = False
+                if val == None: 
+                    undefined = r.get('id')
+                    r[fld] = False
             alldata[r['id']] = r
             del r['id']
 
@@ -2571,7 +2574,12 @@
         if groupby:   
             data = self.read(cr, uid, data_ids, [groupby], context=context)
             # restore order of the search as read() uses the default _order (this is only for groups, so the footprint of data should be small):
-            data_dict = dict((d['id'], d[groupby] ) for d in data)
+            data_dict = {}
+            for d in data:
+                if d['id'] == undefined:
+                    data_dict.update({d['id']:False})
+                else:
+                    data_dict.update({d['id']:d[groupby]})
             result = [{'id': i, groupby: data_dict[i]} for i in data_ids]
         else:
             result = [{'id': i} for i in data_ids]