pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] account : Improve the report

Browse Source 
bzr revid: sbh@tinyerp.com-20100729121642-xg3v8e6f3i5nu17v
This commit is contained in:
sbh (Open ERP)
2010-07-29 17:46:42 +05:30
parent 1ffbc0ee4a
commit 9be73e6044
2 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/third_party_ledger.rml
+33 -31
View File
@@ -275,20 +275,7 @@
<font color="white"> </font>
</para>
<blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>[[ data['form']['initial_balance'] or removeParentNode('tr') ]]
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][0] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][1] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][2] or 0.0 ]]</para>
</td>
</tr>
<tr>
<td>
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
@@ -303,6 +290,20 @@
<para style="P5">[[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]]</para>
</td>
</tr>
<tr>
<td>[[ data['form']['initial_balance'] or removeParentNode('tr') ]]
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][0] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][1] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][2] or 0.0 ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
@@ -391,23 +392,7 @@
<font color="white"> </font>
</para>
<blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>[[display_initial_balance(data) or removeParentNode('tr') ]]
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][0] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][1] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][2] or 0.0 ]]</para>
</td>
<td>
<para style="P5"></para>
</td>
</tr>
<tr>
<td>
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
@@ -427,6 +412,23 @@
</para>
</td>
</tr>
<tr>
<td>[[display_initial_balance(data) or removeParentNode('tr') ]]
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][0] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][1] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][2] or 0.0 ]]</para>
</td>
<td>
<para style="P5"></para>
</td>
</tr>
</blockTable>
<para style="terp_default_2">
<font color="white"> </font>
addons/account/report/third_party_ledger_other.rml
+33 -31
View File
@@ -455,20 +455,7 @@
<section>
<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
<blockTable colWidths="314.0,77.0,75.0,74.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
<tr>
<td>[[ display_initial_balance(data) or removeParentNode('tr') ]]
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][0] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][1] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][2] or 0.0 ]]</para>
</td>
</tr>
<tr>
<td>
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
@@ -483,6 +470,20 @@
<para style="P5">[[ formatLang((sum_debit_partner(p,data) - sum_credit_partner(p,data))) ]]</para>
</td>
</tr>
<tr>
<td>[[ display_initial_balance(data) or removeParentNode('tr') ]]
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][0] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][1] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][2] or 0.0 ]]</para>
</td>
</tr>
</blockTable>
<section>
<para style="P1">[[ repeatIn(lines(p,data), 'line') ]]</para>
@@ -566,23 +567,7 @@
<section>
<para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
<blockTable colWidths="276.0,67.0,66.0,65.0,65.0" style="Table6">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
<tr>
<td>[[ data['form']['initial_balance'] or removeParentNode('tr') ]]
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][0] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][1] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][2] or 0.0 ]]</para>
</td>
<td>
<para style="P5"></para>
</td>
</tr>
<tr>
<td>
<para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
@@ -602,6 +587,23 @@
</para>
</td>
</tr>
<tr>
<td>[[ data['form']['initial_balance'] or removeParentNode('tr') ]]
<para style="P2">Initial Balance</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][0] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][1] or 0.0 ]]</para>
</td>
<td>
<para style="P5">[[ get_intial_balance(p,data)[0][2] or 0.0 ]]</para>
</td>
<td>
<para style="P5"></para>
</td>
</tr>
</blockTable>
<section>
<para style="P1">[[ repeatIn(lines(p,data), 'line') ]]</para>