diff --git a/htdocs/telephonie/distributeurs/commissions.php b/htdocs/telephonie/distributeurs/commissions.php
index 97d19c82fa9..eb40b6cf57c 100644
--- a/htdocs/telephonie/distributeurs/commissions.php
+++ b/htdocs/telephonie/distributeurs/commissions.php
@@ -59,6 +59,7 @@ if ($_GET["id"])
$sql = "SELECT c.date, sum(c.montant)";
$sql .= " FROM ".MAIN_DB_PREFIX."telephonie_commission_conso as c";
$sql .= " WHERE c.fk_distributeur = ".$_GET["id"];
+ $sql .= " AND c.annul = 0";
$sql .= " GROUP BY c.date DESC";
$resql = $db->query($sql);
@@ -137,7 +138,7 @@ if ($_GET["id"])
if ($resql)
{
- $num = $db->num_rows();
+ $num = $db->num_rows($resql);
$i = 0;
$total = 0;
diff --git a/htdocs/telephonie/distributeurs/distributeur.php b/htdocs/telephonie/distributeurs/distributeur.php
index 257f769fcab..75973729e10 100644
--- a/htdocs/telephonie/distributeurs/distributeur.php
+++ b/htdocs/telephonie/distributeurs/distributeur.php
@@ -72,13 +72,13 @@ if ($_GET["id"])
if ($resql)
{
- $num = $db->num_rows();
+ $num = $db->num_rows($resql);
$i = 0;
$total = 0;
while ($i < $num)
{
- $row = $db->fetch_row($i);
+ $row = $db->fetch_row($resql);
$var=!$var;
@@ -88,7 +88,7 @@ if ($_GET["id"])
$i++;
}
- $db->free();
+ $db->free($resql);
}
else
{
@@ -96,6 +96,39 @@ if ($_GET["id"])
}
print '
';
+
+ print '
';
+ print '| Total commission |
';
+
+ $sql = "SELECT sum(c.montant)";
+ $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_commission as c";
+ $sql .= " WHERE c.fk_distributeur = ".$_GET["id"];
+
+ $resql = $db->query($sql);
+
+ if ($resql)
+ {
+ $num = $db->num_rows($resql);
+ $i = 0;
+ $total = 0;
+ $var = 0;
+ while ($i < $num)
+ {
+ $row = $db->fetch_row($resql);
+ $var=!$var;
+ print "";
+ print '| Total | ';
+ print ''.price($row[0]).' HT | ';
+
+ $i++;
+ }
+ $db->free($resql);
+ }
+ else
+ {
+ print $db->error() . ' ' . $sql;
+ }
+ print '
';
print '';
@@ -106,36 +139,31 @@ if ($_GET["id"])
print ' | ';
print '| Date | Commissions |
';
-
$sql = "SELECT c.date, c.montant";
- $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_commission as c";
-
+ $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_commission as c";
$sql .= " WHERE c.fk_distributeur = ".$_GET["id"];
-
$sql .= " ORDER BY c.date DESC";
$resql = $db->query($sql);
if ($resql)
{
- $num = $db->num_rows();
+ $num = $db->num_rows($resql);
$i = 0;
$total = 0;
while ($i < $num)
{
- $row = $db->fetch_row($i);
-
- $var=!$var;
-
- print "";
+ $row = $db->fetch_row($resql);
+ $var=!$var;
+ print "
";
print '| '.substr($row[0], -2).'/'.substr($row[0],0,4).' | ';
print ''.price($row[1]).' HT | ';
$i++;
}
- $db->free();
+ $db->free($resql);
}
else
{
@@ -144,12 +172,10 @@ if ($_GET["id"])
print '
';
print '';
-
print '';
print '';
- print '| Date | '."Prise d'ordre | ";
-
+ print 'Date | '."Prise d'ordre mensuelle | ";
$sql = "SELECT ".$db->pdate("p.datepo") . " as datepo, sum(p.montant)";
$sql .= " FROM ".MAIN_DB_PREFIX."telephonie_contrat_priseordre as p";
@@ -160,13 +186,13 @@ if ($_GET["id"])
if ($resql)
{
- $num = $db->num_rows();
+ $num = $db->num_rows($resql);
$i = 0;
$total = 0;
while ($i < $num)
{
- $row = $db->fetch_row($i);
+ $row = $db->fetch_row($resql);
$var=!$var;
@@ -177,7 +203,7 @@ if ($_GET["id"])
$i++;
}
- $db->free();
+ $db->free($resql);
}
else
{
@@ -188,7 +214,6 @@ if ($_GET["id"])
print '';
print ' ';
-
/* ************************************************************************** */
/* */
/* Barre d'action */
@@ -202,9 +227,6 @@ if ($_GET["id"])
}
print " ";
-
-
-
$db->close();
}
|