[MERGE] bug fixes form 6.1 branch

bzr revid: xmo@openerp.com-20120305070634-li0eloj7vhsljguu

1 files changed, 16 insertions, 12 deletions

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 30654da0c7d..30a0018b6e1 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -291,6 +291,10 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      */
     configure_pager: function (dataset) {
         this.dataset.ids = dataset.ids;
+        // Not exactly clean
+        if (dataset._length) {
+            this.dataset._length = dataset._length;
+        }
 
         var limit = this.limit(),
             total = dataset.size(),
@@ -540,19 +544,17 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      * @param {Array} records selected record values
      */
     do_select: function (ids, records) {
-        this.$element.find('.oe-list-delete')
-            .attr('disabled', !ids.length);
-        if (this.sidebar) {
-            if (ids.length) {
-                this.sidebar.do_unfold();
-            } else {
-                this.sidebar.do_fold();
-            }
-        }
-        if (!records.length) {
+        this.$element.find('.oe-list-delete').attr('disabled', !ids.length);
+        if (!ids.length) {
+            this.dataset.index = 0;
+            if (this.sidebar) { this.sidebar.do_fold(); }
             this.compute_aggregates();
             return;
         }
+
+        this.dataset.index = _(this.dataset.ids).indexOf(ids[0]);
+        if (this.sidebar) { this.sidebar.do_unfold(); }
+
         this.compute_aggregates(_(records).map(function (record) {
             return {count: 1, values: record};
         }));
@@ -1259,9 +1261,11 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
                     if (column.meta) {
                         // do not do anything
                     } else if (column.id in group.aggregates) {
-                        var value = group.aggregates[column.id];
+                        var r = {};
+                        r[column.id] = {value: group.aggregates[column.id]};
                         $('<td class="oe-number">')
-                            .html(openerp.web.format_value(value, column))
+                            .html(openerp.web.format_cell(
+                                r, column, {process_modifiers: false}))
                             .appendTo($row);
                     } else {
                         $row.append('<td>');