[FIX] bloody retarded shit from revid:nicolas.vanhoren@openerp.com-20120418145003...

bzr revid: xmo@openerp.com-20120511113222-o4vj35vscnbebvh8

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 640ba4d..2b52768 100644 (file)
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -111,7 +111,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
             return value_if_empty === undefined ?  '' : value_if_empty;
     }
     var l10n = _t.database.parameters;
-    switch (descriptor.type || (descriptor.field && descriptor.field.type)) {
+    switch (descriptor.widget || descriptor.type || (descriptor.field && descriptor.field.type)) {
         case 'id':
             return value.toString();
         case 'integer':
@@ -171,7 +171,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
         case "":
             return value_if_empty === undefined ?  false : value_if_empty;
     }
-    switch (descriptor.type || (descriptor.field && descriptor.field.type)) {
+    switch (descriptor.widget || descriptor.type || (descriptor.field && descriptor.field.type)) {
         case 'integer':
             var tmp;
             do {