From 5b5384f2deebe2137e78cbd09b6ce7c8adeb540e Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Sun, 24 Nov 2013 16:34:37 +0000
Subject: [PATCH] Merged revisions 5545 via svnmerge from
 svn+ssh://danydb@ns352270.ovh.net/svn/phpcompta/tags/rel670

........
  r5545 | danydb | 2013-11-24 17:29:10 +0100 (dim., 24 nov. 2013) | 1 line

  0000918: Somme des colonnes incorrects
........
---
 include/class_fiche.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/class_fiche.php b/include/class_fiche.php
index e112dc871..a653b5d4a 100644
--- a/include/class_fiche.php
+++ b/include/class_fiche.php
@@ -1513,7 +1513,7 @@ class Fiche
     function Summary($p_search="",$p_action="",$p_sql="",$p_amount=false)
     {
         global $g_user;
-		bcscale(4);
+        bcscale(4);
         $str_dossier=dossier::get();
         $p_search=sql_string($p_search);
         $script=$_SERVER['PHP_SELF'];
@@ -1592,12 +1592,12 @@ class Fiche
                          " ".$tiers->strAttribut(ATTR_DEF_CP).
                          " ".$tiers->strAttribut(ATTR_DEF_PAYS)).
                 "</TD>";
-            $deb=(($amount['debit']==0)?0:nbm($amount['debit']));
-            $cred=(($amount['credit']==0)?0:nbm($amount['credit']));
-            $solde=nbm($amount['solde']);
-            $r.='<TD sorttable_customkey="'.$amount['debit'].'" align="right"> '.$deb.'</TD>';
-            $r.='<TD sorttable_customkey="'.$amount['credit'].'" align="right"> '.$cred.'</TD>';
-            $r.='<TD sorttable_customkey="'.$amount['solde'].'" align="right"> '.$solde."</TD>";
+            $str_deb=(($amount['debit']==0)?0:nbm($amount['debit']));
+            $str_cred=(($amount['credit']==0)?0:nbm($amount['credit']));
+            $str_solde=nbm($amount['solde']);
+            $r.='<TD sorttable_customkey="'.$amount['debit'].'" align="right"> '.$str_deb.'</TD>';
+            $r.='<TD sorttable_customkey="'.$amount['credit'].'" align="right"> '.$str_cred.'</TD>';
+            $r.='<TD sorttable_customkey="'.$amount['solde'].'" align="right"> '.$str_solde."</TD>";
             $deb=bcadd($deb,$amount['debit']);
             $cred=bcadd($cred,$amount['credit']);
 
@@ -1605,8 +1605,9 @@ class Fiche
 
         }
 		$r.="<tfoot>";
-		$solde=bcsub($deb,$cred);
-		$r.=td("").td("").td("Totaux").td(nbm($deb),'class="num"').td(nbm($cred),'class="num"').td(nbm($solde),'class="num"');
+		$solde=abs(bcsub($deb,$cred));
+                $side=($deb > $cred)?'Débit':'Crédit';
+		$r.=td("").td("").td("Totaux").td(nbm($deb),'class="num"').td(nbm($cred),'class="num"').td(" $side ".nbm($solde),'class="num"');
 		$r.="</tfoot>";
         $r.="</TABLE>";
         $r.=$bar;