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

Move permission "see hidden categories" into "see hidden products/services".

Browse Source
This commit is contained in:
Laurent Destailleur 2010-03-13 21:53:45 +00:00
parent 3ad6f2639d
commit 9c77a7621e
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/product/stats/index.php
View File

@ -57,8 +57,8 @@ $db->free();
$sql = "SELECT count(*)"; $sql = "SELECT count(*)";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= " WHERE p.envente = 0"; $sql.= " WHERE p.envente = 0";
if (!$user->rights->produit->voir) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)'; if (!$user->rights->produit->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)';
if (!$user->rights->service->voir) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)'; if (!$user->rights->service->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)';
$sql.= " AND p.fk_product_type <> '1'"; $sql.= " AND p.fk_product_type <> '1'";
$sql.= " AND p.entity = ".$conf->entity; $sql.= " AND p.entity = ".$conf->entity;

4
htdocs/product/stock/entrepot.class.php
View File

@ -359,8 +359,8 @@ class Entrepot extends CommonObject
$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * ps.pmp) as value"; $sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * ps.pmp) as value";
$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product as p"; $sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product as p";
$sql .= " WHERE ps.fk_entrepot = ".$this->id." AND ps.fk_product=p.rowid"; $sql .= " WHERE ps.fk_entrepot = ".$this->id." AND ps.fk_product=p.rowid";
if (!$user->rights->produit->voir) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)'; if (!$user->rights->produit->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)';
if (!$user->rights->service->voir) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)'; if (!$user->rights->service->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)';
//print $sql; //print $sql;
$result = $this->db->query($sql) ; $result = $this->db->query($sql) ;

6
htdocs/product/stock/fiche.php
View File

@ -358,9 +358,9 @@ else
$sql.= " WHERE ps.fk_product = p.rowid"; $sql.= " WHERE ps.fk_product = p.rowid";
$sql.= " AND ps.reel <> 0"; // We do not show if stock is 0 (no product in this warehouse) $sql.= " AND ps.reel <> 0"; // We do not show if stock is 0 (no product in this warehouse)
$sql.= " AND ps.fk_entrepot = ".$entrepot->id; $sql.= " AND ps.fk_entrepot = ".$entrepot->id;
if (!$user->rights->produit->voir) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)'; if (!$user->rights->produit->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)';
if (!$user->rights->service->voir) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)'; if (!$user->rights->service->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)';
$sql.= " ORDER BY " . $sortfield . " " . $sortorder; $sql.= $db->order($sortfield,$sortorder);
//$sql .= $db->plimit($limit + 1 ,$offset); //$sql .= $db->plimit($limit + 1 ,$offset);
dol_syslog('List products sql='.$sql); dol_syslog('List products sql='.$sql);

6
htdocs/product/stock/index.php
View File

@ -117,9 +117,9 @@ $sql.= ", ".MAIN_DB_PREFIX."product as p";
$sql.= " WHERE m.fk_product = p.rowid"; $sql.= " WHERE m.fk_product = p.rowid";
$sql.= " AND m.fk_entrepot = s.rowid"; $sql.= " AND m.fk_entrepot = s.rowid";
$sql.= " AND s.entity = ".$conf->entity; $sql.= " AND s.entity = ".$conf->entity;
if (!$user->rights->produit->voir) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)'; if (!$user->rights->produit->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)';
if (!$user->rights->service->voir) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)'; if (!$user->rights->service->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)';
$sql.= " ORDER BY datem DESC"; $sql.= $db->order("datem","DESC");
$sql.= $db->plimit($max,0); $sql.= $db->plimit($max,0);
dol_syslog("Index:list stock movements sql=".$sql, LOG_DEBUG); dol_syslog("Index:list stock movements sql=".$sql, LOG_DEBUG);

6
htdocs/product/stock/mouvement.php
View File

@ -85,8 +85,8 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON p.fk_user_author = u.rowid";
$sql.= " WHERE m.fk_product = p.rowid"; $sql.= " WHERE m.fk_product = p.rowid";
$sql.= " AND m.fk_entrepot = s.rowid"; $sql.= " AND m.fk_entrepot = s.rowid";
$sql.= " AND s.entity = ".$conf->entity; $sql.= " AND s.entity = ".$conf->entity;
if (!$user->rights->produit->voir) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)'; if (!$user->rights->produit->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)';
if (!$user->rights->service->voir) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)'; if (!$user->rights->service->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)';
if ($_GET["id"]) if ($_GET["id"])
{ {
$sql.= " AND s.rowid ='".$_GET["id"]."'"; $sql.= " AND s.rowid ='".$_GET["id"]."'";
@ -122,7 +122,7 @@ if (! empty($_GET['idproduct']))
{ {
$sql.= " AND p.rowid = '".$_GET['idproduct']."'"; $sql.= " AND p.rowid = '".$_GET['idproduct']."'";
} }
$sql.= " ORDER BY $sortfield $sortorder "; $sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit($conf->liste_limit + 1 ,$offset); $sql.= $db->plimit($conf->liste_limit + 1 ,$offset);
//print $sql; //print $sql;