lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sql error

Browse Source
This commit is contained in:
Laurent Destailleur 2021-11-11 18:30:17 +01:00
parent f24c38db73
commit a725ffefdd
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/takepos/index.php
View File

@ -1037,13 +1037,10 @@ 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 ";
<<<<<<< HEAD
$sql .= " entity = ".((int) $conf->entity)." AND ";
$sql .= " posnumber = ".((int) $_SESSION["takeposterminal"])." AND ";
$sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'";
=======
$sql .= " posnumber = ".$_SESSION["takeposterminal"]." AND ";
$sql .= " date(date_creation) = CURDATE()";
>>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
$resql = $db->query($sql);
if ($resql)
{