From 6e6108e9b69b296bb30d8d36e258027ad7860cbd Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 26 Jul 2013 10:46:40 +0200
Subject: [PATCH] [FIX] Problem with exports that make them crash

lp bug: https://launchpad.net/bugs/1205238 fixed

bzr revid: nicolas.vanhoren@openerp.com-20130726084640-lz11kdlsk27mrjec
---
 addons/web/controllers/main.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index da3cc8b8d2a..5d176122fcf 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1407,7 +1407,10 @@ class Export(http.Controller):
         :returns: for each export format, a pair of identifier and printable name
         :rtype: [(str, str)]
         """
-        return ["CSV", "Excel"]
+        return [
+            {'tag': 'csv', 'label': 'CSV'},
+            {'tag': 'xls', 'label': 'Excel', 'error': None if xlwt else "XLWT required"},
+        ]
 
     def fields_get(self, model):
         Model = request.session.model(model)
@@ -1583,7 +1586,6 @@ class ExportFormat(object):
             cookies={'fileToken': token})
 
 class CSVExport(ExportFormat, http.Controller):
-    fmt = {'tag': 'csv', 'label': 'CSV'}
 
     @http.route('/web/export/csv', type='http', auth="user")
     def index(self, data, token):
@@ -1621,11 +1623,6 @@ class CSVExport(ExportFormat, http.Controller):
         return data
 
 class ExcelExport(ExportFormat, http.Controller):
-    fmt = {
-        'tag': 'xls',
-        'label': 'Excel',
-        'error': None if xlwt else "XLWT required"
-    }
 
     @http.route('/web/export/xls', type='http', auth="user")
     def index(self, data, token):