Fix: enlever le filtre catégorie si le module n'est pas actif
This commit is contained in:
parent
eb983d5e71
commit
b08f966da0
@ -122,21 +122,10 @@ if($action == 'search' )
|
|||||||
if($catMere != -1)
|
if($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."'";
|
||||||
|
|
||||||
}
|
}
|
||||||
$sql .= " ORDER BY p.ref ASC ";
|
$sql .= " ORDER BY p.ref ASC ";
|
||||||
// $sql .= $db->plimit($limit + 1 ,$offset);
|
// $sql .= $db->plimit($limit + 1 ,$offset);
|
||||||
$resql = $db->query($sql) ;
|
$resql = $db->query($sql) ;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($cancel == $langs->trans("Cancel"))
|
if ($cancel == $langs->trans("Cancel"))
|
||||||
@ -365,8 +354,12 @@ if ($id || $ref)
|
|||||||
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");
|
print '<tr><td>'.$langs->trans("CategoryFilter");
|
||||||
// if(MAIN_MODULE_CATEGORIE)
|
|
||||||
|
if(MAIN_MODULE_CATEGORIE)
|
||||||
|
{
|
||||||
print '</td><td>'.$html->select_all_categories($catMere).'</td></tr>';
|
print '</td><td>'.$html->select_all_categories($catMere).'</td></tr>';
|
||||||
|
}
|
||||||
|
|
||||||
print '<tr><td colspan="2"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
|
print '<tr><td colspan="2"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
|
||||||
print '</form>';
|
print '</form>';
|
||||||
print '<tr><td colspan="2"><br>';
|
print '<tr><td colspan="2"><br>';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user