diff --git a/include/class/class_anc_balance_simple.php b/include/class/class_anc_balance_simple.php index 000e7628d..f700c6cbe 100644 --- a/include/class/class_anc_balance_simple.php +++ b/include/class/class_anc_balance_simple.php @@ -139,6 +139,8 @@ class Anc_Balance_Simple extends Anc_Print return $array; } + bcscale(2); + $deb_side=0;$cred_side=0; foreach ( $array as $row) { $odd++; @@ -154,7 +156,19 @@ class Anc_Balance_Simple extends Anc_Print $deb=($row['solde'] == 0 )?'':$deb; $r.=sprintf("%s",$deb); $r.=""; + $deb_side=bcadd($deb_side,$row['sum_deb']); + $cred_side=bcadd($cred_side,$row['sum_cred']); + } + $r.=''; + $r.=td(_("Total")); + $r.=td(nbm($deb_side)); + $r.=td(nbm($cred_side)); + $solde_side=abs(bcsub($deb_side,$cred_side)); + $r.=td(nbm($solde_side)); + if ( $deb_side == $cred_side ) $r.=td("="); + else if ( $deb_side > $cred_side ) $r.=td("D"); + else $r.=td("C"); $r.=""; return $r; } diff --git a/include/class/class_anc_listing.php b/include/class/class_anc_listing.php index 9804ad96c..014fd6d53 100644 --- a/include/class/class_anc_listing.php +++ b/include/class/class_anc_listing.php @@ -70,6 +70,8 @@ class Anc_Listing extends Anc_Print { return 0; } + $cred=0;$deb=0; + bcscale(2); $r.= ''; $r.= ''. ''. @@ -100,11 +102,29 @@ class Anc_Listing extends Anc_Print td($row['jr_comment']). ''. ''. - ''; + ''; $r.= ''; + if ( $row['oa_debit'] == 'f') {$cred=bcadd($cred,$row['oa_amount']);} + if ( $row['oa_debit'] == 't') {$deb=bcadd($deb,$row['oa_amount']);} } + $r.= '
'._('Date').''.$detail.''.nbm($row['oa_amount']).''.(($row['oa_debit']=='f')?'CREDIT':'DEBIT').''.(($row['oa_debit']=='f')?'C':'D').'
'; - return $r; + ob_start(); + echo _("Total"); + echo '
    '; + echo '
  1. '.nbm($deb).' D '.'
  2. '; + echo '
  3. '.nbm($cred).' C '.'
  4. '; + echo '
  5. '; + echo _('Solde'); + $solde=abs(bcsub($deb,$cred)); + echo $solde; + if ( $cred == $deb ) echo " = "; + else if ( $cred > $deb ) echo " C "; + else echo ' D '; + + $r_solde=ob_get_clean(); + + return $r.$r_solde; } /*! * \brief load the data from the database