=== modified file 'bin/addons/sales_followup/report/sale_follow_up_multi_report.rml'
--- bin/addons/sales_followup/report/sale_follow_up_multi_report.rml 2018-05-23 12:46:28 +0000
+++ bin/addons/sales_followup/report/sale_follow_up_multi_report.rml 2018-07-18 13:18:02 +0000
@@ -292,9 +292,8 @@
[[ line.get('state') not in ['cancel', 'cancel_r'] and (line.get('extra_qty', 0) == 0 and formatLang(line.get('backordered_qty', 0.00)) or removeParentNode('para')) or removeParentNode('para') ]]
- [[ line.get('state') in ['cancel', 'cancel_r'] and (line.get('extra_qty', 0) == 0 and formatLang(line.get('backordered_qty', 0.00)) or removeParentNode('para')) or removeParentNode('para') ]]
+ [[ line.get('state') in ['cancel', 'cancel_r'] and formatLang(0.00) or removeParentNode('para') ]]
[[ line.get('state') not in ['cancel', 'cancel_r'] and (line.get('extra_qty', 0) and formatLang(line.get('backordered_qty', 0.00)) or removeParentNode('para')) or removeParentNode('para') ]] (+[[ formatLang(abs(line.get('extra_qty', 0.00))) ]])
- [[ line.get('state') in ['cancel', 'cancel_r'] and (line.get('extra_qty', 0) and formatLang(line.get('backordered_qty', 0.00)) or removeParentNode('para')) or removeParentNode('para') ]] (+[[ formatLang(abs(line.get('extra_qty', 0.00))) ]])
|
[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('state_display', '-') or removeParentNode('para') ]]
=== modified file 'bin/addons/sales_followup/report/sale_follow_up_multi_report_xls.mako'
--- bin/addons/sales_followup/report/sale_follow_up_multi_report_xls.mako 2018-05-04 07:13:24 +0000
+++ bin/addons/sales_followup/report/sale_follow_up_multi_report_xls.mako 2018-07-18 13:18:02 +0000
@@ -331,11 +331,7 @@
% endif
${line.get('delivered_uom', '')|x} |
${line.get('packing', '')|x} |
- % if line.get('extra_qty', False):
- ${line.get('backordered_qty', 0.00)} (+${line.get('extra_qty', 0.00)|x}) |
- % else:
- ${line.get('backordered_qty')} |
- % endif
+ 0.00 |
% if o.transport_type and o.transport_type not in (False, 'False', ''):
${getSel(o, 'transport_type')|x} |
% else:
|