commit
f79a046ae1
|
@ -336,6 +336,7 @@ class partner_balance(report_sxw.rml_parse):
|
||||||
# completearray.append(new_tot)
|
# completearray.append(new_tot)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
new_header['debit'] = tot_debit
|
new_header['debit'] = tot_debit
|
||||||
new_header['credit'] = tot_credit
|
new_header['credit'] = tot_credit
|
||||||
new_header['scredit'] = tot_scredit
|
new_header['scredit'] = tot_scredit
|
||||||
|
@ -371,12 +372,9 @@ class partner_balance(report_sxw.rml_parse):
|
||||||
r['type'] = 1
|
r['type'] = 1
|
||||||
#
|
#
|
||||||
r['balance'] = float(r['sdebit']) - float(r['scredit'])
|
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)
|
completearray.append(r)
|
||||||
|
|
||||||
if cleanarray[i]['account_id'] == cleanarray[i-1]['account_id']:
|
if cleanarray[i]['account_id'] == cleanarray[i-1]['account_id']:
|
||||||
|
|
|
@ -327,13 +327,13 @@
|
||||||
<para style="P8"><u>[[ sum_credit(data) or '0.0' ]]</u></para>
|
<para style="P8"><u>[[ sum_credit(data) or '0.0' ]]</u></para>
|
||||||
</td>
|
</td>
|
||||||
<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>
|
||||||
<td>
|
<td>
|
||||||
<para style="P8"><u>[[ sum_litige(data) or '0.0' ]]</u></para>
|
<para style="P8"><u>[[ sum_litige(data) or '0.0' ]]</u></para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<!--<tr>
|
<!-- <tr>
|
||||||
<td>
|
<td>
|
||||||
<para style="P7">Balance</para>
|
<para style="P7">Balance</para>
|
||||||
</td><td>
|
</td><td>
|
||||||
|
|
Loading…
Reference in New Issue