Unifield Server

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

  1. fm-us-3142
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4453
Proposed branch: lp:~fabien-morin/unifield-server/fm-us-3142
Merge into: lp:unifield-server
Diff against target: 31 lines (+4/-4)
2 files modified
bin/addons/consumption_calculation/report/product_likely_expire_xls.mako (+1/-1)
bin/addons/report_webkit/webkit_report.py (+3/-3)
To merge this branch: bzr merge lp:~fabien-morin/unifield-server/fm-us-3142
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+327968@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/consumption_calculation/report/product_likely_expire_xls.mako'
2--- bin/addons/consumption_calculation/report/product_likely_expire_xls.mako 2014-03-14 16:20:38 +0000
3+++ bin/addons/consumption_calculation/report/product_likely_expire_xls.mako 2017-07-24 15:33:28 +0000
4@@ -131,7 +131,7 @@
5 <Cell ss:StyleID="line"><Data ss:Type="String">${formatLang(i.available_qty) or 0.00} (${(formatLang(i.expired_qty) or 0.00)})</Data></Cell>
6 % endif
7 % if not i.expired_qty:
8- <Cell ss:StyleID="line"><Data ss:Type="Number">${formatLang(i.available_qty) or 0.00}</Data></Cell>
9+ <Cell ss:StyleID="line"><Data ss:Type="Number">${i.available_qty or 0.00}</Data></Cell>
10 % endif
11 % endfor
12 <Cell ss:StyleID="line_number"><Data ss:Type="Number">${line.in_stock or 0.}</Data></Cell>
13
14=== modified file 'bin/addons/report_webkit/webkit_report.py'
15--- bin/addons/report_webkit/webkit_report.py 2017-05-10 11:55:36 +0000
16+++ bin/addons/report_webkit/webkit_report.py 2017-07-24 15:33:28 +0000
17@@ -513,11 +513,11 @@
18 namespaces=namespaces)
19 for cell in number_cells:
20 # if space in the in Numbers, remove them
21- forbidden_chars = [' ', u'\xa0']
22+ forbidden_chars = [' ', u'\xc2\xa0', u'\xa0']
23 for char in forbidden_chars:
24- if isinstance(cell.text, str) and char in cell.text:
25+ if isinstance(cell.text, basestring) and char in cell.text:
26 error_message = 'Line %s of document %s is corrupted, a '\
27- 'Number cannot contain characters or spaces: %s' % \
28+ 'Number cannot contain characters or spaces: %r' % \
29 (cell.sourceline, report_name, cell.text)
30 logger.warning(error_message)
31 cell.text = cell.text.replace(char, '')

Subscribers

People subscribed via source and target branches