diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 130e9f16680..b641efd2502 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -779,7 +779,7 @@ $( document ).ready(function() {
 	if ($conf->global->TAKEPOS_CONTROL_CASH_OPENING) {
 	    $sql = "SELECT rowid, status FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE";
 	    $sql .= " entity = ".$conf->entity." AND ";
-	    $sql .= " date(date_creation) = CURDATE()";
+	    $sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'";
 		$resql = $db->query($sql);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
@@ -1027,7 +1027,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
 
 $sql = "SELECT rowid, status, entity FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE";
 $sql .= " entity = ".$conf->entity." AND ";
-$sql .= " date(date_creation) = CURDATE()";
+$sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'";
 $resql = $db->query($sql);
 if ($resql)
 {
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 9acb13432d2..c18987b8931 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -364,6 +364,18 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
                 break;
             }
             $this->assertTrue($ok, 'Found a declaration @var array() instead of @var array in file '.$file['relativename'].'.');
+
+
+            // Test we don't have CURDATE()
+            $ok=true;
+            $matches=array();
+            preg_match_all('/CURDATE\(\)/', $filecontent, $matches, PREG_SET_ORDER);
+            foreach ($matches as $key => $val)
+            {
+            	$ok=false;
+            	break;
+            }
+            $this->assertTrue($ok, 'Found a CURDATE\(\) into code. Do not use this SQL method in file '.$file['relativename'].'. You must use the PHP function dol_now() instead.');
         }
 
         return;