From d1cbe3544c58b74008eb96f97cf3cefde6346917 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 7 May 2005 02:12:34 +0000
Subject: [PATCH] =?UTF-8?q?Corrections=20mauvais=20r=E9sultat=20du=20ca=20?=
 =?UTF-8?q?par=20soci=E9t=E9=20et=20support=20des=202=20modes=20comptables?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/stats/cabyuser.php | 43 ++++++++++++++++++++++++--------
 htdocs/compta/stats/casoc.php    | 10 ++------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 4c82200e53c..2fc13e75326 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -29,19 +29,19 @@
 
 require("./pre.inc.php");
 
-/*
- * S�curit� acc�s client
- */
-if ($user->societe_id > 0)
-{
-    $socidp = $user->societe_id;
-}
 
 $year=$_GET["year"];
 if (! $year) { $year = strftime("%Y", time()); }
 $modecompta = $conf->compta->mode;
 if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"];
 
+$sortorder=isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
+$sortfield=isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
+if (! $sortorder) $sortorder="desc";
+if (! $sortfield) $sortfield="amount_ttc";
+
+// S�curit� acc�s client
+if ($user->societe_id > 0) $socidp = $user->societe_id;
 
 
 llxHeader();
@@ -146,13 +146,34 @@ if ($modecompta != 'CREANCES-DETTES')
 $i = 0;
 print "<table class=\"noborder\" width=\"100%\">";
 print "<tr class=\"liste_titre\">";
-print "<td>".$langs->trans("User")."</td>";
-print '<td align="right">'.$langs->trans("AmountTTC").'</td><td align="right">'.$langs->trans("Percentage").'</td>';
+print_liste_field_titre($langs->trans("User"),$_SERVER["PHP_SELF"],"name","",'&amp;year='.($year).'&modecompta='.$modecompta,"",$sortfield);
+print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"amount_ttc","",'&amp;year='.($year).'&modecompta='.$modecompta,'align="right"',$sortfield);
+print_liste_field_titre($langs->trans("Percentage"),$_SERVER["PHP_SELF"],"amount_ttc","",'&amp;year='.($year).'&modecompta='.$modecompta,'align="right"',$sortfield);
 print "</tr>\n";
 $var=true;
 
 if (sizeof($amount))
 {
+    $arrayforsort=$name;
+    
+    // On d�finit tableau arrayforsort
+    if ($sortfield == 'nom' && $sortorder == 'asc') {
+        asort($name);
+        $arrayforsort=$name;
+    }
+    if ($sortfield == 'nom' && $sortorder == 'desc') {
+        arsort($name);
+        $arrayforsort=$name;
+    }
+    if ($sortfield == 'amount_ttc' && $sortorder == 'asc') {
+        asort($amount);
+        $arrayforsort=$amount;
+    }
+    if ($sortfield == 'amount_ttc' && $sortorder == 'desc') {
+        arsort($amount);
+        $arrayforsort=$amount;
+    }
+
     foreach($amount as $key=>$value)
     {
         $var=!$var;
@@ -166,8 +187,8 @@ if (sizeof($amount))
             $linkname=$langs->trans("Paiements li�s � aucune facture");
         }
         print "<td>".$linkname."</td>\n";
-        print '<td align="right">'.price($value).'</td>';
-        print '<td align="right">'.($catotal > 0 ? price(100 / $catotal * $value).'%' : '&nbsp;').'</td>';
+        print '<td align="right">'.price($amount[$key]).'</td>';
+        print '<td align="right">'.($catotal > 0 ? price(100 / $catotal * $amount[$key]).'%' : '&nbsp;').'</td>';
         print "</tr>\n";
         $i++;
     }
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index fc405a4e66a..52ae7f9a6a7 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -39,14 +39,8 @@ $sortfield=isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
 if (! $sortorder) $sortorder="desc";
 if (! $sortfield) $sortfield="amount_ttc";
 
-/*
- * S�curit� acc�s client
- */
-if ($user->societe_id > 0) 
-{
-   $socidp = $user->societe_id;
-}
-
+// S�curit� acc�s client
+if ($user->societe_id > 0) $socidp = $user->societe_id;
 
 
 llxHeader();
-- 
GitLab