[MERGE] forward port branch saas-12.4 up to 618ea1ab675

5 files changed, 9 insertions, 5 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 ee3ce15bdd2..c19364fa7a9 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
@@ -372,7 +372,7 @@ ActionManager.include({
                     Widget: View,
                 });
             } else if (config.isDebug('assets')) {
-                console.error("View type '" + viewType + "' is not present in the view registry.");
+                console.log("View type '" + viewType + "' is not present in the view registry.");
             }
         });
         return views;
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js
index beb7116169a..14f03a83222 100644
--- a/addons/web/static/src/js/fields/basic_fields.js
+++ b/addons/web/static/src/js/fields/basic_fields.js
@@ -1526,6 +1526,7 @@ var AbstractFieldBinary = AbstractField.extend({
      */
     _clearFile: function (){
         var self = this;
+        this.$('.o_input_file').val('');
         this.set_filename('');
         if (!this.isDestroyed()) {
             this._setValue(false).then(function() {
diff --git a/addons/web/static/src/js/views/list/list_view.js b/addons/web/static/src/js/views/list/list_view.js
index 58cb24a452f..baba4d4a35f 100644
--- a/addons/web/static/src/js/views/list/list_view.js
+++ b/addons/web/static/src/js/views/list/list_view.js
@@ -14,6 +14,7 @@ var core = require('web.core');
 var ListModel = require('web.ListModel');
 var ListRenderer = require('web.ListRenderer');
 var ListController = require('web.ListController');
+var pyUtils = require('web.py_utils');
 
 var _lt = core._lt;
 
@@ -41,7 +42,8 @@ var ListView = BasicView.extend({
         var selectedRecords = []; // there is no selected records by default
 
         var mode = this.arch.attrs.editable && !params.readonly ? "edit" : "readonly";
-        var expandGroups = !!JSON.parse(this.arch.attrs.expand || "0");
+        var pyevalContext = py.dict.fromJSON(_.pick(params.context, function(value, key, object) {return !_.isUndefined(value)}) || {});
+        var expandGroups = !!JSON.parse(pyUtils.py_eval(this.arch.attrs.expand || "0", {'context': pyevalContext}));
 
         this.groupbys = {};
         this.arch.children.forEach(function (child) {
diff --git a/addons/web/static/src/js/views/qweb/qweb_view.js b/addons/web/static/src/js/views/qweb/qweb_view.js
index 9e79ecf19d2..45c7340d5c1 100644
--- a/addons/web/static/src/js/views/qweb/qweb_view.js
+++ b/addons/web/static/src/js/views/qweb/qweb_view.js
@@ -65,8 +65,9 @@ var Model = AbstractModel.extend({
     /**
      * reload
      */
-    reload: function (_id, _params) {
-        // FIXME: update this._state or something?
+    reload: function (_id, params) {
+        _.extend(this._state, _.pick(params, ['domain', 'context']));
+
         return this._fetch();
     }
 });
diff --git a/addons/web/static/src/scss/layout_boxed.scss b/addons/web/static/src/scss/layout_boxed.scss
index 1916725f812..8b2d555365e 100644
--- a/addons/web/static/src/scss/layout_boxed.scss
+++ b/addons/web/static/src/scss/layout_boxed.scss
@@ -1,5 +1,5 @@
 .o_boxed_footer, .o_boxed_header, .o_report_layout_boxed {
-    font-family: 'Lato' 'Noto';
+    font-family: 'Lato', 'Noto';
     color: gray('700');
     font-size: 15px;
 }