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

Conflicts:
	htdocs/datapolicy/class/datapolicy.class.php
	htdocs/takepos/index.php

htdocs/datapolicy/class/datapolicy.class.php

@@ -268,11 +268,11 @@ class DataPolicy
 		$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
 		if ($message) {
 			if ($sendtocc) {
-				 $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
+				 $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
 			}
-			$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
-			$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
-			$actionmsg .= dol_concatdesc($actionmsg, $message);
+			$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
+			$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
+			$actionmsg = dol_concatdesc($actionmsg, $message);
 		}
 
 		// Send mail
@@ -310,7 +310,6 @@ class DataPolicy
 
 		$sendto = $adherent->email;
 
-
 		$code = md5($adherent->email);
 		if (!empty($adherent->default_lang)) {
 			$l = $adherent->default_lang;
@@ -342,11 +341,11 @@ class DataPolicy
 		$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
 		if ($message) {
 			if ($sendtocc) {
-				$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
+				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
 			}
-			$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
-			$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
-			$actionmsg .= dol_concatdesc($actionmsg, $message);
+			$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
+			$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
+			$actionmsg = dol_concatdesc($actionmsg, $message);
 		}
 
 

htdocs/takepos/index.php

@@ -780,13 +780,16 @@ $( 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 .= " entity = ".((int) $conf->entity)." AND ";
+		$sql .= " posnumber = ".((int) $_SESSION["takeposterminal"])." AND ";
 	    $sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'";
 		$resql = $db->query($sql);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
 			// If there is no cash control from today open it
-			if ($obj->rowid == null) print "ControlCashOpening();";
+			if ($obj->rowid == null) {
+				print "ControlCashOpening();";
+			}
 		}
 	}
 	?>
@@ -1035,7 +1038,12 @@ 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 .= " 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)
 {