diff --git a/include/class_fiche.php b/include/class_fiche.php index e653b4446..fa08772e1 100644 --- a/include/class_fiche.php +++ b/include/class_fiche.php @@ -1285,7 +1285,7 @@ class Fiche th('Let.','style="text-align:right"'); "" ; - $old_exercice=""; + $old_exercice="";$sum_deb=0;$sum_cred=0; bcscale(2); foreach ( $this->row as $op ) { @@ -1296,11 +1296,31 @@ class Fiche $tmp_diff=bcsub($op['deb_montant'],$op['cred_montant']); $progress=bcadd($progress,$tmp_diff); + $sum_cred=bcadd($sum_cred,$op['cred_montant']); + $sum_deb=bcadd($sum_deb,$op['deb_montant']); + /* * reset prog. balance to zero if we change of exercice */ if ( $old_exercice != $op['p_exercice']) - $progress=$tmp_diff; + { + $progress=$tmp_diff; + if ($old_exercice != '' ) + { + echo "". + "". + td(''). + "". + "Totaux". + "".nbm($sum_deb)."". + "".nbm($sum_cred)."". + td(nbm(abs($progress)),'style="text-align:right"'). + td(''). + ""; + $sum_cred=$op['cred_montant']; + $sum_deb=$op['deb_montant']; + } + } echo "". "".format_date($op['j_date_fmt'])."". @@ -1315,16 +1335,16 @@ class Fiche $old_exercice=$op['p_exercice']; } - $solde_type=($tot_deb>$tot_cred)?"solde débiteur":"solde créditeur"; - $diff=round(abs($tot_deb-$tot_cred),2); + $solde_type=($sum_deb>$sum_cred)?"solde débiteur":"solde créditeur"; + $diff=abs(bcsub($sum_deb,$sum_cred)); echo ''; echo "". "Totaux". "". "". "". - "".nbm($tot_deb)."". - "".nbm($tot_cred)."". + "".nbm($sum_deb)."". + "".nbm($sum_cred)."". ""; echo "". "$solde_type".