odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE][FIX] sale: sale order report, pto in invoice template should not cover the whole document 

Courtesy of Stefan Rijnhart (Therp)

bzr revid: dle@openerp.com-20140408193910-2vztatyowndyasj9
This commit is contained in:
Denis Ledoux 2014-04-08 21:39:10 +02:00
parent 4646107e1e a1f11cf0cd
commit 32f4824434
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
addons/sale/report/sale_order.rml
View File

@ -105,33 +105,8 @@
<images/>
</stylesheet>
<story>
<pto>
<para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
<pto_header>
<blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details"><b>Description</b></para>
</td>
<td>
<para style="terp_tblheader_Details_Centre"><b>Tax</b></para>
</td>
<td>
<para style="terp_tblheader_Details_Right"><b>Quantity</b></para>
</td>
<td>
<para style="terp_tblheader_Details_Right"><b>Unit Price</b></para>
</td>
<td>
<para style="terp_tblheader_Details_Centre"><b>Disc.(%)</b></para>
</td>
<td>
<para style="terp_tblheader_Details_Right"><b>Price</b></para>
</td>
</tr>
</blockTable>
</pto_header>
<para style="terp_default_8">
<font color="white"> </font>
</para>
@ -215,6 +190,31 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<pto>
<pto_header>
<blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details"><b>Description</b></para>
</td>
<td>
<para style="terp_tblheader_Details_Centre"><b>VAT</b></para>
</td>
<td>
<para style="terp_tblheader_Details_Right"><b>Quantity</b></para>
</td>
<td>
<para style="terp_tblheader_Details_Right"><b>Unit Price</b></para>
</td>
<td>
<para style="terp_tblheader_Details_Centre"><b>Disc.(%)</b></para>
</td>
<td>
<para style="terp_tblheader_Details_Right"><b>Price</b></para>
</td>
</tr>
</blockTable>
</pto_header>
<blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
<tr>
<td>
@ -262,6 +262,7 @@
</tr>
</blockTable>
</section>
</pto>
<blockTable colWidths="381.0,60.0,93.0" style="Table6">
<tr>
<td>
@ -317,6 +318,5 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
</pto>
</story>
</document>