[MERGE] forward port branch 12.0 up to 8f21148e1a8

10 files changed, 192 insertions, 46 deletions

diff --git a/addons/web/static/src/js/chrome/action_manager_act_window.js b/addons/web/static/src/js/chrome/action_manager_act_window.js
index d36ec9371de..91b3cc7248c 100644
--- a/addons/web/static/src/js/chrome/action_manager_act_window.js
+++ b/addons/web/static/src/js/chrome/action_manager_act_window.js
@@ -58,7 +58,10 @@ ActionManager.include({
      * @param {string} [state.view_type]
      */
     loadState: function (state) {
+        var callersArguments = arguments;
+        var self = this;
         var action;
+        var def;
         var options = {
             clear_breadcrumbs: true,
             pushState: false,
@@ -113,11 +116,20 @@ ActionManager.include({
                 action = lastAction;
                 options.viewType = state.view_type;
             }
+        } else if (state.sa) {
+            def = this._rpc({
+                route: '/web/session/get_session_action',
+                params: {key: state.sa},
+            }).then(function (sessionAction) {
+                action = sessionAction;
+            });
         }
-        if (action) {
-            return this.doAction(action, options);
-        }
-        return this._super.apply(this, arguments);
+        return $.when(def).then(function () {
+            if (action) {
+                return self.doAction(action, options);
+            }
+            return self._super.apply(self, callersArguments);
+        });
     },
 
     //--------------------------------------------------------------------------
diff --git a/addons/web/static/src/js/core/ajax.js b/addons/web/static/src/js/core/ajax.js
index 509126498bc..3e421ad2d1e 100644
--- a/addons/web/static/src/js/core/ajax.js
+++ b/addons/web/static/src/js/core/ajax.js
@@ -30,11 +30,17 @@ function genericJsonRpc (fct_name, params, settings, fct) {
         core.bus.trigger('rpc:result', data, result);
         if (result.error !== undefined) {
             if (result.error.data.arguments[0] !== "bus.Bus not available in test mode") {
+                var func = console.error;
                 if (result.error.data.exception_type === "user_error") {
-                    console.log("Server application error", JSON.stringify(result.error));
-                } else {
-                    console.error("Server application error", JSON.stringify(result.error));
+                    func = console.log;
                 }
+                func(
+                    "Server application error\n",
+                    "Error code:", result.error.code, "\n",
+                    "Error message:", result.error.message, "\n",
+                    "Error data message:\n", result.error.data.message, "\n",
+                    "Error data debug:\n", result.error.data.debug
+                );
             }
             return $.Deferred().reject("server", result.error);
         } else {
diff --git a/addons/web/static/src/js/views/calendar/calendar_controller.js b/addons/web/static/src/js/views/calendar/calendar_controller.js
index ea1ec1591ea..a6dec31afe1 100644
--- a/addons/web/static/src/js/views/calendar/calendar_controller.js
+++ b/addons/web/static/src/js/views/calendar/calendar_controller.js
@@ -160,7 +160,8 @@ var CalendarController = AbstractController.extend({
      * @returns {Deferred}
      */
     _updateRecord: function (record) {
-        return this.model.updateRecord(record).then(this.reload.bind(this, {}));
+        var reload = this.reload.bind(this, {});
+        return this.model.updateRecord(record).then(reload, reload);
     },
 
     //--------------------------------------------------------------------------
diff --git a/addons/web/static/src/js/views/calendar/calendar_model.js b/addons/web/static/src/js/views/calendar/calendar_model.js
index a5d54d4c585..5d613df8ed8 100644
--- a/addons/web/static/src/js/views/calendar/calendar_model.js
+++ b/addons/web/static/src/js/views/calendar/calendar_model.js
@@ -307,7 +307,7 @@ return AbstractModel.extend({
      * Toggle the sidebar (containing the mini calendar)
      */
     toggleFullWidth: function () {
-        var fullWidth = this.call('local_storage', 'getItem', 'calendar_fullWidth') !== 'true';
+        var fullWidth = this.call('local_storage', 'getItem', 'calendar_fullWidth') !== true;
         this.call('local_storage', 'setItem', 'calendar_fullWidth', fullWidth);
     },
     /**
@@ -439,7 +439,7 @@ return AbstractModel.extend({
      */
     _loadCalendar: function () {
         var self = this;
-        this.data.fullWidth = this.call('local_storage', 'getItem', 'calendar_fullWidth') === 'true';
+        this.data.fullWidth = this.call('local_storage', 'getItem', 'calendar_fullWidth') === true;
         this.data.fc_options = this._getFullCalendarOptions();
 
         var defs = _.map(this.data.filters, this._loadFilter.bind(this));
diff --git a/addons/web/static/src/js/views/list/list_editable_renderer.js b/addons/web/static/src/js/views/list/list_editable_renderer.js
index 04da1bc4983..d083a1c2165 100644
--- a/addons/web/static/src/js/views/list/list_editable_renderer.js
+++ b/addons/web/static/src/js/views/list/list_editable_renderer.js
@@ -638,48 +638,48 @@ ListRenderer.include({
     _resequence: function (event, ui) {
         var self = this;
         var movedRecordID = ui.item.data('id');
-        var rows = this.state.data;
-        var row = _.findWhere(rows, {id: movedRecordID});
-        var index0 = rows.indexOf(row);
-        var index1 = ui.item.index();
-        var lower = Math.min(index0, index1);
-        var upper = Math.max(index0, index1) + 1;
+        self.unselectRow().then(function () {
+            var rows = self.state.data;
+            var row = _.findWhere(rows, {id: movedRecordID});
+            var index0 = rows.indexOf(row);
+            var index1 = ui.item.index();
+            var lower = Math.min(index0, index1);
+            var upper = Math.max(index0, index1) + 1;
 
-        var order = _.findWhere(self.state.orderedBy, {name: self.handleField});
-        var asc = !order || order.asc;
-        var reorderAll = false;
-        var sequence = (asc ? -1 : 1) * Infinity;
+            var order = _.findWhere(self.state.orderedBy, {name: self.handleField});
+            var asc = !order || order.asc;
+            var reorderAll = false;
+            var sequence = (asc ? -1 : 1) * Infinity;
 
-        // determine if we need to reorder all lines
-        _.each(rows, function (row, index) {
-            if ((index < lower || index >= upper) &&
-                ((asc && sequence >= row.data[self.handleField]) ||
-                 (!asc && sequence <= row.data[self.handleField]))) {
-                reorderAll = true;
-            }
-            sequence = row.data[self.handleField];
-        });
+            // determine if we need to reorder all lines
+            _.each(rows, function (row, index) {
+                if ((index < lower || index >= upper) &&
+                    ((asc && sequence >= row.data[self.handleField]) ||
+                     (!asc && sequence <= row.data[self.handleField]))) {
+                    reorderAll = true;
+                }
+                sequence = row.data[self.handleField];
+            });
 
-        if (reorderAll) {
-            rows = _.without(rows, row);
-            rows.splice(index1, 0, row);
-        } else {
-            rows = rows.slice(lower, upper);
-            rows = _.without(rows, row);
-            if (index0 > index1) {
-                rows.unshift(row);
+            if (reorderAll) {
+                rows = _.without(rows, row);
+                rows.splice(index1, 0, row);
             } else {
-                rows.push(row);
+                rows = rows.slice(lower, upper);
+                rows = _.without(rows, row);
+                if (index0 > index1) {
+                    rows.unshift(row);
+                } else {
+                    rows.push(row);
+                }
             }
-        }
 
-        var sequences = _.pluck(_.pluck(rows, 'data'), self.handleField);
-        var rowIDs = _.pluck(rows, 'id');
+            var sequences = _.pluck(_.pluck(rows, 'data'), self.handleField);
+            var rowIDs = _.pluck(rows, 'id');
 
-        if (!asc) {
-            rowIDs.reverse();
-        }
-        this.unselectRow().then(function () {
+            if (!asc) {
+                rowIDs.reverse();
+            }
             self.trigger_up('resequence', {
                 rowIDs: rowIDs,
                 offset: _.min(sequences),
diff --git a/addons/web/static/src/scss/form_view_extra.scss b/addons/web/static/src/scss/form_view_extra.scss
index 277537beab4..0d59483c2d8 100644
--- a/addons/web/static/src/scss/form_view_extra.scss
+++ b/addons/web/static/src/scss/form_view_extra.scss
@@ -140,7 +140,7 @@
             border-right: 1px solid #ddd;
         }
         .o_td_label + td {
-            padding: 2px 36px 2px 8px;
+            padding: 0px 36px 0px 8px;
         }
         .o_field_widget.o_text_overflow {
             width: 1px!important; // hack to make the table layout believe it is a small element (so that the table does not grow too much) ...
diff --git a/addons/web/static/src/scss/kanban_view.scss b/addons/web/static/src/scss/kanban_view.scss
index c1b05807ddf..c046a7fffb7 100644
--- a/addons/web/static/src/scss/kanban_view.scss
+++ b/addons/web/static/src/scss/kanban_view.scss
@@ -236,6 +236,7 @@
                 font-weight: 500;
                 background-color: transparent;
                 color: inherit;
+                box-shadow: none;
                 @include o-kanban-tag-color;
 
                 span {
diff --git a/addons/web/static/tests/chrome/action_manager_tests.js b/addons/web/static/tests/chrome/action_manager_tests.js
index a3501f71722..911a03d360c 100644
--- a/addons/web/static/tests/chrome/action_manager_tests.js
+++ b/addons/web/static/tests/chrome/action_manager_tests.js
@@ -1174,6 +1174,30 @@ QUnit.module('ActionManager', {
         actionManager.destroy();
     });
 
+    QUnit.test('state.sa should load action from session', function (assert) {
+        assert.expect(1);
+
+        var actionManager = createActionManager({
+            actions: this.actions,
+            archs: this.archs,
+            data: this.data,
+            mockRPC: function (route, args) {
+                if (route === '/web/session/get_session_action') {
+                    return $.when(1);
+                }
+                return this._super.apply(this, arguments);
+            },
+        });
+        actionManager.loadState({
+            sa: 1,
+        });
+
+        assert.strictEqual(actionManager.$('.o_kanban_view').length, 1,
+            "should have rendered a kanban view");
+
+        actionManager.destroy();
+    });
+
     QUnit.module('Concurrency management');
 
     QUnit.test('drop previous actions if possible', function (assert) {
diff --git a/addons/web/static/tests/views/calendar_tests.js b/addons/web/static/tests/views/calendar_tests.js
index d369f632e56..9ff8474e39d 100644
--- a/addons/web/static/tests/views/calendar_tests.js
+++ b/addons/web/static/tests/views/calendar_tests.js
@@ -1,11 +1,13 @@
 odoo.define('web.calendar_tests', function (require) {
 "use strict";
 
+var AbstractStorageService = require('web.AbstractStorageService');
 var CalendarView = require('web.CalendarView');
 var CalendarRenderer = require('web.CalendarRenderer');
 var Dialog = require('web.Dialog');
 var fieldUtils = require('web.field_utils');
 var mixins = require('web.mixins');
+var RamStorage = require('web.RamStorage');
 var testUtils = require('web.test_utils');
 var time = require('web.time');
 var session = require('web.session');
@@ -2606,6 +2608,44 @@ QUnit.module('Views', {
         calendar.destroy();
     });
 
+    QUnit.test('calendar sidebar toggle', function (assert) {
+        assert.expect(5);
+
+        var calendar = createView({
+            View: CalendarView,
+            model: 'event',
+            data: this.data,
+            arch:
+            '<calendar date_start="start_date">'+
+                    '<field name="name"/>'+
+            '</calendar>',
+            services: {
+                local_storage: AbstractStorageService.extend({storage: new RamStorage()}),
+            },
+        });
+
+        var fullWidth = calendar.call('local_storage', 'getItem', 'calendar_fullWidth');
+        assert.strictEqual(fullWidth, undefined,
+            "calendar_fullWidth should be undefined in local storage");
+        assert.containsNone(calendar, '.o_calendar_sidebar_container.o_sidebar_hidden',
+            "sidebar should be opened");
+
+        // click on close
+        testUtils.dom.click(calendar.$('.o_calendar_sidebar_toggler'));
+        fullWidth = calendar.call('local_storage', 'getItem', 'calendar_fullWidth');
+        assert.strictEqual(fullWidth, true,
+            "calendar_fullWidth should be true in local storage");
+        assert.containsOnce(calendar, '.o_calendar_sidebar_container.o_sidebar_hidden',
+            "sidebar should be hidden");
+
+        // reload calendar view and check calendar view has still full width
+        calendar.reload();
+        assert.containsOnce(calendar, '.o_calendar_sidebar_container.o_sidebar_hidden',
+            "sidebar should be hidden");
+
+        calendar.destroy();
+    });
+
 });
 
 });
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index 43920abc9d3..c7e622eb331 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -7946,6 +7946,68 @@ QUnit.module('Views', {
                      .trigger($.Event('keydown', {which: $.ui.keyCode.ESCAPE}));
         form.destroy();
     });
+
+    QUnit.test('resequence list lines when discardable lines are present', function (assert) {
+        assert.expect(8);
+
+        var onchangeNum = 0;
+
+        this.data.partner.onchanges = {
+            p: function (obj) {
+                onchangeNum++;
+                obj.foo = obj.p.length.toString();
+            },
+        };
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form>' +
+                    '<field name="foo"/>' +
+                    '<field name="p"/>' +
+                '</form>',
+            archs: {
+                'partner,false,list':
+                    '<tree editable="bottom">' +
+                        '<field name="int_field" widget="handle"/>' +
+                        '<field name="display_name" required="1"/>' +
+                    '</tree>',
+            },
+        });
+
+        assert.strictEqual(onchangeNum, 1, "one onchange happens when form is opened");
+        assert.strictEqual(form.$('[name="foo"]').val(), "0", "onchange worked there is 0 line");
+
+        // Add one line
+        form.$('.o_field_x2many_list_row_add a').click();
+        form.$('.o_field_one2many input:first').focus();
+        form.$('.o_field_one2many input:first').val('first line').trigger('input');
+        form.$('input[name="foo"]').click();
+        assert.strictEqual(onchangeNum, 2, "one onchange happens when a line is added");
+        assert.strictEqual(form.$('[name="foo"]').val(), "1", "onchange worked there is 1 line");
+
+        // Drag and drop second line before first one (with 1 draft and invalid line)
+        form.$('.o_field_x2many_list_row_add a').click();
+        testUtils.dragAndDrop(
+            form.$('.ui-sortable-handle').eq(0),
+            form.$('.o_data_row').last(),
+            {position: 'bottom'}
+        );
+        assert.strictEqual(onchangeNum, 3, "one onchange happens when lines are resequenced")
+        assert.strictEqual(form.$('[name="foo"]').val(), "1", "onchange worked there is 1 line");
+
+        // Add a second line
+        form.$('.o_field_x2many_list_row_add a').click();
+        form.$('.o_field_one2many input:first').focus();
+        form.$('.o_field_one2many input:first').val('second line').trigger('input');
+        form.$('input[name="foo"]').click();
+        assert.strictEqual(onchangeNum, 4, "one onchange happens when a line is added");
+        assert.strictEqual(form.$('[name="foo"]').val(), "2", "onchange worked there is 2 lines");
+
+        form.destroy();
+    });
+
     QUnit.test('if the focus is on the discard button, hitting ESCAPE should discard', function (assert) {
         assert.expect(1);