summaryrefslogtreecommitdiff
path: root/addons/web
diff options
context:
space:
mode:
authorxmo-odoo <xmo-odoo@users.noreply.github.com>2015-03-06 13:12:50 +0100
committerxmo-odoo <xmo-odoo@users.noreply.github.com>2015-03-06 13:12:50 +0100
commitd9c9ac72daf45a4a8bd3cd9d2d1dbf33423a1deb (patch)
tree9a8cb566abffd570b419b5039d88285571579068 /addons/web
parent6c9afff057047724953ee14aed47eea34bd2650c (diff)
[FIX] export: decode Field strings before comparisons
Allows exporting fields whose string is a non-ascii *byte*string (rather than unicode). backport of 7286f4e4244 fixing #773 to branch 7.0 by request of @flotho
Diffstat (limited to 'addons/web')
-rw-r--r--addons/web/controllers/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index b3acbbe5119..080025dd737 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1481,7 +1481,7 @@ class Export(openerpweb.Controller):
fields['.id'] = fields.pop('id', {'string': 'ID'})
fields_sequence = sorted(fields.iteritems(),
- key=lambda field: field[1].get('string', ''))
+ key=lambda field: openerp.tools.ustr(field[1].get('string', '')))
records = []
for field_name, field in fields_sequence: