Merge pull request #384 from marcosgdf/task-539

Better practice
This commit is contained in:
Laurent Destailleur 2012-09-10 14:32:42 -07:00
commit 6159e71427

View File

@ -1198,7 +1198,7 @@ class Form
$sql.=")"; $sql.=")";
} }
if (! empty($conf->global->MAIN_MODULE_BARCODE)) if (! empty($conf->barcode->enabled))
{ {
$sql .= " OR p.barcode LIKE '".$filterkey."'"; $sql .= " OR p.barcode LIKE '".$filterkey."'";
} }
@ -1448,7 +1448,7 @@ class Form
$sql.=" AND (pfp.ref_fourn LIKE '%".$filterkey."%' OR p.ref LIKE '%".$filterkey."%' OR p.label LIKE '%".$filterkey."%')"; $sql.=" AND (pfp.ref_fourn LIKE '%".$filterkey."%' OR p.ref LIKE '%".$filterkey."%' OR p.label LIKE '%".$filterkey."%')";
} }
if (! empty($conf->global->MAIN_MODULE_BARCODE)) if (! empty($conf->barcode->enabled))
{ {
$sql .= " OR p.barcode LIKE '".$filterkey."'"; $sql .= " OR p.barcode LIKE '".$filterkey."'";
} }