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:44 +00:00
parent 65f68c3283
commit 3cb4335f9a
12 changed files with 211 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

314
htdocs/admin/tools/eaccelerator.php
View File

@ -27,19 +27,19 @@ require("../../main.inc.php");
$langs->load("admin");
if (!$user->admin)
accessforbidden();
accessforbidden();
/*
* View
*/
* View
*/
llxHeader();
if (!function_exists('eaccelerator_info'))
{
print 'eAccelerator is not installed.';
print 'eAccelerator is not installed.';
llxfooter('$Date$ - $Revision$');
exit;
}
@ -47,23 +47,23 @@ if (!function_exists('eaccelerator_info'))
$info = eaccelerator_info();
if (isset($_POST['caching'])) {
if ($info['cache']) {
eaccelerator_caching(false);
} else {
eaccelerator_caching(true);
}
if ($info['cache']) {
eaccelerator_caching(false);
} else {
eaccelerator_caching(true);
}
} else if (isset($_POST['optimizer']) && function_exists('eaccelerator_optimizer')) {
if ($info['optimizer']) {
eaccelerator_optimizer(false);
} else {
eaccelerator_optimizer(true);
}
if ($info['optimizer']) {
eaccelerator_optimizer(false);
} else {
eaccelerator_optimizer(true);
}
} else if (isset($_POST['clear'])) {
eaccelerator_clear();
eaccelerator_clear();
} else if (isset($_POST['clean'])) {
eaccelerator_clean();
eaccelerator_clean();
} else if (isset($_POST['purge'])) {
eaccelerator_purge();
eaccelerator_purge();
}
$info = eaccelerator_info();
if (!is_array($info)) {
@ -75,31 +75,31 @@ if (!is_array($info)) {
function compare($x, $y)
{
global $sortby;
global $sortby;
if ( $x[$sortby] == $y[$sortby] )
return 0;
else if ( $x[$sortby] < $y[$sortby] )
return -1;
else
return 1;
if ( $x[$sortby] == $y[$sortby] )
return 0;
else if ( $x[$sortby] < $y[$sortby] )
return -1;
else
return 1;
}
function revcompare($x, $y)
{
global $sortby, $langs;
global $sortby, $langs;
if ( $x[$sortby] == $y[$sortby] )
return 0;
else if ( $x[$sortby] < $y[$sortby] )
return 1;
else
return -1;
if ( $x[$sortby] == $y[$sortby] )
return 0;
else if ( $x[$sortby] < $y[$sortby] )
return 1;
else
return -1;
}
function create_script_table($list)
function create_script_table($list)
{
global $sortby,$bc,$langs;
$var=true;
@ -112,54 +112,60 @@ function revcompare($x, $y)
if (isset($_GET['sort'])) {
switch ($_GET['sort']) {
case "mtime":
case "size":
case "reloads":
case "hits":
$sortby = $_GET['sort'];
($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
break;
default:
$sortby = "file";
($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
case "mtime":
case "size":
case "reloads":
case "hits":
$sortby = $_GET['sort'];
($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
break;
default:
$sortby = "file";
($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
}
}
?>
<table class="noborder">
<tr>
<th><a href="<?php print $_SERVER['PHP_SELF']?>?sort=file&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Filename"); ?></a>&nbsp;<? if($sortby == "file") print ($order == "asc" ? "&darr;" : "&uarr;")?></th>
<th><a href="<?php print $_SERVER['PHP_SELF']?>?sort=mtime&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Date"); ?></a>&nbsp;<? if($sortby == "mtime") print ($order == "asc" ? "&darr;" : "&uarr;")?></th>
<th><a href="<?php print $_SERVER['PHP_SELF']?>?sort=size&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Size"); ?></a>&nbsp;<? if($sortby == "size") print ($order == "asc" ? "&darr;" : "&uarr;")?></th>
<th><a href="<?php print $_SERVER['PHP_SELF']?>?sort=reloads&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Reloads"); ?></a>&nbsp;<? if($sortby == "reloads") print ($order == "asc" ? "&darr;" : "&uarr;")?></th>
<th><a href="<?php print $_SERVER['PHP_SELF']?>?sort=hits&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Hits"); ?></a>&nbsp;<? if($sortby == "hits") print ($order == "asc" ? "&darr;" : "&uarr;")?></th>
</tr>
<?php
switch ($sortby) {
case "mtime":
case "size":
case "reloads":
case "hits":
($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
break;
case "file":
default:
$sortby = "file";
($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
<table class="noborder">
<tr>
<th><a
href="<?php print $_SERVER['PHP_SELF']?>?sort=file&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Filename"); ?></a>&nbsp;<? if($sortby == "file") print ($order == "asc" ? "&darr;" : "&uarr;")?></th>
<th><a
href="<?php print $_SERVER['PHP_SELF']?>?sort=mtime&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Date"); ?></a>&nbsp;<? if($sortby == "mtime") print ($order == "asc" ? "&darr;" : "&uarr;")?></th>
<th><a
href="<?php print $_SERVER['PHP_SELF']?>?sort=size&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Size"); ?></a>&nbsp;<? if($sortby == "size") print ($order == "asc" ? "&darr;" : "&uarr;")?></th>
<th><a
href="<?php print $_SERVER['PHP_SELF']?>?sort=reloads&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Reloads"); ?></a>&nbsp;<? if($sortby == "reloads") print ($order == "asc" ? "&darr;" : "&uarr;")?></th>
<th><a
href="<?php print $_SERVER['PHP_SELF']?>?sort=hits&order=<?php print ($order == "asc" ? "desc" : "asc")?>"><?php print $langs->trans("Hits"); ?></a>&nbsp;<? if($sortby == "hits") print ($order == "asc" ? "&darr;" : "&uarr;")?></th>
</tr>
<?php
switch ($sortby) {
case "mtime":
case "size":
case "reloads":
case "hits":
($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
break;
case "file":
default:
$sortby = "file";
($order == "asc" ? uasort($list, 'compare') : uasort($list, 'revcompare'));
}
}
foreach($list as $script) { ?>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td><?php print dol_trunc($script['file'],80,'left'); ?></td>
<td align="center" nowrap="nowrap"><?php print dol_print_date($script['mtime'],'dayhour'); ?></td>
<td align="right" nowrap="nowrap"><?php print number_format($script['size'] / 1024, 2); ?> KB</td>
<td align="right" nowrap="nowrap"><?php print $script['reloads']; ?> (<?php print $script['usecount']; ?>)</td>
<td align="right" nowrap="nowrap"><?php print $script['hits']; ?></td>
</tr>
<?php } ?>
</table>
<?php
foreach($list as $script) { ?>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td><?php print dol_trunc($script['file'],80,'left'); ?></td>
<td align="center" nowrap="nowrap"><?php print dol_print_date($script['mtime'],'dayhour'); ?></td>
<td align="right" nowrap="nowrap"><?php print number_format($script['size'] / 1024, 2); ?>
KB</td>
<td align="right" nowrap="nowrap"><?php print $script['reloads']; ?> (<?php print $script['usecount']; ?>)</td>
<td align="right" nowrap="nowrap"><?php print $script['hits']; ?></td>
</tr>
<?php } ?>
</table>
<?php
}
@ -168,36 +174,37 @@ function create_key_table($list)
{
global $bc,$langs;
$var=true;
?>
<table class="noborder">
<tr class="liste_titre">
<th>Name</th>
<th>Created</th>
<th><?php print $langs->trans("Size"); ?></th>
<th>ttl</th>
</tr>
<?php
foreach($list as $key) {
?>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td><?php print dol_trunc($key['name'],80,'left'); ?></td>
<td align="center" nowrap="nowrap"><?php dol_print_date($key['created'],'dayhour'); ?></td>
<td align="right" nowrap="nowrap"><?php print number_format($key['size']/1024, 3); ?> KB</td>
<td align="right" nowrap="nowrap"><?php
if ($key['ttl'] == -1) {
print 'expired';
} elseif ($key['ttl'] == 0) {
print 'none';
} else {
print dol_print_date($key['ttl'],'dayhour');
}
?></td>
</tr>
<?php
}
?>
</table>
<?php
?>
<table class="noborder">
<tr class="liste_titre">
<th>Name</th>
<th>Created</th>
<th><?php print $langs->trans("Size"); ?></th>
<th>ttl</th>
</tr>
<?php
foreach($list as $key) {
?>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td><?php print dol_trunc($key['name'],80,'left'); ?></td>
<td align="center" nowrap="nowrap"><?php dol_print_date($key['created'],'dayhour'); ?></td>
<td align="right" nowrap="nowrap"><?php print number_format($key['size']/1024, 3); ?>
KB</td>
<td align="right" nowrap="nowrap"><?php
if ($key['ttl'] == -1) {
print 'expired';
} elseif ($key['ttl'] == 0) {
print 'none';
} else {
print dol_print_date($key['ttl'],'dayhour');
}
?></td>
</tr>
<?php
}
?>
</table>
<?php
}
@ -211,37 +218,40 @@ $var=true;
<table class="noborder">
<tr class="liste_titre"><td colspan="2">Information</td></tr>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td>Caching enabled</td>
<td align="right"><?php print $info['cache'] ? 'yes':'no' ?></td>
</tr>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td>Optimizer enabled</td>
<td align="right"><?php print $info['optimizer'] ? 'yes':'no' ?></td>
</tr>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td>Memory usage</td>
<td align="right"><?php print number_format(100 * $info['memoryAllocated'] / $info['memorySize'], 2); ?>%
(<?php print number_format($info['memoryAllocated'] / (1024*1024), 2); ?> MB /
<?php print number_format($info['memorySize'] / (1024*1024), 2); ?> MB)</td>
</tr>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td>Free memory in reserved cache</td>
<td align="right"><?php print number_format($info['memoryAvailable'] / (1024*1024), 2); ?>MB</td>
</tr>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td>Cached scripts</td>
<td align="right"><?php print $info['cachedScripts']; ?></td>
</tr>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td>Removed scripts</td>
<td align="right"><?php print $info['removedScripts']; ?></td>
</tr>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td>Cached keys</td>
<td align="right"><?php print $info['cachedKeys']; ?></td>
</tr>
<tr class="liste_titre">
<td colspan="2">Information</td>
</tr>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td>Caching enabled</td>
<td align="right"><?php print $info['cache'] ? 'yes':'no' ?></td>
</tr>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td>Optimizer enabled</td>
<td align="right"><?php print $info['optimizer'] ? 'yes':'no' ?></td>
</tr>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td>Memory usage</td>
<td align="right"><?php print number_format(100 * $info['memoryAllocated'] / $info['memorySize'], 2); ?>%
(<?php print number_format($info['memoryAllocated'] / (1024*1024), 2); ?>
MB / <?php print number_format($info['memorySize'] / (1024*1024), 2); ?>
MB)</td>
</tr>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td>Free memory in reserved cache</td>
<td align="right"><?php print number_format($info['memoryAvailable'] / (1024*1024), 2); ?>MB</td>
</tr>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td>Cached scripts</td>
<td align="right"><?php print $info['cachedScripts']; ?></td>
</tr>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td>Removed scripts</td>
<td align="right"><?php print $info['removedScripts']; ?></td>
</tr>
<tr <?php $var = ! $var; print $bc[$var]; ?>>
<td>Cached keys</td>
<td align="right"><?php print $info['cachedKeys']; ?></td>
</tr>
</table>
<?php
@ -257,7 +267,7 @@ if (is_array($resCached) || is_array($resRemoved))
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="noborder">';
print '<tr class="liste_titre"><td colspan="2">Actions</td></tr>';
if (is_array($resCached))
{
$var = ! $var;
@ -271,7 +281,7 @@ if (is_array($resCached) || is_array($resRemoved))
print '<td align="right"><input type="submit" class="butAction" name="optimizer" value="'. ($info['optimizer']?'disable':'enable') .'" /></td>';
print "</tr>";
}
if (is_array($resRemoved))
{
$var = ! $var;
@ -290,20 +300,20 @@ if (is_array($resCached) || is_array($resRemoved))
print '<td align="right"><input type="submit" class="butAction" name="purge" value="purge" title="remove all \'removed\' scripts from shared memory" /></td>';
print "</tr></table></form>";
}
if (is_array($resCached))
{
print "<br><br>";
print "<b>Cached scripts</b><br>";
create_script_table($resCached);
}
if (is_array($resRemoved))
{
print "<br><br>";
print "<b>Removed scripts</b><br>";
create_script_table($resRemoved);
}
if (is_array($resCached))
{
print "<br><br>";
print "<b>Cached scripts</b><br>";
create_script_table($resCached);
}
if (is_array($resRemoved))
{
print "<br><br>";
print "<b>Removed scripts</b><br>";
create_script_table($resRemoved);
}
}
else
{
@ -318,7 +328,7 @@ if (function_exists('eaccelerator_get'))
{
print '<br><br>';
print '<b>Cached keys</b><br>';
$res=eaccelerator_list_keys();
$res=eaccelerator_list_keys();
create_key_table($res);
}

10
htdocs/html.form.class.php
View File

@ -841,14 +841,14 @@ class Form
*/
function select_produits_do($selected='',$htmlname='productid',$filtertype='',$limit=20,$price_level=0,$ajaxkeysearch='',$status=1,$finished=2)
{
global $langs,$conf,$user;
global $langs,$conf,$user,$db;
$sql = "SELECT ";
$sql.= " p.rowid, p.label, p.ref, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.duration, p.stock";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p ";
$sql.= " WHERE p.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($finished == 0)
{
@ -865,8 +865,8 @@ class Form
}
if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$filtertype;
if ($ajaxkeysearch && $ajaxkeysearch != '') $sql.=" AND (p.ref like '%".$ajaxkeysearch."%' OR p.label like '%".$ajaxkeysearch."%')";
$sql.= " ORDER BY p.ref";
if ($limit) $sql.= " LIMIT $limit";
$sql.= $db->order("p.ref");
$sql.= $db->plimit($limit);
dol_syslog("Form::select_produits_do sql=".$sql, LOG_DEBUG);
$result=$this->db->query($sql);

4
htdocs/includes/boxes/box_produits.php
View File

@ -74,8 +74,8 @@ class box_produits extends ModeleBoxes {
$sql = "SELECT p.rowid, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.envente";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= " WHERE p.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 (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
if (empty($user->rights->service->lire)) $sql.=' AND p.fk_product_type != 1';
$sql.= $db->order('p.datec', 'DESC');

4
htdocs/includes/boxes/box_services_vendus.php
View File

@ -81,8 +81,8 @@ class box_services_vendus extends ModeleBoxes {
$sql.= ")";
$sql.= " WHERE s.rowid = c.fk_soc";
$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)';
$sql.= " AND c.rowid = cd.fk_contrat";
$sql.= " AND cd.fk_product = p.rowid";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;

4
htdocs/product.class.php
View File

@ -2677,8 +2677,8 @@ class Product extends CommonObject
$sql = "SELECT count(p.rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= " WHERE p.fk_product_type <> 1";
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.entity = ".$conf->entity;
$resql=$this->db->query($sql);

21
htdocs/product/fiche.php
View File

@ -127,6 +127,7 @@ if ($_POST["action"] == 'add' && ($user->rights->produit->creer || $user->rights
$product->volume_units = $_POST["volume_units"];
$product->finished = $_POST["finished"];
$product->hidden = $_POST["hidden"]=='yes'?1:0;
// MultiPrix
if($conf->global->PRODUIT_MULTIPRICES)
{
@ -732,7 +733,13 @@ if ($_GET["action"] == 'create' && ($user->rights->produit->creer || $user->righ
|| ($_GET["type"] == 1 && $user->rights->service->hidden))
{
print '<tr><td>'.$langs->trans("Hidden").'</td><td>';
print $html->selectyesno($product->hidden);
print $html->selectyesno('hidden',$product->hidden);
print '</td></tr>';
}
else
{
print '<tr><td>'.$langs->trans("Hidden").'</td><td>';
print yn("No");
print '</td></tr>';
}
@ -1105,6 +1112,12 @@ if ($_GET["id"] || $_GET["ref"])
print yn($product->hidden);
print "</td></tr>\n";
}
else
{
print '<tr><td>'.$langs->trans("Hidden").'</td><td>';
print yn("No");
print '</td></tr>';
}
// Note
print '<tr><td valign="top">'.$langs->trans("Note").'</td><td colspan="2">'.nl2br($product->note).'</td></tr>';
@ -1244,6 +1257,12 @@ if ($_GET["id"] || $_GET["ref"])
print $html->selectyesno('hidden',$product->hidden);
print '</td></tr>';
}
else
{
print '<tr><td>'.$langs->trans("Hidden").'</td><td>';
print yn("No");
print '</td></tr>';
}
// Note
print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="2">';

4
htdocs/product/index.php
View File

@ -165,8 +165,8 @@ $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_subproduct as sp ON p.rowid = sp.fk_product_subproduct";
$sql.= " WHERE sp.fk_product_subproduct IS NULL";
$sql.= " AND p.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 ($type != '') $sql.= " AND p.fk_product_type = ".$type;
$sql.= $db->order("p.tms","DESC");
$sql.= $db->plimit($max,0);

4
htdocs/product/liste.php
View File

@ -111,8 +111,8 @@ if ($_GET["fourn_id"] > 0)
$sql.= ", ".MAIN_DB_PREFIX."product_fournisseur as pf";
}
$sql.= " WHERE p.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 ($sall)
{
$sql.= " AND (p.ref like '%".addslashes($sall)."%' OR p.label like '%".addslashes($sall)."%' OR p.description like '%".addslashes($sall)."%' OR p.note like '%".addslashes($sall)."%')";

4
htdocs/product/popuprop.php
View File

@ -92,8 +92,8 @@ $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
$sql.= ", ".MAIN_DB_PREFIX."product as p";
$sql.= " WHERE p.rowid = pd.fk_product";
$sql.= " AND p.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 (isset($_GET['type'])) $sql.= " AND fk_product_type = ".$_GET['type'];
$sql.= " GROUP BY (p.rowid)";
$sql.= $db->order($sortfield,$sortorder);

4
htdocs/product/reassort.php
View File

@ -86,8 +86,8 @@ if ($_GET["fourn_id"] > 0)
}
$sql.= " WHERE p.rowid = s.fk_product";
$sql.= " AND p.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 ($sall)
{
$sql.= " AND (p.ref like '%".addslashes($sall)."%' OR p.label like '%".addslashes($sall)."%' OR p.description like '%".addslashes($sall)."%' OR p.note like '%".addslashes($sall)."%')";

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

@ -42,8 +42,8 @@ $mesg = '';
$sql = "SELECT count(*)";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= " WHERE p.fk_product_type <> 1";
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.entity = ".$conf->entity;
if ($db->query($sql))
@ -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;
@ -103,8 +103,8 @@ if ($conf->service->enabled)
$sql = "SELECT count(*)";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= " WHERE p.fk_product_type = '1'";
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.entity = ".$conf->entity;
if ($db->query($sql))
@ -117,8 +117,8 @@ if ($conf->service->enabled)
$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;

4
htdocs/service.class.php
View File

@ -67,8 +67,8 @@ class Service extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= " WHERE p.fk_product_type = 1";
$sql.= " AND p.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)';
$resql=$this->db->query($sql);
if ($resql)