diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-22 12:46:30 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-22 12:46:30 +0200 |
| commit | 6a67e5cf42564bb276114bf70f30d6eaf9fe00d7 (patch) | |
| tree | 06c2356cad872e0d16c19920b5f9da237b0d6a84 /addons/web/controllers | |
| parent | 2fa3591a9bab94bf388c76346ad508261d1e6432 (diff) | |
| parent | e083d720a9f5df58e035ed179ad284d9bba50de3 (diff) | |
[MERGE] forward port branch 8.0 up to e083d72
Diffstat (limited to 'addons/web/controllers')
| -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 3ec3dbd91be..024041b9ca8 100644 --- a/addons/web/controllers/pivot.py +++ b/addons/web/controllers/pivot.py @@ -1,5 +1,6 @@ from openerp import http import simplejson +from openerp.tools import ustr from openerp.http import request, serialize_exception as _serialize_exception from cStringIO import StringIO from collections import deque @@ -70,7 +71,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): |