unifield-wm

Merge lp:~unifield-team/unifield-wm/us-16 into lp:unifield-wm

  1. us-16
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2422
Proposed branch: lp:~unifield-team/unifield-wm/us-16
Merge into: lp:unifield-wm
Diff against target: 113 lines (+34/-11)
1 file modified
stock_override/report/internal_move.rml (+34/-11)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/us-16
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+252723@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 'stock_override/report/internal_move.rml'
2--- stock_override/report/internal_move.rml 2014-04-08 12:14:42 +0000
3+++ stock_override/report/internal_move.rml 2015-03-12 10:48:36 +0000
4@@ -9,7 +9,7 @@
5 </pageGraphics>
6 </pageTemplate>-->
7
8- <pageTemplate>
9+ <pageTemplate id="first">
10 <frame id="first" x1="28.0" y1="28.0" width="786" height="525"/>
11 <pageGraphics>
12 <image x="28.0" y="510" height="35.0" >[[ company.logo or removeParentNode('image') ]]</image>
13@@ -23,6 +23,19 @@
14 <lines>25 550 818 550</lines>
15 </pageGraphics>
16 </pageTemplate>
17+ <pageTemplate id="second">
18+ <frame id="second" x1="28.0" y1="28.0" width="786" height="525"/>
19+ <pageGraphics>
20+ <fill color="black"/>
21+ <stroke color="black"/>
22+ <setFont name="DejaVu Sans" size="8"/>
23+ <drawString x="25" y="555"> [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]] [[ time.strftime("%H:%M") ]]</drawString>
24+ <setFont name="DejaVu Sans Bold" size="10"/>
25+ <drawString x="382" y="555">[[ company.partner_id.name ]]</drawString>
26+ <stroke color="#000000"/>
27+ <lines>25 550 818 550</lines>
28+ </pageGraphics>
29+ </pageTemplate>
30
31 </template>
32
33@@ -36,6 +49,7 @@
34 <blockTableStyle id="HeaderInfo">
35 <blockValign value="MIDDLE" />
36 <lineStyle kind="GRID" colorName="#f2f2f2" />
37+ <blockSpan start="1,-1" stop="-1,-1" />
38 </blockTableStyle>
39
40 <blockTableStyle id="LineHeader">
41@@ -88,7 +102,7 @@
42 </para>
43
44 <!-- Header Information -->
45- <blockTable colWidths="120.0,120.0,120.0,120.0,120.0,120.0" style="HeaderInfo">
46+ <blockTable colWidths="100.0,100.0,100.0,200.0,120.0,100.0" style="HeaderInfo">
47 <tr>
48 <td>
49 <para style="HeaderRight">Reference :</para>
50@@ -97,10 +111,10 @@
51 <para style="Header">[[ picking.name ]]</para>
52 </td>
53 <td>
54- <para style="HeaderRight">Origin :</para>
55+ <para style="HeaderRight">Order Category :</para>
56 </td>
57 <td>
58- <para style="Header">[[ picking.origin ]]</para>
59+ <para style="Header">[[ get_selec(picking, 'order_category') ]]</para>
60 </td>
61 <td>
62 <para style="HeaderRight">Actual Receipt Date :</para>
63@@ -131,12 +145,6 @@
64 </tr>
65 <tr>
66 <td>
67- <para style="HeaderRight">Order Category :</para>
68- </td>
69- <td>
70- <para style="Header">[[ get_selec(picking, 'order_category') ]]</para>
71- </td>
72- <td>
73 <para style="HeaderRight">State :</para>
74 </td>
75 <td>
76@@ -148,6 +156,20 @@
77 <td>
78 <para style="Header"> </para>
79 </td>
80+ <td>
81+ <para style="HeaderRight"> </para>
82+ </td>
83+ <td>
84+ <para style="Header"> </para>
85+ </td>
86+ </tr>
87+ <tr>
88+ <td>
89+ <para style="HeaderRight">Origin :</para>
90+ </td>
91+ <td>
92+ <para style="Header">[[ picking.origin ]]</para>
93+ </td>
94 </tr>
95 </blockTable>
96
97@@ -155,6 +177,7 @@
98 <font color="white"> </font>
99 </para>
100
101+ <setNextTemplate name="second" />
102
103 <section>
104 <blockTable colWidths="25.0,70.0,120.0,60.0,45.0,40.0,70.0,70.0,70.0,80.0,80.0,80.0" style="LineHeader" repeatRows="1">
105@@ -242,7 +265,7 @@
106 <para style="Header">
107 <font color="white"> </font>
108 </para>
109-
110+
111 <blockTable colWidths="44.0,169.0,169.0,169.0,169.0" style="FooterInfo" keepWithNext="1">
112 <tr>
113 <td>

Subscribers

People subscribed via source and target branches