Fix: Correction sur la liste des prospects jamais contactés

This commit is contained in:
Laurent Destailleur 2005-10-31 18:26:37 +00:00
parent 21dd662975
commit 0467828e7c

View File

@ -36,14 +36,8 @@ $user->getrights('fichinter');
$user->getrights('commande'); $user->getrights('commande');
$user->getrights('projet'); $user->getrights('projet');
if ($_GET["action"] == 'cstc')
{
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm = ".$_GET["pstcomm"];
$sql .= " WHERE idp = ".$_GET["pid"];
$db->query($sql);
}
// Sécurité accés client // Sécurité accés client
$socidp=0;
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$action = ''; $action = '';
@ -51,9 +45,12 @@ if ($user->societe_id > 0)
} }
$socname=isset($_GET["socname"])?$_GET["socname"]:$_POST["socname"]; $socname=isset($_GET["socname"])?$_GET["socname"]:$_POST["socname"];
$stcomm=isset($_GET["stcomm"])?$_GET["stcomm"]:$_POST["stcomm"];
$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"]; $sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; $sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
$page=isset($_GET["page"])?$_GET["page"]:$_POST["page"]; $page=isset($_GET["page"])?$_GET["page"]:$_POST["page"];
if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="s.nom";
$page = $user->page_param["page"]; $page = $user->page_param["page"];
if ($page == -1) { $page = 0 ; } if ($page == -1) { $page = 0 ; }
@ -62,137 +59,153 @@ $offset = $conf->liste_limit * $page ;
$pageprev = $page - 1; $pageprev = $page - 1;
$pagenext = $page + 1; $pagenext = $page + 1;
/*
* Actions
*/
if ($_GET["action"] == 'cstc')
{
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm = ".$_GET["pstcomm"];
$sql .= " WHERE idp = ".$_GET["pid"];
$db->query($sql);
}
/*
* Affichage liste
*/
$sql = "SELECT s.idp, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, st.libelle as stcomm, s.prefix_comm, s.fk_stcomm "; $sql = "SELECT s.idp, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea, st.libelle as stcomm, s.prefix_comm, s.fk_stcomm ";
$sql .= ", d.nom as departement"; $sql .= ", d.nom as departement";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st"; $sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."societe as s";
$sql .= " LEFT join ".MAIN_DB_PREFIX."c_departements as d on d.rowid = s.fk_departement"; $sql .= " LEFT join ".MAIN_DB_PREFIX."c_departements as d on d.rowid = s.fk_departement";
$sql .= " WHERE s.fk_stcomm = st.id AND s.client=2"; $sql .= " WHERE s.fk_stcomm = st.id AND s.client=2";
if ($_GET["stcomm"]) if (isset($_GET["stcomm"]))
{ {
$sql .= " AND s.fk_stcomm=".$_GET["stcomm"]; $sql .= " AND s.fk_stcomm=".$_GET["stcomm"];
} }
if ($user->societe_id) if ($user->societe_id)
{ {
$sql .= " AND s.idp = " .$user->societe_id; $sql .= " AND s.idp = " .$user->societe_id;
} }
if ($_GET["search_nom"]) if ($_GET["search_nom"])
{ {
$sql .= " AND lower(s.nom) like '%".strtolower($_GET["search_nom"])."%'"; $sql .= " AND lower(s.nom) like '%".strtolower($_GET["search_nom"])."%'";
} }
if ($_GET["search_ville"]) if ($_GET["search_ville"])
{ {
$sql .= " AND lower(s.ville) like '%".strtolower($_GET["search_ville"])."%'"; $sql .= " AND lower(s.ville) like '%".strtolower($_GET["search_ville"])."%'";
} }
if ($socname) if ($socname)
{ {
$sql .= " AND lower(s.nom) like '%".strtolower($socname)."%'"; $sql .= " AND lower(s.nom) like '%".strtolower($socname)."%'";
$sortfield = "lower(s.nom)"; $sortfield = "lower(s.nom)";
$sortorder = "ASC"; $sortorder = "ASC";
} }
if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="s.nom";
$sql .= " ORDER BY $sortfield $sortorder, s.nom ASC "; $sql .= " ORDER BY $sortfield $sortorder, s.nom ASC ";
$sql .= $db->plimit($conf->liste_limit+1, $offset); $sql .= $db->plimit($conf->liste_limit+1, $offset);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num == 1 && $socname) if ($num == 1 && $socname)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
Header("Location: fiche.php?socid=".$obj->idp); Header("Location: fiche.php?socid=".$obj->idp);
exit:
} }
else else
{ {
llxHeader(); llxHeader();
} }
$urladd="page=$page&stcomm=$stcomm"; $urladd="page=$page";
if (isset($stcomm)) $urladd.="&stcomm=".$stcomm;
print_barre_liste($langs->trans("ListOfProspects"), $page, "prospects.php",'&stcomm='.$_GET["stcomm"],"","",'',$num); print_barre_liste($langs->trans("ListOfProspects"), $page, "prospects.php",'&stcomm='.$_GET["stcomm"],"","",'',$num);
$i = 0; $i = 0;
print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Company"),"prospects.php","s.nom","","","valign=\"center\"",$sortfield);
print_liste_field_titre($langs->trans("Town"),"prospects.php","s.ville","","","",$sortfield);
print_liste_field_titre($langs->trans("State"),"prospects.php","s.fk_departement","","","align=\"center\"",$sortfield);
print_liste_field_titre($langs->trans("DateCreation"),"prospects.php","s.datec","","","align=\"center\"",$sortfield);
print_liste_field_titre($langs->trans("Status"),"prospects.php","s.fk_stcomm","","","align=\"center\"",$sortfield);
print '<td class="liste_titre" colspan="4">&nbsp;</td>';
print "</tr>\n";
print '<form method="get" action="prospects.php">'; print '<table class="liste" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td class="liste_titre" valign="right">'; print_liste_field_titre($langs->trans("Company"),"prospects.php","s.nom","","","valign=\"center\"",$sortfield);
print '<input type="text" class="flat" name="search_nom" value="'.$_GET["search_nom"].'">'; print_liste_field_titre($langs->trans("Town"),"prospects.php","s.ville","","","",$sortfield);
print '</td><td class="liste_titre">'; print_liste_field_titre($langs->trans("State"),"prospects.php","s.fk_departement","","","align=\"center\"",$sortfield);
print '<input type="text" class="flat" name="search_ville" size="12" value="'.$_GET["search_ville"].'">'; print_liste_field_titre($langs->trans("DateCreation"),"prospects.php","s.datec","","","align=\"center\"",$sortfield);
print '</td>'; print_liste_field_titre($langs->trans("Status"),"prospects.php","s.fk_stcomm","","","align=\"center\"",$sortfield);
print '<td class="liste_titre" colspan="7" align="right">'; print '<td class="liste_titre" colspan="4">&nbsp;</td>';
print '<input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'">'; print "</tr>\n";
print '</td>';
print "</tr>\n"; print '<form method="get" action="prospects.php">';
print '<tr class="liste_titre">';
print '<td class="liste_titre" valign="right">';
print '<input type="text" class="flat" name="search_nom" value="'.$_GET["search_nom"].'">';
print '</td><td class="liste_titre">';
print '<input type="text" class="flat" name="search_ville" size="12" value="'.$_GET["search_ville"].'">';
print '</td>';
print '<td class="liste_titre" colspan="7" align="right">';
print '<input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'">';
print '</td>';
$var=true; print "</tr>\n";
while ($i < min($num,$conf->liste_limit)) $var=true;
while ($i < min($num,$conf->liste_limit))
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$var=!$var;
print "<tr $bc[$var]>"; $var=!$var;
print '<td><a href="'.DOL_URL_ROOT.'/comm/prospect/fiche.php?id='.$obj->idp.'">';
print img_object($langs->trans("ShowProspect"),"company");
print ' '.dolibarr_trunc($obj->nom,44).'</a></td>';
print "<td>".$obj->ville."&nbsp;</td>";
print "<td align=\"center\">$obj->departement</td>";
// Date création
print "<td align=\"center\">".dolibarr_print_date($obj->datec)."</td>";
// Statut
print "<td align=\"center\">";
$transcode=$langs->trans("StatusProspect".$obj->fk_stcomm);
$libelle=($transcode!="StatusProspect".$obj->fk_stcomm?$transcode:$obj->stcomm);
print $libelle;
print "</td>";
$sts = array(-1,0,1,2,3); print "<tr $bc[$var]>";
print '<td align="right" nowrap>'; print '<td><a href="'.DOL_URL_ROOT.'/comm/prospect/fiche.php?id='.$obj->idp.'">';
foreach ($sts as $key => $value) print img_object($langs->trans("ShowProspect"),"company");
{ print ' '.dolibarr_trunc($obj->nom,44).'</a></td>';
if ($value <> $obj->fk_stcomm) print "<td>".$obj->ville."&nbsp;</td>";
{ print "<td align=\"center\">$obj->departement</td>";
print '<a href="prospects.php?pid='.$obj->idp.'&amp;pstcomm='.$value.'&amp;action=cstc&amp;'.$urladd.'">'; // Date création
print img_action(0,$value); print "<td align=\"center\">".dolibarr_print_date($obj->datec)."</td>";
print '</a>&nbsp;'; // Statut
} print "<td align=\"center\">";
} $transcode=$langs->trans("StatusProspect".$obj->fk_stcomm);
print '</td>'; $libelle=($transcode!="StatusProspect".$obj->fk_stcomm?$transcode:$obj->stcomm);
print $libelle;
print "</td>";
print "</tr>\n"; $sts = array(-1,0,1,2,3);
$i++; print '<td align="right" nowrap>';
foreach ($sts as $key => $value)
{
if ($value <> $obj->fk_stcomm)
{
print '<a href="prospects.php?pid='.$obj->idp.'&amp;pstcomm='.$value.'&amp;action=cstc&amp;'.$urladd.'">';
print img_action(0,$value);
print '</a>&nbsp;';
}
}
print '</td>';
print "</tr>\n";
$i++;
} }
print "</table>"; print "</table>";
$db->free($resql); $db->free($resql);
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>