Merge lp:~eoc/web-addons/6.1-web-addons_fix_number_parsing_add_es_translation into lp:~webaddons-core-editors/web-addons/6.1

[Mariano Ruiz]

We fix the issue #1046342 in this branch.

Also we add Spanish translation .po file.

... I'm fix the request proposal changing the target to the 6.1 version.

[Holger Brunn (Therp) (hbrunn)]

#44 you should check if xlwt is not None and issue a warning otherwise
#53ff I think you're better off using locale.setlocale(locale.LC_NUMERIC, context.get('lang', 'en_US')) and locale.atof afterwards. setlocale raises if the locale is not installed, so better catch that too
#68 the comment contradicts what you do. I think you want to suppress the ValueError (and better also only except that)

review: Needs Fixing

[Cristian Salamea (ovnicraft)]

Hi Mariano, i did some work around this and made a MP https://code.launchpad.net/~ovnicraft/web-addons/6.1-export-view-float-field/+merge/169678

So i'd like check my code to cooperate and make one merge.

Just comments about my code.

Decimal separators read from res.lang object.
Regexp to identify thousands and decimals.
Apply number format in XLS cell.

Waiting for your comments !

Regards,

review: Needs Information

[Mariano Ruiz (marianoruiz)]

Yea Cristian, I put a comment about the proposal of that branch, I think than with some fix, will be a better solution than my branch.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> Yea Cristian, I put a comment about the proposal of that branch, I think than
> with some fix, will be a better solution than my branch.

So can we close this MP, or put it in 'Work in progress' meanwhile a solution is found?

[Cristian Salamea (ovnicraft)]

We with Mariano are commenting in my MP, we can close this.

Regards,

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> We with Mariano are commenting in my MP, we can close this.
>
> Regards,

I put it as 'rejected' to reflect that.

Unmerged revisions

13. By Mariano Ruiz on 2013-06-05

[FIX] Convert number string to float number. Parse according with the context lang [IMP] Add Spanish translation

=== modified file 'web_export_view/AUTHORS.txt'
--- web_export_view/AUTHORS.txt	2013-01-28 18:35:43 +0000
+++ web_export_view/AUTHORS.txt	2013-06-05 15:35:36 +0000
@@ -4,3 +4,4 @@
 Simone Orsi <[e-mail]> [simahawk]
 Lorenzo Battistini <[e-mail]>
 Stefan Rijnhart <[e-mail]>
+Mariano Ruiz <[e-mail]>

=== modified file 'web_export_view/__openerp__.py'
--- web_export_view/__openerp__.py	2013-01-20 15:16:52 +0000
+++ web_export_view/__openerp__.py	2013-06-05 15:35:36 +0000
@@ -22,7 +22,7 @@
 
 {
     'name': 'Export Current View',
-    'version': '1.0',
+    'version': '1.0.1',
     'category': 'Web',
     'description': """
 WEB EXPORT VIEW

=== modified file 'web_export_view/controllers.py'
--- web_export_view/controllers.py	2013-01-20 15:16:52 +0000
+++ web_export_view/controllers.py	2013-06-05 15:35:36 +0000
@@ -22,6 +22,12 @@
     import json
 except ImportError:
     import simplejson as json
+import re
+from cStringIO import StringIO
+try:
+    import xlwt
+except ImportError:
+    xlwt = None
 
 import web.common.http as openerpweb
 
@@ -31,6 +37,42 @@
 class ExcelExportView(ExcelExport):
     _cp_path = '/web/export/xls_view'
 
+    def from_data(self, fields, rows, context):
+        workbook = xlwt.Workbook()
+        worksheet = workbook.add_sheet('Sheet 1')
+
+        for i, fieldname in enumerate(fields):
+            worksheet.write(0, i, fieldname)
+            worksheet.col(i).width = 8000 # around 220 pixels
+
+        style = xlwt.easyxf('align: wrap yes')
+
+        en_lang = context.get('lang', '').startswith('en')
+        latin_lang = not en_lang and context.get('lang', '').startswith('es')
+        for row_index, row in enumerate(rows):
+            for cell_index, cell_value in enumerate(row):
+                if isinstance(cell_value, basestring):
+                    cell_value = re.sub("\r", " ", cell_value)
+                if cell_value is False: cell_value = None
+                try:
+                    if en_lang:
+                        # Number format with "." decimal separator, ex. "4567.40"
+                        cell_value = float(cell_value)
+                    elif latin_lang:
+                        # Number format with "," decimal separator, ex. "4567,40"
+                        cell_value = float(cell_value.replace(",", "."))
+                except:
+                    # If the cell is not a number raise a ValueError
+                    pass
+                worksheet.write(row_index + 1, cell_index, cell_value, style)
+
+        fp = StringIO()
+        workbook.save(fp)
+        fp.seek(0)
+        data = fp.read()
+        fp.close()
+        return data
+
     @openerpweb.httprequest
     def index(self, req, data, token):
         data = json.loads(data)
@@ -40,7 +82,7 @@
 
         context = req.session.eval_context(req.context)
 
-        return req.make_response(self.from_data(columns_headers, rows),
+        return req.make_response(self.from_data(columns_headers, rows, context),
             headers=[('Content-Disposition', 'attachment; filename="%s"' % self.filename(model)),
                      ('Content-Type', self.content_type)],
             cookies={'fileToken': int(token)})

=== added directory 'web_export_view/i18n'
=== added file 'web_export_view/i18n/es.po'
--- web_export_view/i18n/es.po	1970-01-01 00:00:00 +0000
+++ web_export_view/i18n/es.po	2013-06-05 15:35:36 +0000
@@ -0,0 +1,20 @@
+# Spanish translation for web_export_view
+# This file is distributed under the same license as the web_export_view package.
+# Mariano Ruiz <[e-mail]>, 2013.
+#
+msgid ""
+msgstr ""
+"POT-Creation-Date: 2013-06-05 12:40+0200\n"
+"PO-Revision-Date: 2013-06-05 11:25+0000\n"
+"Last-Translator: Mariano Ruiz <[e-mail]>\n"
+"Language-Team: Enterprise Objects Consulting <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. module: web_export_view
+#. openerp-web
+#: code:addons/web_export_view/static/js/web_advanced_export.js:56
+#, python-format
+msgid "Export current view"
+msgstr "Exportar datos actuales"