diff --git a/htdocs/telephonie/distributeurs/commissions.php b/htdocs/telephonie/distributeurs/commissions.php
index 7075d1895c5..c946ec00910 100644
--- a/htdocs/telephonie/distributeurs/commissions.php
+++ b/htdocs/telephonie/distributeurs/commissions.php
@@ -45,6 +45,10 @@ if ($_GET["id"])
$head[$h][1] = $distri->nom;
$h++;
+ $head[$h][0] = DOL_URL_ROOT.'/telephonie/distributeurs/contrat.php?id='.$distri->id;
+ $head[$h][1] = "Contrat";
+ $h++;
+
$head[$h][0] = DOL_URL_ROOT.'/telephonie/distributeurs/commissions.php?id='.$distri->id;
$head[$h][1] = "Commissions";
$hselected = $h;
diff --git a/htdocs/telephonie/distributeurs/distributeur.php b/htdocs/telephonie/distributeurs/distributeur.php
index 214bcd7993f..11dca78697f 100644
--- a/htdocs/telephonie/distributeurs/distributeur.php
+++ b/htdocs/telephonie/distributeurs/distributeur.php
@@ -46,6 +46,10 @@ if ($_GET["id"])
$hselected = $h;
$h++;
+ $head[$h][0] = DOL_URL_ROOT.'/telephonie/distributeurs/contrat.php?id='.$distri->id;
+ $head[$h][1] = "Contrat";
+ $h++;
+
$head[$h][0] = DOL_URL_ROOT.'/telephonie/distributeurs/commissions.php?id='.$distri->id;
$head[$h][1] = "Commissions";
$h++;
@@ -65,37 +69,52 @@ if ($_GET["id"])
print '
';
print '';
- print '';
- print '| Commerciaux | ';
+ print '| Responsables | ';
$sql = "SELECT u.rowid, u.firstname, u.name";
$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
- $sql .= " , ".MAIN_DB_PREFIX."telephonie_distributeur_commerciaux as dc";
-
+ $sql .= " , ".MAIN_DB_PREFIX."telephonie_distributeur_responsable as dc";
$sql .= " WHERE u.rowid = dc.fk_user ";
- $sql .= " AND dc.fk_distributeur = ".$_GET["id"];
-
- $sql .= " ORDER BY u.name ASC";
+ $sql .= " AND dc.fk_distributeur = '".$_GET["id"]."'";
+ $sql .= " ORDER BY u.name ASC;";
$resql = $db->query($sql);
if ($resql)
{
- $num = $db->num_rows($resql);
- $i = 0;
- $total = 0;
-
- while ($i < $num)
+ while ($row = $db->fetch_row($resql))
+ {
+ $var=!$var;
+ print "";
+ print '| '.$row[1].' '.$row[2].' | ';
+ }
+ $db->free($resql);
+ }
+ else
+ {
+ print $db->error() . ' ' . $sql;
+ }
+ print ' ';
+
+ print '';
+ print '| Commerciaux | ';
+
+ $sql = "SELECT u.rowid, u.firstname, u.name";
+ $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+ $sql .= " , ".MAIN_DB_PREFIX."telephonie_distributeur_commerciaux as dc";
+ $sql .= " WHERE u.rowid = dc.fk_user ";
+ $sql .= " AND dc.fk_distributeur = '".$_GET["id"]."'";
+ $sql .= " ORDER BY u.name ASC;";
+
+ $resql = $db->query($sql);
+
+ if ($resql)
+ {
+ while ($row = $db->fetch_row($resql))
{
- $row = $db->fetch_row($resql);
-
$var=!$var;
-
print "";
-
print '| '.$row[1].' '.$row[2].' | ';
-
- $i++;
}
$db->free($resql);
}
diff --git a/htdocs/telephonie/distributeurs/po.php b/htdocs/telephonie/distributeurs/po.php
index 3e08132bbb8..69b998d174e 100644
--- a/htdocs/telephonie/distributeurs/po.php
+++ b/htdocs/telephonie/distributeurs/po.php
@@ -64,6 +64,10 @@ if ($_GET["id"])
$head[$h][1] = $distri->nom;
$h++;
+ $head[$h][0] = DOL_URL_ROOT.'/telephonie/distributeurs/contrat.php?id='.$distri->id;
+ $head[$h][1] = "Contrat";
+ $h++;
+
$head[$h][0] = DOL_URL_ROOT.'/telephonie/distributeurs/commissions.php?id='.$distri->id;
$head[$h][1] = "Commissions";
$h++;
diff --git a/htdocs/telephonie/distributeurs/stats.php b/htdocs/telephonie/distributeurs/stats.php
index 9063c944598..8737ed349a7 100644
--- a/htdocs/telephonie/distributeurs/stats.php
+++ b/htdocs/telephonie/distributeurs/stats.php
@@ -46,6 +46,10 @@ if ($_GET["id"])
$head[$h][1] = $distri->nom;
$h++;
+ $head[$h][0] = DOL_URL_ROOT.'/telephonie/distributeurs/contrat.php?id='.$distri->id;
+ $head[$h][1] = "Contrat";
+ $h++;
+
$head[$h][0] = DOL_URL_ROOT.'/telephonie/distributeurs/commissions.php?id='.$distri->id;
$head[$h][1] = "Commissions";
$h++;
|