[MERGE] forward port branch 10.0 up to 8c55e57c7ff

2 files changed, 5 insertions, 2 deletions

diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js
index d5449dae6d9..1ea73e6278e 100644
--- a/addons/web/static/lib/qweb/qweb2.js
+++ b/addons/web/static/lib/qweb/qweb2.js
@@ -153,14 +153,15 @@ var QWeb2 = {
         foreach: function(context, enu, as, old_dict, callback) {
             if (enu != null) {
                 var index, jlen, cur;
-                var size, new_dict = this.extend({}, old_dict);
+                var new_dict = this.extend({}, old_dict);
                 new_dict[as + "_all"] = enu;
                 var as_value = as + "_value",
                     as_index = as + "_index",
                     as_first = as + "_first",
                     as_last = as + "_last",
                     as_parity = as + "_parity";
-                if (size = enu.length) {
+                if (enu instanceof Array) {
+                    var size = enu.length;
                     new_dict[as + "_size"] = size;
                     for (index = 0, jlen = enu.length; index < jlen; index++) {
                         cur = enu[index];
diff --git a/addons/web/static/src/less/form_view_layout.less b/addons/web/static/src/less/form_view_layout.less
index fc5522035e5..7e108b6af2c 100644
--- a/addons/web/static/src/less/form_view_layout.less
+++ b/addons/web/static/src/less/form_view_layout.less
@@ -168,7 +168,9 @@
 
     // Flex fields
     .o_form_field_many2one, .o_form_field_radio, .o_form_field_many2manytags, .o_form_field_percent_pie, .o_form_field_monetary, .o_form_field_binary_file {
+    @media (min-width: @screen-sm-min) {
         .o-inline-flex-display();
+    }
         > span, > button {
             .o-flex(0, 0, auto);
         }