Therp Backports (Deprecated)

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

  1. lp971713-pto_scope_in_invoice_template
  2. Merge into openerp-addons-6.1
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
=== modified file 'account/report/account_print_invoice.rml'
--- account/report/account_print_invoice.rml 2011-12-22 15:17:58 +0000
+++ account/report/account_print_invoice.rml 2013-03-11 13:09:22 +0000
@@ -138,21 +138,8 @@
138 <images/>138 <images/>
139 </stylesheet>139 </stylesheet>
140 <story>140 <story>
141 <pto>
142 <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>141 <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
143 <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>142 <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
144 <pto_header><!-- Must be after setLang() -->
145 <blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
146 <tr>
147 <td> <para style="terp_tblheader_Details">Description</para> </td>
148 <td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
149 <td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
150 <td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
151 <td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
152 <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
153 </tr>
154 </blockTable>
155 </pto_header>
156 <blockTable colWidths="297.0,233.0" style="Table_Partner_Address">143 <blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
157 <tr>144 <tr>
158 <td>145 <td>
@@ -217,6 +204,19 @@
217 <para style="terp_default_8">204 <para style="terp_default_8">
218 <font color="white"> </font>205 <font color="white"> </font>
219 </para>206 </para>
207 <pto>
208 <pto_header>
209 <blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table7">
210 <tr>
211 <td> <para style="terp_tblheader_Details">Description</para> </td>
212 <td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
213 <td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
214 <td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
215 <td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
216 <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
217 </tr>
218 </blockTable>
219 </pto_header>
220 <blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table7">220 <blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table7">
221 <tr>221 <tr>
222 <td>222 <td>
@@ -294,6 +294,7 @@
294 </tr>294 </tr>
295 </blockTable>295 </blockTable>
296 </section>296 </section>
297 </pto>
297 <blockTable colWidths="385.0,60.0,85.0" style="Table10">298 <blockTable colWidths="385.0,60.0,85.0" style="Table10">
298 <tr>299 <tr>
299 <td>300 <td>
@@ -401,6 +402,5 @@
401 <para style="terp_default_2">402 <para style="terp_default_2">
402 <font color="white"> </font>403 <font color="white"> </font>
403 </para>404 </para>
404 </pto>
405 </story>405 </story>
406</document>406</document>
407407
=== modified file 'sale/report/sale_order.rml'
--- sale/report/sale_order.rml 2012-05-24 12:51:39 +0000
+++ sale/report/sale_order.rml 2013-03-11 13:09:22 +0000
@@ -126,33 +126,8 @@
126 <images/>126 <images/>
127 </stylesheet>127 </stylesheet>
128 <story>128 <story>
129 <pto>
130 <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>129 <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
131 <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>130 <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
132 <pto_header>
133 <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
134 <tr>
135 <td>
136 <para style="terp_tblheader_Details">Description</para>
137 </td>
138 <td>
139 <para style="terp_tblheader_Details_Centre">VAT</para>
140 </td>
141 <td>
142 <para style="terp_tblheader_Details_Right">Quantity</para>
143 </td>
144 <td>
145 <para style="terp_tblheader_Details_Right">Unit Price</para>
146 </td>
147 <td>
148 <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
149 </td>
150 <td>
151 <para style="terp_tblheader_Details_Right">Price</para>
152 </td>
153 </tr>
154 </blockTable>
155 </pto_header>
156 <para style="terp_default_9">131 <para style="terp_default_9">
157 <font color="white"> </font>132 <font color="white"> </font>
158 </para>133 </para>
@@ -233,6 +208,31 @@
233 <para style="terp_default_8">208 <para style="terp_default_8">
234 <font color="white"> </font>209 <font color="white"> </font>
235 </para>210 </para>
211 <pto>
212 <pto_header>
213 <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
214 <tr>
215 <td>
216 <para style="terp_tblheader_Details">Description</para>
217 </td>
218 <td>
219 <para style="terp_tblheader_Details_Centre">VAT</para>
220 </td>
221 <td>
222 <para style="terp_tblheader_Details_Right">Quantity</para>
223 </td>
224 <td>
225 <para style="terp_tblheader_Details_Right">Unit Price</para>
226 </td>
227 <td>
228 <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
229 </td>
230 <td>
231 <para style="terp_tblheader_Details_Right">Price</para>
232 </td>
233 </tr>
234 </blockTable>
235 </pto_header>
236 <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">236 <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
237 <tr>237 <tr>
238 <td>238 <td>
@@ -310,6 +310,7 @@
310 </tr>310 </tr>
311 </blockTable>311 </blockTable>
312 </section>312 </section>
313 </pto>
313 <blockTable colWidths="381.0,60.0,93.0" style="Table6">314 <blockTable colWidths="381.0,60.0,93.0" style="Table6">
314 <tr>315 <tr>
315 <td>316 <td>
@@ -365,6 +366,5 @@
365 <para style="terp_default_8">366 <para style="terp_default_8">
366 <font color="white"> </font>367 <font color="white"> </font>
367 </para>368 </para>
368 </pto>
369 </story>369 </story>
370</document>370</document>

Subscribers

People subscribed via source and target branches

to all changes: