lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrections mauvais rsultat du ca par socit et support des 2 modes comptables.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-05-07 02:12:34 +00:00
parent 2a480075b9
commit d1cbe3544c
2 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
htdocs/compta/stats/cabyuser.php
View File

@ -29,19 +29,19 @@
require("./pre.inc.php"); require("./pre.inc.php");
/*
* Sécurité accés client
*/
if ($user->societe_id > 0)
{
$socidp = $user->societe_id;
}
$year=$_GET["year"]; $year=$_GET["year"];
if (! $year) { $year = strftime("%Y", time()); } if (! $year) { $year = strftime("%Y", time()); }
$modecompta = $conf->compta->mode; $modecompta = $conf->compta->mode;
if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"]; 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(); llxHeader();
@ -146,13 +146,34 @@ if ($modecompta != 'CREANCES-DETTES')
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print "<td>".$langs->trans("User")."</td>"; print_liste_field_titre($langs->trans("User"),$_SERVER["PHP_SELF"],"name","",'&amp;year='.($year).'&modecompta='.$modecompta,"",$sortfield);
print '<td align="right">'.$langs->trans("AmountTTC").'</td><td align="right">'.$langs->trans("Percentage").'</td>'; 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"; print "</tr>\n";
$var=true; $var=true;
if (sizeof($amount)) 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) foreach($amount as $key=>$value)
{ {
$var=!$var; $var=!$var;
@ -166,8 +187,8 @@ if (sizeof($amount))
$linkname=$langs->trans("Paiements liés à aucune facture"); $linkname=$langs->trans("Paiements liés à aucune facture");
} }
print "<td>".$linkname."</td>\n"; print "<td>".$linkname."</td>\n";
print '<td align="right">'.price($value).'</td>'; print '<td align="right">'.price($amount[$key]).'</td>';
print '<td align="right">'.($catotal > 0 ? price(100 / $catotal * $value).'%' : '&nbsp;').'</td>'; print '<td align="right">'.($catotal > 0 ? price(100 / $catotal * $amount[$key]).'%' : '&nbsp;').'</td>';
print "</tr>\n"; print "</tr>\n";
$i++; $i++;
} }

10
htdocs/compta/stats/casoc.php
View File

@ -39,14 +39,8 @@ $sortfield=isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
if (! $sortorder) $sortorder="desc"; if (! $sortorder) $sortorder="desc";
if (! $sortfield) $sortfield="amount_ttc"; if (! $sortfield) $sortfield="amount_ttc";
/* // Sécurité accés client
* Sécurité accés client if ($user->societe_id > 0) $socidp = $user->societe_id;
*/
if ($user->societe_id > 0)
{
$socidp = $user->societe_id;
}
llxHeader(); llxHeader();