diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-22 14:23:07 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-22 14:23:07 +0200 |
| commit | b1b700adb1f26bb43e8f4b77b85f969a4b52d36c (patch) | |
| tree | fd1febbefe6cdb41fb2a063fec4af3718860b9a9 /addons/web/controllers/pivot.py | |
| parent | 5a0a29b5285ea8f18716f936d58960b9b5c0f0d9 (diff) | |
| parent | 6854887ade204c635fb99a16275f7e0ca664697a (diff) | |
[MERGE] forward port branch saas-11 up to 6854887
Diffstat (limited to 'addons/web/controllers/pivot.py')
| -rw-r--r-- | addons/web/controllers/pivot.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/controllers/pivot.py b/addons/web/controllers/pivot.py index 41c113bbbdd..8e861cacb12 100644 --- a/addons/web/controllers/pivot.py +++ b/addons/web/controllers/pivot.py @@ -1,5 +1,6 @@ from openerp import http import json +from openerp.tools import ustr from openerp.http import request, serialize_exception as _serialize_exception from openerp.tools.misc import xlwt from cStringIO import StringIO @@ -67,7 +68,7 @@ class TableExporter(http.Controller): # Step 3: writing data x = 0 for row in jdata['rows']: - worksheet.write(y, x, row['indent'] * ' ' + row['title'], header_plain) + worksheet.write(y, x, row['indent'] * ' ' + ustr(row['title']), header_plain) for cell in row['values']: x = x + 1 if cell.get('is_bold', False): |