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

merge 

bzr revid: olt@tinyerp.com-20081103135701-0fr992l81c6p1qsi
This commit is contained in:
Olivier Laurent 2008-11-03 14:57:01 +01:00
parent d1032ca0a9 6578c17a61
commit f79a046ae1
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/account/report/partner_balance.py
View File

@ -336,6 +336,7 @@ class partner_balance(report_sxw.rml_parse):
# completearray.append(new_tot)
new_header['debit'] = tot_debit
new_header['credit'] = tot_credit
new_header['scredit'] = tot_scredit
@ -371,12 +372,9 @@ class partner_balance(report_sxw.rml_parse):
r['type'] = 1
#
r['balance'] = float(r['sdebit']) - float(r['scredit'])
tot_debit = r['debit']
tot_credit = r['credit']
tot_scredit = r['scredit']
tot_sdebit = r['sdebit']
tot_enlitige = (r['enlitige'] or 0.0)
#
completearray.append(r)
if cleanarray[i]['account_id'] == cleanarray[i-1]['account_id']:

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

@ -327,13 +327,13 @@
<para style="P8"><u>[[ sum_credit(data) or '0.0' ]]</u></para>
</td>
<td>
<para style="P8"><u>[[ (sum_scredit(data)-sum_sdebit(data)) or '0.0' ]]</u></para>
<para style="P8"><u>[[ (solde_debit(data)-solde_credit(data)) or '0.0' ]]</u></para>
</td>
<td>
<para style="P8"><u>[[ sum_litige(data) or '0.0' ]]</u></para>
</td>
</tr>
<!--<tr>
<!-- <tr>
<td>
<para style="P7">Balance</para>
</td><td>