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

Fix: enlever le filtre catgorie si le module n'est pas actif

Browse Source
This commit is contained in:
Regis Houssin 2006-03-21 15:41:00 +00:00
parent 17dbf80228
commit 5efea3a092
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/product/sousproduits/fiche.php
View File

@ -101,15 +101,14 @@ if ($action == 'add_prod' &&
} }
} }
} }
// action recherche des produits par mot-clé et/ou par catégorie // action recherche des produits par mot-clé et/ou par catégorie
if($action == 'search' ) if($action == 'search' )
{ {
$sql = 'SELECT p.rowid, p.ref, p.label, p.price, p.fk_product_type'; $sql = 'SELECT p.rowid, p.ref, p.label, p.price, p.fk_product_type';
$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p'; $sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
if($catMere != -1) if($conf->categorie->enabled && $catMere != -1)
{ {
$sql .= ', '.MAIN_DB_PREFIX.'categorie_product as cp'; $sql .= ', '.MAIN_DB_PREFIX.'categorie_product as cp';
} }
@ -119,7 +118,7 @@ if($action == 'search' )
$sql .= " AND (p.ref like '%".$key."%'"; $sql .= " AND (p.ref like '%".$key."%'";
$sql .= " OR p.label like '%".$key."%')"; $sql .= " OR p.label like '%".$key."%')";
} }
if($catMere != -1) if($conf->categorie->enabled && $catMere != -1)
{ {
$sql .= " AND p.rowid=cp.fk_product AND cp.fk_categorie ='".$catMere."'"; $sql .= " AND p.rowid=cp.fk_product AND cp.fk_categorie ='".$catMere."'";
} }
@ -352,11 +351,11 @@ if ($id || $ref)
print '</td><td><input type="text" name="key" value="'.$key.'">'; print '</td><td><input type="text" name="key" value="'.$key.'">';
print '<input type="hidden" name="action" value="search">'; print '<input type="hidden" name="action" value="search">';
print '<input type="hidden" name="id" value="'.$id.'">'; print '<input type="hidden" name="id" value="'.$id.'">';
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("CategoryFilter");
if($conf->categorie->enabled)
if($conf->categorie->enabled)
{ {
print '<tr><td>'.$langs->trans("CategoryFilter");
print '</td><td>'.$html->select_all_categories($catMere).'</td></tr>'; print '</td><td>'.$html->select_all_categories($catMere).'</td></tr>';
} }