[MERGE] forward port branch saas-15 up to b0992d082da

2 files changed, 24 insertions, 13 deletions

diff --git a/addons/web/static/src/js/views/kanban/kanban_view.js b/addons/web/static/src/js/views/kanban/kanban_view.js
index 4716e7a3bc3..2edb44abf7d 100644
--- a/addons/web/static/src/js/views/kanban/kanban_view.js
+++ b/addons/web/static/src/js/views/kanban/kanban_view.js
@@ -25,6 +25,13 @@ var KanbanView = BasicView.extend({
         this._super.apply(this, arguments);
 
         var arch = viewInfo.arch;
+
+        this.loadParams.limit = this.loadParams.limit || 40;
+        this.loadParams.openGroupByDefault = true;
+        this.loadParams.type = 'list';
+
+        this.loadParams.groupBy = arch.attrs.default_group_by ? [arch.attrs.default_group_by] : (params.groupBy || []);
+
         var activeActions = this.controllerParams.activeActions;
         activeActions = _.extend(activeActions, {
             group_edit: arch.attrs.group_edit ? JSON.parse(arch.attrs.group_edit) : true,
@@ -35,7 +42,7 @@ var KanbanView = BasicView.extend({
             editable: activeActions.group_edit,
             deletable: activeActions.group_delete,
             group_creatable: true,
-            quick_create: params.isQuickCreateEnabled || this._isQuickCreateEnabled(arch),
+            quick_create: params.isQuickCreateEnabled || this._isQuickCreateEnabled(viewInfo),
         };
         this.rendererParams.record_options = {
             editable: activeActions.edit,
@@ -47,19 +54,17 @@ var KanbanView = BasicView.extend({
 
         this.controllerParams.readOnlyMode = false;
         this.controllerParams.hasButtons = true;
-
-        this.loadParams.limit = this.loadParams.limit || 40;
-        this.loadParams.openGroupByDefault = true;
-        this.loadParams.type = 'list';
-
-        this.loadParams.groupBy = arch.attrs.default_group_by ? [arch.attrs.default_group_by] : (params.groupBy || []);
     },
-    _isQuickCreateEnabled: function (arch) {
+    _isQuickCreateEnabled: function (viewInfo) {
+        var groupBy = this.loadParams.groupBy[0];
+        if(groupBy !== undefined && !_.contains(['char', 'boolean', 'many2one'], viewInfo.fields[groupBy].type)) {
+            return false;
+        }
         if (!this.controllerParams.activeActions.create) {
             return false;
         }
-        if (arch.attrs.quick_create !== undefined) {
-            return JSON.parse(arch.attrs.quick_create);
+        if (viewInfo.arch.attrs.quick_create !== undefined) {
+            return JSON.parse(viewInfo.arch.attrs.quick_create);
         }
         return true;
     }
diff --git a/addons/web/static/src/js/widgets/data_export.js b/addons/web/static/src/js/widgets/data_export.js
index f8c622bf5e8..44a815cf82d 100644
--- a/addons/web/static/src/js/widgets/data_export.js
+++ b/addons/web/static/src/js/widgets/data_export.js
@@ -207,9 +207,15 @@ var DataExport = Dialog.extend({
         this.records = {};
         this.dataset = dataset;
         this.exports = new data.DataSetSearch(this, 'ir.exports', this.dataset.get_context());
-        
+
         this.row_index = 0;
         this.row_index_level = 0;
+
+        // The default for the ".modal_content" element is "max-height: 100%;"
+        // but we want it to always expand to "height: 100%;" for this modal.
+        // This can be achieved thanks to LESS modification without touching
+        // the ".modal-content" rules... but not with Internet explorer (11).
+        this.$modal.find(".modal-content").css("height", "100%");
     },
     start: function() {
         var self = this;
@@ -265,7 +271,7 @@ var DataExport = Dialog.extend({
 
         function do_setup_export_formats(formats) {
             var $fmts = self.$('.o_export_format');
-            
+
             _.each(formats, function(format, i) {
                 var $radio = $('<input/>', {type: 'radio', value: format.tag, name: 'o_export_format_name'});
                 var $label = $('<label/>', {html: format.label});
@@ -374,7 +380,7 @@ var DataExport = Dialog.extend({
     },
     on_show_data: function(records, expansion) {
         var self = this;
-    
+
         if(expansion) {
             this.$('.o_export_tree_item[data-id="' + expansion + '"]')
                 .addClass('open')