openerp-dev-web team mailing list archive

["Yogesh\(Open ERP\)" <ysa@xxxxxxxxxxx>]

Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-server/trunk-bug-779727-ysa into lp:openobject-server.

Requested reviews:
  Naresh(OpenERP) (nch-openerp)
Related bugs:
  Bug #779727 in OpenERP Server: "[Import data] Message of error generate unicode exception"
  https://bugs.launchpad.net/openobject-server/+bug/779727

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-779727-ysa/+merge/61747

fix import error message translation problem used tools.ustr() in error message.
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-779727-ysa/+merge/61747
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/trunk-bug-779727-ysa.

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2011-05-16 15:05:34 +0000
+++ openerp/osv/orm.py	2011-05-20 11:46:08 +0000
@@ -838,14 +838,15 @@
                     res = line[i] and float(line[i]) or 0.0
                 elif fields_def[field[len(prefix)]]['type'] == 'selection':
                     for key, val in fields_def[field[len(prefix)]]['selection']:
-                        if line[i] in [tools.ustr(key), tools.ustr(val)]:
+                        if tools.ustr(line[i]) in [tools.ustr(key), tools.ustr(val)]:
                             res = key
                             break
                     if line[i] and not res:
                         logger.notifyChannel("import", netsvc.LOG_WARNING,
                                 _("key '%s' not found in selection field '%s'") % \
-                                        (line[i], field[len(prefix)]))
-                        warning += [_("Key/value '%s' not found in selection field '%s'") % (line[i], field[len(prefix)])]
+                                        ( tools.ustr(line[i]), tools.ustr(field[len(prefix)])))
+                        warning += [_("Key/value '%s' not found in selection field '%s'") % (tools.ustr(line[i]), tools.ustr(field[len(prefix)]))]
+
                 else:
                     res = line[i]