[MERGE] forward port branch saas-12.1 up to 0f4abc5c228

6 files changed, 28 insertions, 20 deletions

diff --git a/addons/web/static/src/js/views/control_panel/control_panel_model.js b/addons/web/static/src/js/views/control_panel/control_panel_model.js
index f58fbc93c4f..e59dbfb1036 100644
--- a/addons/web/static/src/js/views/control_panel/control_panel_model.js
+++ b/addons/web/static/src/js/views/control_panel/control_panel_model.js
@@ -927,10 +927,21 @@ var ControlPanelModel = mvc.Model.extend({
                     }
                     var sort = JSON.parse(favorite.sort);
                     var orderedBy = sort.map(function (order) {
-                        var orderTerms = order.split(' ');
+                        var fieldName;
+                        var asc;
+                        var sqlNotation = order.split(' ');
+                        if (sqlNotation.length > 1) {
+                            // regex: \fieldName (asc|desc)?\
+                            fieldName = sqlNotation[0];
+                            asc = sqlNotation[1] === 'asc';
+                        } else {
+                            // legacy notation -- regex: \-?fieldName\
+                            fieldName = order[0] === '-' ? order.slice(1) : order;
+                            asc = order[0] === '-' ? false : true;
+                        }
                         return {
-                            name: orderTerms[0],
-                            asc: orderTerms.length === 2 && orderTerms[1] === 'asc',
+                            name: fieldName,
+                            asc: asc,
                         };
                     });
                     return {
diff --git a/addons/web/static/src/js/views/control_panel/search/filter_menu.js b/addons/web/static/src/js/views/control_panel/search/filter_menu.js
index 70a242dd0f8..04f333b37c4 100644
--- a/addons/web/static/src/js/views/control_panel/search/filter_menu.js
+++ b/addons/web/static/src/js/views/control_panel/search/filter_menu.js
@@ -89,8 +89,6 @@ var FilterMenu = DropdownMenu.extend({
                 domain: Domain.prototype.arrayToString(preFilter.attrs.domain),
             };
         });
-        // TO DO intercepts 'new_filters' and decide what to do whith filters
-        //  rewrite web.search_filters?
         this.trigger_up('new_filters', {filters: filters});
         _.invoke(this.propositions, 'destroy');
         this.propositions = [];
diff --git a/addons/web/static/src/js/views/control_panel/search/search_filters.js b/addons/web/static/src/js/views/control_panel/search/search_filters.js
index 4703995ac7c..80a9019c02d 100644
--- a/addons/web/static/src/js/views/control_panel/search/search_filters.js
+++ b/addons/web/static/src/js/views/control_panel/search/search_filters.js
@@ -171,15 +171,6 @@ var Char = Field.extend({
         {value: "∃", text: _lt("is set")},
         {value: "∄", text: _lt("is not set")}
     ],
-    get_domain: function (field, operator) {
-        switch (operator.value) {
-        case '∃': return [[field.name, '!=', false]];
-        case '∄': return [[field.name, '=', false]];
-        // does not work in all cases
-        // default: return "[('" + field.name + "', '" + operator.value + "', '" + this.get_value() + "')]";
-        default: return [[field.name, operator.value, this.get_value()]];
-        }
-    },
     get_value: function () {
         return this.$el.val();
     }
@@ -251,7 +242,7 @@ var DateTime = Field.extend({
     _create_new_widget: function (name) {
         this[name] = new (this._get_widget_class())(this);
         return this[name].appendTo(this.$el).then((function () {
-            this[name].setValue(moment(new Date()));
+            this[name].setValue(moment());
         }).bind(this));
     },
     _get_widget_class: function () {
diff --git a/addons/web/static/src/js/views/graph/graph_renderer.js b/addons/web/static/src/js/views/graph/graph_renderer.js
index 09706695bbc..82204bf3bd5 100644
--- a/addons/web/static/src/js/views/graph/graph_renderer.js
+++ b/addons/web/static/src/js/views/graph/graph_renderer.js
@@ -21,6 +21,7 @@ var CHART_TYPES = ['pie', 'bar', 'line'];
 
 // hide top legend when too many items for device size
 var MAX_LEGEND_LENGTH = 25 * (Math.max(1, config.device.size_class));
+var SPLIT_THRESHOLD = config.device.isMobile ? Infinity : 20;
 
 return AbstractRenderer.extend({
     className: "o_graph_renderer",
@@ -417,7 +418,11 @@ return AbstractRenderer.extend({
             }
         }
 
-        var $svgContainer = $('<div/>', {class: 'o_graph_svg_container'});
+        var $svgContainer = $('<div/>', { class: 'o_graph_svg_container'});
+        // Split the tooltip into columns for large data because some portion goes out off the screen.
+        if (data.length >= SPLIT_THRESHOLD) {
+            $svgContainer.addClass('o_tooltip_split_in_columns');
+        }
         this.$el.append($svgContainer);
         var svg = d3.select($svgContainer[0]).append('svg');
         svg.datum(data);
diff --git a/addons/web/static/src/js/views/pivot/pivot_model.js b/addons/web/static/src/js/views/pivot/pivot_model.js
index 4c37b823639..3f195c1ea24 100644
--- a/addons/web/static/src/js/views/pivot/pivot_model.js
+++ b/addons/web/static/src/js/views/pivot/pivot_model.js
@@ -237,7 +237,7 @@ var PivotModel = AbstractModel.extend({
                             [
                                 this.data.timeRangeDescription.toString(),
                                 this.data.comparisonTimeRangeDescription.toString(),
-                                'Variation'
+                                _t('Variation')
                             ],
                             makeMeasure
                         )
@@ -443,8 +443,10 @@ var PivotModel = AbstractModel.extend({
                 self._updateMainGroupBys(old_row, self.data.main_row);
             }
 
-            self._updateTree(old_col.root, self.data.main_col.root);
-            self._updateMainGroupBys(old_col, self.data.main_col);
+            if (!('pivot_column_groupby' in (params.context || {}))) {
+                self._updateTree(old_col.root, self.data.main_col.root);
+                self._updateMainGroupBys(old_col, self.data.main_col);
+            }
         });
     },
     /**
diff --git a/addons/web/static/src/js/views/pivot/pivot_renderer.js b/addons/web/static/src/js/views/pivot/pivot_renderer.js
index 813dc5d38b3..1a3c451f064 100644
--- a/addons/web/static/src/js/views/pivot/pivot_renderer.js
+++ b/addons/web/static/src/js/views/pivot/pivot_renderer.js
@@ -7,6 +7,7 @@ var field_utils = require('web.field_utils');
 var config = require('web.config');
 
 var QWeb = core.qweb;
+var _t = core._t;
 
 var PivotRenderer = AbstractRenderer.extend({
     tagName: 'table',
@@ -173,7 +174,7 @@ var PivotRenderer = AbstractRenderer.extend({
             $thead.append($row);
         }
         if (this.compare) {
-            var colLabels = [this.timeRangeDescription, this.comparisonTimeRangeDescription, 'Variation'];
+            var colLabels = [this.timeRangeDescription, this.comparisonTimeRangeDescription, _t('Variation')];
             var dataTypes = ['data', 'comparisonData', 'variation'];
             $row = $('<tr>');
             for (i = 0; i < 3 * nbrCols; i++) {