Merge lp:~fabien-morin/unifield-server/fm-us-3142 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/consumption_calculation/report/product_likely_expire_xls.mako'
--- bin/addons/consumption_calculation/report/product_likely_expire_xls.mako	2014-03-14 16:20:38 +0000
+++ bin/addons/consumption_calculation/report/product_likely_expire_xls.mako	2017-07-24 15:33:28 +0000
@@ -131,7 +131,7 @@
     <Cell ss:StyleID="line"><Data ss:Type="String">${formatLang(i.available_qty) or 0.00} (${(formatLang(i.expired_qty) or 0.00)})</Data></Cell>
     % endif
     % if not i.expired_qty:
-    <Cell ss:StyleID="line"><Data ss:Type="Number">${formatLang(i.available_qty) or 0.00}</Data></Cell>
+    <Cell ss:StyleID="line"><Data ss:Type="Number">${i.available_qty or 0.00}</Data></Cell>
     % endif
 % endfor
 <Cell ss:StyleID="line_number"><Data ss:Type="Number">${line.in_stock or 0.}</Data></Cell>
 
=== modified file 'bin/addons/report_webkit/webkit_report.py'
--- bin/addons/report_webkit/webkit_report.py	2017-05-10 11:55:36 +0000
+++ bin/addons/report_webkit/webkit_report.py	2017-07-24 15:33:28 +0000
@@ -513,11 +513,11 @@
                                       namespaces=namespaces)
         for cell in number_cells:
             # if space in the in Numbers, remove them
-            forbidden_chars = [' ', u'\xa0']
+            forbidden_chars = [' ', u'\xc2\xa0', u'\xa0']
             for char in forbidden_chars:
-                if isinstance(cell.text, str) and char in cell.text:
+                if isinstance(cell.text, basestring) and char in cell.text:
                     error_message = 'Line %s of document %s is corrupted, a '\
-                        'Number cannot contain characters or spaces: %s' % \
+                        'Number cannot contain characters or spaces: %r' % \
                             (cell.sourceline, report_name, cell.text)
                     logger.warning(error_message)
                     cell.text = cell.text.replace(char, '')