Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2019-09-25 15:48:54 +02:00
commit b71f79ea4f

View File

@ -52,7 +52,7 @@ elseif ($action=="search" && $term != '') {
$sql = 'SELECT * FROM '.MAIN_DB_PREFIX.'product'; $sql = 'SELECT * FROM '.MAIN_DB_PREFIX.'product';
$sql.= ' WHERE entity IN ('.getEntity('product').')'; $sql.= ' WHERE entity IN ('.getEntity('product').')';
$sql.= ' AND tosell = 1'; $sql.= ' AND tosell = 1';
$sql.= natural_search(array('label','barcode'), $term); $sql.= natural_search(array('ref','label','barcode'), $term);
$resql = $db->query($sql); $resql = $db->query($sql);
$rows = array(); $rows = array();
while ($row = $db->fetch_array($resql)) { while ($row = $db->fetch_array($resql)) {