Resolution conflits cvs update
This commit is contained in:
parent
2a7571f91f
commit
2074623839
@ -19,13 +19,14 @@
|
||||
* $Source$
|
||||
*
|
||||
*/
|
||||
|
||||
/** \file htdocs/comm/prospect/pre.inc.php
|
||||
\ingroup commercial
|
||||
\brief Fichier de gestion du menu gauche de l'espace commercial
|
||||
\version $Revision$
|
||||
|
||||
/*!
|
||||
\file htdocs/comm/prospect/pre.inc.php
|
||||
\ingroup commercial
|
||||
\brief Fichier de gestion du menu gauche de l'espace commercial
|
||||
\version $Revision$
|
||||
*/
|
||||
|
||||
|
||||
require("../../main.inc.php");
|
||||
|
||||
function llxHeader($head = "", $urlp = "") {
|
||||
@ -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/clients.php", $langs->trans("Customers"));
|
||||
|
||||
left_menu($menu->liste);
|
||||
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
|
||||
@ -83,6 +83,16 @@ if ($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)
|
||||
{
|
||||
$sql .= " AND lower(s.nom) like '%".strtolower($socname)."%'";
|
||||
@ -137,9 +147,12 @@ if ($result)
|
||||
print '<td valign="right">';
|
||||
print '<input type="text" class="flat" name="search_nom" value="'.$_GET["search_nom"].'">';
|
||||
print '</td><td>';
|
||||
print '<input type="text" class="flat" name="search_ville" value="'.$_GET["search_nom"].'">';
|
||||
print "</td><td> </td>";
|
||||
print "<td> </td><td> </td><td> </td><td> </td><td> </td><td> </td>";
|
||||
|
||||
print '<input type="text" name="search_ville" value="'.$_GET["search_ville"].'">';
|
||||
print "</td>";
|
||||
print "<td>";
|
||||
print '<input type="submit"></td><td colspan="6"> </td>';
|
||||
|
||||
print "</tr>\n";
|
||||
|
||||
$var=true;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user