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

[IMP]:account:improved invoices report for big columns 

bzr revid: apa@tinyerp.com-20101101110611-imtzgkfgeuuxo6dw
This commit is contained in:
apa-tiny 2010-11-01 16:36:11 +05:30
parent 64ec8f4ca7
commit 6295c236df
3 changed files with 25 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/account/report/account_print_invoice.rml
View File

@ -194,7 +194,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="219.0,87.0,62.0,56.0,46.0,62.0" style="Table7">
<blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
<tr>
<td>
<para style="terp_tblheader_Details">Description</para>
@ -218,7 +218,7 @@
</blockTable>
<section>
<para style="terp_default_2">[[ repeatIn(o.invoice_line,'l') ]]</para>
<blockTable colWidths="218.0,88.0,62.0,55.0,46.0,62.0" style="Table8">
<blockTable colWidths="202.0,88.0,71.0,57.0,42.0,71.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">[[ l.name ]]</para>
@ -271,7 +271,7 @@
</tr>
</blockTable>
</section>
<blockTable colWidths="407.0,54.0,69.0" style="Table10">
<blockTable colWidths="391.0,54.0,85.0" style="Table10">
<tr>
<td>
<para style="terp_default_8">
@ -315,7 +315,7 @@
<para style="Text body">
<font color="white"> </font>
</para>
<blockTable colWidths="206.0,51.0,49.0,225.0" style="Table9">
<blockTable colWidths="205.0,71.0,71.0,183.0" style="Table9">
<tr>
<td>
<para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
@ -335,7 +335,7 @@
</blockTable>
<section>
<para style="terp_default_2">[[ repeatIn(o.tax_line,'t') ]]</para>
<blockTable colWidths="205.0,52.0,49.0,224.0" style="Table2">
<blockTable colWidths="205.0,71.0,71.0,184.0" style="Table2">
<tr>
<td>
<para style="terp_default_8">[[ t.name ]]</para>

29
addons/account_invoice_layout/report/report_account_invoice_layout.rml
View File

@ -60,7 +60,6 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
@ -245,7 +244,7 @@
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Tableau6">
<blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Tableau6">
<tr>
<td>
<para style="terp_tblheader_Details">Description / Taxes</para>
@ -266,7 +265,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
<blockTable colWidths="4.0,280.0,44.0,21.0,66.0,53.0,71.0" style="Table_Invoice_Line_Content">
<blockTable colWidths="4.0,280.0,71.0,57.0,57.0,71.0" style="Table_Invoice_Line_Content">
<tr>
<td>
<para style="terp_default_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
@ -275,10 +274,7 @@
<para style="terp_default_9"><font face="Helvetica">[[ ((a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] + ')' ) ]]</para>
</td>
<td>
<para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['quantity'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['uos'] ]]</para>
<para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['quantity'] ]] [[ a['uos'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['price_unit'] ]]</para>
@ -322,11 +318,6 @@
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Note">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="4.0,278.0,257.0" style="Table1">
@ -344,8 +335,8 @@
</td>
</tr>
</blockTable>
<para style="terp_default_1">[[ a['type']!='break' and removeParentNode('pageBreak')]]</para>
<blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Table2">
<pageBreak style="terp_default_1">[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
<blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Table2">
<tr>
<td>
<para style="terp_tblheader_Details">Description / Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para>
@ -365,7 +356,7 @@
</tr>
</blockTable>
</section>
<blockTable colWidths="405.0,59.0,74.0" style="Tableau3">
<blockTable colWidths="395.0,59.0,85.0" style="Tableau3">
<tr>
<td>
<para style="terp_default_9">
@ -380,7 +371,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="405.0,59.0,74.0" style="Table4">
<blockTable colWidths="395.0,59.0,85.0" style="Table4">
<tr>
<td>
<para style="terp_default_9">
@ -395,7 +386,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="405.0,59.0,74.0" style="Table6">
<blockTable colWidths="395.0,59.0,85.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">
@ -416,7 +407,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="206.0,50.0,52.0,230.0" style="Table7">
<blockTable colWidths="205.0,71.0,71.0,191.0" style="Table7">
<tr>
<td>
<para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
@ -436,7 +427,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
<blockTable colWidths="206.0,49.0,52.0,230.0" style="Table8">
<blockTable colWidths="206.0,71.0,71.0,191.0" style="Table8">
<tr>
<td>
<para style="terp_default_8">[[ t.name ]]</para>

29
addons/account_invoice_layout/report/special_message_invoice.rml
View File

@ -60,7 +60,6 @@
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
</blockTableStyle>
<blockTableStyle id="Table1">
<blockAlignment value="LEFT"/>
@ -249,7 +248,7 @@
<para style="Standard">
<font color="white"> </font>
</para>
<blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Tableau6">
<blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Tableau6">
<tr>
<td>
<para style="terp_tblheader_Details">Description / Taxes</para>
@ -270,7 +269,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
<blockTable colWidths="4.0,280.0,44.0,21.0,66.0,53.0,71.0" style="Table_Invoice_Line_Content">
<blockTable colWidths="4.0,280.0,71.0,57.0,57.0,71.0" style="Table_Invoice_Line_Content">
<tr>
<td>
<para style="terp_default_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
@ -279,10 +278,7 @@
<para style="terp_default_9"><font face="Helvetica">[[ ((a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] +' )' ) ]]</para>
</td>
<td>
<para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['quantity'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9">[[ a['uos'] ]]</para>
<para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['quantity'] ]] [[ a['uos'] ]]</para>
</td>
<td>
<para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['price_unit'] ]]</para>
@ -326,11 +322,6 @@
<font color="white"> </font>
</para>
</td>
<td>
<para style="terp_default_Note">
<font color="white"> </font>
</para>
</td>
</tr>
</blockTable>
<blockTable colWidths="4.0,278.0,257.0" style="Table1">
@ -348,8 +339,8 @@
</td>
</tr>
</blockTable>
<para style="terp_default_1">[[ a['type']!='break' and removeParentNode('pageBreak')]]</para>
<blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Table2">
<pageBreak style="terp_default_1">[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
<blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Table2">
<tr>
<td>
<para style="terp_tblheader_Details">Description / Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para>
@ -369,7 +360,7 @@
</tr>
</blockTable>
</section>
<blockTable colWidths="405.0,59.0,74.0" style="Tableau3">
<blockTable colWidths="395.0,59.0,85.0" style="Tableau3">
<tr>
<td>
<para style="terp_default_9">
@ -384,7 +375,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="405.0,59.0,74.0" style="Table4">
<blockTable colWidths="395.0,59.0,85.0" style="Table4">
<tr>
<td>
<para style="terp_default_9">
@ -399,7 +390,7 @@
</td>
</tr>
</blockTable>
<blockTable colWidths="405.0,59.0,74.0" style="Table6">
<blockTable colWidths="395.0,59.0,85.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">
@ -420,7 +411,7 @@
<para style="terp_default_8">
<font color="white"> </font>
</para>
<blockTable colWidths="209.0,54.0,46.0,229.0" style="Table7">
<blockTable colWidths="209.0,71.0,71.0,188.0" style="Table7">
<tr>
<td>
<para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
@ -440,7 +431,7 @@
</blockTable>
<section>
<para style="terp_default_1">[[ repeatIn(o.tax_line,'t') ]]</para>
<blockTable colWidths="209.0,55.0,46.0,229.0" style="Table8">
<blockTable colWidths="209.0,71.0,71.0,188.0" style="Table8">
<tr>
<td>
<para style="terp_default_8">[[ t.name ]]</para>