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
1=== modified file 'bin/addons/msf_printed_documents/report/freight_manifest.rml'
2--- bin/addons/msf_printed_documents/report/freight_manifest.rml 2016-03-22 08:24:13 +0000
3+++ bin/addons/msf_printed_documents/report/freight_manifest.rml 2016-08-10 12:27:28 +0000
4@@ -22,14 +22,17 @@
5 </template>
6
7 <stylesheet>
8+ <blockTableStyle id="Signature">
9+ <blockAlignment value="LEFT" />
10+ <blockVAlign value="MIDDLE" />
11+ </blockTableStyle>
12+
13 <blockTableStyle id="OrderInformations">
14 <blockAlignment value="LEFT" />
15 <blockVAlign value="MIDDLE" />
16- <lineStyle kind="OUTLINE" colorName="black" start="0,0" stop="0,-1" thickness="0.5" />
17- <lineStyle kind="OUTLINE" colorName="black" start="2,0" stop="2,-1" thickness="0.5" />
18- <lineStyle kind="OUTLINE" colorName="black" start="4,0" stop="4,-1" thickness="0.5" />
19- <lineStyle kind="OUTLINE" colorName="black" start="6,0" stop="6,-1" thickness="0.5" />
20- <lineStyle kind="OUTLINE" colorName="black" start="8,0" stop="8,-1" thickness="0.5" />
21+ <lineStyle kind="OUTLINE" colorName="black" start="1,0" stop="1,-1" thickness="0.5" />
22+ <lineStyle kind="OUTLINE" colorName="black" start="3,0" stop="3,-1" thickness="0.5" />
23+ <lineStyle kind="OUTLINE" colorName="black" start="5,0" stop="5,-1" thickness="0.5" />
24 </blockTableStyle>
25
26 <blockTableStyle id="ItemsTitle">
27@@ -246,12 +249,9 @@
28 </blockTable>
29
30
31- <blockTable colWidths="125.0,5.5,200.0,5.5,200.0,5.5,200.0,5.5,25.0" >
32+ <blockTable colWidths="80.5,200.0,5.5,200.0,5.5,200.0,11.0,69.5" style="OrderInformations">
33 <tr>
34 <td>
35- <para style="TextInformation"></para>
36- </td>
37- <td>
38 <para style="TextInformation"> </para>
39 </td>
40 <td>
41@@ -278,9 +278,6 @@
42 </tr>
43 <tr>
44 <td>
45- <para style="TextInformation"></para>
46- </td>
47- <td>
48 <para style="TextInformation"> </para>
49 </td>
50 <td>
51@@ -307,9 +304,6 @@
52 </tr>
53 <tr>
54 <td>
55- <para style="TextInformation"></para>
56- </td>
57- <td>
58 <para style="TextInformation"> </para>
59 </td>
60 <td>
61@@ -336,9 +330,6 @@
62 </tr>
63 <tr>
64 <td>
65- <para style="TextInformation"></para>
66- </td>
67- <td>
68 <para style="TextInformation"> </para>
69 </td>
70 <td>
71@@ -365,9 +356,6 @@
72 </tr>
73 <tr>
74 <td>
75- <para style="TextInformation"></para>
76- </td>
77- <td>
78 <para style="TextInformation"> </para>
79 </td>
80 <td>
81@@ -394,10 +382,7 @@
82 </tr>
83 <tr>
84 <td>
85- <para style="TextInformation"></para>
86- </td>
87- <td>
88- <para style="TextInformation"></para>
89+ <para style="TextInformation"> </para>
90 </td>
91 <td>
92 <para style="TextInformation"></para>
93@@ -426,16 +411,13 @@
94 <para style="TextInformation"> </para>
95 </td>
96 <td>
97- <para style="TextInformation"> </para>
98- </td>
99- <td>
100- <para style="TextInformation"></para>
101- </td>
102- <td>
103- <para style="TextInformation"> </para>
104- </td>
105- <td>
106- <para style="TextInformation"></para>
107+ <para style="TextInformation">Date:</para>
108+ </td>
109+ <td>
110+ <para style="TextInformation"> </para>
111+ </td>
112+ <td>
113+ <para style="TextInformation">Date:</para>
114 </td>
115 <td>
116 <para style="TextInformation"> </para>
117@@ -452,19 +434,26 @@
118 </tr>
119 <tr>
120 <td>
121- <para style="TextInformation"></para>
122- </td>
123- <td>
124- <para style="TextInformation"> </para>
125- </td>
126- <td>
127- <para style="TextInformation"></para>
128- </td>
129- <td>
130- <para style="TextInformation"> </para>
131- </td>
132- <td>
133- <para style="TextInformation"></para>
134+ <para style="TextInformation"> </para>
135+ </td>
136+ <td>
137+ <para style="TextInformation">Signature:</para>
138+ <blockTable colWidths="180.00" style="Signature" rowHeights="30">
139+ <tr>
140+ <td><para style="TextInformation"> </para></td>
141+ </tr>
142+ </blockTable>
143+ </td>
144+ <td>
145+ <para style="TextInformation"> </para>
146+ </td>
147+ <td>
148+ <para style="TextInformation">Signature:</para>
149+ <blockTable colWidths="180.00" style="Signature" rowHeights="30">
150+ <tr>
151+ <td><para style="TextInformation"> </para></td>
152+ </tr>
153+ </blockTable>
154 </td>
155 <td>
156 <para style="TextInformation"> </para>

Subscribers

People subscribed via source and target branches

to all changes: