[MERGE] forward port branch saas-14 up to 48f88992da6

2 files changed, 4 insertions, 3 deletions

diff --git a/addons/web/static/src/js/views/form_common.js b/addons/web/static/src/js/views/form_common.js
index 24c64aad7a4..dbbc46f3fcf 100644
--- a/addons/web/static/src/js/views/form_common.js
+++ b/addons/web/static/src/js/views/form_common.js
@@ -174,8 +174,8 @@ var CompletionFieldMixin = {
     init: function() {
         this.limit = 7;
         this.orderer = new utils.DropMisordered();
-        this.can_create = this.node.attrs.can_create || true;
-        this.can_write = this.node.attrs.can_write || true;
+        this.can_create = this.node.attrs.can_create == "false" ? false : true;
+        this.can_write = this.node.attrs.can_write == "false" ? false : true;
     },
     /**
      * Call this method to search using a string.
diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js
index 4f141570902..98cce6e484a 100644
--- a/addons/web/static/src/js/views/form_view.js
+++ b/addons/web/static/src/js/views/form_view.js
@@ -1091,7 +1091,8 @@ var FormView = View.extend(common.FieldManagerMixin, {
                         || field.field.type === 'one2many'
                         || field.field.type === 'many2many'
                         || field.field.type === 'binary'
-                        || field.password) {
+                        || field.password
+                        || !_.isEmpty(field.field.depends)) {
                     return false;
                 }