[MERGE] forward port branch 12.0 up to 6e5ac011603

Also contains fixes for previous forward-port.

2 files changed, 3 insertions, 3 deletions

diff --git a/addons/web/static/src/js/views/kanban/kanban_controller.js b/addons/web/static/src/js/views/kanban/kanban_controller.js
index 8c43857277c..025c3d9bb90 100644
--- a/addons/web/static/src/js/views/kanban/kanban_controller.js
+++ b/addons/web/static/src/js/views/kanban/kanban_controller.js
@@ -211,7 +211,7 @@ var KanbanController = BasicController.extend({
     _onAddColumn: function (ev) {
         var self = this;
         this.mutex.exec(function () {
-            return self.model.createGroup(ev.data.value, this.handle).then(function () {
+            return self.model.createGroup(ev.data.value, self.handle).then(function () {
                 var state = self.model.get(self.handle, {raw: true});
                 var ids = _.pluck(state.data, 'res_id').filter(_.isNumber);
                 return self._resequenceColumns(ids);
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 607cf2d7b2f..4c37b823639 100644
--- a/addons/web/static/src/js/views/pivot/pivot_model.js
+++ b/addons/web/static/src/js/views/pivot/pivot_model.js
@@ -315,8 +315,8 @@ var PivotModel = AbstractModel.extend({
         if (!this.data.has_data) {
             return {
                 has_data: false,
-                colGroupBys: this.data.main_col.groupbys,
-                rowGroupBys:  this.data.main_row.groupbys,
+                colGroupBys: this.data.main_col.root.groupbys,
+                rowGroupBys:  this.data.main_row.root.groupbys,
                 measures: this.data.measures,
             };
         }