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

Resolution conflits cvs update

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2005-04-05 11:41:58 +00:00
parent 2a7571f91f
commit 2074623839
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/comm/prospect/pre.inc.php
View File

@ -20,10 +20,11 @@
* *
*/ */
/** \file htdocs/comm/prospect/pre.inc.php /*!
\ingroup commercial \file htdocs/comm/prospect/pre.inc.php
\brief Fichier de gestion du menu gauche de l'espace commercial \ingroup commercial
\version $Revision$ \brief Fichier de gestion du menu gauche de l'espace commercial
\version $Revision$
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
@ -55,11 +56,9 @@ function llxHeader($head = "", $urlp = "") {
$menu->add(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Prop")); $menu->add(DOL_URL_ROOT."/comm/propal.php", $langs->trans("Prop"));
} }
$menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customers")); $menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customers"));
left_menu($menu->liste); left_menu($menu->liste);
} }
?> ?>

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

@ -83,6 +83,16 @@ if ($user->societe_id)
$sql .= " AND s.idp = " .$user->societe_id; $sql .= " AND s.idp = " .$user->societe_id;
} }
if ($_GET["search_nom"])
{
$sql .= " AND lower(s.nom) like '%".strtolower($_GET["search_nom"])."%'";
}
if ($_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)."%'";
@ -137,9 +147,12 @@ if ($result)
print '<td valign="right">'; print '<td valign="right">';
print '<input type="text" class="flat" name="search_nom" value="'.$_GET["search_nom"].'">'; print '<input type="text" class="flat" name="search_nom" value="'.$_GET["search_nom"].'">';
print '</td><td>'; print '</td><td>';
print '<input type="text" class="flat" name="search_ville" value="'.$_GET["search_nom"].'">';
print "</td><td>&nbsp;</td>"; print '<input type="text" name="search_ville" value="'.$_GET["search_ville"].'">';
print "<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>"; print "</td>";
print "<td>";
print '<input type="submit"></td><td colspan="6">&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
$var=true; $var=true;