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

Ajout de la permission "consulter tous les clients" dans le module commercial, afin

Browse Source 
qu'un commercial puisse voir que les clients qui lui sont affects.
This commit is contained in:
Regis Houssin 2006-03-08 14:00:24 +00:00
parent f8c7085143
commit 851ae01a62
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/action/index.php
View File

@ -67,7 +67,9 @@ llxHeader();
$sql = "SELECT s.nom as societe, s.idp as socidp, s.client,";
$sql.= " a.id,".$db->pdate("a.datea")." as da, a.fk_contact, a.note, a.percent as percent,";
$sql.= " c.code as acode, c.libelle, u.code, u.rowid as userid";
if (!$user->rights->commercial->client->voir) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."user as u";
if (!$user->rights->commercial->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE a.fk_soc = s.idp AND c.id=a.fk_action AND a.fk_user_author = u.rowid";
if ($_GET["type"])
{
@ -81,6 +83,10 @@ if ($socid)
{
$sql .= " AND s.idp = $socid";
}
if (!$user->rights->commercial->client->voir) //restriction
{
$sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
}
if ($status == 'done') { $sql.= " AND a.percent = 100"; }
if ($status == 'todo') { $sql.= " AND a.percent < 100"; }
$sql .= " ORDER BY $sortfield $sortorder";

4
htdocs/contact/index.php
View File

@ -92,8 +92,8 @@ llxHeader();
$sql = "SELECT s.idp, s.nom, p.idp as cidp, p.name, p.firstname, p.email, p.phone, p.phone_mobile, p.fax";
if (!$user->rights->commercial->client->voir) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql .= "FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc";
if (!$user->rights->commercial->client->voir) $sql .= ", ".MAIN_DB_PREFIX."socpeople as p ";
$sql .= "FROM ".MAIN_DB_PREFIX."socpeople as p";
if (!$user->rights->commercial->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.idp = p.fk_soc ";
$sql .= "WHERE 1=1 ";

11
htdocs/societe.php
View File

@ -121,10 +121,12 @@ if (isset($_POST["button_removefilter_x"]))
$title=$langs->trans("ListOfCompanies");
$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.= ", s.siren";
$sql = "SELECT s.idp, s.nom, s.ville, ".$db->pdate("s.datec")." as datec, ".$db->pdate("s.datea")." as datea";
$sql.= ", st.libelle as stcomm, s.prefix_comm, s.client, s.fournisseur, s.siren";
if (!$user->rights->commercial->client->voir) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
if (!$user->rights->commercial->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.fk_stcomm = st.id";
if ($user->societe_id > 0)
{
@ -140,6 +142,11 @@ if (strlen($stcomm)) {
$sql .= " AND s.fk_stcomm=$stcomm";
}
if (!$user->rights->commercial->client->voir) //restriction
{
$sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
}
if ($search_nom) {
$sql .= " AND (s.nom LIKE '%".$search_nom."%' OR s.code_client LIKE '%".$search_nom."%')";
}