[MERGE] forward port branch saas-12 up to 9ad5f26

2 files changed, 3 insertions, 11 deletions

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 4b277f816ea..e4e7f9d9a42 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -25,18 +25,13 @@ from xml.etree import ElementTree
 from cStringIO import StringIO
 
 
-try:
-    import xlwt
-except ImportError:
-    xlwt = None
-
 import odoo
 import odoo.modules.registry
 from odoo.api import Environment
 from odoo.modules import get_resource_path
 from odoo.tools import topological_sort
 from odoo.tools.translate import _
-from odoo.tools.misc import str2bool
+from odoo.tools.misc import str2bool, xlwt
 from odoo import http
 from odoo.http import request, serialize_exception as _serialize_exception
 from odoo.exceptions import AccessError
diff --git a/addons/web/controllers/pivot.py b/addons/web/controllers/pivot.py
index 97fc1d4eb83..7d1ea70b6dc 100644
--- a/addons/web/controllers/pivot.py
+++ b/addons/web/controllers/pivot.py
@@ -1,16 +1,13 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from openerp.tools.misc import xlwt
 from collections import deque
 import json
 
 from odoo import http
 from odoo.http import request
 
-try:
-    import xlwt
-except ImportError:
-    xlwt = None
 
 
 class TableExporter(http.Controller):
@@ -24,7 +21,7 @@ class TableExporter(http.Controller):
         jdata = json.loads(data)
         nbr_measures = jdata['nbr_measures']
         workbook = xlwt.Workbook()
-        worksheet = workbook.add_sheet(jdata['title'][:30])
+        worksheet = workbook.add_sheet(jdata['title'])
         header_bold = xlwt.easyxf("font: bold on; pattern: pattern solid, fore_colour gray25;")
         header_plain = xlwt.easyxf("pattern: pattern solid, fore_colour gray25;")
         bold = xlwt.easyxf("font: bold on;")