Merge lp:~openerp-dev/openobject-addons/trunk-basecalendar-readgroup-count-bth into lp:openobject-addons

[Harry (OpenERP)]

[lp:~openerp-dev/openobject-addons/trunk-basecalendar-readgroup-count-bth]

8941. By Bhumi Thakkar (Open ERP) on 2013-11-07

[MERGE]Merge trunk.

8942. By Bhumi Thakkar (Open ERP) on 2013-11-08

[IMP]Improved code for count.

8943. By Bhumi Thakkar (Open ERP) on 2013-11-08

[MERGE]Merge trunk.

8944. By Bhumi Thakkar (Open ERP) on 2013-11-11

[MERGE]Merge trunk.

Unmerged revisions

8944. By Bhumi Thakkar (Open ERP) on 2013-11-11

[MERGE]Merge trunk.

8943. By Bhumi Thakkar (Open ERP) on 2013-11-08

[MERGE]Merge trunk.

8942. By Bhumi Thakkar (Open ERP) on 2013-11-08

[IMP]Improved code for count.

8941. By Bhumi Thakkar (Open ERP) on 2013-11-07

[MERGE]Merge trunk.

8940. By Bhumi Thakkar (Open ERP) on 2013-10-10

[IMP]Update count of read_group to match with search result.

=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2013-10-06 11:58:08 +0000
+++ base_calendar/base_calendar.py	2013-11-11 13:45:54 +0000
@@ -1457,13 +1457,14 @@
         if 'date' in groupby:
             raise osv.except_osv(_('Warning!'), _('Group by date is not supported, use the calendar view instead.'))
         virtual_id = context.get('virtual_id', True)
+        oldcontext = context.copy()
         context.update({'virtual_id': False})
         res = super(calendar_event, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby)
         for re in res:
-            #remove the count, since the value is not consistent with the result of the search when expand the group
+            rec_count = self.search(cr, uid, re.get('__domain', []), offset=offset, limit=limit, order=orderby, context=oldcontext, count=True)
             for groupname in groupby:
-                if re.get(groupname + "_count"):
-                    del re[groupname + "_count"]
+                #update the count, to consistent with the result of the search when expand the group
+                re.update({groupname + "_count": rec_count})
             re.get('__context', {}).update({'virtual_id' : virtual_id})
         return res