Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur
2021-02-03 20:43:39 +01:00
parent 4bba124c3f 83e32f96b7
commit 041decaf93
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/takepos/index.php
View File

@@ -730,10 +730,9 @@ $( document ).ready(function() {
else print "TerminalsDialog();"; else print "TerminalsDialog();";
} }
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 FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE "; $sql .= " entity = ".$conf->entity." AND ";
$sql .= "date(date_creation) = CURDATE() "; $sql .= " date(date_creation) = CURDATE()";
$sql .= "";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) { if ($resql) {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
@@ -917,8 +916,9 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
); );
} }
$sql = "SELECT rowid, status FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE "; $sql = "SELECT rowid, status, entity FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE";
$sql .= "date(date_creation) = CURDATE() "; $sql .= " entity = ".$conf->entity." AND ";
$sql .= " date(date_creation) = CURDATE()";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {