admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cosmetic:

Browse source 
========
Amount appereance in HTML
This commit is contained in:
Dany De Bontridder 2010-11-02 13:14:04 +00:00
parent 2304bb526e
commit 78fd568ea0
3 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
html/ajax_history.php
View file

@ -92,8 +92,8 @@ $html=escape_xml($html);
header('Content-type: text/xml; charset=UTF-8');
echo <<<EOF
<?xml version="1.0" encoding="UTF-8"?>
<data>
<ctl>$div</ctl>
<code>$html</code>
</data>
<data>
<ctl>$div</ctl>
<code>$html</code>
</data>
EOF;

16
include/class_acc_account_ledger.php
View file

@ -328,16 +328,17 @@ class Acc_Account_Ledger
$op['jr_id'], dossier::id(), $op['jr_internal']);
$let='';
if ( $op['letter'] !=-1) $let=$op['letter'];
$progress+=$op['deb_montant']-$op['cred_montant'];
$tmp_diff=bcsub($op['deb_montant'],$op['cred_montant']);
$progress=bcadd($progress,$tmp_diff);
echo "<TR>".
"<TD>".format_date($op['j_date'])."</TD>".
td(h($op['jr_pj_number'])).
"<TD>".$vw_operation."</TD>".
"<TD>".h($op['description'])."</TD>".
"<TD style=\"text-align:right\">".sprintf("%.2f",$op['deb_montant'])."</TD>".
"<TD style=\"text-align:right\">".sprintf("%.2f",$op['cred_montant'])."</TD>".
td(sprintf('%.2f',abs($progress)),'style="text-align:right"').
"<TD style=\"text-align:right\">".nbm($op['deb_montant'])."</TD>".
"<TD style=\"text-align:right\">".nbm($op['cred_montant'])."</TD>".
td(nbm(abs($progress)),'style="text-align:right"').
td($let,' style="color:red;text-align:right"').
"</TR>";
@ -347,12 +348,15 @@ class Acc_Account_Ledger
$solde_type=($tot_deb>$tot_cred)?"solde débiteur":"solde créditeur";
$diff=round(abs($tot_deb-$tot_cred),2);
echo "<TR>".
"<TD>$solde_type</TD>".
"<TD style=\"text-align:right\">$diff</TD>".
"<TD>Totaux</TD><td></td>".
"<TD ></TD>".
"<TD></TD>".
"<TD style=\"text-align:right\">$tot_deb</TD>".
"<TD style=\"text-align:right\">$tot_cred</TD>".
"</TR>";
echo "<TD>$solde_type</TD><td></td>".
"<TD style=\"text-align:right\">$diff</TD>".
"</TR>";
echo '</tfoot>';
echo '</tbody>';

19
include/class_fiche.php
View file

@ -1209,9 +1209,9 @@ class Fiche
td(h($op['jr_pj_number'])).
"<TD>".$vw_operation."</TD>".
"<TD>".h($op['description'])."</TD>".
"<TD style=\"text-align:right\">".sprintf("%.2f",$op['deb_montant'])."</TD>".
"<TD style=\"text-align:right\">".sprintf("%.2f",$op['cred_montant'])."</TD>".
td(sprintf('%.2f',abs($progress)),'style="text-align:right"').
"<TD style=\"text-align:right\">".nbm($op['deb_montant'])."</TD>".
"<TD style=\"text-align:right\">".nbm($op['cred_montant'])."</TD>".
td(nbm(abs($progress)),'style="text-align:right"').
td($let,' style="color:red;text-align:right"').
"</TR>";
@ -1219,13 +1219,18 @@ class Fiche
$solde_type=($tot_deb>$tot_cred)?"solde débiteur":"solde créditeur";
$diff=round(abs($tot_deb-$tot_cred),2);
echo '<tfoot>';
echo "<TR>".
"<TD>Totaux</TD>".
"<TD ></TD>".
"<TD ></TD>".
"<TD></TD>".
"<TD style=\"text-align:right\">".nbm($tot_deb)."</TD>".
"<TD style=\"text-align:right\">".nbm($tot_cred)."</TD>".
"</TR>";
echo "<TR>".
"<TD>$solde_type</TD>".
"<TD style=\"text-align:right\">$diff</TD>".
"<TD style=\"text-align:right\">".nbm($diff)."</TD>".
"<TD></TD>".
"<TD style=\"text-align:right\">$tot_deb</TD>".
"<TD style=\"text-align:right\">$tot_cred</TD>".
"</TR>";
echo '</tfoot>';
echo '</tbody>';