Unifield Server

Merge lp:~unifield-team/unifield-server/us-565 into lp:unifield-server

  1. us-565
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3917
Proposed branch: lp:~unifield-team/unifield-server/us-565
Merge into: lp:unifield-server
Diff against target: 156 lines (+37/-48)
1 file modified
bin/addons/msf_printed_documents/report/freight_manifest.rml (+37/-48)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-565
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+302541@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/freight_manifest.rml'
--- bin/addons/msf_printed_documents/report/freight_manifest.rml 2016-03-22 08:24:13 +0000
+++ bin/addons/msf_printed_documents/report/freight_manifest.rml 2016-08-10 12:27:28 +0000
@@ -22,14 +22,17 @@
22 </template>22 </template>
2323
24 <stylesheet>24 <stylesheet>
25 <blockTableStyle id="Signature">
26 <blockAlignment value="LEFT" />
27 <blockVAlign value="MIDDLE" />
28 </blockTableStyle>
29
25 <blockTableStyle id="OrderInformations">30 <blockTableStyle id="OrderInformations">
26 <blockAlignment value="LEFT" />31 <blockAlignment value="LEFT" />
27 <blockVAlign value="MIDDLE" />32 <blockVAlign value="MIDDLE" />
28 <lineStyle kind="OUTLINE" colorName="black" start="0,0" stop="0,-1" thickness="0.5" />33 <lineStyle kind="OUTLINE" colorName="black" start="1,0" stop="1,-1" thickness="0.5" />
29 <lineStyle kind="OUTLINE" colorName="black" start="2,0" stop="2,-1" thickness="0.5" />34 <lineStyle kind="OUTLINE" colorName="black" start="3,0" stop="3,-1" thickness="0.5" />
30 <lineStyle kind="OUTLINE" colorName="black" start="4,0" stop="4,-1" thickness="0.5" />35 <lineStyle kind="OUTLINE" colorName="black" start="5,0" stop="5,-1" thickness="0.5" />
31 <lineStyle kind="OUTLINE" colorName="black" start="6,0" stop="6,-1" thickness="0.5" />
32 <lineStyle kind="OUTLINE" colorName="black" start="8,0" stop="8,-1" thickness="0.5" />
33 </blockTableStyle>36 </blockTableStyle>
3437
35 <blockTableStyle id="ItemsTitle">38 <blockTableStyle id="ItemsTitle">
@@ -246,12 +249,9 @@
246 </blockTable>249 </blockTable>
247250
248251
249 <blockTable colWidths="125.0,5.5,200.0,5.5,200.0,5.5,200.0,5.5,25.0" >252 <blockTable colWidths="80.5,200.0,5.5,200.0,5.5,200.0,11.0,69.5" style="OrderInformations">
250 <tr>253 <tr>
251 <td>254 <td>
252 <para style="TextInformation"></para>
253 </td>
254 <td>
255 <para style="TextInformation"> </para>255 <para style="TextInformation"> </para>
256 </td>256 </td>
257 <td>257 <td>
@@ -278,9 +278,6 @@
278 </tr>278 </tr>
279 <tr>279 <tr>
280 <td>280 <td>
281 <para style="TextInformation"></para>
282 </td>
283 <td>
284 <para style="TextInformation"> </para>281 <para style="TextInformation"> </para>
285 </td>282 </td>
286 <td>283 <td>
@@ -307,9 +304,6 @@
307 </tr>304 </tr>
308 <tr>305 <tr>
309 <td>306 <td>
310 <para style="TextInformation"></para>
311 </td>
312 <td>
313 <para style="TextInformation"> </para>307 <para style="TextInformation"> </para>
314 </td>308 </td>
315 <td>309 <td>
@@ -336,9 +330,6 @@
336 </tr>330 </tr>
337 <tr>331 <tr>
338 <td>332 <td>
339 <para style="TextInformation"></para>
340 </td>
341 <td>
342 <para style="TextInformation"> </para>333 <para style="TextInformation"> </para>
343 </td>334 </td>
344 <td>335 <td>
@@ -365,9 +356,6 @@
365 </tr>356 </tr>
366 <tr>357 <tr>
367 <td>358 <td>
368 <para style="TextInformation"></para>
369 </td>
370 <td>
371 <para style="TextInformation"> </para>359 <para style="TextInformation"> </para>
372 </td>360 </td>
373 <td>361 <td>
@@ -394,10 +382,7 @@
394 </tr>382 </tr>
395 <tr>383 <tr>
396 <td>384 <td>
397 <para style="TextInformation"></para>385 <para style="TextInformation"> </para>
398 </td>
399 <td>
400 <para style="TextInformation"></para>
401 </td>386 </td>
402 <td>387 <td>
403 <para style="TextInformation"></para>388 <para style="TextInformation"></para>
@@ -426,16 +411,13 @@
426 <para style="TextInformation"> </para>411 <para style="TextInformation"> </para>
427 </td>412 </td>
428 <td>413 <td>
429 <para style="TextInformation"> </para>414 <para style="TextInformation">Date:</para>
430 </td>415 </td>
431 <td>416 <td>
432 <para style="TextInformation"></para>417 <para style="TextInformation"> </para>
433 </td>418 </td>
434 <td>419 <td>
435 <para style="TextInformation"> </para>420 <para style="TextInformation">Date:</para>
436 </td>
437 <td>
438 <para style="TextInformation"></para>
439 </td>421 </td>
440 <td>422 <td>
441 <para style="TextInformation"> </para>423 <para style="TextInformation"> </para>
@@ -452,19 +434,26 @@
452 </tr>434 </tr>
453 <tr>435 <tr>
454 <td>436 <td>
455 <para style="TextInformation"></para>437 <para style="TextInformation"> </para>
456 </td>438 </td>
457 <td>439 <td>
458 <para style="TextInformation"> </para>440 <para style="TextInformation">Signature:</para>
459 </td>441 <blockTable colWidths="180.00" style="Signature" rowHeights="30">
460 <td>442 <tr>
461 <para style="TextInformation"></para>443 <td><para style="TextInformation"> </para></td>
462 </td>444 </tr>
463 <td>445 </blockTable>
464 <para style="TextInformation"> </para>446 </td>
465 </td>447 <td>
466 <td>448 <para style="TextInformation"> </para>
467 <para style="TextInformation"></para>449 </td>
450 <td>
451 <para style="TextInformation">Signature:</para>
452 <blockTable colWidths="180.00" style="Signature" rowHeights="30">
453 <tr>
454 <td><para style="TextInformation"> </para></td>
455 </tr>
456 </blockTable>
468 </td>457 </td>
469 <td>458 <td>
470 <para style="TextInformation"> </para>459 <para style="TextInformation"> </para>

Subscribers

People subscribed via source and target branches

to all changes: