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

Modif register_global

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2004-07-30 07:57:13 +00:00
parent da57613483
commit 3b0c44eed7
2 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,11 @@ if ($user->societe_id > 0)
$socidp = $user->societe_id; $socidp = $user->societe_id;
} }
$socname=$_GET["socname"];
$sortorder=$_GET["sortorder"];
$sortfield=$_GET["sortfield"];
$page=$_GET["page"];
$page = $user->page_param["page"]; $page = $user->page_param["page"];
if ($page == -1) { $page = 0 ; } if ($page == -1) { $page = 0 ; }
@ -74,7 +79,7 @@ if ($user->societe_id)
$sql .= " AND s.idp = " .$user->societe_id; $sql .= " AND s.idp = " .$user->societe_id;
} }
if ($_GET["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)";
@ -105,7 +110,7 @@ if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows();
if ($num == 1) if ($num == 1 && $socname)
{ {
$obj = $db->fetch_object(0); $obj = $db->fetch_object(0);
Header("Location: fiche.php?socid=$obj->idp"); Header("Location: fiche.php?socid=$obj->idp");
@ -137,17 +142,8 @@ if ($result)
} }
print "</div>"; print "</div>";
$i = 0; $i = 0;
if ($sortorder == "DESC")
{
$sortorder="ASC";
}
else
{
$sortorder="DESC";
}
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">'; print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
print '<TR class="liste_titre">'; print '<TR class="liste_titre">';
print "<TD valign=\"center\">"; print "<TD valign=\"center\">";
@ -181,7 +177,6 @@ if ($result)
if ($user->societe_id == 0) if ($user->societe_id == 0)
{ {
print "<TD align=\"center\"><a href=\"addpropal.php?socidp=$obj->idp&action=create\">".strftime("%d/%b/%y",$obj->datec)."</A></td>\n"; print "<TD align=\"center\"><a href=\"addpropal.php?socidp=$obj->idp&action=create\">".strftime("%d/%b/%y",$obj->datec)."</A></td>\n";
} }
@ -205,9 +200,6 @@ if ($result)
} }
} }
print "</TR>\n"; print "</TR>\n";
$i++; $i++;
} }

62
htdocs/societe.php
View File

@ -36,6 +36,7 @@ if ($user->societe_id > 0)
llxHeader(); llxHeader();
$socname=$_GET["socname"];
$sortorder=$_GET["sortorder"]; $sortorder=$_GET["sortorder"];
$sortfield=$_GET["sortfield"]; $sortfield=$_GET["sortfield"];
$page=$_GET["page"]; $page=$_GET["page"];
@ -63,19 +64,31 @@ $langs->load("suppliers");
* *
* *
*/ */
if ($mode == 'search') { if ($_GET["mode"] == 'search')
if ($mode-search == 'soc') { {
$sql = "SELECT s.idp FROM ".MAIN_DB_PREFIX."societe as s "; if ($_GET["mode-search"] == 'soc')
$sql .= " WHERE lower(s.nom) like '%".strtolower($socname)."%'"; {
} $sql = "SELECT s.idp FROM ".MAIN_DB_PREFIX."societe as s ";
$sql .= " WHERE lower(s.nom) like '%".strtolower($_GET["socname"])."%'";
if ( $db->query($sql) ) { }
if ( $db->num_rows() == 1) {
$obj = $db->fetch_object(0); if ( $db->query($sql) )
$socid = $obj->idp; {
if ( $db->num_rows() == 1)
{
$obj = $db->fetch_object(0);
$socid = $obj->idp;
}
$db->free();
}
/*
* Sécurité accés client
*/
if ($user->societe_id > 0)
{
$action = '';
$socid = $user->societe_id;
} }
$db->free();
}
} }
/* /*
@ -84,10 +97,13 @@ if ($mode == 'search') {
* *
*/ */
$title=$langs->trans("CompanyList");
$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.client, s.fournisseur"; $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.client, s.fournisseur";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st WHERE s.fk_stcomm = st.id"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st WHERE s.fk_stcomm = st.id";
if ($user->societe_id > 0) { if ($user->societe_id > 0)
{
$sql .= " AND s.idp = " . $user->societe_id; $sql .= " AND s.idp = " . $user->societe_id;
} }
@ -100,7 +116,9 @@ if (strlen($begin)) {
$sql .= " AND upper(s.nom) like '$begin%'"; $sql .= " AND upper(s.nom) like '$begin%'";
} }
if ($socname) { if ($socname)
{
$title_filtre .= " contenant '$socname'";
$sql .= " AND lower(s.nom) like '%".strtolower($socname)."%'"; $sql .= " AND lower(s.nom) like '%".strtolower($socname)."%'";
} }
@ -114,22 +132,20 @@ if ($result)
$params = "&amp;socname=$socname"; $params = "&amp;socname=$socname";
print_barre_liste($langs->trans("CompanyList"), $page, $PHP_SELF,$params,$sortfield,$sortorder,'',$num); print_barre_liste($title, $page, $PHP_SELF,$params,$sortfield,$sortorder,'',$num);
if ($sortorder == "DESC") if ($title_filtre)
{ {
$sortorder="ASC"; print "Filtre : $title_filtre";
} print ' <a href="societe.php">Supprimer le filtre</a>';
else
{
$sortorder="DESC";
} }
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="3">'; print '<table class="noborder" width="100%" cellspacing="0" cellpadding="3">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'; print '<td width="25%">';
print_liste_field_titre($langs->trans("Company"),$PHP_SELF,"s.nom", $params); print_liste_field_titre($langs->trans("Company"),$PHP_SELF,"s.nom", $params);
print "</td><td>"; print '</td><td width="25%">';
print_liste_field_titre($langs->trans("Town"),$PHP_SELF,"s.ville",$params); print_liste_field_titre($langs->trans("Town"),$PHP_SELF,"s.ville",$params);
print '</td><td colspan="2" align="center">'.$langs->trans("Cards").'</td>'; print '</td><td colspan="2" align="center">'.$langs->trans("Cards").'</td>';
print "</tr>\n"; print "</tr>\n";