[MERGE] forward port branch saas-11.4 up to 3c108977c1e

1 files changed, 5 insertions, 1 deletions

diff --git a/addons/web/static/src/js/views/basic/basic_view.js b/addons/web/static/src/js/views/basic/basic_view.js
index 7bc5e95bfc8..9e1cde2aada 100644
--- a/addons/web/static/src/js/views/basic/basic_view.js
+++ b/addons/web/static/src/js/views/basic/basic_view.js
@@ -225,7 +225,7 @@ var BasicView = AbstractView.extend({
             attrs.options = attrs.options ? pyUtils.py_eval(attrs.options) : {};
         }
 
-        if (attrs.on_change && !field.onChange) {
+        if (attrs.on_change && attrs.on_change !== "0" && !field.onChange) {
             field.onChange = "1";
         }
 
@@ -378,6 +378,10 @@ var BasicView = AbstractView.extend({
                     if (!(dependency_name in fields)) {
                         fields[dependency_name] = dependency_dict;
                     }
+
+                    if (fv.fields && !(dependency_name in fv.fields)) {
+                        fv.fields[dependency_name] = dependency_dict;
+                    }
                 }
             }
             return false;