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

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
=== modified file 'bin/addons/msf_printed_documents/report/report_reception.rml'
--- bin/addons/msf_printed_documents/report/report_reception.rml 2018-01-25 16:44:10 +0000
+++ bin/addons/msf_printed_documents/report/report_reception.rml 2018-08-14 12:43:24 +0000
@@ -400,12 +400,9 @@
400400
401 <blockTable colWidths="800.0" >401 <blockTable colWidths="800.0" >
402 <tr><td></td></tr>402 <tr><td></td></tr>
403 </blockTable>
404
405 <blockTable colWidths="800.0" >
406 <tr>403 <tr>
407 <td>404 <td>
408 <para style="TextInformationGROS" alignment="CENTER"><b>[[ getWarning(objects[0]) ]]</b></para>405 <para style="TextInformationGROS" alignment="CENTER"><b>[[ getWarning(objects[0]) or removeParentNode('tr')]]</b></para>
409 </td>406 </td>
410 </tr>407 </tr>
411 </blockTable>408 </blockTable>
@@ -416,18 +413,7 @@
416413
417 <blockTable colWidths="800.0" style="OrderInformations2" repeatRows="7">414 <blockTable colWidths="800.0" style="OrderInformations2" repeatRows="7">
418415
419 <tr>416 <tr><td></td></tr>
420 <td>
421 <blockTable colWidths="800.0" style="OrderInformations3">
422 <tr>
423 <td>
424 <para style="TextInformation" alignment="CENTER"></para>
425 </td>
426 </tr>
427 </blockTable>
428
429 </td>
430 </tr>
431 <tr>417 <tr>
432 <td>418 <td>
433 <blockTable colWidths="800.0" style="OrderInformations3">419 <blockTable colWidths="800.0" style="OrderInformations3">

Subscribers

People subscribed via source and target branches