Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
This commit is contained in:
commit
e89cc08ffa
@ -776,7 +776,7 @@ $( 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()";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user