[Phpcompta-dev] r5546 - in phpcompta/trunk: . include

[phpcompta-dev]

Author: danydb
Date: 2013-11-24 17:34:37 +0100 (Sun, 24 Nov 2013)
New Revision: 5546

Modified:
   phpcompta/trunk/
   phpcompta/trunk/include/class_fiche.php
Log:
Merged revisions 5545 via svnmerge from 
svn+ssh://address@hidden/svn/phpcompta/tags/rel670

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



Property changes on: phpcompta/trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /phpcompta/tags/rel670:1-5539,5541-5543
   + /phpcompta/tags/rel670:1-5539,5541-5545

Modified: phpcompta/trunk/include/class_fiche.php
===================================================================
--- phpcompta/trunk/include/class_fiche.php     2013-11-24 16:29:10 UTC (rev 
5545)
+++ phpcompta/trunk/include/class_fiche.php     2013-11-24 16:34:37 UTC (rev 
5546)
@@ -1513,7 +1513,7 @@
     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 @@
                          " ".$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 @@
 
         }
                $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;



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu