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

Le CA par utilisateur et socit ne doit pas inclure les factures l'tat brouillons.

Browse Source
This commit is contained in:
Laurent Destailleur 2004-01-24 16:37:30 +00:00
parent 6629344b39
commit d51ad5aa89
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ if ($user->societe_id > 0)
*/ */
llxHeader(); llxHeader();
print_titre("Chiffre d'affaire par utilisateur"); print_titre("Chiffre d'affaire par utilisateur (euros HT)");
/* /*
* Ca total * Ca total
@ -41,9 +41,10 @@ print_titre("Chiffre d'affaire par utilisateur");
*/ */
$sql = "SELECT sum(f.total) as ca FROM llx_facture as f"; $sql = "SELECT sum(f.total) as ca FROM llx_facture as f";
$sql .= " WHERE f.fk_user_valid is not NULL AND f.fk_statut = 1";
if ($socidp) if ($socidp)
{ {
$sql .= " WHERE f.fk_soc = $socidp"; $sql .= " AND f.fk_soc = $socidp";
} }
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
@ -55,14 +56,14 @@ if ($result)
} }
} }
print "Total : ".price($catotal); print "<br><b>Cumul : ".price($catotal)."</b>";
if ($catotal == 0) { $catotal = 1; }; if ($catotal == 0) { $catotal = 1; };
$sql = "SELECT u.name, u.firstname, sum(f.total) as ca"; $sql = "SELECT u.name, u.firstname, sum(f.total) as ca";
$sql .= " FROM llx_user as u,llx_facture as f"; $sql .= " FROM llx_user as u,llx_facture as f";
$sql .= " WHERE f.fk_user_author = u.rowid"; $sql .= " WHERE f.fk_user_valid is not NULL and f.fk_statut = 1 AND f.fk_user_author = u.rowid";
if ($socidp) if ($socidp)
{ {
$sql .= " AND f.fk_soc = $socidp"; $sql .= " AND f.fk_soc = $socidp";
@ -76,7 +77,7 @@ if ($result)
if ($num > 0) if ($num > 0)
{ {
$i = 0; $i = 0;
print "<p><TABLE border=\"0\" width=\"50%\" cellspacing=\"0\" cellpadding=\"4\">"; print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
print "<TR class=\"liste_titre\">"; print "<TR class=\"liste_titre\">";
print "<td>Utilisateur</td>"; print "<td>Utilisateur</td>";
print '<td align="right">Montant</TD><td align="right">Pourcentage</td>'; print '<td align="right">Montant</TD><td align="right">Pourcentage</td>';

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

@ -33,7 +33,7 @@ if ($user->societe_id > 0)
*/ */
llxHeader(); llxHeader();
print_titre("Chiffre d'affaire par société"); print_titre("Chiffre d'affaire par société (euros HT)");
/* /*
* Ca total * Ca total
@ -41,9 +41,10 @@ print_titre("Chiffre d'affaire par soci
*/ */
$sql = "SELECT sum(f.total) as ca FROM llx_facture as f"; $sql = "SELECT sum(f.total) as ca FROM llx_facture as f";
$sql .= " WHERE f.fk_user_valid = 1 AND f.fk_statut = 1";
if ($socidp) if ($socidp)
{ {
$sql .= " WHERE f.fk_soc = $socidp"; $sql .= " AND f.fk_soc = $socidp";
} }
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
@ -55,14 +56,14 @@ if ($result)
} }
} }
print "<div class=\"titre\"><b>Total : ".price($catotal)."</b></div>"; print "<br><b>Cumul : ".price($catotal)."</b>";
if ($catotal == 0) { $catotal = 1; }; if ($catotal == 0) { $catotal = 1; };
$sql = "SELECT s.nom, s.idp, sum(f.total) as ca"; $sql = "SELECT s.nom, s.idp, sum(f.total) as ca";
$sql .= " FROM llx_societe as s,llx_facture as f"; $sql .= " FROM llx_societe as s,llx_facture as f";
$sql .= " WHERE f.fk_soc = s.idp"; $sql .= " WHERE f.fk_statut = 1 and f.fk_user_valid = 1 AND f.fk_soc = s.idp";
if ($socidp) if ($socidp)
{ {
$sql .= " AND f.fk_soc = $socidp"; $sql .= " AND f.fk_soc = $socidp";
@ -76,7 +77,7 @@ if ($result)
if ($num > 0) if ($num > 0)
{ {
$i = 0; $i = 0;
print "<p><TABLE border=\"0\" width=\"50%\" cellspacing=\"0\" cellpadding=\"4\">"; print "<p><TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
print "<TR class=\"liste_titre\">"; print "<TR class=\"liste_titre\">";
print "<TD>Société</td>"; print "<TD>Société</td>";
print '<TD align="right">Montant</TD><td align="right">Pourcentage</td>'; print '<TD align="right">Montant</TD><td align="right">Pourcentage</td>';