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 "
| ".$langs->trans("User")." | "; -print ''.$langs->trans("AmountTTC").' | '.$langs->trans("Percentage").' | '; +print_liste_field_titre($langs->trans("User"),$_SERVER["PHP_SELF"],"name","",'&year='.($year).'&modecompta='.$modecompta,"",$sortfield); +print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"amount_ttc","",'&year='.($year).'&modecompta='.$modecompta,'align="right"',$sortfield); +print_liste_field_titre($langs->trans("Percentage"),$_SERVER["PHP_SELF"],"amount_ttc","",'&year='.($year).'&modecompta='.$modecompta,'align="right"',$sortfield); print "".$linkname." | \n"; - print ''.price($value).' | '; - print ''.($catotal > 0 ? price(100 / $catotal * $value).'%' : ' ').' | '; + print ''.price($amount[$key]).' | '; + print ''.($catotal > 0 ? price(100 / $catotal * $amount[$key]).'%' : ' ').' | '; print "\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();