From c16626dfac5745e5567263ff9b03e25cac0e1ae6 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Fri, 2 Sep 2005 14:08:02 +0000 Subject: [PATCH] Modif permission --- htdocs/telephonie/distributeurs/po.php | 11 +++++++++-- htdocs/telephonie/distributeurs/pre.inc.php | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/htdocs/telephonie/distributeurs/po.php b/htdocs/telephonie/distributeurs/po.php index d2223fbe8b4..fa676a6c076 100644 --- a/htdocs/telephonie/distributeurs/po.php +++ b/htdocs/telephonie/distributeurs/po.php @@ -21,6 +21,10 @@ */ require("./pre.inc.php"); +if ($user->distributeur_id) +{ + $_GET["id"] = $user->distributeur_id; +} $page = $_GET["page"]; $sortorder = $_GET["sortorder"]; @@ -83,7 +87,7 @@ if ($_GET["id"]) * */ - $sql = "SELECT s.idp, s.nom, p.fk_contrat, p.montant"; + $sql = "SELECT s.idp, s.nom, p.fk_contrat, p.montant, p.avance_duree, p.avance_pourcent"; $sql .= " , ".$db->pdate("p.datepo") . " as datepo"; $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_contrat_priseordre as p"; $sql .= " , ".MAIN_DB_PREFIX."telephonie_contrat as c"; @@ -110,13 +114,14 @@ if ($_GET["id"]) print_liste_field_titre("Contrat","po.php","l.ligne"); print 'DateMontant'; + print 'Avance DuréeAvance %'; print "\n"; $var=True; while ($i < min($num,$conf->liste_limit)) { - $obj = $db->fetch_object($i); + $obj = $db->fetch_object($resql); $var=!$var; print ""; @@ -131,6 +136,8 @@ if ($_GET["id"]) print ''.sprintf("%01.2f",$obj->montant)."\n"; + print ''.$obj->avance_duree."\n"; + print ''.$obj->avance_pourcent." %\n"; print "\n"; $i++; diff --git a/htdocs/telephonie/distributeurs/pre.inc.php b/htdocs/telephonie/distributeurs/pre.inc.php index dab9b42f75a..5dec204cfad 100644 --- a/htdocs/telephonie/distributeurs/pre.inc.php +++ b/htdocs/telephonie/distributeurs/pre.inc.php @@ -22,9 +22,22 @@ require("../../main.inc.php"); $user->getrights('telephonie'); +$user->distributeur_id = 0; require DOL_DOCUMENT_ROOT.'/telephonie/distributeurtel.class.php'; require DOL_DOCUMENT_ROOT.'/telephonie/telephonie.commercial.class.php'; +$sql = "SELECT fk_distributeur"; +$sql .= " FROM ".MAIN_DB_PREFIX."telephonie_distributeur_commerciaux"; +$sql .= " WHERE fk_user=".$user->id; + +$resql = $db->query($sql); +if ($resql) +{ + $row = $db->fetch_row($resql); + $user->distributeur_id = $row[0]; +} + + function llxHeader($head = "", $title="") { global $user, $conf, $db; @@ -62,6 +75,12 @@ function llxHeader($head = "", $title="") { $sql = "SELECT d.nom, d.rowid"; $sql .= " FROM ".MAIN_DB_PREFIX."telephonie_distributeur as d"; + + if ($user->distributeur_id) + { + $sql .= " WHERE d.rowid = ".$user->distributeur_id; + } + $sql .= " ORDER BY d.nom ASC"; $resql = $db->query($sql);