diff --git a/htdocs/takepos/ajax.php b/htdocs/takepos/ajax.php index 9586e71fd18..74f69618a0f 100644 --- a/htdocs/takepos/ajax.php +++ b/htdocs/takepos/ajax.php @@ -48,12 +48,11 @@ if ($action=="getProducts") { $prods = $object->getObjectsInCateg("product"); echo json_encode($prods); } - -elseif ($action=="search") { +elseif ($action=="search" && $term != '') { $sql = 'SELECT * FROM '.MAIN_DB_PREFIX.'product'; - $sql .= ' WHERE entity IN ('.getEntity('product').')'; - $sql .= ' AND tosell = 1'; - $sql .= natural_search(array('label','barcode'), $term); + $sql.= ' WHERE entity IN ('.getEntity('product').')'; + $sql.= ' AND tosell = 1'; + $sql.= natural_search(array('label','barcode'), $term); $resql = $db->query($sql); $rows = array(); while ($row = $db->fetch_array($resql)) { diff --git a/htdocs/takepos/freezone.php b/htdocs/takepos/freezone.php index ce2c120b63f..4bf96470219 100644 --- a/htdocs/takepos/freezone.php +++ b/htdocs/takepos/freezone.php @@ -60,7 +60,7 @@ if ($action=="freezone") echo ''; ?> - + diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php index d9e25688fc3..e02f14d8384 100644 --- a/htdocs/takepos/takepos.php +++ b/htdocs/takepos/takepos.php @@ -26,7 +26,7 @@ if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); -$_GET['theme']="md"; // Force theme. MD theme provides better look and feel to TakePOS +//$_GET['theme']="md"; // Force theme. MD theme provides better look and feel to TakePOS require '../main.inc.php'; // Load $user and permissions require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';