[MERGE] forward port branch saas-12 up to b1b700a

2016-09-22 15:23:45 +02:00
parent 4b812d9965 b1b700adb1
commit 856476d441
32 changed files with 1030 additions and 972 deletions
@@ -6,6 +6,7 @@ import json

 from odoo import http
 from odoo.http import request
+from odoo.tools import ustr
 from odoo.tools.misc import xlwt


@@ -69,7 +70,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):