Unifield Server

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

  1. US-3492
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5047
Proposed branch: lp:~dorian-kemps/unifield-server/US-3492
Merge into: lp:unifield-server
Diff against target: 37 lines (+2/-16)
1 file modified
bin/addons/msf_printed_documents/report/report_reception.rml (+2/-16)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-3492
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+353079@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/msf_printed_documents/report/report_reception.rml'
2--- bin/addons/msf_printed_documents/report/report_reception.rml 2018-01-25 16:44:10 +0000
3+++ bin/addons/msf_printed_documents/report/report_reception.rml 2018-08-14 12:43:24 +0000
4@@ -400,12 +400,9 @@
5
6 <blockTable colWidths="800.0" >
7 <tr><td></td></tr>
8- </blockTable>
9-
10- <blockTable colWidths="800.0" >
11 <tr>
12 <td>
13- <para style="TextInformationGROS" alignment="CENTER"><b>[[ getWarning(objects[0]) ]]</b></para>
14+ <para style="TextInformationGROS" alignment="CENTER"><b>[[ getWarning(objects[0]) or removeParentNode('tr')]]</b></para>
15 </td>
16 </tr>
17 </blockTable>
18@@ -416,18 +413,7 @@
19
20 <blockTable colWidths="800.0" style="OrderInformations2" repeatRows="7">
21
22- <tr>
23- <td>
24- <blockTable colWidths="800.0" style="OrderInformations3">
25- <tr>
26- <td>
27- <para style="TextInformation" alignment="CENTER"></para>
28- </td>
29- </tr>
30- </blockTable>
31-
32- </td>
33- </tr>
34+ <tr><td></td></tr>
35 <tr>
36 <td>
37 <blockTable colWidths="800.0" style="OrderInformations3">

Subscribers

People subscribed via source and target branches