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

La recherche socit recherche aussi dans email et url

Browse Source
This commit is contained in:
Laurent Destailleur 2006-11-18 00:19:44 +00:00
parent 68f012601a
commit fef06eefcc
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/societe.php
View File

@ -84,7 +84,12 @@ if ($mode == 'search')
if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user"; if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE s.nom like '%".$socname."%'"; $sql.= " WHERE (";
$sql.= "s.nom like '%".$socname."%'";
$sql.= " OR s.code_client LIKE '%".$socname."%'";
$sql.= " OR s.email like '%".$socname."%'";
$sql.= " OR s.url like '%".$socname."%'";
$sql.= ")";
if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id; if (!$user->rights->commercial->client->voir && !$socid) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
$result=$db->query($sql); $result=$db->query($sql);
@ -94,7 +99,7 @@ if ($mode == 'search')
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$socid = $obj->idp; $socid = $obj->idp;
header("location: soc.php?socid=$socid"); header("Location: soc.php?socid=$socid");
exit; exit;
} }
$db->free($result); $db->free($result);
@ -135,7 +140,7 @@ if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PR
$sql.= " WHERE s.fk_stcomm = st.id"; $sql.= " WHERE s.fk_stcomm = st.id";
if ($socid) if ($socid)
{ {
$sql .= " AND s.idp = $socid"; $sql .= " AND s.idp = ".$socid;
} }
if ($socname) if ($socname)
@ -152,8 +157,14 @@ if (!$user->rights->commercial->client->voir && !$socid) //restriction
$sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id; $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
} }
if ($search_nom) { if ($search_nom)
$sql .= " AND (s.nom LIKE '%".$search_nom."%' OR s.code_client LIKE '%".$search_nom."%')"; {
$sql.= " AND (";
$sql.= "s.nom LIKE '%".$search_nom."%'";
$sql.= " OR s.code_client LIKE '%".$search_nom."%'";
$sql.= " OR s.email like '%".$search_nom."%'";
$sql.= " OR s.url like '%".$search_nom."%'";
$sql.= ")";
} }
if ($search_ville) { if ($search_ville) {