From 9d0bb63c390ef0d27f47f8ceb9a3cbef7e2bf630 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Sep 2008 22:22:48 +0000 Subject: [PATCH] Fix: Change of prospect statut does not change page --- htdocs/comm/prospect/prospects.php | 192 ++++++++++++++--------------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/htdocs/comm/prospect/prospects.php b/htdocs/comm/prospect/prospects.php index 687ee47bd62..bdc23bf461e 100644 --- a/htdocs/comm/prospect/prospects.php +++ b/htdocs/comm/prospect/prospects.php @@ -18,11 +18,11 @@ */ /** - \file htdocs/comm/prospect/prospects.php - \ingroup prospect - \brief Page de la liste des prospects - \version $Id$ -*/ + \file htdocs/comm/prospect/prospects.php + \ingroup prospect + \brief Page de la liste des prospects + \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/prospect.class.php"); @@ -49,14 +49,14 @@ if (! $sortfield) $sortfield="s.nom"; -/* +/* * Actions */ if ($_GET["action"] == 'cstc') { - $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm = ".$_GET["pstcomm"]; - $sql .= " WHERE rowid = ".$_GET["socid"]; - $result=$db->query($sql); + $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm = ".$_GET["pstcomm"]; + $sql .= " WHERE rowid = ".$_GET["socid"]; + $result=$db->query($sql); } @@ -77,11 +77,11 @@ if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc if (isset($stcomm) && $stcomm != '') { - $sql .= " AND s.fk_stcomm=".$stcomm; + $sql .= " AND s.fk_stcomm=".$stcomm; } if ($user->societe_id) { - $sql .= " AND s.rowid = " .$user->societe_id; + $sql .= " AND s.rowid = " .$user->societe_id; } if ($_GET["search_nom"]) $sql .= " AND s.nom like '%".addslashes(strtolower($_GET["search_nom"]))."%'"; @@ -89,9 +89,9 @@ if ($_GET["search_ville"]) $sql .= " AND s.ville like '%".addslashes(strtolower( if ($socname) { - $sql .= " AND s.nom like '%".addslashes(strtolower($socname))."%'"; - $sortfield = "s.nom"; - $sortorder = "ASC"; + $sql .= " AND s.nom like '%".addslashes(strtolower($socname))."%'"; + $sortfield = "s.nom"; + $sortorder = "ASC"; } // Count total nb of records @@ -108,103 +108,103 @@ $sql .= $db->plimit($conf->liste_limit+1, $offset); $resql = $db->query($sql); if ($resql) { - $num = $db->num_rows($resql); + $num = $db->num_rows($resql); - if ($num == 1 && $socname) - { - $obj = $db->fetch_object($resql); - Header("Location: fiche.php?socid=".$obj->rowid); - exit; - } - else - { - llxHeader(); - } + if ($num == 1 && $socname) + { + $obj = $db->fetch_object($resql); + Header("Location: fiche.php?socid=".$obj->rowid); + exit; + } + else + { + llxHeader(); + } $param='&stcomm='.$stcomm.'&search_nom='.urlencode($_GET["search_nom"]).'&search_ville='.urlencode($_GET["search_ville"]); - print_barre_liste($langs->trans("ListOfProspects"), $page, $_SERVER["PHP_SELF"], $param, $sortfield,$sortorder,'',$num,$nbtotalofrecords); + print_barre_liste($langs->trans("ListOfProspects"), $page, $_SERVER["PHP_SELF"], $param, $sortfield,$sortorder,'',$num,$nbtotalofrecords); - print ''; - print ''; - print_liste_field_titre($langs->trans("Company"),"prospects.php","s.nom","",$param,"valign=\"center\"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Town"),"prospects.php","s.ville","",$param,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("State"),"prospects.php","s.fk_departement","",$param,"align=\"center\"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DateCreation"),"prospects.php","s.datec","",$param,"align=\"center\"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("ProspectLevelShort"),"prospects.php","s.fk_prospectlevel","",$param,"align=\"center\"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Status"),"prospects.php","s.fk_stcomm","",$param,"align=\"center\"",$sortfield,$sortorder); - print ''; - print "\n"; + print '
 
'; + print ''; + print_liste_field_titre($langs->trans("Company"),"prospects.php","s.nom","",$param,"valign=\"center\"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Town"),"prospects.php","s.ville","",$param,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("State"),"prospects.php","s.fk_departement","",$param,"align=\"center\"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateCreation"),"prospects.php","s.datec","",$param,"align=\"center\"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("ProspectLevelShort"),"prospects.php","s.fk_prospectlevel","",$param,"align=\"center\"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"),"prospects.php","s.fk_stcomm","",$param,"align=\"center\"",$sortfield,$sortorder); + print ''; + print "\n"; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; - print "\n"; + print "\n"; - $i = 0; - $var=true; + $i = 0; + $var=true; - $prospectstatic=new Prospect($db); - $prospectstatic->client=2; - - while ($i < min($num,$conf->liste_limit)) - { - $obj = $db->fetch_object($resql); + $prospectstatic=new Prospect($db); + $prospectstatic->client=2; - $var=!$var; + while ($i < min($num,$conf->liste_limit)) + { + $obj = $db->fetch_object($resql); - print ""; - print ''; - print ""; - print ""; - // Creation date - print ""; - // Level - print ""; - // Statut - print ""; - - $sts = array(-1,0,1,2,3); - print ''; + $var=!$var; - print "\n"; - $i++; - } - - if ($num > $conf->liste_limit || $page > 0) print_barre_liste('', $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); - - print "
 
'; - print ''; - print ''; - print ''; - print ''; - print ''; - print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print '
'; - $prospectstatic->id=$obj->rowid; - $prospectstatic->nom=$obj->nom; - print $prospectstatic->getNomUrl(1); - print '".$obj->ville." $obj->departement".dolibarr_print_date($obj->datec).""; - print $prospectstatic->LibLevel($obj->fk_prospectlevel); - print ""; - print $prospectstatic->LibStatut($obj->fk_stcomm,2); - print "'; - foreach ($sts as $key => $value) - { - if ($value <> $obj->fk_stcomm) - { - print ''; - print img_action(0,$value); - print ' '; - } - } - print '
"; - $db->free($resql); + print ""; + print ''; + $prospectstatic->id=$obj->rowid; + $prospectstatic->nom=$obj->nom; + print $prospectstatic->getNomUrl(1); + print ''; + print "".$obj->ville." "; + print "$obj->departement"; + // Creation date + print "".dolibarr_print_date($obj->datec).""; + // Level + print ""; + print $prospectstatic->LibLevel($obj->fk_prospectlevel); + print ""; + // Statut + print ""; + print $prospectstatic->LibStatut($obj->fk_stcomm,2); + print ""; + + $sts = array(-1,0,1,2,3); + print ''; + foreach ($sts as $key => $value) + { + if ($value <> $obj->fk_stcomm) + { + print ''; + print img_action(0,$value); + print ' '; + } + } + print ''; + + print "\n"; + $i++; + } + + if ($num > $conf->liste_limit || $page > 0) print_barre_liste('', $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); + + print ""; + $db->free($resql); } else { - dolibarr_print_error($db); + dolibarr_print_error($db); } $db->close();