[MERGE] forward port branch saas-11.3 up to fdef30fc299

3 files changed, 8 insertions, 17 deletions

diff --git a/addons/web/static/src/js/core/mixins.js b/addons/web/static/src/js/core/mixins.js
index fd8e8f93dbe..e29c97ea086 100644
--- a/addons/web/static/src/js/core/mixins.js
+++ b/addons/web/static/src/js/core/mixins.js
@@ -333,6 +333,7 @@ var EventDispatcherMixin = _.extend({}, ParentedMixin, {
         var event = new OdooEvent(this, name, info);
         //console.info('event: ', name, info);
         this._trigger_up(event);
+        return event;
     },
     _trigger_up: function (event) {
         var parent;
diff --git a/addons/web/static/src/js/core/rpc.js b/addons/web/static/src/js/core/rpc.js
index 53d298c9019..cc56cb74ebb 100644
--- a/addons/web/static/src/js/core/rpc.js
+++ b/addons/web/static/src/js/core/rpc.js
@@ -52,19 +52,19 @@ return {
 
         if (options.method === 'read_group') {
             if (!(params.args && params.args[0] !== undefined)) {
-                params.kwargs.domain = options.domain || params.domain || params.kwargs.domain || [];
+                params.kwargs.domain = options.domain || params.domain || params.kwargs.domain || [];
             }
             if (!(params.args && params.args[1] !== undefined)) {
-                params.kwargs.fields = options.fields || params.fields || params.kwargs.fields || [];
+                params.kwargs.fields = options.fields || params.fields || params.kwargs.fields || [];
             }
             if (!(params.args && params.args[2] !== undefined)) {
-                params.kwargs.groupby = options.groupBy || params.groupBy || params.kwargs.groupby || [];
+                params.kwargs.groupby = options.groupBy || params.groupBy || params.kwargs.groupby || [];
             }
-            params.kwargs.offset = options.offset || params.offset || params.kwargs.offset;
-            params.kwargs.limit = options.limit || params.limit || params.kwargs.limit;
+            params.kwargs.offset = options.offset || params.offset || params.kwargs.offset;
+            params.kwargs.limit = options.limit || params.limit || params.kwargs.limit;
             // In kwargs, we look for "orderby" rather than "orderBy" (note the absence of capital B),
             // since the Python argument to the actual function is "orderby".
-            var orderBy = options.orderBy || params.orderBy || params.kwargs.orderby;
+            var orderBy = options.orderBy || params.orderBy || params.kwargs.orderby;
             params.kwargs.orderby = orderBy ? this._serializeSort(orderBy) : orderBy;
             params.kwargs.lazy = 'lazy' in options ? options.lazy : params.lazy;
         }
@@ -72,7 +72,7 @@ return {
         if (options.method === 'search_read') {
             // call the model method
             params.kwargs.domain = options.domain || params.domain || params.kwargs.domain;
-            params.kwargs.fields = options.fields || params.fields || params.kwargs.fields;
+            params.kwargs.fields = options.fields || params.fields || params.kwargs.fields;
             params.kwargs.offset = options.offset || params.offset || params.kwargs.offset;
             params.kwargs.limit = options.limit || params.limit || params.kwargs.limit;
             // In kwargs, we look for "order" rather than "orderBy" since the Python
diff --git a/addons/web/static/src/js/core/widget.js b/addons/web/static/src/js/core/widget.js
index 651e1ea4feb..b25cd99587b 100644
--- a/addons/web/static/src/js/core/widget.js
+++ b/addons/web/static/src/js/core/widget.js
@@ -284,16 +284,6 @@ var Widget = core.Class.extend(mixins.PropertiesMixin, ServicesMixin, {
 
         return this;
     },
-    
-    /**
-     * Update the modifiers with the newest value. 
-     * Now this.attrs.modifiersValue can be used consistantly even with 
-     * conditional modifiers
-     * 
-     * @param {Object} modifiers  the updated modifiers
-     */
-    updateModifiersValue: function(modifiers) {
-    },
 
     //--------------------------------------------------------------------------
     // Private