diff --git a/htdocs/product/stats/index.php b/htdocs/product/stats/index.php index b630d0a8257..7739bbdc4c8 100644 --- a/htdocs/product/stats/index.php +++ b/htdocs/product/stats/index.php @@ -57,8 +57,8 @@ $db->free(); $sql = "SELECT count(*)"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; $sql.= " WHERE p.envente = 0"; -if (!$user->rights->produit->voir) $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->produit->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)'; +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.entity = ".$conf->entity; diff --git a/htdocs/product/stock/entrepot.class.php b/htdocs/product/stock/entrepot.class.php index d2fcf8c779f..b23ac9c9bc8 100644 --- a/htdocs/product/stock/entrepot.class.php +++ b/htdocs/product/stock/entrepot.class.php @@ -359,8 +359,8 @@ class Entrepot extends CommonObject $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 .= " 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->service->voir) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)'; + if (!$user->rights->produit->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)'; + if (!$user->rights->service->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)'; //print $sql; $result = $this->db->query($sql) ; diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php index f1fde37d2e1..b9c433c0ea3 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/fiche.php @@ -355,12 +355,12 @@ else $sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.fk_product_type as type,"; $sql.= " ps.pmp, ps.reel as value"; $sql.= " FROM ".MAIN_DB_PREFIX."product_stock ps, ".MAIN_DB_PREFIX."product p"; - $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.fk_entrepot = ".$entrepot->id; - if (!$user->rights->produit->voir) $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)'; - $sql.= " ORDER BY " . $sortfield . " " . $sortorder; + $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.fk_entrepot = ".$entrepot->id; + if (!$user->rights->produit->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)'; + if (!$user->rights->service->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)'; + $sql.= $db->order($sortfield,$sortorder); //$sql .= $db->plimit($limit + 1 ,$offset); dol_syslog('List products sql='.$sql); diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index 4085a3f42e0..a269b0a1b96 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -117,9 +117,9 @@ $sql.= ", ".MAIN_DB_PREFIX."product as p"; $sql.= " WHERE m.fk_product = p.rowid"; $sql.= " AND m.fk_entrepot = s.rowid"; $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->service->voir) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)'; -$sql.= " ORDER BY datem DESC"; +if (!$user->rights->produit->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)'; +if (!$user->rights->service->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)'; +$sql.= $db->order("datem","DESC"); $sql.= $db->plimit($max,0); dol_syslog("Index:list stock movements sql=".$sql, LOG_DEBUG); diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 463a228a566..0c8a92a2dc8 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -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.= " AND m.fk_entrepot = s.rowid"; $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->service->voir) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)'; +if (!$user->rights->produit->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 0)'; +if (!$user->rights->service->hidden) $sql.=' AND (p.hidden=0 OR p.fk_product_type != 1)'; if ($_GET["id"]) { $sql.= " AND s.rowid ='".$_GET["id"]."'"; @@ -122,7 +122,7 @@ if (! empty($_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); //print $sql;