2 files changed, 10 insertions, 4 deletions
diff --git a/addons/web/static/src/js/fields/field_utils.js b/addons/web/static/src/js/fields/field_utils.js
index 98fafcef7f1..aabf5e2ae95 100644
--- a/addons/web/static/src/js/fields/field_utils.js
+++ b/addons/web/static/src/js/fields/field_utils.js
@@ -296,12 +296,12 @@ function formatMonetary(value, field, options) {
  * @param {boolean} [options.escape=false] if true, escapes the formatted value
  */
 function formatSelection(value, field, options) {
-    if (!value) {
-        return '';
-    }
     var val = _.find(field.selection, function (option) {
         return option[0] === value;
     });
+    if (!val) {
+        return '';
+    }
     value = val[1];
     if (options && options.escape) {
         value = _.escape(value);
diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js
index d65532165e8..7f8cbd2eb45 100644
--- a/addons/web/static/src/js/fields/relational_fields.js
+++ b/addons/web/static/src/js/fields/relational_fields.js
@@ -1671,7 +1671,7 @@ var FieldSelection = AbstractField.extend({
     },
 
     //--------------------------------------------------------------------------
-    // Private
+    // Public
     //--------------------------------------------------------------------------
 
     /**
@@ -1681,6 +1681,12 @@ var FieldSelection = AbstractField.extend({
     getFocusableElement: function () {
         return this.$el.is('select') ? this.$el : $();
     },
+    /**
+     * @override
+     */
+    isSet: function () {
+        return this.value !== false;
+    },
 
     //--------------------------------------------------------------------------
     // Private