lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Si le dpartement n'tait pas renseign, le prospect n'apparaissait pas dans la liste

Browse Source
This commit is contained in:
Laurent Destailleur 2004-10-30 12:14:18 +00:00
parent 435da96724
commit 78330e8649
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/comm/prospect/prospects.php
View File

@ -20,6 +20,14 @@
* $Source$ * $Source$
* *
*/ */
/*!
\file htdocs/comm/prospect/prospect.php
\ingroup prospect
\brief Page de la liste des prospects
\version $Revision$
*/
require("./pre.inc.php"); require("./pre.inc.php");
$user->getrights('propale'); $user->getrights('propale');
@ -59,10 +67,9 @@ $pagenext = $page + 1;
$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."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
$sql .= " , ".MAIN_DB_PREFIX."c_departements as d"; $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";
$sql .= " AND d.rowid = s.fk_departement";
if (strlen($stcomm)) if (strlen($stcomm))
{ {
@ -86,24 +93,16 @@ if ($socname)
$sortorder = "ASC"; $sortorder = "ASC";
} }
if ($user->page_param["sortorder"] == '') if (! $sortorder)
{ {
$sortorder="ASC"; $sortorder="ASC";
} }
else if (! $sortfield)
{
$sortorder=$user->page_param["sortorder"];
}
if ($user->page_param["sortfield"] == '')
{ {
$sortfield="s.nom"; $sortfield="s.nom";
} }
else
{ $sql .= " ORDER BY $sortfield $sortorder, s.nom ASC " . $db->plimit($conf->liste_limit, $offset);
$sortfield=$user->page_param["sortfield"];
}
$sql .= " ORDER BY $sortfield $sortorder, s.nom ASC " . $db->plimit($conf->liste_limit +1, $offset);
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
@ -113,7 +112,7 @@ if ($result)
if ($num == 1 && $socname) if ($num == 1 && $socname)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
Header("Location: fiche.php?socid=$obj->idp"); Header("Location: fiche.php?socid=".$obj->idp);
} }
else else
{ {
@ -147,9 +146,9 @@ if ($result)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print "<td valign=\"center\">"; print "<td valign=\"center\">";
print_liste_field_titre("Société","prospects.php","s.nom"); print_liste_field_titre($langs->trans("Company"),"prospects.php","s.nom");
print "</td><td>"; print "</td><td>";
print_liste_field_titre("Ville","prospects.php","s.ville"); print_liste_field_titre($langs->trans("Town"),"prospects.php","s.ville");
print "</td>"; print "</td>";
print "<td align=\"center\">"; print "<td align=\"center\">";
print_liste_field_titre("Département","prospects.php","s.fk_departement"); print_liste_field_titre("Département","prospects.php","s.fk_departement");
@ -182,7 +181,7 @@ if ($result)
} }
else else
{ {
print "<TD>&nbsp;</TD>\n"; print "<td>&nbsp;</td>\n";
} }
$sts = array(-1,0,1,2); $sts = array(-1,0,1,2);