This commit is contained in:
Laurent Destailleur 2010-07-29 13:00:50 +00:00
parent c0fd415527
commit 3852527ee4
2 changed files with 7 additions and 7 deletions

View File

@ -53,8 +53,8 @@ class box_clients extends ModeleBoxes {
} }
/** /**
* \brief Charge les donnees en memoire pour affichage ulterieur * Load data of box into memory for a future usage
* \param $max Nombre maximum d'enregistrements a charger * @param $max Maximum number of records to show
*/ */
function loadBox($max=5) function loadBox($max=5)
{ {
@ -68,14 +68,14 @@ class box_clients extends ModeleBoxes {
if ($user->rights->societe->lire) if ($user->rights->societe->lire)
{ {
$sql = "SELECT s.nom, s.rowid as socid, s.tms"; $sql = "SELECT s.nom, s.rowid as socid, s.tms";
$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.client IN (1, 3)"; $sql.= " WHERE s.client IN (1, 3)";
$sql.= " AND s.entity = ".$conf->entity; $sql.= " AND s.entity = ".$conf->entity;
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 ($user->societe_id) $sql.= " AND s.rowid = $user->societe_id"; if ($user->societe_id) $sql.= " AND s.rowid = $user->societe_id";
$sql .= " ORDER BY s.tms DESC "; $sql.= " ORDER BY s.tms DESC";
$sql .= $db->plimit($max, 0); $sql.= $db->plimit($max, 0);
$result = $db->query($sql); $result = $db->query($sql);

View File

@ -52,8 +52,8 @@ class box_fournisseurs extends ModeleBoxes {
} }
/** /**
* \brief Charge les donn<EFBFBD>es en m<EFBFBD>moire pour affichage ult<EFBFBD>rieur * Load data of box into memory for a future usage
* \param $max Nombre maximum d'enregistrements <EFBFBD> charger * @param $max Maximum number of records to show
*/ */
function loadBox($max=5) function loadBox($max=5)
{ {