Unifield Server

Merge lp:~mallorymarcot/unifield-server/us-4281 into lp:unifield-server

  1. us-4281
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5001
Proposed branch: lp:~mallorymarcot/unifield-server/us-4281
Merge into: lp:unifield-server
Diff against target: 31 lines (+2/-7)
2 files modified
bin/addons/sales_followup/report/sale_follow_up_multi_report.rml (+1/-2)
bin/addons/sales_followup/report/sale_follow_up_multi_report_xls.mako (+1/-5)
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-4281
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+349812@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/sales_followup/report/sale_follow_up_multi_report.rml'
2--- bin/addons/sales_followup/report/sale_follow_up_multi_report.rml 2018-05-23 12:46:28 +0000
3+++ bin/addons/sales_followup/report/sale_follow_up_multi_report.rml 2018-07-18 13:18:02 +0000
4@@ -292,9 +292,8 @@
5 </td>
6 <td>
7 <para style="LinesBlue">[[ 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') ]]</para>
8- <para style="LinesGrey">[[ 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') ]]</para>
9+ <para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and formatLang(0.00) or removeParentNode('para') ]]</para>
10 <para style="LinesBlue">[[ 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))) ]])</para>
11- <para style="LinesGrey">[[ 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))) ]])</para>
12 </td>
13 <td>
14 <para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('state_display', '-') or removeParentNode('para') ]]</para>
15
16=== modified file 'bin/addons/sales_followup/report/sale_follow_up_multi_report_xls.mako'
17--- bin/addons/sales_followup/report/sale_follow_up_multi_report_xls.mako 2018-05-04 07:13:24 +0000
18+++ bin/addons/sales_followup/report/sale_follow_up_multi_report_xls.mako 2018-07-18 13:18:02 +0000
19@@ -331,11 +331,7 @@
20 % endif
21 <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('delivered_uom', '')|x}</Data></Cell>
22 <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('packing', '')|x}</Data></Cell>
23- % if line.get('extra_qty', False):
24- <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('backordered_qty', 0.00)} (+${line.get('extra_qty', 0.00)|x})</Data></Cell>
25- % else:
26- <Cell ss:StyleID="line_right_grey"><Data ss:Type="Number">${line.get('backordered_qty')}</Data></Cell>
27- % endif
28+ <Cell ss:StyleID="line_right_grey"><Data ss:Type="Number">0.00</Data></Cell>
29 % if o.transport_type and o.transport_type not in (False, 'False', ''):
30 <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${getSel(o, 'transport_type')|x}</Data></Cell>
31 % else:

Subscribers

People subscribed via source and target branches