[MERGE] forward port branch 9.0 up to c725745d14

addons/sale/models/sale.py

@@ -389,11 +389,11 @@ class SaleOrder(models.Model):
             'state': 'draft',
             'procurement_group_id': False,
         })
-        orders.mapped('order_line').mapped('procurement_ids').write({'sale_line_id': False})
+        return orders.mapped('order_line').mapped('procurement_ids').write({'sale_line_id': False})
 
     @api.multi
     def action_cancel(self):
-        self.write({'state': 'cancel'})
+        return self.write({'state': 'cancel'})
 
     @api.multi
     def action_quotation_send(self):
@@ -443,7 +443,7 @@ class SaleOrder(models.Model):
 
     @api.multi
     def action_done(self):
-        self.write({'state': 'done'})
+        return self.write({'state': 'done'})
 
     def _prepare_procurement_group(self):
         return {'name': self.name}

addons/web/static/src/js/views/search_menus.js

@@ -434,8 +434,8 @@ return Widget.extend({
         if (!this._fields_def) {
             this._fields_def = data_manager.load_fields(this.searchview.dataset).then(function (fields) {
                 var groupable_types = ['many2one', 'char', 'boolean', 'selection', 'date', 'datetime'];
-                var filter_group_field = _.filter(fields, function(field, name) {
-                    if (field.store && _.contains(groupable_types, field.type)) {
+                var filter_group_field = _.filter(fields, function (field, name) {
+                    if (field.sortable && _.contains(groupable_types, field.type)) {
                         field.name = name;
                         return field;
                     }