Merge lp:~openerp-dev/openerp-web/trunk-export-excell-raw-mat into lp:openerp-web

[Martin Trigaux (OpenERP)]

Require first to merge lp:~openerp-dev/openobject-server/trunk-export-excell-raw-mat

Allow excel export to use raw data instead of all string. Numbers and dates will be considered as such by the program.

[lp:~openerp-dev/openerp-web/trunk-export-excell-raw-mat]

3963. By Martin Trigaux (OpenERP) on 2014-04-01

[FIX] default is False, style format is different than DEFAULT_SERVER_DATE{TIME}_FORMAT, datetime is instance of date

3964. By Martin Trigaux (OpenERP) on 2014-04-01

[IMP] remove useless import

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2014-03-12 18:17:24 +0000
+++ addons/web/controllers/main.py	2014-04-01 12:31:17 +0000
@@ -1679,6 +1679,8 @@
             for k, v in self.fields_info(model, export_fields).iteritems())
 
 class ExportFormat(object):
+    raw_data = False
+
     @property
     def content_type(self):
         """ Provides the format's content type """
@@ -1711,7 +1713,7 @@
         ids = ids or Model.search(domain, 0, False, False, request.context)
 
         field_names = map(operator.itemgetter('name'), fields)
-        import_data = Model.export_data(ids, field_names, request.context).get('datas',[])
+        import_data = Model.export_data(ids, field_names, self.raw_data, context=request.context).get('datas',[])
 
         if import_compat:
             columns_headers = field_names
@@ -1764,6 +1766,8 @@
         return data
 
 class ExcelExport(ExportFormat, http.Controller):
+    # Excel needs raw data to correctly handle numbers and date values
+    raw_data = True
 
     @http.route('/web/export/xls', type='http', auth="user")
     @serialize_exception
@@ -1785,14 +1789,20 @@
             worksheet.write(0, i, fieldname)
             worksheet.col(i).width = 8000 # around 220 pixels
 
-        style = xlwt.easyxf('align: wrap yes')
+        base_style = xlwt.easyxf('align: wrap yes')
+        date_style = xlwt.easyxf('align: wrap yes', num_format_str='YYYY-MM-DD')
+        datetime_style = xlwt.easyxf('align: wrap yes', num_format_str='YYYY-MM-DD HH:mm:SS')
 
         for row_index, row in enumerate(rows):
             for cell_index, cell_value in enumerate(row):
+                cell_style = base_style
                 if isinstance(cell_value, basestring):
                     cell_value = re.sub("\r", " ", cell_value)
-                if cell_value is False: cell_value = None
-                worksheet.write(row_index + 1, cell_index, cell_value, style)
+                elif isinstance(cell_value, datetime.datetime):
+                    cell_style = datetime_style
+                elif isinstance(cell_value, datetime.date):
+                    cell_style = date_style
+                worksheet.write(row_index + 1, cell_index, cell_value, cell_style)
 
         fp = StringIO()
         workbook.save(fp)