From 969339b8dfd74e2ba4d38bd7717e9e5e2d7e9a02 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Thu, 8 Sep 2005 10:31:18 +0000 Subject: [PATCH] Ajout onglet --- .../telephonie/distributeurs/commissions.php | 4 ++ .../telephonie/distributeurs/distributeur.php | 55 +++++++++++++------ htdocs/telephonie/distributeurs/po.php | 4 ++ htdocs/telephonie/distributeurs/stats.php | 4 ++ 4 files changed, 49 insertions(+), 18 deletions(-) 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 ''; + print ''; $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 ''; + } + $db->free($resql); + } + else + { + print $db->error() . ' ' . $sql; + } + print '
Commerciaux
Responsables
'.$row[1].' '.$row[2].'

'; + + print ''; + print ''; + + $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 ''; - - $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++;
Commerciaux
'.$row[1].' '.$row[2].'