[MERGE] forward port branch 11.0 up to e1104ac344c

2 files changed, 24 insertions, 24 deletions

diff --git a/addons/web/static/src/js/chrome/control_panel.js b/addons/web/static/src/js/chrome/control_panel.js
index 8be394205d5..98ce7814b7a 100644
--- a/addons/web/static/src/js/chrome/control_panel.js
+++ b/addons/web/static/src/js/chrome/control_panel.js
@@ -10,32 +10,32 @@ odoo.define('web.ControlPanelMixin', function (require) {
  * we get the time to refactor the control panel.
  *
  * For example, here is what a typical client action would need to do to add
- * support for a control panel with some buttons:
+ * support for a control panel with some buttons::
  *
- * var ControlPanelMixin = require('web.ControlPanelMixin');
+ *     var ControlPanelMixin = require('web.ControlPanelMixin');
  *
- * var SomeClientAction = Widget.extend(ControlPanelMixin, {
- *     ...
- *     start: function () {
- *         this._renderButtons();
- *         this._updateControlPanel();
+ *     var SomeClientAction = Widget.extend(ControlPanelMixin, {
  *         ...
- *     },
- *     do_show: function () {
- *          ...
- *          this._updateControlPanel();
- *     },
- *     _renderButtons: function () {
- *         this.$buttons = $(QWeb.render('SomeTemplate.Buttons'));
- *         this.$buttons.on('click', ...);
- *     },
- *     _updateControlPanel: function () {
- *         this.update_control_panel({
- *             breadcrumbs: this.action_manager.get_breadcrumbs(),
- *             cp_content: {
- *                $buttons: this.$buttons,
- *             },
- *      });
+ *         start: function () {
+ *             this._renderButtons();
+ *             this._updateControlPanel();
+ *             ...
+ *         },
+ *         do_show: function () {
+ *              ...
+ *              this._updateControlPanel();
+ *         },
+ *         _renderButtons: function () {
+ *             this.$buttons = $(QWeb.render('SomeTemplate.Buttons'));
+ *             this.$buttons.on('click', ...);
+ *         },
+ *         _updateControlPanel: function () {
+ *             this.update_control_panel({
+ *                 breadcrumbs: this.action_manager.get_breadcrumbs(),
+ *                 cp_content: {
+ *                    $buttons: this.$buttons,
+ *                 },
+ *          });
  */
 var ControlPanelMixin = {
     need_control_panel: true,
diff --git a/addons/web/static/src/js/chrome/search_menus.js b/addons/web/static/src/js/chrome/search_menus.js
index eee7303ffbd..fe2ce5f3c32 100644
--- a/addons/web/static/src/js/chrome/search_menus.js
+++ b/addons/web/static/src/js/chrome/search_menus.js
@@ -415,7 +415,7 @@ return Widget.extend({
         this.groupableFields = [];
         var groupable_types = ['many2one', 'char', 'boolean', 'selection', 'date', 'datetime'];
         _.each(fields, function (field, name) {
-            if (field.store && _.contains(groupable_types, field.type)) {
+            if (field.sortable && _.contains(groupable_types, field.type)) {
                 self.groupableFields.push(_.extend({}, field, {name: name}));
             }
         });