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

This commit is contained in:
Laurent Destailleur 2021-02-03 23:04:50 +01:00
commit e89cc08ffa

View File

@ -776,10 +776,10 @@ $( document ).ready(function() {
{ {
print "ModalBox('ModalTerminal');"; print "ModalBox('ModalTerminal');";
} }
if ($conf->global->TAKEPOS_CONTROL_CASH_OPENING) if ($conf->global->TAKEPOS_CONTROL_CASH_OPENING) {
$sql = "SELECT rowid, status FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE"; $sql = "SELECT rowid, status FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE";
$sql .= " entity = ".$conf->entity." AND "; $sql .= " entity = ".$conf->entity." AND ";
$sql .= " date(date_creation) = CURDATE()"; $sql .= " date(date_creation) = CURDATE()";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) { if ($resql) {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);