From be5bab60c8b3f88ff32f6bcd78af79a08c0a4843 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 9 Feb 2012 16:14:10 +0100
Subject: [PATCH] [IMP] display string label of selection and m2o fields in
 defaults-setting dialog

bzr revid: xmo@openerp.com-20120209151410-49j13cfbrwwhrp23
---
 addons/web/static/src/js/view_form.js | 15 +++++++++++++++
 addons/web/static/src/xml/base.xml    |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index ba1f885d2e6..5eec08a45f6 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -655,10 +655,25 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
                         || field.field.type === 'many2many') {
                     return false;
                 }
+                var displayed;
+                switch(field.field.type) {
+                case 'selection':
+                    displayed = _(field.values).find(function (option) {
+                            return option[0] === value;
+                        })[1];
+                    break;
+                case 'many2one':
+                    displayed = field.value[1] || value;
+                    break;
+                default:
+                    displayed = value;
+                }
+
                 return {
                     name: name,
                     string: field.string,
                     value: value,
+                    displayed: displayed,
                     // convert undefined to false
                     change_default: !!field.field.change_default
                 }
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fd1fda36753..7ee68877fdd 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -806,7 +806,7 @@
                     <option value=""/>
                     <option t-foreach="args.fields" t-as="field"
                             t-att-value="field.name">
-                        <t t-esc="field.string"/> = <t t-esc="field.value"/>
+                        <t t-esc="field.string"/> = <t t-esc="field.displayed"/>
                     </option>
                 </select>
             </td>
@@ -823,7 +823,7 @@
                     <option value=""/>
                     <option t-foreach="args.conditions" t-as="cond"
                             t-att-value="cond.name + '=' + cond.value">
-                        <t t-esc="cond.string"/>=<t t-esc="cond.value"/>
+                        <t t-esc="cond.string"/>=<t t-esc="cond.displayed"/>
                     </option>
                 </select>
             </td>