diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php index 84defe62c43..dc6a0cd82e9 100644 --- a/htdocs/takepos/index.php +++ b/htdocs/takepos/index.php @@ -1086,6 +1086,7 @@ $sql = "SELECT rowid, status, entity FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE $sql .= " entity = ".((int) $conf->entity)." AND "; $sql .= " posnumber = ".((int) $_SESSION["takeposterminal"])." AND "; $sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'"; + $resql = $db->query($sql); if ($resql) { $num = $db->num_rows($resql); diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php index 32b6cceb2e9..5287b65b0c7 100644 --- a/test/phpunit/FunctionsLibTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -1321,8 +1321,8 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase $this->assertEquals(1, price2num('1.000'), 'Test 1.000 give 1 with english language'); // Text can't be converted - $this->assertEquals('12.4$', price2num('12.4$')); - $this->assertEquals('12.4$', price2num('12r.4$')); + $this->assertEquals('12.4', price2num('12.4$')); + $this->assertEquals('12.4', price2num('12r.4$')); // For spanish language $newlangs2 = new Translate('', $conf);