From d965aad6e6cef9b2e44fa0e41f303701455652cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 23 Mar 2020 14:31:59 +0100
Subject: [PATCH] Some fix to support correctly parallel sales

---
 htdocs/langs/en_US/cashdesk.lang | 1 +
 htdocs/societe/list.php          | 9 ++++-----
 htdocs/takepos/invoice.php       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index a70e470e8a8..c492417e2a8 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -97,3 +97,4 @@ TakeposNumpadUsePaymentIcon=Use payment icon on numpad
 CashDeskRefNumberingModules=Numbering module for cash desk
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
\ No newline at end of file
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 63641f27625..fa8ac3d9469 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -102,6 +102,7 @@ $search_parent_name = GETPOST('search_parent_name', 'alpha');
 $type = GETPOST('type', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 $mode = GETPOST("mode", 'alpha');
+$place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0';	// $place is string id of table for Bar or Restaurant
 
 $diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user->id;
 
@@ -228,7 +229,6 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 if ($action == "change")	// Change customer for TakePOS
 {
     $idcustomer = GETPOST('idcustomer', 'int');
-    $place = (GETPOST('place', 'alpha') ? GETPOST('place', 'alpha') : 0); // $place is id of table for Ba or Restaurant
 
     // Check if draft invoice already exists, if not create it
 	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' AND entity IN (".getEntity('invoice').")";
@@ -252,8 +252,8 @@ if ($action == "change")	// Change customer for TakePOS
     $resql = $db->query($sql);
     ?>
 	    <script>
-	    console.log("Reload page invoice.php");
-	    parent.$("#poslines").load("invoice.php?place="+<?php print $place; ?>, function() {
+	    console.log("Reload page invoice.php with place=<?php print $place; ?>");
+	    parent.$("#poslines").load("invoice.php?place=<?php print $place; ?>", function() {
 	        //parent.$("#poslines").scrollTop(parent.$("#poslines")[0].scrollHeight);
 			<?php if (!$resql) { ?>
 				alert('Error failed to update customer on draft invoice.');
@@ -1031,8 +1031,7 @@ while ($i < min($num, $limit))
 	print '<tr class="oddeven"';
 	if ($contextpage == 'poslist')
 	{
-		$place = (GETPOST('place', 'alpha') > 0 ? GETPOST('place', 'alpha') : 0); // $place is id of table for Bar or Restaurant
-	    print ' onclick="location.href=\'list.php?action=change&contextpage=poslist&idcustomer='.$obj->rowid.'&place='.$place.'\'"';
+	    print ' onclick="location.href=\'list.php?action=change&contextpage=poslist&idcustomer='.$obj->rowid.'&place='.urlencode($place).'\'"';
 	}
 	print '>';
 	if (!empty($arrayfields['s.rowid']['checked']))
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 3d1bfce1bb4..15f26967529 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -743,7 +743,7 @@ $( document ).ready(function() {
 		}
 		echo '$("#customerandsales").append(\'<a onclick="location.href=\\\'index.php?place=0-';
 		echo $max_sale+1;
-		echo '\\\'"><span class="fa fa-plus-square"></a>\');';
+		echo '\\\'"><span class="fa fa-plus-square" title="'.dol_escape_htmltag($langs->trans("StartAParallelSale")).'"></a>\');';
 	} else {
 		dol_print_error($db);
 	}