Merge lp:~openerp-dev/openerp-web/7.0-opw-591038-cpa into lp:openerp-web/7.0

[Chirag Patel (OpenERP)]

Hello,

Record not expand when groupby on float field.

Demo:
1) Add following filter in "Quotation" search view.
   <filter string="My total" icon="terp-go-month" context="{'group_by':'amount_total'}"/>
2) Groupby on this filter.
3) Try to expand groupby record which have more then 1 record.

Observed: Records not expand in list view.

Required branch for server
lp:~openerp-dev/openobject-server/7.0-opw-591038-cpa

Thanks.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

See comment on server branch.

review: Disapprove

Unmerged revisions

3892. By Chirag Patel (OpenERP) on 2013-04-10

[FIX] Fixed groupby on float field and expand groupby record.

=== modified file 'addons/web/static/src/js/view_list.js'
--- addons/web/static/src/js/view_list.js	2013-03-22 16:23:10 +0000
+++ addons/web/static/src/js/view_list.js	2013-04-12 13:08:54 +0000
@@ -1383,9 +1383,9 @@
                 .each(function (column) {
                     if (column.meta) {
                         // do not do anything
-                    } else if (column.id in group.aggregates) {
+                    } else if (column.id+"_header" in group.aggregates) {
                         var r = {};
-                        r[column.id] = {value: group.aggregates[column.id]};
+                        r[column.id] = {value: group.aggregates[column.id+"_header"]};
                         $('<td class="oe_number">')
                             .html(column.format(r, {process_modifiers: false}))
                             .appendTo($row);