Merge lp:~therp-nl/therp-backports/lp971713-pto_scope_in_invoice_template into lp:therp-backports

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 6711
Proposed branch: lp:~therp-nl/therp-backports/lp971713-pto_scope_in_invoice_template
Merge into: lp:therp-backports
Diff against target: 145 lines (+40/-40)
2 files modified
account/report/account_print_invoice.rml (+14/-14)
sale/report/sale_order.rml (+26/-26)
To merge this branch: bzr merge lp:~therp-nl/therp-backports/lp971713-pto_scope_in_invoice_template
Reviewer Review Type Date Requested Status
Ronald Portier (Therp) Approve
Review via email: mp+152666@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ronald Portier (Therp) (rportier1962) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/report/account_print_invoice.rml'
2--- account/report/account_print_invoice.rml 2011-12-22 15:17:58 +0000
3+++ account/report/account_print_invoice.rml 2013-03-11 13:09:22 +0000
4@@ -138,21 +138,8 @@
5 <images/>
6 </stylesheet>
7 <story>
8- <pto>
9 <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
10 <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
11- <pto_header><!-- Must be after setLang() -->
12- <blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
13- <tr>
14- <td> <para style="terp_tblheader_Details">Description</para> </td>
15- <td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
16- <td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
17- <td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
18- <td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
19- <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
20- </tr>
21- </blockTable>
22- </pto_header>
23 <blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
24 <tr>
25 <td>
26@@ -217,6 +204,19 @@
27 <para style="terp_default_8">
28 <font color="white"> </font>
29 </para>
30+ <pto>
31+ <pto_header>
32+ <blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table7">
33+ <tr>
34+ <td> <para style="terp_tblheader_Details">Description</para> </td>
35+ <td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
36+ <td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
37+ <td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
38+ <td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
39+ <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
40+ </tr>
41+ </blockTable>
42+ </pto_header>
43 <blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table7">
44 <tr>
45 <td>
46@@ -294,6 +294,7 @@
47 </tr>
48 </blockTable>
49 </section>
50+ </pto>
51 <blockTable colWidths="385.0,60.0,85.0" style="Table10">
52 <tr>
53 <td>
54@@ -401,6 +402,5 @@
55 <para style="terp_default_2">
56 <font color="white"> </font>
57 </para>
58- </pto>
59 </story>
60 </document>
61
62=== modified file 'sale/report/sale_order.rml'
63--- sale/report/sale_order.rml 2012-05-24 12:51:39 +0000
64+++ sale/report/sale_order.rml 2013-03-11 13:09:22 +0000
65@@ -126,33 +126,8 @@
66 <images/>
67 </stylesheet>
68 <story>
69- <pto>
70 <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
71 <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
72- <pto_header>
73- <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
74- <tr>
75- <td>
76- <para style="terp_tblheader_Details">Description</para>
77- </td>
78- <td>
79- <para style="terp_tblheader_Details_Centre">VAT</para>
80- </td>
81- <td>
82- <para style="terp_tblheader_Details_Right">Quantity</para>
83- </td>
84- <td>
85- <para style="terp_tblheader_Details_Right">Unit Price</para>
86- </td>
87- <td>
88- <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
89- </td>
90- <td>
91- <para style="terp_tblheader_Details_Right">Price</para>
92- </td>
93- </tr>
94- </blockTable>
95- </pto_header>
96 <para style="terp_default_9">
97 <font color="white"> </font>
98 </para>
99@@ -233,6 +208,31 @@
100 <para style="terp_default_8">
101 <font color="white"> </font>
102 </para>
103+ <pto>
104+ <pto_header>
105+ <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
106+ <tr>
107+ <td>
108+ <para style="terp_tblheader_Details">Description</para>
109+ </td>
110+ <td>
111+ <para style="terp_tblheader_Details_Centre">VAT</para>
112+ </td>
113+ <td>
114+ <para style="terp_tblheader_Details_Right">Quantity</para>
115+ </td>
116+ <td>
117+ <para style="terp_tblheader_Details_Right">Unit Price</para>
118+ </td>
119+ <td>
120+ <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
121+ </td>
122+ <td>
123+ <para style="terp_tblheader_Details_Right">Price</para>
124+ </td>
125+ </tr>
126+ </blockTable>
127+ </pto_header>
128 <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
129 <tr>
130 <td>
131@@ -310,6 +310,7 @@
132 </tr>
133 </blockTable>
134 </section>
135+ </pto>
136 <blockTable colWidths="381.0,60.0,93.0" style="Table6">
137 <tr>
138 <td>
139@@ -365,6 +366,5 @@
140 <para style="terp_default_8">
141 <font color="white"> </font>
142 </para>
143- </pto>
144 </story>
145 </document>

Subscribers

People subscribed via source and target branches

to all changes: