[MERGE] forward port branch saas-11 up to 3a2147d

2 files changed, 3 insertions, 11 deletions

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 1a17c8c623f..aa4900e25b6 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -25,18 +25,13 @@ import werkzeug.utils
 import werkzeug.wrappers
 from openerp.api import Environment
 
-try:
-    import xlwt
-except ImportError:
-    xlwt = None
-
 import openerp
 import openerp.modules.registry
 from openerp.modules import get_resource_path
 from openerp.tools import topological_sort
 from openerp.tools.translate import _
 from openerp.tools import ustr
-from openerp.tools.misc import str2bool
+from openerp.tools.misc import str2bool, xlwt
 from openerp import http
 from openerp.http import request, serialize_exception as _serialize_exception
 from openerp.exceptions import AccessError
diff --git a/addons/web/controllers/pivot.py b/addons/web/controllers/pivot.py
index 571cff94229..41c113bbbdd 100644
--- a/addons/web/controllers/pivot.py
+++ b/addons/web/controllers/pivot.py
@@ -1,13 +1,10 @@
 from openerp import http
 import json
 from openerp.http import request, serialize_exception as _serialize_exception
+from openerp.tools.misc import xlwt
 from cStringIO import StringIO
 from collections import deque
 
-try:
-    import xlwt
-except ImportError:
-    xlwt = None
 
 class TableExporter(http.Controller):
 
@@ -21,7 +18,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;")