diff --git a/htdocs/telephonie/distributeurs/commissions.php b/htdocs/telephonie/distributeurs/commissions.php index 3f11822cf37..99a6dfe29d1 100644 --- a/htdocs/telephonie/distributeurs/commissions.php +++ b/htdocs/telephonie/distributeurs/commissions.php @@ -51,39 +51,31 @@ if ($_GET["id"]) dolibarr_fiche_head($head, $hselected, "Distributeur"); - print ''; - - print '
'; - - - - - - /* Commissions */ + /* Conso */ + $conso_total = 0; $consos = array(); $sql = "SELECT c.date, sum(c.montant)"; - $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_commission_conso as c"; - + $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_commission_conso as c"; $sql .= " WHERE c.fk_distributeur = ".$_GET["id"]; - $sql .= " GROUP BY c.date DESC"; $resql = $db->query($sql); if ($resql) { - $num = $db->num_rows(); + $num = $db->num_rows($resql); $i = 0; while ($i < $num) { - $row = $db->fetch_row($i); + $row = $db->fetch_row($resql); $consos[$row[0]] = $row[1]; + $conso_total += $row[1]; $i++; } - $db->free(); + $db->free($resql); } else { @@ -91,13 +83,52 @@ if ($_GET["id"]) } + /* Commission */ + $comm_total = 0; + $commissions = array(); + + $sql = "SELECT c.date, c.montant"; + $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($resql); + $i = 0; + + while ($i < $num) + { + $row = $db->fetch_row($resql); + $commissions[$row[0]] = $row[1]; + $comm_total += $row[1]; + $i++; + } + $db->free($resql); + } + else + { + print $db->error() . ' ' . $sql; + } + + + + print ''; + + print '
'; + + print ''; print ''; - print ''; + print ''; + $var=1; + print ''; + print ''; $sql = "SELECT c.date, c.montant"; $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_commission as c"; - $sql .= " WHERE c.fk_distributeur = ".$_GET["id"]; $sql .= " ORDER BY c.date DESC"; @@ -112,20 +143,20 @@ if ($_GET["id"]) while ($i < $num) { - $row = $db->fetch_row($i); + $row = $db->fetch_row($resql); $var=!$var; print ""; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; $i++; } - $db->free(); + $db->free($resql); } else {
DateVerséConsosSolde
DateVerséConsosSolde
Total'.price($comm_total).' HT'.price($conso_total).' HT'.price($comm_total - $conso_total).' HT
'.substr($row[0], -2).'/'.substr($row[0],0,4).''.price($row[1]).' HT'.price($consos[$row[0]]).' HT'.price($consos[$row[0]] - $row[1]).' HT'.price($row[1]).' HT'.price($consos[$row[0]]).' HT'.price($consos[$row[0]] - $row[1]).' HT