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

Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-02-02 09:49:12 +01:00
commit 0e06ba1a88
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/asterisk/cidlookup.php
View File

@ -42,7 +42,7 @@ if (empty($phone))
$sql = "SELECT nom as name FROM ".MAIN_DB_PREFIX."societe as s"; $sql = "SELECT nom as name FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON sp.fk_soc = s.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON sp.fk_soc = s.rowid";
$sql.= " WHERE s.entity IN (".getEntity(societe, 1).")"; $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
$sql.= " AND (s.tel='".$db->escape($phone)."'"; $sql.= " AND (s.tel='".$db->escape($phone)."'";
$sql.= " OR sp.phone='".$db->escape($phone)."'"; $sql.= " OR sp.phone='".$db->escape($phone)."'";
$sql.= " OR sp.phone_perso='".$db->escape($phone)."'"; $sql.= " OR sp.phone_perso='".$db->escape($phone)."'";

8
htdocs/comm/index.php
View File

@ -285,7 +285,7 @@ if ($conf->societe->enabled && $user->rights->societe->lire)
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.client IN (1, 2, 3)"; $sql.= " WHERE s.client IN (1, 2, 3)";
$sql.= " AND s.entity IN (".getEntity('societe', 1).")"; $sql.= " AND s.entity IN (".getEntity($companystatic->element, 1).")";
if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($socid) $sql.= " AND s.rowid = $socid"; if ($socid) $sql.= " AND s.rowid = $socid";
$sql .= " ORDER BY s.tms DESC"; $sql .= " ORDER BY s.tms DESC";
@ -345,7 +345,7 @@ if ($conf->fournisseur->enabled && $user->rights->societe->lire)
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.fournisseur = 1"; $sql.= " WHERE s.fournisseur = 1";
$sql.= " AND s.entity IN (".getEntity(societe, 1).")"; $sql.= " AND s.entity IN (".getEntity($companystatic->element, 1).")";
if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if ($socid) $sql.= " AND s.rowid = ".$socid; if ($socid) $sql.= " AND s.rowid = ".$socid;
$sql.= " ORDER BY s.datec DESC"; $sql.= " ORDER BY s.datec DESC";
@ -547,8 +547,8 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';
llxFooter();
$db->close(); $db->close();
llxFooter();
?> ?>

2
htdocs/comm/prospect/class/prospect.class.php
View File

@ -69,7 +69,7 @@ class Prospect extends Societe
$clause = "AND"; $clause = "AND";
} }
$sql.= " ".$clause." s.client IN (1,2,3)"; $sql.= " ".$clause." s.client IN (1,2,3)";
$sql.= " AND s.entity IN (".getEntity(societe, 1).")"; $sql.= " AND s.entity IN (".getEntity($this->element, 1).")";
$sql.= " GROUP BY s.client"; $sql.= " GROUP BY s.client";
$resql=$this->db->query($sql); $resql=$this->db->query($sql);

8
htdocs/comm/prospect/index.php
View File

@ -75,7 +75,7 @@ $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st ";
if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.fk_stcomm = st.id"; $sql.= " WHERE s.fk_stcomm = st.id";
$sql.= " AND s.client IN (2, 3)"; $sql.= " AND s.client IN (2, 3)";
$sql.= " AND s.entity IN (".getEntity(societe, 1).")"; $sql.= " AND s.entity IN (".getEntity($companystatic->element, 1).")";
if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " GROUP BY st.id"; $sql.= " GROUP BY st.id";
$sql.= " ORDER BY st.id"; $sql.= " ORDER BY st.id";
@ -241,7 +241,7 @@ $sql = "SELECT s.nom as name, s.rowid as socid, s.client, s.canvas";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.fk_stcomm = 1"; $sql.= " WHERE s.fk_stcomm = 1";
$sql.= " AND s.entity IN (".getEntity(societe, 1).")"; $sql.= " AND s.entity IN (".getEntity($companystatic->element, 1).")";
if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " ORDER BY s.tms ASC"; $sql.= " ORDER BY s.tms ASC";
$sql.= $db->plimit(15, 0); $sql.= $db->plimit(15, 0);
@ -279,8 +279,8 @@ if ($resql)
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';
llxFooter();
$db->close(); $db->close();
llxFooter();
?> ?>

2
htdocs/core/class/html.formcompany.class.php
View File

@ -526,7 +526,7 @@ class FormCompany
$sql.= " WHERE rowid IN (".join(',',$limitto).")"; $sql.= " WHERE rowid IN (".join(',',$limitto).")";
} }
} }
$sql.= " AND s.entity IN (".getEntity(societe, 1).")"; $sql.= " AND s.entity IN (".getEntity('societe', 1).")";
$sql.= " ORDER BY nom ASC"; $sql.= " ORDER BY nom ASC";
//print $sql; //print $sql;