Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-4990 into lp:unifield-server

  1. US-4990
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5115
Proposed branch: lp:~dorian-kemps/unifield-server/US-4990
Merge into: lp:unifield-server
Diff against target: 25 lines (+2/-2)
2 files modified
bin/addons/consumption_calculation/report/product_likely_expire.rml (+1/-1)
bin/addons/consumption_calculation/report/product_likely_expire_xls.mako (+1/-1)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-4990
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+355779@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.rml'
2--- bin/addons/consumption_calculation/report/product_likely_expire.rml 2018-07-12 14:26:58 +0000
3+++ bin/addons/consumption_calculation/report/product_likely_expire.rml 2018-09-27 15:36:53 +0000
4@@ -88,7 +88,7 @@
5 <para style="TextInfoBold">Location : </para>
6 </td>
7 <td>
8- <para style="TextInfo">[[ objects[0].msf_instance or '' ]]</para>
9+ <para style="TextInfo">[[ objects[0].location_id and objects[0].location_id.name or '' ]]</para>
10 </td>
11 <td>
12 <para style="TextInfo"> </para>
13
14=== modified file 'bin/addons/consumption_calculation/report/product_likely_expire_xls.mako'
15--- bin/addons/consumption_calculation/report/product_likely_expire_xls.mako 2018-09-03 09:45:36 +0000
16+++ bin/addons/consumption_calculation/report/product_likely_expire_xls.mako 2018-09-27 15:36:53 +0000
17@@ -95,7 +95,7 @@
18 % endfor
19 </Row>
20 <Row>
21-<Cell ss:StyleID="line" ><Data ss:Type="String">${(o.msf_instance or '')|x}</Data></Cell>
22+<Cell ss:StyleID="line" ><Data ss:Type="String">${(o.location_id and objects[0].location_id.name or '')|x}</Data></Cell>
23 <Cell ss:StyleID="line" ><Data ss:Type="String">${(getReportPeriod(o) or '')|x}</Data></Cell>
24 <Cell ss:StyleID="line" ss:MergeAcross="2"><Data ss:Type="String">${(getReportConsumptionType(o) or '')|x}</Data></Cell>
25 % for n in range(cols):

Subscribers

People subscribed via source and target branches