[MERGE] forward port of branch saas-6 up to 63e92cb

7 files changed, 14 insertions, 7 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 72a89d001e9..65bd414cefa 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -551,6 +551,7 @@
   border-radius: 3px;
   background: #f0f0fa;
   color: #4C4C4C;
+  display: inline-block;
   word-break: break-word;
 }
 .openerp .oe_tag_dark {
@@ -590,6 +591,7 @@
 }
 .openerp .oe_tags .text-wrap {
   width: 100% !important;
+  position: static;
 }
 .openerp .oe_tags .text-wrap textarea {
   width: 100% !important;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 03aeec7e04f..b844f1a8929 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -502,6 +502,7 @@ $sheet-padding: 16px
         @include radius(3px)
         background: $tag-bg-light
         color: #4C4C4C
+        display: inline-block
         word-break: break-word
     .oe_tag_dark
         background: $tag-bg-dark
@@ -533,6 +534,7 @@ $sheet-padding: 16px
             min-width: 250px
         .text-wrap
             width: 100% !important
+            position: static
             textarea
                 width: 100% !important
         .text-core
diff --git a/addons/web/static/src/js/framework/data.js b/addons/web/static/src/js/framework/data.js
index 273f10efaab..136fc01aa13 100644
--- a/addons/web/static/src/js/framework/data.js
+++ b/addons/web/static/src/js/framework/data.js
@@ -629,7 +629,7 @@ var DataSetStatic =  DataSet.extend({
         var offset = options.offset || 0,
             limit = options.limit || false;
         var end_pos = limit && limit !== -1 ? offset + limit : this.ids.length;
-        return this.read_ids(this.ids.slice(offset, end_pos), fields);
+        return this.read_ids(this.ids.slice(offset, end_pos), fields, options);
     },
     set_ids: function (ids) {
         this.ids = ids;
diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index 3042eddcd72..fb77d9feb3b 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -876,6 +876,10 @@ var FieldX2Many = AbstractManyField.extend({
 var X2ManyDataSet = data.BufferedDataSet.extend({
     get_context: function() {
         this.context = this.x2m.build_context();
+        var self = this;
+        _.each(arguments, function(context) {
+            self.context.add(context);
+        });
         return this.context;
     },
     create: function(data, options) {
diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js
index 8b25776c9dd..b720bfc77fe 100644
--- a/addons/web/static/src/js/views/list_view.js
+++ b/addons/web/static/src/js/views/list_view.js
@@ -1898,7 +1898,7 @@ var ColumnBinary = Column.extend({
      * @private
      */
     _format: function (row_data, options) {
-        var text = _t("Download");
+        var text = _t("Download"), filename=_t('Binary file');
         var value = row_data[this.id].value;
         if (!value) {
             return options.value_if_empty || '';
@@ -1916,11 +1916,13 @@ var ColumnBinary = Column.extend({
         if (this.filename && row_data[this.filename]) {
             text = _.str.sprintf(_t("Download \"%s\""), formats.format_value(
                     row_data[this.filename].value, {type: 'char'}));
+            filename = row_data[this.filename].value;
         }
-        return _.template('<a href="<%-href%>"><%-text%></a> (<%-size%>)')({
+        return _.template('<a download="<%-download%>" href="<%-href%>"><%-text%></a> (<%-size%>)')({
             text: text,
             href: download_url,
             size: utils.binary_to_binsize(value),
+            download: filename,
         });
     }
 });
diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js
index 023cfed381e..ae3cd33f4c3 100644
--- a/addons/web/static/src/js/views/list_view_editable.js
+++ b/addons/web/static/src/js/views/list_view_editable.js
@@ -812,6 +812,7 @@ ListView.include(/** @lends instance.web.ListView# */{
             e.preventDefault();
             return this._next();
         }
+        this.editor.form.__clicked_inside = true;
         return $.when();
     }
 });
diff --git a/addons/web/static/src/js/views/search_menus.js b/addons/web/static/src/js/views/search_menus.js
index faa67d890c2..208a50754fc 100644
--- a/addons/web/static/src/js/views/search_menus.js
+++ b/addons/web/static/src/js/views/search_menus.js
@@ -55,10 +55,6 @@ return Widget.extend({
                 }
             })
             .on('reset', this.proxy('clear_selection'));
-        if (!this.action_id) {
-            this.prepare_dropdown_menu([]);
-            return $.when();
-        }
         return this.model.call('get_filters', [this.target_model, this.action_id],
                                {context: this.searchview.dataset.context})
             .done(this.proxy('prepare_dropdown_menu'));