From b4d3c937adb28a02ecfef4aef01f487f305a96c9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 7 Jul 2011 17:46:49 +0200
Subject: [PATCH] [fix] small problem in field selection

bzr revid: nicolas.vanhoren@openerp.com-20110707154649-u6djzfim3wc9zg97
---
 addons/base/static/src/js/form.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index 1d7e9a13106..e8fe70c7f2d 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -1133,12 +1133,12 @@ openerp.base.form.FieldSelection = openerp.base.form.Field.extend({
         value = value instanceof Array ? value[0] : value;
         this._super(value);
         var option = _.detect(this.field_index, function(x) {return x.ekey === value;});
-        this.$element.find('select').val(option.ikey);
+        this.$element.find('select').val(option === undefined ? '' : option.ikey);
     },
     set_value_from_ui: function() {
         var ikey = this.$element.find('select').val();
         var option = _.detect(this.field_index, function(x) {return x.ikey === ikey;});
-        this.value = option.ekey;
+        this.value = option === undefined ? false : option.ekey;
     },
     update_dom: function() {
         this._super.apply(this, arguments);
@@ -1147,7 +1147,7 @@ openerp.base.form.FieldSelection = openerp.base.form.Field.extend({
     validate: function() {
         var ikey = this.$element.find('select').val();
         var option = _.detect(this.field_index, function(x) {return x.ikey === ikey;});
-        this.invalid = this.required && option.ekey === false;
+        this.invalid = this.required && (option === undefined || option.ekey === false);
     },
     focus: function() {
         this.$element.find('select').focus();