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

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
=== 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 @@
292 </td>292 </td>
293 <td>293 <td>
294 <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>294 <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>
295 <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>295 <para style="LinesGrey">[[ line.get('state') in ['cancel', 'cancel_r'] and formatLang(0.00) or removeParentNode('para') ]]</para>
296 <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>296 <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>
297 <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>
298 </td>297 </td>
299 <td>298 <td>
300 <para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('state_display', '-') or removeParentNode('para') ]]</para>299 <para style="LinesBlue">[[ line.get('state') not in ['cancel', 'cancel_r'] and line.get('state_display', '-') or removeParentNode('para') ]]</para>
301300
=== 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 @@
331 % endif331 % endif
332 <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('delivered_uom', '')|x}</Data></Cell>332 <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('delivered_uom', '')|x}</Data></Cell>
333 <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('packing', '')|x}</Data></Cell>333 <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${line.get('packing', '')|x}</Data></Cell>
334 % if line.get('extra_qty', False):334 <Cell ss:StyleID="line_right_grey"><Data ss:Type="Number">0.00</Data></Cell>
335 <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>
336 % else:
337 <Cell ss:StyleID="line_right_grey"><Data ss:Type="Number">${line.get('backordered_qty')}</Data></Cell>
338 % endif
339 % if o.transport_type and o.transport_type not in (False, 'False', ''):335 % if o.transport_type and o.transport_type not in (False, 'False', ''):
340 <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${getSel(o, 'transport_type')|x}</Data></Cell>336 <Cell ss:StyleID="line_left_grey"><Data ss:Type="String">${getSel(o, 'transport_type')|x}</Data></Cell>
341 % else:337 % else:

Subscribers

People subscribed via source and target branches