[MERGE] Forwardport of branch 9.0 up to revision 87578177

2 files changed, 47 insertions, 7 deletions

diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index 3d35a0d3f4d..be003b06cd8 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -1396,13 +1396,11 @@ var FieldMany2ManyTags = AbstractManyField.extend(common.CompletionFieldMixin, c
         this._super(field_manager, node);
         common.CompletionFieldMixin.init.call(this);
         this.set({"value": []});
-
+    },
+    willStart: function () {
         var self = this;
-        // We need to know if the field 'color' exists on the model
-        this.mutex.exec(function(){
-            return self.dataset.call('fields_get', []).then(function(fields) {
-               self.fields = fields;
-            });
+        return this.dataset.call('fields_get', []).then(function(fields) {
+           self.fields = fields;
         });
     },
     commit_value: function() {
@@ -1733,4 +1731,3 @@ return {
 };
 
 });
-
diff --git a/addons/web/static/src/less/enterprise_compatibility.less b/addons/web/static/src/less/enterprise_compatibility.less
index 7dc4238f684..74b5e99abf1 100644
--- a/addons/web/static/src/less/enterprise_compatibility.less
+++ b/addons/web/static/src/less/enterprise_compatibility.less
@@ -326,6 +326,27 @@ div.o_checkbox {
         > .o_address_zip {
             margin-right: 0;
         }
+        &.o_zip_city {
+            > .o_address_zip {
+                margin-right: 2%;
+            }
+            > .o_address_city {
+                margin-right: 0;
+            }
+            > .o_address_state {
+                clear: left;
+                margin-right: 0;
+            }
+        }
+        &.o_city_state {
+            > .o_address_state {
+                margin-right: 0;
+            }
+            > .o_address_zip {
+                clear: left;
+                margin-right: 0;
+            }
+        }
     }
     &.oe_form_editable .o_address_format {
         > .o_address_city {
@@ -337,6 +358,28 @@ div.o_checkbox {
         > .o_address_zip {
             width: 25%;
         }
+        &.o_zip_city {
+            > .o_address_zip {
+                width: 38%;
+            }
+            > .o_address_city {
+                width: 60%;
+            }
+            > .o_address_state {
+                width: 100%;
+            }
+        }
+        &.o_city_state {
+            > .o_address_city {
+                width: 50%;
+            }
+            > .o_address_state {
+                width: 48%;
+            }
+            > .o_address_zip {
+                width: 100%;
+            }
+        }
     }
 }