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

[IMP] account: print journal report layout improvements 

bzr revid: qdp-launchpad@openerp.com-20120206123334-x70j7nzwo6vq5i5s
This commit is contained in:
Quentin (OpenERP) 2012-02-06 13:33:34 +01:00
parent 607f8e9c34
commit a634bb35be
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/report/account_journal.rml
View File

@ -211,7 +211,7 @@
</para>
<para style="Standard"><font color="white">[[ set_last_move_id(False)]]</font></para>
<section>
<para style="Standard"><font color="white">[[ display_currency(data) == False or removeParentNode('section') ]]</font></para>
[[ display_currency(data) == False or removeParentNode('section') ]]
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,95.0,160.0,70.0,70.0" style="Table1">
<tr>
<td><para style="P10a">Move</para></td>
@ -257,7 +257,7 @@
</section>
<section>
<para style="Standard"><font color="white">[[ display_currency(data) or removeParentNode('section') ]]</font></para>
[[ display_currency(data) or removeParentNode('section') ]]
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,70.0,130.0,70.0,70.0,70.0" style="Table1">
<tr>
<td><para style="P10a">Move</para></td>

22
addons/account/report/account_journal_sale_purchase.rml
View File

@ -211,8 +211,8 @@
</para>
<para style="Standard"><font color="white">[[ set_last_move_id(False) ]]</font></para>
<section>
<para style="Standard"><font color="white">[[ display_currency(data) == False or removeParentNode('section') ]]</font></para>
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,80.0,110.0,15.0,50.0,70.0,70.0" style="Table1">
[[ display_currency(data) == False or removeParentNode('section') ]]
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,60.0,110.0,15.0,70.0,70.0,70.0" style="Table1">
<tr>
<td><para style="P10a">Move</para></td>
<td><para style="P10a">Date</para></td>
@ -232,12 +232,12 @@
<td><para style="P8">[[ not check_last_move_id(line.move_id.id) and removeParentNode('blockTable') ]]</para></td>
</tr>
</blockTable>
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,80.0,110.0,15.0,50.0,70.0,70.0" style="Table_no_lines">
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,60.0,110.0,15.0,70.0,70.0,70.0" style="Table_no_lines">
<tr>
<td><para style="terp_default_8">[[ line.move_id.name &lt;&gt; '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]]</para></td>
<td><para style="terp_default_8">[[ formatLang(line.date,date=True) ]]</para></td>
<td><para style="terp_default_8">[[ line.account_id.code ]]</para></td>
<td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,17) ]]</para></td>
<td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,15) ]]</para></td>
<td><para style="terp_default_8">[[ strip_name(line.name,25) ]]</para></td>
<td><para style="P8">[[ line.tax_code_id and (line.tax_code_id.code + ':') ]]</para></td>
<td><para style="terp_default_8">[[ line.tax_amount and formatLang(line.tax_amount, currency_obj=company.currency_id) ]]</para></td>
@ -247,7 +247,7 @@
</blockTable>
<para style="terp_default_8">[[ set_last_move_id(line.move_id.id) ]]</para>
</section>
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,80.0,110.0,15.0,50.0,70.0,70.0" style="Table4Total">
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,60.0,110.0,15.0,70.0,70.0,70.0" style="Table4Total">
<tr>
<td><para style="P11"></para></td>
<td><para style="P11"></para></td>
@ -263,8 +263,8 @@
</section>
<section>
<para style="Standard"><font color="white">[[ display_currency(data) or removeParentNode('section') ]]</font></para>
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,70.0,70.0,10.0,50.0,70.0,70.0,70.0" style="Table1">
[[ display_currency(data) or removeParentNode('section') ]]
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,50.0,70.0,10.0,70.0,70.0,70.0,70.0" style="Table1">
<tr>
<td><para style="P10a">Move</para></td>
<td><para style="P10a">Date</para></td>
@ -285,13 +285,13 @@
<td><para style="P8">[[ not check_last_move_id(line.move_id.id) and removeParentNode('blockTable') ]]</para></td>
</tr>
</blockTable>
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,70.0,70.0,10.0,50.0,70.0,70.0,70.0" style="Table_no_lines">
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,50.0,70.0,10.0,70.0,70.0,70.0,70.0" style="Table_no_lines">
<tr>
<td><para style="terp_default_8">[[ line.move_id.name &lt;&gt; '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]]</para></td>
<td><para style="terp_default_8">[[ formatLang(line.date,date=True) ]]</para></td>
<td><para style="terp_default_8">[[ line.account_id.code ]]</para></td>
<td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,17) ]]</para></td>
<td><para style="terp_default_8">[[ strip_name(line.name,17) ]]</para></td>
<td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,12) ]]</para></td>
<td><para style="terp_default_8">[[ strip_name(line.name,16) ]]</para></td>
<td><para style="terp_default_8">[[ line.tax_code_id and (line.tax_code_id.code + ':') ]]</para></td>
<td><para style="P8">[[ line.tax_amount and formatLang(line.tax_amount, currency_obj=company.currency_id) ]]</para></td>
<td><para style="P8">[[ formatLang(line.debit, currency_obj=company.currency_id) ]]</para></td>
@ -301,7 +301,7 @@
</blockTable>
<para style="terp_default_8">[[ set_last_move_id(line.move_id.id) ]]</para>
</section>
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,70.0,70.0,10.0,50.0,70.0,70.0,70.0" style="Table4Total">
<blockTable rowHeights="0.55cm" colWidths="55.0,45.0,50.0,50.0,70.0,10.0,70.0,70.0,70.0,70.0" style="Table4Total">
<tr>
<td><para style="P11"></para></td>
<td><para style="P11"></para></td>