--- /tmp/dsg/dolibarr/htdocs/takepos/github_floors.php
+++ /tmp/dsg/dolibarr/htdocs/takepos/client_floors.php
@@ -23,23 +23,22 @@
 

 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language

 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language

-//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');

-//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');

-if (!defined('NOCSRFCHECK'))	define('NOCSRFCHECK', '1');

+//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');

+//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');

+if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');

 if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');

-if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');

-if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');

-if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');

+if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');

+if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');

+if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');

 

 require '../main.inc.php'; // Load $user and permissions

-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

 

 $langs->loadLangs(array("bills", "orders", "commercial", "cashdesk"));

 

 $floor = GETPOST('floor', 'int');

 if ($floor == "") $floor = 1;

 $id = GETPOST('id', 'int');

-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

 $left = GETPOST('left', 'alpha');

 $top = GETPOST('top', 'alpha');

 

@@ -59,39 +58,36 @@
 

 if ($action == "getTables")

 {

-	$sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables where floor=".$floor;

-	$resql = $db->query($sql);

-	$rows = array();

-	while ($row = $db->fetch_array($resql)) {

-		$invoice = new Facture($db);

-		$result = $invoice->fetch('', '(PROV-POS'.$_SESSION['takeposterminal'].'-'.$row['rowid'].')');

-		if ($result > 0) $row['occupied'] = "red";

-		$rows[] = $row;

-	}

-	echo json_encode($rows);

-	exit;

+    $sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables where floor=".$floor;

+    $resql = $db->query($sql);

+    $rows = array();

+    while ($row = $db->fetch_array($resql)) {

+        $rows[] = $row;

+    }

+    echo json_encode($rows);

+    exit;

 }

 

 if ($action == "update")

 {

-	if ($left > 95) $left = 95;

-	if ($top > 95) $top = 95;

-	if ($left > 3 or $top > 4) $db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set leftpos=".$left.", toppos=".$top." WHERE rowid='".$place."'");

-	else $db->query("DELETE from ".MAIN_DB_PREFIX."takepos_floor_tables where rowid='".$place."'");

+    if ($left > 95) $left = 95;

+    if ($top > 95) $top = 95;

+    if ($left > 3 or $top > 4) $db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set leftpos=".$left.", toppos=".$top." WHERE rowid='".$place."'");

+    else $db->query("DELETE from ".MAIN_DB_PREFIX."takepos_floor_tables where rowid='".$place."'");

 }

 

 if ($action == "updatename")

 {

-	$newname = preg_replace("/[^a-zA-Z0-9\s]/", "", $newname); // Only English chars

-	if (strlen($newname) > 3) $newname = substr($newname, 0, 3); // Only 3 chars

-	$db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set label='".$db->escape($newname)."' WHERE rowid='".$place."'");

+    $newname = preg_replace("/[^a-zA-Z0-9\s]/", "", $newname); // Only English chars

+    if (strlen($newname) > 3) $newname = substr($newname, 0, 3); // Only 3 chars

+    $db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set label='".$db->escape($newname)."' WHERE rowid='".$place."'");

 }

 

 if ($action == "add")

 {

-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."takepos_floor_tables(entity, label, leftpos, toppos, floor) VALUES (".$conf->entity.", '', '45', '45', ".$floor.")";

-	$asdf = $db->query($sql);

-	$db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label=rowid where label=''"); // No empty table names

+    $sql = "INSERT INTO ".MAIN_DB_PREFIX."takepos_floor_tables(entity, label, leftpos, toppos, floor) VALUES (".$conf->entity.", '', '45', '45', ".$floor.")";

+    $asdf = $db->query($sql);

+    $db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label=rowid where label=''"); // No empty table names

 }

 

 

@@ -116,9 +112,6 @@
 text-align: center;

 font-size:300%;

 color:white;

-}

-div.red{

-color:red;

 }

 html, body

 {

@@ -179,7 +172,7 @@
 				$(this).focus();

 			})

 			<?php } else {?>

-			$('body').append('<div class="tablediv '+val.occupied+'" onclick="LoadPlace('+val.rowid+');" style="position: absolute; left: '+val.leftpos+'%; top: '+val.toppos+'%;" id="tablename'+val.rowid+'">'+val.label+'</div>');

+			$('body').append('<div class="tablediv" onclick="LoadPlace('+val.rowid+');" style="position: absolute; left: '+val.leftpos+'%; top: '+val.toppos+'%;" id="tablename'+val.rowid+'">'+val.label+'</div>');

 			<?php } ?>

 		});

 	});

--- /tmp/dsg/dolibarr/htdocs/takepos/github_freezone.php
+++ /tmp/dsg/dolibarr/htdocs/takepos/client_freezone.php
@@ -1,6 +1,5 @@
 <?php

-/* Copyright (C) 2018 Andreu Bisquerra	<jove@bisquerra.com>

- * Copyright (C) 2020 Laurent Destailleur  <eldy@users.sourceforge.net>

+/* Copyright (C) 2018	Andreu Bisquerra	<jove@bisquerra.com>

  *

  * This program is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

@@ -24,13 +23,13 @@
 

 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language

 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language

-//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');

-//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');

-if (!defined('NOCSRFCHECK'))	define('NOCSRFCHECK', '1');

+//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');

+//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');

+if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');

 if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');

-if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');

-if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');

-if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');

+if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');

+if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');

+if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');

 

 require '../main.inc.php'; // Load $user and permissions

 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';

@@ -44,7 +43,7 @@
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'); // $place is id of table for Bar or Restaurant

 

 $idline = GETPOST('idline', 'int');

-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

 

 if (empty($user->rights->takepos->run)) {

 	accessforbidden();

--- /tmp/dsg/dolibarr/htdocs/takepos/github_index.php
+++ /tmp/dsg/dolibarr/htdocs/takepos/client_index.php
@@ -1,7 +1,6 @@
 <?php

 /* Copyright (C) 2018	Andreu Bisquerra	<jove@bisquerra.com>

  * Copyright (C) 2019	Josep Lluís Amador	<joseplluis@lliuretic.cat>

- * Copyright (C) 2020	Thibault FOUCART	<support@ptibogxiv.net>

  *

  * This program is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

@@ -25,13 +24,13 @@
 

 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language

 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language

-//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');

-//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');

-if (!defined('NOCSRFCHECK'))	define('NOCSRFCHECK', '1');

+//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');

+//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');

+if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');

 if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');

-if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');

-if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');

-if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');

+if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');

+if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');

+if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');

 

 require '../main.inc.php'; // Load $user and permissions

 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';

@@ -40,28 +39,14 @@
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

 require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';

-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

 

 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant or multiple sales

-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

 $setterminal = GETPOST('setterminal', 'int');

-$setcurrency = GETPOST('setcurrency', 'aZ09');

-

-if ($_SESSION["takeposterminal"] == "")

-{

-	if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") $_SESSION["takeposterminal"] = 1; // Use terminal 1 if there is only 1 terminal

-	elseif (!empty($_COOKIE["takeposterminal"])) $_SESSION["takeposterminal"] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE["takeposterminal"]); // Restore takeposterminal from previous session

-}

 

 if ($setterminal > 0)

 {

 	$_SESSION["takeposterminal"] = $setterminal;

-	setcookie("takeposterminal", $setterminal, (time() + (86400 * 354)), '/', null, false, true); // Permanent takeposterminal var in a cookie

-}

-

-if ($setcurrency != "")

-{

-	$_SESSION["takeposcustomercurrency"] = $setcurrency;

 }

 

 $_SESSION["urlfrom"] = '/takepos/index.php';

@@ -74,8 +59,8 @@
 $maxproductbydefaultforthisdevice = 24;

 if ($conf->browser->layout == 'phone')

 {

-	$maxcategbydefaultforthisdevice = 8;

-	$maxproductbydefaultforthisdevice = 16;

+    $maxcategbydefaultforthisdevice = 8;

+    $maxproductbydefaultforthisdevice = 16;

 	//REDIRECT TO BASIC LAYOUT IF TERMINAL SELECTED AND BASIC MOBILE LAYOUT ENABLED

 	if ($_SESSION["takeposterminal"] != "" && $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1)

 	{

@@ -131,28 +116,29 @@
 $levelofrootcategory = 0;

 if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)

 {

-	foreach ($categories as $key => $categorycursor)

-	{

-		if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)

-		{

-			$levelofrootcategory = $categorycursor['level'];

-			break;

-		}

-	}

-}

-

+    foreach ($categories as $key => $categorycursor)

+    {

+        if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)

+        {

+            $levelofrootcategory = $categorycursor['level'];

+            break;

+        }

+    }

+}

 $levelofmaincategories = $levelofrootcategory + 1;

 

 $maincategories = array();

 $subcategories = array();

 foreach ($categories as $key => $categorycursor)

 {

-	if ($categorycursor['level'] == $levelofmaincategories)

-	{

-		$maincategories[$key] = $categorycursor;

-	} else {

-		$subcategories[$key] = $categorycursor;

-	}

+    if ($categorycursor['level'] == $levelofmaincategories)

+    {

+        $maincategories[$key] = $categorycursor;

+    }

+    else

+    {

+        $subcategories[$key] = $categorycursor;

+    }

 }

 

 $maincategories = dol_sort_array($maincategories, 'label');

@@ -169,7 +155,6 @@
 var place="<?php echo $place; ?>";

 var editaction="qty";

 var editnumber="";

-var invoiceid=0;

 

 /*

 var app = this;

@@ -300,18 +285,12 @@
 			//console.log("ishow"+ishow+" idata="+idata);

 			console.log(data[idata]);

 			if (typeof (data[idata]) == "undefined") {

-				<?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES)

-				{

-					echo '$("#prodivdesc"+ishow).hide();';

-					echo '$("#prodesc"+ishow).text("");';

-					echo '$("#proimg"+ishow).attr("title","");';

-					echo '$("#proimg"+ishow).attr("src","genimg/empty.png");';

-				} else {

-					echo '$("#probutton"+ishow).hide();';

-					echo '$("#probutton"+ishow).text("");';

-				}?>

+				$("#prodivdesc"+ishow).hide();

+				$("#prodesc"+ishow).text("");

 				$("#proprice"+ishow).attr("class", "hidden");

 				$("#proprice"+ishow).html("");

+				$("#proimg"+ishow).attr("title","");

+				$("#proimg"+ishow).attr("src","genimg/empty.png");

 				$("#prodiv"+ishow).data("rowid","");

 				$("#prodiv"+ishow).attr("class","wrapper2 divempty");

 				$("#prowatermark"+ishow).hide();

@@ -323,22 +302,14 @@
 					$titlestring .= " + ' - ".dol_escape_js($langs->trans("Barcode").': ')."' + data[idata]['barcode']";

 				?>

 				var titlestring = <?php echo $titlestring; ?>;

-				<?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES)

-				{

-					echo '$("#prodivdesc"+ishow).show();';

-					echo '$("#prodesc"+ishow).text(data[parseInt(idata)][\'label\']);';

-					echo '$("#proimg"+ishow).attr("title", titlestring);';

-					echo '$("#proimg"+ishow).attr("src", "genimg/index.php?query=pro&id="+data[idata][\'id\']);';

-				}

-				else {

-					echo '$("#probutton"+ishow).show();';

-					echo '$("#probutton"+ishow).text(data[parseInt(idata)][\'label\']);';

-				}

-				?>

+				$("#prodivdesc"+ishow).show();

+				$("#prodesc"+ishow).text(data[parseInt(idata)]['label']);

 				if (data[parseInt(idata)]['price_formated']) {

 					$("#proprice"+ishow).attr("class", "productprice");

 					$("#proprice"+ishow).html(data[parseInt(idata)]['price_formated']);

 				}

+				$("#proimg"+ishow).attr("title", titlestring);

+				$("#proimg"+ishow).attr("src", "genimg/index.php?query=pro&id="+data[idata]['id']);

 				$("#prodiv"+ishow).data("rowid", data[idata]['id']);

 				$("#prodiv"+ishow).data("iscat", 0);

 				$("#prodiv"+ishow).attr("class","wrapper2");

@@ -430,18 +401,9 @@
 	ClearSearch();

 }

 

-function ChangeThirdparty(idcustomer) {

-	 console.log("ChangeThirdparty");

-		// Call page list.php to change customer

-		$("#poslines").load("../societe/list.php?action=change&type=t&contextpage=poslist&idcustomer="+idcustomer+"&place="+place+"", function() {

-		});

-

-	ClearSearch();

-}

-

 function deleteline() {

 	console.log("Delete line");

-	$("#poslines").load("invoice.php?action=deleteline&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline, function() {

+	$("#poslines").load("invoice.php?action=deleteline&place="+place+"&idline="+selectedline, function() {

 		//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);

 	});

 	ClearSearch();

@@ -449,7 +411,7 @@
 

 function Customer() {

 	console.log("Open box to select the thirdparty place="+place);

-	$.colorbox({href:"../societe/list.php?type=t&contextpage=poslist&nomassaction=1&place="+place, width:"90%", height:"80%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Customer"); ?>"});

+	$.colorbox({href:"../societe/list.php?contextpage=poslist&nomassaction=1&place="+place, width:"90%", height:"80%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Customer"); ?>"});

 }

 

 function History()

@@ -486,18 +448,17 @@
 }

 

 function Refresh() {

-	console.log("Refresh by reloading place="+place+" invoiceid="+invoiceid);

-	$("#poslines").load("invoice.php?place="+place+"&invoiceid="+invoiceid, function() {

+	console.log("Refresh");

+	$("#poslines").load("invoice.php?place="+place, function() {

 		//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);

 	});

 }

 

 function New() {

 	// If we go here,it means $conf->global->TAKEPOS_BAR_RESTAURANT is not defined

+	console.log("New with place = <?php echo $place; ?>, js place="+place);

+

 	invoiceid = $("#invoiceid").val();

-

-	console.log("New with place = <?php echo $place; ?>, js place="+place+", invoiceid="+invoiceid);

-

 	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getInvoice&id='+invoiceid, function(data) {

 		var r;

 

@@ -508,8 +469,7 @@
 		}

 

 		if (r == true) {

-			// Reload section with invoice lines

-			$("#poslines").load("invoice.php?action=delete&token=<?php echo newToken(); ?>&place=" + place, function () {

+			$("#poslines").load("invoice.php?action=delete&place=" + place, function () {

 				//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);

 			});

 			ClearSearch();

@@ -565,28 +525,13 @@
 			// If there is only 1 answer

 			if ($('#search').val().length > 0 && data.length == 1) {

 				console.log($('#search').val()+' - '+data[0]['barcode']);

-				if ($('#search').val() == data[0]['barcode'] && 'thirdparty' == data[0]['object']) {

-					console.log("There is only 1 answer with barcode matching the search, so we change the thirdparty "+data[0]['rowid']);

-					ChangeThirdparty(data[0]['rowid']);

-				}

-				else if ($('#search').val() == data[0]['barcode'] && 'product' == data[0]['object']) {

+				if ($('#search').val() == data[0]['barcode']) {

 					console.log("There is only 1 answer with barcode matching the search, so we add the product in basket");

 					ClickProduct(0);

 				}

 			}

-			if (eventKeyCode == keyCodeForEnter){

-				if (data.length == 0) {

-					$('#search').val('<?php

-					$langs->load('errors');

-					echo dol_escape_js($langs->trans("ErrorRecordNotFound"));

-					?>');

-					$('#search').select();

-				}

-				else ClearSearch();

-			}

 		});

 	}

-

 }

 

 function Edit(number) {

@@ -687,19 +632,16 @@
 }

 

 function OpenDrawer(){

-	console.log("OpenDrawer call ajax url http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print");

+	console.log("OpenDrawer");

 	$.ajax({

 		type: "POST",

-		<?php

-		if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) echo "url: '".$conf->global->TAKEPOS_PRINT_SERVER."/printer/drawer.php',";

-		else echo "url: 'http://".$conf->global->TAKEPOS_PRINT_SERVER.":8111/print',";

-		?>

+		url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',

 		data: "opendrawer"

 	});

 }

 

 function DolibarrOpenDrawer() {

-	console.log("DolibarrOpenDrawer call ajax url /takepos/ajax/ajax.php?action=opendrawer&term=<?php print $_SESSION["takeposterminal"] ?>");

+	console.log("DolibarrOpenDrawer");

 	$.ajax({

 		type: "GET",

 		url: "<?php print dol_buildpath('/takepos/ajax/ajax.php', 1).'?action=opendrawer&term='.$_SESSION["takeposterminal"]; ?>",

@@ -738,11 +680,30 @@
     $.colorbox({href:"../compta/cashcontrol/report.php?id="+rowid+"&contextpage=takepos", width:"60%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("CashReport"); ?>"});

 }

 

-// TakePOS Popup

-function ModalBox(ModalID)

-{

-    var modal = document.getElementById(ModalID);

-	modal.style.display = "block";

+// Popup to select the terminal to use

+function TerminalsDialog()

+{

+    jQuery("#dialog-info").dialog({

+	    resizable: false,

+	    height: <?php echo 180 + round($conf->global->TAKEPOS_NUM_TERMINALS / 3 * 20); ?>,

+	    width: <?php echo ($conf->dol_optimize_smallscreen ? 316 : 400); ?>,

+	    modal: true,

+	    buttons: {

+			'<?php echo dol_escape_js($langs->trans("Terminal")) ?> 1': function() {

+				location.href='index.php?setterminal=1';

+			}

+			<?php

+			for ($i = 2; $i <= $conf->global->TAKEPOS_NUM_TERMINALS; $i++)

+			{

+				print ",

+				'".dol_escape_js($langs->trans("Terminal"))." ".$i."': function() {

+					location.href='index.php?setterminal=".$i."';

+				}

+				";

+			}

+			?>

+	    }

+	});

 }

 

 function DirectPayment(){

@@ -753,19 +714,6 @@
 

 function FullScreen() {

 	document.documentElement.requestFullscreen();

-}

-

-function WeighingScale(){

-	console.log("Weighing Scale");

-    $.ajax({

-        type: "POST",

-        url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/scale/index.php',

-    })

-	.done(function( editnumber ) {

-		$("#poslines").load("invoice.php?action=updateqty&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {

-                editnumber="";

-            });

-	});

 }

 

 $( document ).ready(function() {

@@ -776,12 +724,14 @@
 	//IF NO TERMINAL SELECTED

 	if ($_SESSION["takeposterminal"] == "")

 	{

-		print "ModalBox('ModalTerminal');";

-	}

-	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 .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'";

+		if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") $_SESSION["takeposterminal"] = 1;

+		else print "TerminalsDialog();";

+	}

+	if ($conf->global->TAKEPOS_CONTROL_CASH_OPENING)

+	{

+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE ";

+		$sql .= "date(date_creation) = CURDATE() ";

+		$sql .= "";

 		$resql = $db->query($sql);

 		if ($resql) {

 			$obj = $db->fetch_object($resql);

@@ -795,6 +745,7 @@
 

 <body class="bodytakepos" style="overflow: hidden;">

 <?php

+print '<div class="hidden dialog-info-takepos-terminal" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';

 $keyCodeForEnter = $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} > 0 ? $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} : '';

 ?>

 <div class="container">

@@ -806,7 +757,7 @@
 		<div class="topnav">

 			<div class="topnav-left">

 			<div class="inline-block valignmiddle">

-			<a class="topnav-terminalhour" onclick="ModalBox('ModalTerminal');">

+			<a class="topnav-terminalhour" onclick="TerminalsDialog();">

 			<span class="fa fa-cash-register"></span>

 			<span class="hideonsmartphone">

 			<?php echo $langs->trans("Terminal"); ?>

@@ -816,15 +767,7 @@
 			else echo $_SESSION["takeposterminal"];

 			echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>';

 			?>

-			</a>

-			<?php

-			if (!empty($conf->multicurrency->enabled)) {

-				print '<a class="valignmiddle tdoverflowmax100" id="multicurrency" onclick="ModalBox(\'ModalCurrency\');" title=""><span class="fas fa-coins paddingrightonly"></span>';

-				print '<span class="hideonsmartphone">'.$langs->trans("Currency").'</span>';

-				print '</a>';

-			}

-			?>

-			</div>

+			</a></div>

 			<!-- section for customer and open sales -->

 			<div class="inline-block valignmiddle" id="customerandsales">

 			</div>

@@ -834,11 +777,11 @@
 			</div>

 			<div class="topnav-right">

 				<div class="login_block_other">

-				<input type="text" id="search" name="search" onkeyup="Search2(<?php echo $keyCodeForEnter; ?>);" placeholder="<?php echo $langs->trans("Search"); ?>" autofocus>

+				<input type="text" id="search" name="search" onkeyup="Search2(<?php echo $keyCodeForEnter; ?>);"  placeholder="<?php echo $langs->trans("Search"); ?>" autofocus>

 				<a onclick="ClearSearch();"><span class="fa fa-backspace"></span></a>

-				<a onclick="window.location.href='<?php echo DOL_URL_ROOT.'/'; ?>';"><span class="fas fa-home"></span></a>

+				<a onclick="window.location.href='<?php echo DOL_URL_ROOT; ?>';"><span class="fas fa-home"></span></a>

 				<?php if (empty($conf->dol_use_jmobile)) { ?>

-				<a class="hideonsmartphone" onclick="FullScreen();"><span class="fa fa-expand-arrows-alt"></span></a>

+				<a onclick="FullScreen();"><span class="fa fa-expand-arrows-alt"></span></a>

 				<?php } ?>

 				</div>

 				<div class="login_block_user">

@@ -852,63 +795,6 @@
 	<?php

 }

 ?>

-

-<!-- Modal terminal box -->

-<div id="ModalTerminal" class="modal">

-	<div class="modal-content">

-		<div class="modal-header">

-		<span class="close" href="#" onclick="document.getElementById('ModalTerminal').style.display = 'none';">&times;</span>

-		<h3><?php print $langs->trans("TerminalSelect"); ?></h3>

-	</div>

-	<div class="modal-body">

-		<button type="button" class="block" onclick="location.href='index.php?setterminal=1'"><?php print $langs->trans("Terminal"); ?> 1</button>

-		<?php

-		for ($i = 2; $i <= $conf->global->TAKEPOS_NUM_TERMINALS; $i++)

-		{

-			print '<button type="button" class="block" onclick="location.href=\'index.php?setterminal='.$i.'\'">'.$langs->trans("Terminal").' '.$i.'</button>';

-		}

-		?>

-	</div>

-</div>

-</div>

-

-<!-- Modal multicurrency box -->

-<?php if (!empty($conf->multicurrency->enabled)) { ?>

-<div id="ModalCurrency" class="modal">

-	<div class="modal-content">

-		<div class="modal-header">

-			<span class="close" href="#" onclick="document.getElementById('ModalCurrency').style.display = 'none';">&times;</span>

-			<h3><?php print $langs->trans("SetMultiCurrencyCode"); ?></h3>

-		</div>

-		<div class="modal-body">

-			<?php

-			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';

-			$sql .= " WHERE entity IN ('".getEntity('multicurrency')."')";

-			$resql = $db->query($sql);

-			if ($resql)

-			{

-				while ($obj = $db->fetch_object($resql))

-				print '<button type="button" class="block" onclick="location.href=\'index.php?setcurrency='.$obj->code.'\'">'.$obj->code.'</button>';

-			}

-			?>

-		</div>

-	</div>

-</div>

-<?php } ?>

-

-<!-- Modal terminal Credit Note -->

-<div id="ModalCreditNote" class="modal">

-	<div class="modal-content">

-		<div class="modal-header">

-		<span class="close" href="#" onclick="document.getElementById('ModalCreditNote').style.display = 'none';">&times;</span>

-		<h3><?php print $langs->trans("invoiceAvoirWithLines"); ?></h3>

-	</div>

-	<div class="modal-body">

-		<button type="button" class="block" onclick="CreditNote(); document.getElementById('ModalCreditNote').style.display = 'none';"><?php print $langs->trans("Yes"); ?></button>

-		<button type="button" class="block" onclick="document.getElementById('ModalCreditNote').style.display = 'none';"><?php print $langs->trans("No"); ?></button>

-	</div>

-</div>

-</div>

 

 	<div class="row1<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) print 'withhead'; ?>">

 

@@ -946,9 +832,9 @@
 $paiementsModes = array();

 if ($resql) {

 	while ($obj = $db->fetch_object($resql)) {

-		$paycode = $obj->code;

-		if ($paycode == 'LIQ') $paycode = 'CASH';

-		if ($paycode == 'CHQ') $paycode = 'CHEQUE';

+        $paycode = $obj->code;

+        if ($paycode == 'LIQ') $paycode = 'CASH';

+        if ($paycode == 'CHQ') $paycode = 'CHEQUE';

 

 		$constantforkey = "CASHDESK_ID_BANKACCOUNT_".$paycode.$_SESSION["takeposterminal"];

 		//var_dump($constantforkey.' '.$conf->global->$constantforkey);

@@ -962,13 +848,7 @@
 	setEventMessages($langs->trans("ProblemIsInSetupOfTerminal", $_SESSION["takeposterminal"]), null, 'errors');

 }

 if (count($maincategories) == 0) {

-	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) {

-		$tmpcategory = new Categorie($db);

-		$tmpcategory->fetch($conf->global->TAKEPOS_ROOT_CATEGORY_ID);

-		setEventMessages($langs->trans("TakeposNeedsAtLeastOnSubCategoryIntoParentCategory", $tmpcategory->label), null, 'errors');

-	} else {

-		setEventMessages($langs->trans("TakeposNeedsCategories"), null, 'errors');

-	}

+	setEventMessages($langs->trans("TakeposNeedsCategories"), null, 'errors');

 }

 // User menu and external TakePOS modules

 $menus = array();

@@ -976,10 +856,12 @@
 

 if (empty($conf->global->TAKEPOS_BAR_RESTAURANT))

 {

-	$menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("New").'</div>', 'action'=>'New();');

-} else {

-	// BAR RESTAURANT specific menu

-	$menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("Place").'</div>', 'action'=>'Floors();');

+    $menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("New").'</div>', 'action'=>'New();');

+}

+else

+{

+    // BAR RESTAURANT specific menu

+    $menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("Place").'</div>', 'action'=>'Floors();');

 }

 

 if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {

@@ -1004,7 +886,7 @@
 	//Button to print receipt before payment

 	if ($conf->global->TAKEPOS_BAR_RESTAURANT)

 	{

-		if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {

+	    if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {

 			if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposConnector(placeid);');

 			else $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposPrinting(placeid);');

 		} elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {

@@ -1015,27 +897,26 @@
 	}

 	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && $conf->global->TAKEPOS_ORDER_NOTES == 1)

 	{

-		$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("OrderNotes").'</div>', 'action'=>'TakeposOrderNotes();');

+	    $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("OrderNotes").'</div>', 'action'=>'TakeposOrderNotes();');

 	}

 	if ($conf->global->TAKEPOS_SUPPLEMENTS)

 	{

-		$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("ProductSupplements").'</div>', 'action'=>'LoadProducts(\'supplements\');');

+	    $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("ProductSupplements").'</div>', 'action'=>'LoadProducts(\'supplements\');');

 	}

 }

 

 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {

-	$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("DOL_OPEN_DRAWER").'</div>', 'action'=>'OpenDrawer();');

+    $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("DOL_OPEN_DRAWER").'</div>', 'action'=>'OpenDrawer();');

 }

 if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {

-	$menus[$r++] = array(

+    $menus[$r++] = array(

 		'title' => '<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("DOL_OPEN_DRAWER").'</div>',

 		'action' => 'DolibarrOpenDrawer();',

 	);

 }

 

-$sql = "SELECT rowid, status, entity FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE";

-$sql .= " entity = ".$conf->entity." AND ";

-$sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'";

+$sql = "SELECT rowid, status FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE ";

+$sql .= "date(date_creation) = CURDATE() ";

 $resql = $db->query($sql);

 if ($resql)

 {

@@ -1066,26 +947,22 @@
 	$menus[$r++] = array('title'=>'<span class="fa fa-sign-out-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Logout").'</div>', 'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';');

 }

 

-if ($conf->global->TAKEPOS_WEIGHING_SCALE)

-{

-	$menus[$r++] = array('title'=>'<span class="fa fa-balance-scale paddingrightonly"></span><div class="trunc">'.$langs->trans("WeighingScale").'</div>', 'action'=>'WeighingScale();');

-}

-

 ?>

 		<!-- Show buttons -->

 		<div class="div3">

 		<?php

-		$i = 0;

-		foreach ($menus as $menu)

-		{

-			$i++;

-			if (count($menus) > 12 and $i == 12)

-			{

-				echo '<button style="'.$menu['style'].'" type="button" id="actionnext" class="actionbutton" onclick="MoreActions('.count($menus).');">'.$langs->trans("Next").'</button>';

-				echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';

-			} elseif ($i > 12) echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';

-			else echo '<button style="'.$menu['style'].'" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';

-		}

+        $i = 0;

+        foreach ($menus as $menu)

+        {

+        	$i++;

+        	if (count($menus) > 12 and $i == 12)

+        	{

+        		echo '<button style="'.$menu['style'].'" type="button" id="actionnext" class="actionbutton" onclick="MoreActions('.count($menus).');">'.$langs->trans("Next").'</button>';

+        		echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';

+        	}

+            elseif ($i > 12) echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';

+            else echo '<button style="'.$menu['style'].'" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';

+        }

 

 		if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {

 			print '<!-- Show the search input text -->'."\n";

@@ -1094,7 +971,7 @@
 			print '<a class="marginleftonly hideonsmartphone" onclick="ClearSearch();">'.img_picto('', 'searchclear').'</a>';

 			print '</div>';

 		}

-		?>

+        ?>

 		</div>

 	</div>

 

@@ -1106,17 +983,20 @@
 	$count = 0;

 	while ($count < $MAXCATEG)

 	{

-		?>

+	    ?>

 			<div class="wrapper" <?php if ($count == ($MAXCATEG - 2)) echo 'onclick="MoreCategories(\'less\');"'; elseif ($count == ($MAXCATEG - 1)) echo 'onclick="MoreCategories(\'more\');"'; else echo 'onclick="LoadProducts('.$count.');"'; ?> id="catdiv<?php echo $count; ?>">

 				<?php

 				if ($count == ($MAXCATEG - 2)) {

-					//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="catimg'.$count.'" />';

-					echo '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';

-				} elseif ($count == ($MAXCATEG - 1)) {

-					//echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="catimg'.$count.'" />';

-					echo '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';

-				} else {

-					if (!$conf->global->TAKEPOS_HIDE_CATEGORY_IMAGES) echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';

+				    //echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="catimg'.$count.'" />';

+				    echo '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';

+				}

+				elseif ($count == ($MAXCATEG - 1)) {

+				    //echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="catimg'.$count.'" />';

+				    echo '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';

+				}

+				else

+				{

+				    echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';

 				}

 				?>

 				<?php if ($count != ($MAXCATEG - 2) && $count != ($MAXCATEG - 1)) { ?>

@@ -1127,7 +1007,7 @@
 				<div class="catwatermark" id='catwatermark<?php echo $count; ?>'>...</div>

 			</div>

 	    <?php

-		$count++;

+        $count++;

 	}

 	?>

 		</div>

@@ -1135,27 +1015,27 @@
 	    <!--  Show product -->

 		<div class="div5">

     <?php

-	$count = 0;

-	while ($count < $MAXPRODUCT)

-	{

-		?>

+    $count = 0;

+    while ($count < $MAXPRODUCT)

+    {

+        ?>

     			<div class="wrapper2" id='prodiv<?php echo $count; ?>' <?php if ($count == ($MAXPRODUCT - 2)) {?> onclick="MoreProducts('less');" <?php } if ($count == ($MAXPRODUCT - 1)) {?> onclick="MoreProducts('more');" <?php } else echo 'onclick="ClickProduct('.$count.');"'; ?>>

     				<?php

-					if ($count == ($MAXPRODUCT - 2)) {

-						//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';

-						print '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';

-					} elseif ($count == ($MAXPRODUCT - 1)) {

-						//echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="proimg'.$count.'" />';

-						print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';

-					} else {

-						if ($conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) echo '<button type="button" id="probutton'.$count.'" class="productbutton" style="display: none;"></button>';

-						else {

-							print '<div class="" id="proprice'.$count.'"></div>';

-							print '<img class="imgwrapper" height="100%" title="" id="proimg'.$count.'">';

-						}

-					}

-					?>

-					<?php if ($count != ($MAXPRODUCT - 2) && $count != ($MAXPRODUCT - 1) && !$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) { ?>

+    				if ($count == ($MAXPRODUCT - 2)) {

+    				    //echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';

+    					print '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';

+    				}

+    				elseif ($count == ($MAXPRODUCT - 1)) {

+    				    //echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="proimg'.$count.'" />';

+    					print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';

+    				}

+    				else

+    				{

+    					print '<div class="" id="proprice'.$count.'"></div>';

+    					print '<img class="imgwrapper" height="100%" title="" id="proimg'.$count.'">';

+    				}

+    				?>

+					<?php if ($count != ($MAXPRODUCT - 2) && $count != ($MAXPRODUCT - 1)) { ?>

     				<div class="description" id="prodivdesc<?php echo $count; ?>">

     					<div class="description_content" id="prodesc<?php echo $count; ?>"></div>

     				</div>

@@ -1163,9 +1043,9 @@
     				<div class="catwatermark" id='prowatermark<?php echo $count; ?>'>...</div>

     			</div>

         <?php

-		$count++;

-	}

-	?>

+        $count++;

+    }

+    ?>

 		</div>

 	</div>

 </div>

--- /tmp/dsg/dolibarr/htdocs/takepos/github_invoice.php
+++ /tmp/dsg/dolibarr/htdocs/takepos/client_invoice.php
@@ -39,23 +39,17 @@
 

 global $mysoc;

 

-$langs->loadLangs(array("companies", "commercial", "bills", "cashdesk", "stocks", "banks"));

+$langs->loadLangs(array("companies", "commercial", "bills", "cashdesk", "stocks"));

 

 $id = GETPOST('id', 'int');

-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

 $idproduct = GETPOST('idproduct', 'int');

 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant

 $placeid = 0; // $placeid is ID of invoice

-// Terminal is stored into $_SESSION["takeposterminal"];

 

 if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {

 	accessforbidden();

 }

-

-

-/*

- * View

- */

 

 if (($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1 && $conf->browser->layout == 'phone') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))

 {

@@ -63,7 +57,8 @@
 	if ($_SESSION["takeposterminal"] == "")

 	{

 		if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") $_SESSION["takeposterminal"] = 1;

-		else {

+		else

+		{

 			header("Location: ".DOL_URL_ROOT."/takepos/index.php");

 			exit;

 		}

@@ -100,8 +95,8 @@
 $number = GETPOST('number', 'alpha');

 $idline = GETPOST('idline', 'int');

 $selectedline = GETPOST('selectedline', 'int');

-$desc = GETPOST('desc', 'alphanohtml');

-$pay = GETPOST('pay', 'aZ09');

+$desc = GETPOST('desc', 'alpha');

+$pay = GETPOST('pay', 'alpha');

 $amountofpayment = price2num(GETPOST('amount', 'alpha'));

 

 $invoiceid = GETPOST('invoiceid', 'int');

@@ -116,19 +111,22 @@
 $sql .= " WHERE entity IN (".getEntity('c_paiement').")";

 $sql .= " AND code = '".$db->escape($paycode)."'";

 $resql = $db->query($sql);

-$obj = $db->fetch_object($resql);

-$paiementid = $obj->id;

+$codes = $db->fetch_array($resql);

+$paiementid = $codes[0];

+

 

 $invoice = new Facture($db);

 if ($invoiceid > 0)

 {

-	$ret = $invoice->fetch($invoiceid);

-} else {

-	$ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')');

+    $ret = $invoice->fetch($invoiceid);

+}

+else

+{

+    $ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')');

 }

 if ($ret > 0)

 {

-	$placeid = $invoice->id;

+    $placeid = $invoice->id;

 }

 

 $constforcompanyid = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];

@@ -142,44 +140,28 @@
  * Actions

  */

 

-// Action to record a payment on a TakePOS invoice

 if ($action == 'valid' && $user->rights->facture->creer)

 {

-	$bankaccount = 0;

-	$error = 0;

-

-	if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {

-		$bankaccount = GETPOST('accountid', 'int');

-	} else {

-		if ($pay == "cash") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]};            // For backward compatibility

-		elseif ($pay == "card") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$_SESSION["takeposterminal"]};          // For backward compatibility

-		elseif ($pay == "cheque") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]};    // For backward compatibility

-		else {

-			$accountname = "CASHDESK_ID_BANKACCOUNT_".$pay.$_SESSION["takeposterminal"];

-			$bankaccount = $conf->global->$accountname;

-		}

-	}

-

-	if ($bankaccount <= 0 && $pay != "delayed") {

-		$errormsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount"));

-		$error++;

-	}

-

+    if ($pay == "cash") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]};            // For backward compatibility

+    elseif ($pay == "card") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$_SESSION["takeposterminal"]};          // For backward compatibility

+    elseif ($pay == "cheque") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]};    // For backward compatibility

+    else

+    {

+        $accountname = "CASHDESK_ID_BANKACCOUNT_".$pay.$_SESSION["takeposterminal"];

+    	$bankaccount = $conf->global->$accountname;

+    }

 	$now = dol_now();

 	$res = 0;

 

 	$invoice = new Facture($db);

 	$invoice->fetch($placeid);

-

 	if ($invoice->total_ttc < 0) {

 		$invoice->type = $invoice::TYPE_CREDIT_NOTE;

-

-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture WHERE";

-		$sql .= " fk_soc = ".((int) $invoice->socid);

-		$sql .= " AND type <> ".Facture::TYPE_CREDIT_NOTE;

-		$sql .= " AND fk_statut >= ".$invoice::STATUS_VALIDATED;

-		$sql .= " ORDER BY rowid DESC";

-

+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture WHERE ";

+		$sql .= "fk_soc = '".$invoice->socid."' ";

+		$sql .= "AND type <> ".Facture::TYPE_CREDIT_NOTE." ";

+		$sql .= "AND fk_statut >= ".$invoice::STATUS_VALIDATED." ";

+		$sql .= "ORDER BY rowid DESC";

 		$resql = $db->query($sql);

 		if ($resql) {

 			$obj = $db->fetch_object($resql);

@@ -202,21 +184,21 @@
 	//}

 

 	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];

-	if ($error) {

-		dol_htmloutput_errors($errormsg, null, 1);

-	} elseif ($invoice->statut != Facture::STATUS_DRAFT) {

+	if ($invoice->statut != Facture::STATUS_DRAFT) {

 		//If invoice is validated but it is not fully paid is not error and make the payment

-		if ($invoice->getRemainToPay() > 0) {

-			$res = 1;

-		} else {

+		if ($invoice->getRemainToPay() > 0) $res = 1;

+		else {

 			dol_syslog("Sale already validated");

 			dol_htmloutput_errors($langs->trans("InvoiceIsAlreadyValidated", "TakePos"), null, 1);

 		}

-	} elseif (count($invoice->lines) == 0) {

-		$error++;

-		dol_syslog('Sale without lines');

+	}

+	elseif (count($invoice->lines) == 0)

+	{

+		dol_syslog("Sale without lines");

 		dol_htmloutput_errors($langs->trans("NoLinesToBill", "TakePos"), null, 1);

-	} elseif (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1") {

+	}

+	elseif (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1")

+	{

 		$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;

 		$conf->global->STOCK_CALCULATE_ON_BILL = 1;

 

@@ -230,12 +212,10 @@
 		$res = $invoice->validate($user, '', $conf->global->$constantforkey, 0, $batch_rule);

 

 		$conf->global->STOCK_CALCULATE_ON_BILL = $savconst;

-	} else {

-		$res = $invoice->validate($user);

-		if ($res < 0) {

-			$error++;

-			dol_htmloutput_errors($invoice->error, $invoice->errors, 1);

-		}

+	}

+	else

+	{

+	    $res = $invoice->validate($user);

 	}

 

 	// Restore save values

@@ -244,30 +224,26 @@
 	//	$conf->global->FACTURE_ADDON = $sav_FACTURE_ADDON;

 	//}

 

+	$remaintopay = $invoice->getRemainToPay();

+

 	// Add the payment

-	if (!$error && $res >= 0) {

-		$remaintopay = $invoice->getRemainToPay();

-		if ($remaintopay > 0) {

-			$payment = new Paiement($db);

-			$payment->datepaye = $now;

-			$payment->fk_account = $bankaccount;

-			$payment->amounts[$invoice->id] = $amountofpayment;

-			if ($pay == 'cash') $payment->pos_change = price2num(GETPOST('excess', 'alpha'));

-

-			// If user has not used change control, add total invoice payment

-			// Or if user has used change control and the amount of payment is higher than remain to pay, add the remain to pay

-			if ($amountofpayment == 0 || $amountofpayment > $remaintopay) $payment->amounts[$invoice->id] = $remaintopay;

-

-			$payment->paiementid = $paiementid;

-			$payment->num_payment = $invoice->ref;

-

-			if ($pay != "delayed") {

-				$payment->create($user);

-				$payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', '');

-				$remaintopay = $invoice->getRemainToPay(); // Recalculate remain to pay after the payment is recorded

-			}

-		}

-

+	if ($res >= 0 && $remaintopay > 0) {

+		$payment = new Paiement($db);

+		$payment->datepaye = $now;

+		$payment->fk_account = $bankaccount;

+		$payment->amounts[$invoice->id] = $amountofpayment;

+

+		// If user has not used change control, add total invoice payment

+		// Or if user has used change control and the amount of payment is higher than remain to pay, add the remain to pay

+		if ($amountofpayment == 0 || $amountofpayment > $remaintopay) $payment->amounts[$invoice->id] = $remaintopay;

+

+		$payment->paiementid = $paiementid;

+		$payment->num_payment = $invoice->ref;

+

+		$payment->create($user);

+		$payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', '');

+

+		$remaintopay = $invoice->getRemainToPay(); // Recalculate remain to pay after the payment is recorded

 		if ($remaintopay == 0) {

 			dol_syslog("Invoice is paid, so we set it to status Paid");

 			$result = $invoice->set_paid($user);

@@ -279,167 +255,14 @@
 		}

 	} else {

 		dol_htmloutput_errors($invoice->error, $invoice->errors, 1);

-	}

-}

-

-if ($action == 'creditnote')

-{

-	$creditnote = new Facture($db);

-	$creditnote->socid = $invoice->socid;

-	$creditnote->date = dol_now();

-	$creditnote->type = Facture::TYPE_CREDIT_NOTE;

-	$creditnote->fk_facture_source = $placeid;

-	$creditnote->remise_absolue = $invoice->remise_absolue;

-	$creditnote->remise_percent = $invoice->remise_percent;

-	$creditnote->create($user);

-

-	foreach ($invoice->lines as $line)

-	{

-		// Extrafields

-		if (method_exists($line, 'fetch_optionals')) {

-			// load extrafields

-			$line->fetch_optionals();

-		}

-		// Reset fk_parent_line for no child products and special product

-		if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {

-			$fk_parent_line = 0;

-		}

-		if ($invoice->type == Facture::TYPE_SITUATION)

-		{

-			$source_fk_prev_id = $line->fk_prev_id; // temporary storing situation invoice fk_prev_id

-			$line->fk_prev_id  = $line->id; // The new line of the new credit note we are creating must be linked to the situation invoice line it is created from

-			if (!empty($invoice->tab_previous_situation_invoice))

-			{

-				// search the last standard invoice in cycle and the possible credit note between this last and invoice

-				// TODO Move this out of loop of $invoice->lines

-				$tab_jumped_credit_notes = array();

-				$lineIndex = count($invoice->tab_previous_situation_invoice) - 1;

-				$searchPreviousInvoice = true;

-				while ($searchPreviousInvoice)

-				{

-					if ($invoice->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1)

-					{

-						$searchPreviousInvoice = false; // find, exit;

-						break;

-					} else {

-						if ($invoice->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_CREDIT_NOTE) {

-							$tab_jumped_credit_notes[$lineIndex] = $invoice->tab_previous_situation_invoice[$lineIndex]->id;

-						}

-						$lineIndex--; // go to previous invoice in cycle

-					}

-				}

-

-				$maxPrevSituationPercent = 0;

-				foreach ($invoice->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine)

-				{

-					if ($prevLine->id == $source_fk_prev_id)

-					{

-						$maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);

-

-						//$line->subprice  = $line->subprice - $prevLine->subprice;

-						$line->total_ht  = $line->total_ht - $prevLine->total_ht;

-						$line->total_tva = $line->total_tva - $prevLine->total_tva;

-						$line->total_ttc = $line->total_ttc - $prevLine->total_ttc;

-						$line->total_localtax1 = $line->total_localtax1 - $prevLine->total_localtax1;

-						$line->total_localtax2 = $line->total_localtax2 - $prevLine->total_localtax2;

-

-						$line->multicurrency_subprice  = $line->multicurrency_subprice - $prevLine->multicurrency_subprice;

-						$line->multicurrency_total_ht  = $line->multicurrency_total_ht - $prevLine->multicurrency_total_ht;

-						$line->multicurrency_total_tva = $line->multicurrency_total_tva - $prevLine->multicurrency_total_tva;

-						$line->multicurrency_total_ttc = $line->multicurrency_total_ttc - $prevLine->multicurrency_total_ttc;

-					}

-				}

-

-				// prorata

-				$line->situation_percent = $maxPrevSituationPercent - $line->situation_percent;

-

-				//print 'New line based on invoice id '.$invoice->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';

-

-				// If there is some credit note between last situation invoice and invoice used for credit note generation (note: credit notes are stored as delta)

-				$maxPrevSituationPercent = 0;

-				foreach ($tab_jumped_credit_notes as $index => $creditnoteid) {

-					foreach ($invoice->tab_previous_situation_invoice[$index]->lines as $prevLine)

-					{

-						if ($prevLine->fk_prev_id == $source_fk_prev_id)

-						{

-							$maxPrevSituationPercent = $prevLine->situation_percent;

-

-							$line->total_ht  -= $prevLine->total_ht;

-							$line->total_tva -= $prevLine->total_tva;

-							$line->total_ttc -= $prevLine->total_ttc;

-							$line->total_localtax1 -= $prevLine->total_localtax1;

-							$line->total_localtax2 -= $prevLine->total_localtax2;

-

-							$line->multicurrency_subprice  -= $prevLine->multicurrency_subprice;

-							$line->multicurrency_total_ht  -= $prevLine->multicurrency_total_ht;

-							$line->multicurrency_total_tva -= $prevLine->multicurrency_total_tva;

-							$line->multicurrency_total_ttc -= $prevLine->multicurrency_total_ttc;

-						}

-					}

-				}

-

-				// prorata

-				$line->situation_percent += $maxPrevSituationPercent;

-

-				//print 'New line based on invoice id '.$invoice->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';

-			}

-		}

-

-		$line->fk_facture = $creditnote->id;

-		$line->fk_parent_line = $fk_parent_line;

-

-		$line->subprice = -$line->subprice; // invert price for object

-		$line->pa_ht = $line->pa_ht; // we choosed to have buy/cost price always positive, so no revert of sign here

-		$line->total_ht = -$line->total_ht;

-		$line->total_tva = -$line->total_tva;

-		$line->total_ttc = -$line->total_ttc;

-		$line->total_localtax1 = -$line->total_localtax1;

-		$line->total_localtax2 = -$line->total_localtax2;

-

-		$line->multicurrency_subprice = -$line->multicurrency_subprice;

-		$line->multicurrency_total_ht = -$line->multicurrency_total_ht;

-		$line->multicurrency_total_tva = -$line->multicurrency_total_tva;

-		$line->multicurrency_total_ttc = -$line->multicurrency_total_ttc;

-

-		$result = $line->insert(0, 1); // When creating credit note with same lines than source, we must ignore error if discount alreayd linked

-

-		$creditnote->lines[] = $line; // insert new line in current object

-

-		// Defined the new fk_parent_line

-		if ($result > 0 && $line->product_type == 9) {

-			$fk_parent_line = $result;

-		}

-	}

-	$creditnote->update_price(1);

-

-	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];

-	if (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1") {

-		$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;

-		$conf->global->STOCK_CALCULATE_ON_BILL = 1;

-		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];

-		dol_syslog("Validate invoice with stock change into warehouse defined into constant ".$constantforkey." = ".$conf->global->$constantforkey);

-		$batch_rule = 0;

-		if (!empty($conf->productbatch->enabled) && !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {

-			require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';

-			$batch_rule = Productbatch::BATCH_RULE_SELLBY_EATBY_DATES_FIRST;

-		}

-		$res = $creditnote->validate($user, '', $conf->global->$constantforkey, 0, $batch_rule);

-		$conf->global->STOCK_CALCULATE_ON_BILL = $savconst;

-	} else {

-		$res = $creditnote->validate($user);

-	}

-}

-

-if ($action == 'history' || $action == 'creditnote')

-{

-	if ($action == 'creditnote') $placeid = $creditnote->id;

-	else $placeid = (int) GETPOST('placeid', 'int');

-	$invoice = new Facture($db);

-	$invoice->fetch($placeid);

-}

-

-if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "") {

-	$invoice->setMulticurrencyCode($_SESSION["takeposcustomercurrency"]);

+    }

+}

+

+if ($action == 'history')

+{

+    $placeid = (int) GETPOST('placeid', 'int');

+    $invoice = new Facture($db);

+    $invoice->fetch($placeid);

 }

 

 if (($action == "addline" || $action == "freezone") && $placeid == 0)

@@ -448,13 +271,14 @@
 	$invoice->date = dol_now();

 	$invoice->module_source = 'takepos';

 	$invoice->pos_source = $_SESSION["takeposterminal"];

-	$invoice->entity = !empty($_SESSION["takeposinvoiceentity"]) ? $_SESSION["takeposinvoiceentity"] : $conf->entity;

 

 	if ($invoice->socid <= 0)

 	{

 		$langs->load('errors');

 		dol_htmloutput_errors($langs->trans("ErrorModuleSetupNotComplete", "TakePos"), null, 1);

-	} else {

+	}

+	else

+	{

 		$placeid = $invoice->create($user);

 		if ($placeid < 0)

 		{

@@ -468,7 +292,7 @@
 if ($action == "addline")

 {

 	$prod = new Product($db);

-	$prod->fetch($idproduct);

+    $prod->fetch($idproduct);

 

 	$customer = new Societe($db);

 	$customer->fetch($invoice->socid);

@@ -517,7 +341,6 @@
 		}

 	}

 	if ($idoflineadded <= 0) {

-		$invoice->fetch_thirdparty();

 		$idoflineadded = $invoice->addline($prod->description, $price, 1, $tva_tx, $localtax1_tx, $localtax2_tx, $idproduct, $customer->remise_percent, '', 0, 0, 0, '', $price_base_type, $price_ttc, $prod->type, -1, 0, '', 0, $parent_line, null, '', '', 0, 100, '', null, 0);

 	}

 

@@ -525,112 +348,109 @@
 }

 

 if ($action == "freezone") {

-	$customer = new Societe($db);

-	$customer->fetch($invoice->socid);

+    $customer = new Societe($db);

+    $customer->fetch($invoice->socid);

 

 	$tva_tx = GETPOST('tva_tx', 'alpha');

 	if ($tva_tx != '') {

-		if (!preg_match('/\((.*)\)/', $tva_tx)) {

-			$tva_tx = price2num($tva_tx);

-		}

+		$tva_tx = price2num($tva_tx);

 	} else {

 		$tva_tx = get_default_tva($mysoc, $customer);

 	}

 

-	// Local Taxes

-	$localtax1_tx = get_localtax($tva_tx, 1, $customer, $mysoc, $tva_npr);

-	$localtax2_tx = get_localtax($tva_tx, 2, $customer, $mysoc, $tva_npr);

-

-	$invoice->addline($desc, $number, 1, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', 0, 0, 0, '', 'TTC', $number, 0, -1, 0, '', 0, 0, null, '', '', 0, 100, '', null, 0);

-	$invoice->fetch($placeid);

+    // Local Taxes

+    $localtax1_tx = get_localtax($tva_tx, 1, $customer, $mysoc, $tva_npr);

+    $localtax2_tx = get_localtax($tva_tx, 2, $customer, $mysoc, $tva_npr);

+

+    $invoice->addline($desc, $number, 1, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', 0, 0, 0, '', 'TTC', $number, 0, -1, 0, '', 0, 0, null, '', '', 0, 100, '', null, 0);

+    $invoice->fetch($placeid);

 }

 

 if ($action == "addnote") {

-	foreach ($invoice->lines as $line)

-	{

-		if ($line->id == $number)

+    foreach ($invoice->lines as $line)

+    {

+        if ($line->id == $number)

 		{

 			$line->array_options['order_notes'] = $desc;

 			$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);

-		}

-	}

-	$invoice->fetch($placeid);

+        }

+    }

+    $invoice->fetch($placeid);

 }

 

 if ($action == "deleteline") {

-	if ($idline > 0 and $placeid > 0) { // If invoice exists and line selected. To avoid errors if deleted from another device or no line selected.

-		$invoice->deleteline($idline);

-		$invoice->fetch($placeid);

-	} elseif ($placeid > 0) {             // If invoice exists but no line selected, proceed to delete last line.

-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facturedet where fk_facture = ".((int) $placeid)." ORDER BY rowid DESC";

-		$resql = $db->query($sql);

-		$row = $db->fetch_array($resql);

-		$deletelineid = $row[0];

-		$invoice->deleteline($deletelineid);

-		$invoice->fetch($placeid);

-	}

-	if (count($invoice->lines) == 0) {

-		$invoice->delete($user);

-		header("Location: ".DOL_URL_ROOT."/takepos/invoice.php");

-		exit;

-	}

-}

-

-// Action to delete or discard an invoice

+    if ($idline > 0 and $placeid > 0) { // If invoice exists and line selected. To avoid errors if deleted from another device or no line selected.

+        $invoice->deleteline($idline);

+        $invoice->fetch($placeid);

+    }

+    elseif ($placeid > 0) {             // If invoice exists but no line selected, proceed to delete last line.

+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facturedet where fk_facture='".$placeid."' order by rowid DESC";

+        $resql = $db->query($sql);

+        $row = $db->fetch_array($resql);

+        $deletelineid = $row[0];

+        $invoice->deleteline($deletelineid);

+        $invoice->fetch($placeid);

+    }

+}

+

 if ($action == "delete") {

 	// $placeid is the invoice id (it differs from place) and is defined if the place is set and the ref of invoice is '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')', so the fetch at begining of page works.

+

+	/*$reg = array();

+	if (preg_match('/^(\d+)-(\d+)$/', $place, $reg)) {

+

+		$place = $reg[1];

+		var_dump($place);

+	}*/

+

 	if ($placeid > 0) {

-		$result = $invoice->fetch($placeid);

-

-		if ($result > 0 && $invoice->statut == Facture::STATUS_DRAFT)

-		{

-			$db->begin();

-

-			// We delete the lines

-			$resdeletelines = 1;

-			foreach ($invoice->lines as $line) {

-				$tmpres = $invoice->deleteline($line->id);

-				if ($tmpres < 0) {

-					$resdeletelines = 0;

-					break;

-				}

-			}

-

-			$sql = "UPDATE ".MAIN_DB_PREFIX."facture";

-			$sql .= " SET fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]}.", ";

-			$sql .= " datec = '".$db->idate(dol_now())."'";

-			$sql .= " WHERE ref='(PROV-POS".$db->escape($_SESSION["takeposterminal"]."-".$place).")'";

-			$resql1 = $db->query($sql);

-

-			if ($resdeletelines && $resql1) {

+        $result = $invoice->fetch($placeid);

+

+        if ($result > 0 && $invoice->statut == Facture::STATUS_DRAFT)

+        {

+        	$db->begin();

+

+        	// We delete the lines

+        	$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet_extrafields where fk_object = ".$placeid;

+        	$resql1 = $db->query($sql);

+        	$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet where fk_facture = ".$placeid;

+            $resql2 = $db->query($sql);

+			$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]};

+			$sql .= " WHERE ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";

+			$resql3 = $db->query($sql);

+

+            if ($resql1 && $resql2 && $resql3)

+            {

             	$db->commit();

-            } else {

+            }

+            else

+            {

             	$db->rollback();

             }

 

-			$invoice->fetch($placeid);

-		}

-	}

+            $invoice->fetch($placeid);

+        }

+    }

 }

 

 if ($action == "updateqty")

 {

-	foreach ($invoice->lines as $line)

-	{

-		if ($line->id == $idline)

-		{

-			$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);

-		}

-	}

-

-	$invoice->fetch($placeid);

+    foreach ($invoice->lines as $line)

+    {

+        if ($line->id == $idline)

+        {

+            $result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);

+        }

+    }

+

+    $invoice->fetch($placeid);

 }

 

 if ($action == "updateprice")

 {

-	foreach ($invoice->lines as $line)

-	{

-		if ($line->id == $idline)

+    foreach ($invoice->lines as $line)

+    {

+        if ($line->id == $idline)

 		{

 			$prod = new Product($db);

 			$prod->fetch($line->fk_product);

@@ -644,16 +464,17 @@
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($line->remise_percent) / 100) < price2num($price_min))))

 			{

 				echo $langs->trans("CantBeLessThanMinPrice");

-			} else $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);

-		}

-	}

-	$invoice->fetch($placeid);

+			}

+			else $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);

+        }

+    }

+    $invoice->fetch($placeid);

 }

 

 if ($action == "updatereduction")

 {

-	foreach ($invoice->lines as $line)

-	{

+    foreach ($invoice->lines as $line)

+    {

 		if ($line->id == $idline)

 		{

 			$prod = new Product($db);

@@ -668,9 +489,10 @@
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($line->multicurrency_subprice) * (1 - price2num($number) / 100) < price2num($price_min))))

 			{

 				echo $langs->trans("CantBeLessThanMinPrice");

-			} else $result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);

-		}

-	}

+			}

+			else $result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);

+		}

+    }

 	$invoice->fetch($placeid);

 } elseif ($action == 'update_reduction_global') {

 	foreach ($invoice->lines as $line) {

@@ -682,152 +504,105 @@
 

 if ($action == "order" and $placeid != 0)

 {

-	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

-	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {

+    include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

+	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {

 		require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';

 		$printer = new dolReceiptPrinter($db);

 	}

 

-	$sql = "SELECT label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) $place);

-	$resql = $db->query($sql);

-	$row = $db->fetch_object($resql);

-	$headerorder = '<html><br><b>'.$langs->trans('Place').' '.$row->label.'<br><table width="65%"><thead><tr><th class="left">'.$langs->trans("Label").'</th><th class="right">'.$langs->trans("Qty").'</th></tr></thead><tbody>';

-	$footerorder = '</tbody></table>'.dol_print_date(dol_now(), 'dayhour').'<br></html>';

-	$order_receipt_printer1 = "";

-	$order_receipt_printer2 = "";

-	$order_receipt_printer3 = "";

-	$catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);

-	$catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2);

-	$catsprinter3 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_3);

-	foreach ($invoice->lines as $line)

-	{

-		if ($line->special_code == "4") {

-			continue;

-		}

-		$c = new Categorie($db);

-		$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');

-		$result = array_intersect($catsprinter1, $existing);

-		$count = count($result);

-		if (!$line->fk_product) $count++; // Print Free-text item (Unassigned printer) to Printer 1

-		if ($count > 0) {

-			$linestoprint++;

-			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='1' where rowid=".$line->id; //Set to print on printer 1

-			$db->query($sql);

-			$order_receipt_printer1 .= '<tr><td class="left">';

-			if ($line->fk_product) $order_receipt_printer1 .= $line->product_label;

-			else $order_receipt_printer1 .= $line->description;

-			$order_receipt_printer1 .= '</td><td class="right">'.$line->qty;

+    $headerorder = '<html><br><b>'.$langs->trans('Place').' '.$place.'<br><table width="65%"><thead><tr><th class="left">'.$langs->trans("Label").'</th><th class="right">'.$langs->trans("Qty").'</th></tr></thead><tbody>';

+    $footerorder = '</tbody></table>'.dol_print_date(dol_now(), 'dayhour').'<br></html>';

+    $order_receipt_printer1 = "";

+    $order_receipt_printer2 = "";

+    $catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);

+    $catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2);

+    foreach ($invoice->lines as $line)

+    {

+        if ($line->special_code == "4") {

+        	continue;

+        }

+        $c = new Categorie($db);

+        $existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');

+        $result = array_intersect($catsprinter1, $existing);

+        $count = count($result);

+        if ($count > 0) {

+            $linestoprint++;

+            $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='1' where rowid=".$line->id; //Set to print on printer 1

+            $db->query($sql);

+            $order_receipt_printer1 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;

 			if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer1 .= "<br>(".$line->array_options['options_order_notes'].")";

 			$order_receipt_printer1 .= '</td></tr>';

-		}

-	}

-	if (($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $linestoprint > 0) {

+        }

+    }

+    if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" && $linestoprint > 0) {

 		$invoice->fetch($placeid); //Reload object before send to printer

 		$printer->orderprinter = 1;

-		echo "<script>";

-		echo "var orderprinter1esc='";

 		$ret = $printer->sendToPrinter($invoice, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]}, $conf->global->{'TAKEPOS_ORDER_PRINTER1_TO_USE'.$_SESSION["takeposterminal"]}); // PRINT TO PRINTER 1

-		echo "';</script>";

 	}

 	$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='1' and fk_facture=".$invoice->id; // Set as printed

 	$db->query($sql);

 	$invoice->fetch($placeid); //Reload object after set lines as printed

 	$linestoprint = 0;

 

-	foreach ($invoice->lines as $line)

-	{

-		if ($line->special_code == "4") {

-			continue;

-		}

-		$c = new Categorie($db);

-		$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');

-		$result = array_intersect($catsprinter2, $existing);

-		$count = count($result);

-		if ($count > 0) {

-			$linestoprint++;

-			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='2' where rowid=".$line->id; //Set to print on printer 2

-			$db->query($sql);

-			$order_receipt_printer2 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;

+    foreach ($invoice->lines as $line)

+    {

+        if ($line->special_code == "4") {

+        	continue;

+        }

+        $c = new Categorie($db);

+        $existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');

+        $result = array_intersect($catsprinter2, $existing);

+        $count = count($result);

+        if ($count > 0) {

+            $linestoprint++;

+            $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='2' where rowid=".$line->id; //Set to print on printer 2

+            $db->query($sql);

+            $order_receipt_printer2 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;

 			if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer2 .= "<br>(".$line->array_options['options_order_notes'].")";

 			$order_receipt_printer2 .= '</td></tr>';

-		}

-	}

-	if (($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $linestoprint > 0) {

+        }

+    }

+    if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" && $linestoprint > 0) {

 		$invoice->fetch($placeid); //Reload object before send to printer

 		$printer->orderprinter = 2;

-		echo "<script>";

-		echo "var orderprinter2esc='";

 		$ret = $printer->sendToPrinter($invoice, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]}, $conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$_SESSION["takeposterminal"]}); // PRINT TO PRINTER 2

-		echo "';</script>";

 	}

 	$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='2' and fk_facture=".$invoice->id; // Set as printed

 	$db->query($sql);

 	$invoice->fetch($placeid); //Reload object after set lines as printed

-	$linestoprint = 0;

-

-	foreach ($invoice->lines as $line)

-	{

-		if ($line->special_code == "4") {

-			continue;

-		}

-		$c = new Categorie($db);

-		$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');

-		$result = array_intersect($catsprinter3, $existing);

-		$count = count($result);

-		if ($count > 0) {

-			$linestoprint++;

-			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='3' where rowid=".$line->id; //Set to print on printer 3

-			$db->query($sql);

-			$order_receipt_printer3 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;

-			if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer3 .= "<br>(".$line->array_options['options_order_notes'].")";

-			$order_receipt_printer3 .= '</td></tr>';

-		}

-	}

-	if (($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $linestoprint > 0) {

-		$invoice->fetch($placeid); //Reload object before send to printer

-		$printer->orderprinter = 3;

-		echo "<script>";

-		echo "var orderprinter3esc='";

-		$ret = $printer->sendToPrinter($invoice, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]}, $conf->global->{'TAKEPOS_ORDER_PRINTER3_TO_USE'.$_SESSION["takeposterminal"]}); // PRINT TO PRINTER 3

-		echo "';</script>";

-	}

-	$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='3' and fk_facture=".$invoice->id; // Set as printed

-	$db->query($sql);

-	$invoice->fetch($placeid); //Reload object after set lines as printed

 }

 

 $sectionwithinvoicelink = '';

-if ($action == "valid" || $action == "history" || $action == 'creditnote')

-{

-	$sectionwithinvoicelink .= '<!-- Section with invoice link -->'."\n";

-	$sectionwithinvoicelink .= '<span style="font-size:120%;" class="center">';

-	$sectionwithinvoicelink .= $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, -1, '_backoffice')." - ";

-	$remaintopay = $invoice->getRemainToPay();

-	if ($remaintopay > 0)

-	{

-		$sectionwithinvoicelink .= $langs->trans('RemainToPay').': <span class="amountremaintopay" style="font-size: unset">'.price($remaintopay, 1, $langs, 1, -1, -1, $conf->currency).'</span>';

-	} else {

-		if ($invoice->paye) $sectionwithinvoicelink .= '<span class="amountpaymentcomplete" style="font-size: unset">'.$langs->trans("Paid").'</span>';

-		else $sectionwithinvoicelink .= $langs->trans('BillShortStatusValidated');

-	}

-	$sectionwithinvoicelink .= '</span><br>';

-	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {

+if ($action == "valid" || $action == "history")

+{

+    $sectionwithinvoicelink .= '<!-- Section with invoice link -->'."\n";

+    $sectionwithinvoicelink .= '<span style="font-size:120%;" class="center">';

+    $sectionwithinvoicelink .= $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, -1, '_backoffice')." - ";

+    $remaintopay = $invoice->getRemainToPay();

+    if ($remaintopay > 0)

+    {

+        $sectionwithinvoicelink .= $langs->trans('RemainToPay').': <span class="amountremaintopay" style="font-size: unset">'.price($remaintopay, 1, $langs, 1, -1, -1, $conf->currency).'</span>';

+    }

+    else

+    {

+        if ($invoice->paye) $sectionwithinvoicelink .= '<span class="amountpaymentcomplete" style="font-size: unset">'.$langs->trans("Paid").'</span>';

+        else $sectionwithinvoicelink .= $langs->trans('BillShortStatusValidated');

+    }

+    $sectionwithinvoicelink .= '</span>';

+    if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {

 		if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposConnector('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';

 		else $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';

-	} elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {

-		$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="DolibarrTakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';

-	} else {

-		$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';

-		if ($conf->global->TAKEPOS_GIFT_RECEIPT) {

-			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.', 1);">'.$langs->trans('GiftReceipt').'</button>';

-		}

-	}

-	if ($conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE > 0)

-	{

-		$sectionwithinvoicelink .= ' <button id="buttonsend" type="button" onclick="SendTicket('.$placeid.');">'.$langs->trans('SendTicket').'</button>';

-	}

-

-	if ($remaintopay <= 0 && $conf->global->TAKEPOS_AUTO_PRINT_TICKETS) $sectionwithinvoicelink .= '<script language="javascript">$("#buttonprint").click();</script>';

+    } elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {

+        $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="DolibarrTakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';

+    } else {

+        $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';

+    }

+    if ($conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE > 0)

+    {

+    	$sectionwithinvoicelink .= ' <button id="buttonsend" type="button" onclick="SendTicket('.$placeid.');">'.$langs->trans('SendTicket').'</button>';

+    }

+

+    if ($remaintopay <= 0 && $conf->global->TAKEPOS_AUTO_PRINT_TICKETS) $sectionwithinvoicelink .= '<script language="javascript">$("#buttonprint").click();</script>';

 }

 

 /*

@@ -852,7 +627,7 @@
         else selectedline=this.id;

         selectedtext=$('#'+selectedline).find("td:first").html();

 		<?php

-		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {

+		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){

 			print '$("#phonediv1").load("auto_order.php?action=editline&placeid="+placeid+"&selectedline="+selectedline, function() {

 			});';

 		}

@@ -868,82 +643,48 @@
 <?php

 

 if ($action == "order" and $order_receipt_printer1 != "") {

-	if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {

-		?>

-		$.ajax({

-			type: "POST",

-			url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/printer/index.php',

-			data: 'invoice='+orderprinter1esc

-		});

-		<?php

-	}

-	else {

-		?>

-		$.ajax({

-			type: "POST",

-			url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',

-			data: '<?php

-			print $headerorder.$order_receipt_printer1.$footerorder; ?>'

-		});

-		<?php

-	}

-}

-

-if ($action == "order" and $order_receipt_printer2 != "") {

-	if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {

-		?>

-		$.ajax({

-			type: "POST",

-			url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/printer/index.php?printer=2',

-			data: 'invoice='+orderprinter2esc

-		});

-		<?php

-	}

-	else {

-		?>

-		$.ajax({

-			type: "POST",

-			url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print2',

-			data: '<?php

-			print $headerorder.$order_receipt_printer2.$footerorder; ?>'

-		});

-    	<?php

-	}

-}

-

-if ($action == "order" and $order_receipt_printer3 != "") {

-	if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {

-		?>

-		$.ajax({

-			type: "POST",

-			url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/printer/index.php?printer=3',

-			data: 'invoice='+orderprinter3esc

-		});

-		<?php

-	}

-}

-

-// Set focus to search field

-if ($action == "search" || $action == "valid") {

-	?>

-	parent.setFocusOnSearchField();

-    <?php

-}

-

-

-if ($action == "temp" and $ticket_printer1 != "") {

-	?>

+    ?>

     $.ajax({

         type: "POST",

         url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',

         data: '<?php

-		print $header_soc.$header_ticket.$body_ticket.$ticket_printer1.$ticket_total.$footer_ticket; ?>'

+        print $headerorder.$order_receipt_printer1.$footerorder; ?>'

     });

     <?php

 }

 

+if ($action == "order" and $order_receipt_printer2 != "") {

+    ?>

+    $.ajax({

+        type: "POST",

+        url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print2',

+        data: '<?php

+        print $headerorder.$order_receipt_printer2.$footerorder; ?>'

+    });

+    <?php

+}

+

+// Set focus to search field

+if ($action == "search" || $action == "valid") {

+    ?>

+	parent.setFocusOnSearchField();

+    <?php

+}

+

+

+if ($action == "temp" and $ticket_printer1 != "") {

+    ?>

+    $.ajax({

+        type: "POST",

+        url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',

+        data: '<?php

+        print $header_soc.$header_ticket.$body_ticket.$ticket_printer1.$ticket_total.$footer_ticket; ?>'

+    });

+    <?php

+}

+

 if ($action == "search") {

-	?>

+    ?>

     $('#search').focus();

     <?php

 }

@@ -958,14 +699,13 @@
     $.colorbox({href:"send.php?facid="+id, width:"70%", height:"30%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("SendTicket"); ?>"});

 }

 

-function Print(id, gift){

-    $.colorbox({href:"receipt.php?facid="+id+"&gift="+gift, width:"40%", height:"90%", transition:"none", iframe:"true", title:"<?php

-	echo $langs->trans("PrintTicket"); ?>"});

+function Print(id){

+    $.colorbox({href:"receipt.php?facid="+id, width:"40%", height:"90%", transition:"none", iframe:"true", title:"<?php

+    echo $langs->trans("PrintTicket"); ?>"});

 }

 

 function TakeposPrinting(id){

     var receipt;

-	console.log("TakeposPrinting" + id);

     $.get("receipt.php?facid="+id, function(data, status){

         receipt=data.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '');

         $.ajax({

@@ -977,92 +717,78 @@
 }

 

 function TakeposConnector(id){

-	console.log("TakeposConnector" + id);

-	$.get("ajax/ajax.php?action=printinvoiceticket&term=<?php echo $_SESSION["takeposterminal"]; ?>&id="+id, function(data, status){

-        $.ajax({

-			type: "POST",

-			url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/printer/index.php',

-			data: 'invoice='+data

-		});

+	var invoice='<?php

+	$data = json_encode($invoice);

+	$data = base64_encode($data);

+	echo $data;

+	?>';

+    $.ajax({

+        type: "POST",

+        url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print.php',

+        data: 'invoice='+invoice

     });

 }

 

 function DolibarrTakeposPrinting(id) {

-    console.log("DolibarrTakeposPrinting Printing invoice ticket " + id)

+    console.log('Printing invoice ticket ' + id)

     $.ajax({

         type: "GET",

         url: "<?php print dol_buildpath('/takepos/ajax/ajax.php', 1).'?action=printinvoiceticket&term='.$_SESSION["takeposterminal"].'&id='; ?>" + id,

     });

 }

 

-function CreditNote() {

-	$("#poslines").load("invoice.php?action=creditnote&invoiceid="+placeid, function() {

-	});

-}

-

 

 $( document ).ready(function() {

-	console.log("Set customer info and sales in header placeid=<?php echo $placeid; ?> status=<?php echo $invoice->statut; ?>");

+	console.log("Set customer info and sales in header");

 

     <?php

-	$s = $langs->trans("Customer");

-	if ($invoice->id > 0 && ($invoice->socid != $conf->global->$constforcompanyid)) {

-		$s = $soc->name;

-	}

-	?>

+    $s = $langs->trans("Customer");

+    if ($invoice->id > 0 && ($invoice->socid != $conf->global->$constforcompanyid)) {

+    	$s = $soc->name;

+    }

+    ?>

 

     $("#customerandsales").html('');

 

-	$("#customerandsales").append('<a class="valignmiddle tdoverflowmax100 minwidth100" id="customer" onclick="Customer();" title="<?php print dol_escape_js($s); ?>"><span class="fas fa-building paddingrightonly"></span><?php print dol_escape_js($s); ?></a>');

+	$("#customerandsales").append('<a class="valignmiddle tdoverflowmax100 minwidth75" id="customer" onclick="Customer();" title="<?php print dol_escape_js($s); ?>"><span class="fas fa-building paddingrightonly"></span><?php print dol_escape_js($s); ?></a>');

 

 	<?php

 	$sql = "SELECT rowid, datec, ref FROM ".MAIN_DB_PREFIX."facture";

-	if (empty($conf->global->TAKEPOS_CAN_EDIT_IF_ALREADY_VALIDATED)) {

-		// By default, only invoices with a ref not already defined can in list of open invoice we can edit.

-		$sql .= " WHERE ref LIKE '(PROV-POS".$db->escape($_SESSION["takeposterminal"])."-0%' AND entity IN (".getEntity('invoice').")";

-	} else {

-		// If TAKEPOS_CAN_EDIT_IF_ALREADY_VALIDATED set, we show also draft invoice that already has a reference defined

-		$sql .= " WHERE pos_source = '".$db->escape($_SESSION["takeposterminal"])."'";

-		$sql .= " AND module_source = 'takepos'";

-		$sql .= " AND entity IN (".getEntity('invoice').")";

-	}

-

+	$sql .= " WHERE ref LIKE '(PROV-POS".$_SESSION["takeposterminal"]."-0%'";

 	$sql .= $db->order('datec', 'ASC');

 	$resql = $db->query($sql);

 	if ($resql) {

 		while ($obj = $db->fetch_object($resql)) {

 			echo '$("#customerandsales").append(\'';

-			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M', 'tzuser'))).'" onclick="place=\\\'';

+			echo '<a class="valignmiddle" onclick="place=\\\'';

 			$num_sale = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));

 			echo $num_sale;

 			if (str_replace("-", "", $num_sale) > $max_sale) $max_sale = str_replace("-", "", $num_sale);

-			echo '\\\'; invoiceid=\\\'';

-			echo $obj->rowid;

-			echo '\\\'; Refresh();">';

+			echo '\\\';Refresh();">';

 			if ($placeid == $obj->rowid) echo "<b>";

-			echo dol_print_date($db->jdate($obj->datec), '%H:%M', 'tzuser');

+			echo date('H:i', strtotime($obj->datec));

 			if ($placeid == $obj->rowid) echo "</b>";

 			echo '</a>\');';

 		}

 		echo '$("#customerandsales").append(\'<a onclick="place=\\\'0-';

 		echo $max_sale + 1;

-		echo '\\\'; invoiceid=0; Refresh();"><span class="fa fa-plus-square" title="'.dol_escape_htmltag($langs->trans("StartAParallelSale")).'"></a>\');';

+		echo '\\\';Refresh();"><span class="fa fa-plus-square" title="'.dol_escape_htmltag($langs->trans("StartAParallelSale")).'"></a>\');';

 	} else {

 		dol_print_error($db);

 	}

 

 	$s = '';

 

-	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];

-	if (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1")

-	{

-		$s = '<span class="small">';

-		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];

-		$warehouse = new Entrepot($db);

-		$warehouse->fetch($conf->global->$constantforkey);

-		$s .= $langs->trans("Warehouse").'<br>'.$warehouse->ref;

-		$s .= '</span>';

-	}

+    $constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];

+    if (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1")

+    {

+    	$s = '<span class="small">';

+    	$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];

+    	$warehouse = new Entrepot($db);

+    	$warehouse->fetch($conf->global->$constantforkey);

+    	$s .= $langs->trans("Warehouse").'<br>'.$warehouse->ref;

+    	$s .= '</span>';

+    }

 	?>

 

     $("#infowarehouse").html('<?php print dol_escape_js($s); ?>');

@@ -1081,7 +807,6 @@
 		if ($result > 0)

 		{

 			$adh->ref = $adh->getFullName($langs);

-			if (empty($adh->statut)) { $s .= "<s>"; }

 			$s .= $adh->getFullName($langs);

 			$s .= ' - '.$adh->type;

 			if ($adh->datefin)

@@ -1090,12 +815,15 @@
 				if ($adh->hasDelay()) {

 					$s .= " ".img_warning($langs->trans("Late"));

 				}

-			} else {

+			}

+			else

+			{

 				$s .= '<br>'.$langs->trans("SubscriptionNotReceived");

 				if ($adh->statut > 0) $s .= " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated

 			}

-	  		if (empty($adh->statut)) { $s .= "</s>"; }

-		} else {

+		}

+		else

+		{

 			$s .= '<br>'.$langs->trans("ThirdpartyNotLinkedToMember");

 		}

 		$s .= '</span>';

@@ -1112,63 +840,47 @@
 // for tooltip and other js beautifiers must be reexecuted too.

 if (!empty($conf->use_javascript_ajax))

 {

-	print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";

-	print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";

+    print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";

+    print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";

 }

 

 print '<!-- invoice.php place='.(int) $place.' invoice='.$invoice->ref.' mobilepage='.$mobilepage.' $_SESSION["basiclayout"]='.$_SESSION["basiclayout"].' conf->global->TAKEPOS_BAR_RESTAURANT='.$conf->global->TAKEPOS_BAR_RESTAURANT.' -->'."\n";

 print '<div class="div-table-responsive-no-min invoice">';

 print '<table id="tablelines" class="noborder noshadow postablelines" width="100%">';

-if ($sectionwithinvoicelink && ($mobilepage == "invoice" || $mobilepage == "")) {

-	print '<tr><td colspan="4">'.$sectionwithinvoicelink.'</td></tr>';

-}

 print '<tr class="liste_titre nodrag nodrop">';

 print '<td class="linecoldescription">';

-// In phone version only show when it is invoice page

-if ($mobilepage == "invoice" || $mobilepage == "") {

-	print '<input type="hidden" name="invoiceid" id="invoiceid" value="'.$invoice->id.'">';

-}

+print '<span style="font-size:120%;" class="right">';

 if ($conf->global->TAKEPOS_BAR_RESTAURANT)

 {

-	$sql = "SELECT floor, label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) $place);

-	$resql = $db->query($sql);

-	$obj = $db->fetch_object($resql);

-	if ($obj)

-	{

-		$label = $obj->label;

-		$floor = $obj->floor;

-	}

+    $sql = "SELECT floor, label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) $place);

+    $resql = $db->query($sql);

+    $obj = $db->fetch_object($resql);

+    if ($obj)

+    {

+        $label = $obj->label;

+        $floor = $obj->floor;

+    }

 	// In phone version only show when is invoice page

 	if ($mobilepage == "invoice" || $mobilepage == "") {

-		print '<span class="opacitymedium">'.$langs->trans('Place')."</span> <b>".$label."</b><br>";

-		print '<span class="opacitymedium">'.$langs->trans('Floor')."</span> <b>".$floor."</b>";

+		print $langs->trans('Place')." <b>".$label."</b> - ";

+		print $langs->trans('Floor')." <b>".$floor."</b> - ";

 	}

 	elseif (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) print $mysoc->name;

 	elseif ($mobilepage == "cats") print $langs->trans('Category');

 	elseif ($mobilepage == "products") print $langs->trans('Label');

-} else {

-	print $langs->trans("Products");

-}

-print '</td>';

+}

+// In phone version only show when is invoice page

+if ($mobilepage == "invoice" || $mobilepage == "") {

+	print $langs->trans('TotalTTC');

+	print ' : <b>'.price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</b></span>';

+	print '<br><input type="hidden" name="invoiceid" id="invoiceid" value="'.$invoice->id.'">'.$sectionwithinvoicelink;

+	print '</td>';

+}

 if ($_SESSION["basiclayout"] != 1)

 {

 	print '<td class="linecolqty right">'.$langs->trans('ReductionShort').'</td>';

 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';

-	print '<td class="linecolht right nowraponall">';

-	print '<span class="opacitymedium small">'.$langs->trans('TotalTTCShort').'</span><br>';

-	// In phone version only show when it is invoice page

-	if ($mobilepage == "invoice" || $mobilepage == "") {

-		print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">'.price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</span>';

-		if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {

-			//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency

-			include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';

-			$multicurrency = new MultiCurrency($db);

-			$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);

-			print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($invoice->total_ttc * $multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';

-		}

-		print '</td>';

-	}

-	print '</td>';

+	print '<td class="linecolht right nowraponall">'.$langs->trans('TotalTTCShort').'</td>';

 }

 elseif ($mobilepage == "invoice") print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';

 print "</tr>\n";

@@ -1180,9 +892,9 @@
 	{

 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

 		$categorie = new Categorie($db);

-		$categories = $categorie->get_full_arbo('product');

+        $categories = $categorie->get_full_arbo('product');

 		$htmlforlines = '';

-		foreach ($categories as $row) {

+        foreach ($categories as $row) {

 			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) $htmlforlines .= '<div class="leftcat';

 			else $htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';

 			$htmlforlines .= '" onclick="LoadProducts('.$row['id'].');">';

@@ -1250,12 +962,12 @@
 	//In Phone basic layout hide some content depends situation

 	if ($_SESSION["basiclayout"] == 1 && $mobilepage != "invoice" && $action != "order") return;

 

-	if (is_array($invoice->lines) && count($invoice->lines))

-	{

-		print '<!-- invoice.php show lines of invoices -->'."\n";

-		$tmplines = array_reverse($invoice->lines);

-		foreach ($tmplines as $line)

-		{

+    if (is_array($invoice->lines) && count($invoice->lines))

+    {

+    	print '<!-- Show lines of invoices -->'."\n";

+        $tmplines = array_reverse($invoice->lines);

+        foreach ($tmplines as $line)

+        {

 			if ($line->fk_parent_line != false)

 			{

 				$htmlsupplements[$line->fk_parent_line] .= '<tr class="drag drop oddeven posinvoiceline';

@@ -1271,7 +983,9 @@
 					if ($firstline != $line->desc)

 					{

 						$htmlsupplements[$line->fk_parent_line] .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);

-					} else {

+					}

+					else

+					{

 						$htmlsupplements[$line->fk_parent_line] .= $line->desc;

 					}

 				}

@@ -1285,49 +999,50 @@
 				$htmlsupplements[$line->fk_parent_line] .= '</tr>'."\n";

 				continue;

 			}

-			$htmlforlines = '';

-

-			$htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';

-			if ($line->special_code == "4") {

-				$htmlforlines .= ' order';

-			}

-			$htmlforlines .= '" id="'.$line->id.'">';

-			$htmlforlines .= '<td class="left">';

+            $htmlforlines = '';

+

+            $htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';

+            if ($line->special_code == "4") {

+                $htmlforlines .= ' order';

+            }

+            $htmlforlines .= '" id="'.$line->id.'">';

+            $htmlforlines .= '<td class="left">';

 			if ($_SESSION["basiclayout"] == 1) $htmlforlines .= '<span class="phoneqty">'.$line->qty."</span> x ";

-			if (isset($line->product_type))

-			{

-				if (empty($line->product_type)) $htmlforlines .= img_object('', 'product').' ';

-				else $htmlforlines .= img_object('', 'service').' ';

-			}

-			if (empty($conf->global->TAKEPOS_SHOW_N_FIRST_LINES)) {

-				$tooltiptext = '';

-				if ($line->product_ref) {

-					$tooltiptext .= '<b>'.$langs->trans("Ref").'</b> : '.$line->product_ref.'<br>';

-					$tooltiptext .= '<b>'.$langs->trans("Label").'</b> : '.$line->product_label.'<br>';

-					if ($line->product_label != $line->desc) {

-						if ($line->desc) $tooltiptext .= '<br>';

-						$tooltiptext .= $line->desc;

-					}

-				}

-				$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext);

-			} else {

-				if ($line->product_label) $htmlforlines .= $line->product_label;

-				if ($line->product_label != $line->desc)

-				{

-					if ($line->product_label && $line->desc) $htmlforlines .= '<br>';

-					$firstline = dolGetFirstLineOfText($line->desc, $conf->global->TAKEPOS_SHOW_N_FIRST_LINES);

-					if ($firstline != $line->desc)

-					{

-						$htmlforlines .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);

-					} else {

-						$htmlforlines .= $line->desc;

-					}

-				}

-			}

-			if (!empty($line->array_options['options_order_notes'])) $htmlforlines .= "<br>(".$line->array_options['options_order_notes'].")";

-			if ($_SESSION["basiclayout"] == 1) {

-				$htmlforlines .= '</td><td class="right phonetable"><button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty - 1).');" class="publicphonebutton2 phonered">-</button>&nbsp;&nbsp;<button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty + 1).');" class="publicphonebutton2 phonegreen">+</button>';

-			}

+            //if ($line->product_label) $htmlforlines.= '<b>'.$line->product_label.'</b>';

+            if (isset($line->product_type))

+            {

+                if (empty($line->product_type)) $htmlforlines .= img_object('', 'product').' ';

+                else $htmlforlines .= img_object('', 'service').' ';

+            }

+            if (empty($conf->global->TAKEPOS_SHOW_N_FIRST_LINES)) {

+            	$tooltiptext = '';

+            	if ($line->product_ref) {

+            		$tooltiptext .= '<b>'.$langs->trans("Ref").'</b> : '.$line->product_ref.'<br>';

+            		$tooltiptext .= '<b>'.$langs->trans("Label").'</b> : '.$line->product_label.'<br>';

+	            	if ($line->product_label != $line->desc) {

+	            		if ($line->desc) $tooltiptext .= '<br>';

+	    	        	$tooltiptext .= $line->desc;

+	            	}

+            	}

+            	$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext);

+            } else {

+            	if ($line->product_label) $htmlforlines .= $line->product_label;

+            	if ($line->product_label != $line->desc)

+	            {

+	            	if ($line->product_label && $line->desc) $htmlforlines .= '<br>';

+	            	$firstline = dolGetFirstLineOfText($line->desc, $conf->global->TAKEPOS_SHOW_N_FIRST_LINES);

+	                if ($firstline != $line->desc)

+	                {

+	                    $htmlforlines .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);

+	                }

+	                else

+	                {

+	                    $htmlforlines .= $line->desc;

+	                }

+	            }

+            }

+            if (!empty($line->array_options['options_order_notes'])) $htmlforlines .= "<br>(".$line->array_options['options_order_notes'].")";

+            if ($_SESSION["basiclayout"] == 1) $htmlforlines .= '</td><td class="right phonetable"><button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty-1).');" class="publicphonebutton2 phonered">-</button>&nbsp;&nbsp;<button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty+1).');" class="publicphonebutton2 phonegreen">+</button>';

 			if ($_SESSION["basiclayout"] != 1)

 			{

 				$moreinfo = '';

@@ -1338,74 +1053,33 @@
 				$moreinfo .= '<br>'.$langs->transcountry("TotalLT2", $mysoc->country_code).': '.price($line->total_localtax2);

 				$moreinfo .= '<br>'.$langs->transcountry("TotalTTC", $mysoc->country_code).': '.price($line->total_ttc);

 				//$moreinfo .= $langs->trans("TotalHT").': '.$line->total_ht;

-				if ($line->date_start || $line->date_end) $htmlforlines .= '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end).'</div>';

+

 				$htmlforlines .= '</td>';

 				$htmlforlines .= '<td class="right">'.vatrate($line->remise_percent, true).'</td>';

-				$htmlforlines .= '<td class="right">';

-				if (!empty($conf->stock->enabled) && !empty($user->rights->stock->mouvement->lire))

-				{

-					$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];

-					if (!empty($conf->global->$constantforkey) && $line->fk_product > 0) {

-						$sql = "SELECT e.rowid, e.ref, e.lieu, e.fk_parent, e.statut, ps.reel, ps.rowid as product_stock_id, p.pmp";

-						$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e,";

-						$sql .= " ".MAIN_DB_PREFIX."product_stock as ps";

-						$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = ps.fk_product";

-						$sql .= " WHERE ps.reel != 0";

-						$sql .= " AND ps.fk_entrepot = ".$conf->global->$constantforkey;

-						$sql .= " AND e.entity IN (".getEntity('stock').")";

-						$sql .= " AND ps.fk_product = ".$line->fk_product;

-						$resql = $db->query($sql);

-						if ($resql) {

-							$obj = $db->fetch_object($resql);

-							$stock_real = price2num($obj->reel, 'MS');

-							$htmlforlines .= $line->qty;

-							if ($line->qty && $line->qty > $stock_real) $htmlforlines .= '<span style="color: var(--amountremaintopaycolor)">';

-							$htmlforlines .= ' <span class="posstocktoolow">('.$langs->trans("Stock").' '.$stock_real.')</span>';

-							if ($line->qty && $line->qty > $stock_real) $htmlforlines .= "</span>";

-						} else {

-							dol_print_error($db);

-						}

-					} else {

-						$htmlforlines .= $line->qty;

-					}

-				} else {

-					$htmlforlines .= $line->qty;

-				}

-

-				$htmlforlines .= '</td>';

-				$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';

-				$htmlforlines .= price($line->total_ttc, 1, '', 1, -1, -1, $conf->currency);

-				if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {

-					//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency

-					include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';

-					$multicurrency = new MultiCurrency($db);

-					$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);

-					$htmlforlines .= '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($line->total_ttc * $multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';

-				}

-				$htmlforlines .= '</td>';

+				$htmlforlines .= '<td class="right">'.$line->qty.'</td>';

+				$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">'.price($line->total_ttc).'</td>';

 			}

 			$htmlforlines .= '</tr>'."\n";

 			$htmlforlines .= $htmlsupplements[$line->id];

 

-			print $htmlforlines;

-		}

-	} else {

-		print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';

-	}

-} else {      // No invoice generated yet

-	print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';

+            print $htmlforlines;

+        }

+    }

+    else

+    {

+        print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';

+    }

+}

+else {      // No invoice generated yet

+    print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';

 }

 

 print '</table>';

 

-if (($action == "valid" || $action == "history") && $invoice->type != Facture::TYPE_CREDIT_NOTE) {

-	print '<button id="buttonprint" type="button" onclick="ModalBox(\'ModalCreditNote\')">'.$langs->trans('CreateCreditNote').'</button>';

-}

-

 

 if ($action == "search")

 {

-	print '<center>

+    print '<center>

 	<input type="text" id="search" name="search" onkeyup="Search2();" name="search" style="width:80%;font-size: 150%;" placeholder=' . $langs->trans('Search').'

 	</center>';

 }

--- /tmp/dsg/dolibarr/htdocs/takepos/github_pay.php
+++ /tmp/dsg/dolibarr/htdocs/takepos/client_pay.php
@@ -34,8 +34,6 @@
 require '../main.inc.php'; // Load $user and permissions

 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

 

-$langs->loadLangs(array("main", "bills", "cashdesk", "banks"));

-

 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'); // $place is id of table for Bar or Restaurant

 

 $invoiceid = GETPOST('invoiceid', 'int');

@@ -52,55 +50,49 @@
 $invoice = new Facture($db);

 if ($invoiceid > 0)

 {

-	$invoice->fetch($invoiceid);

-} else {

-	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";

-	$resql = $db->query($sql);

-	$obj = $db->fetch_object($resql);

-	if ($obj)

-	{

-		$invoiceid = $obj->rowid;

-	}

-	if (!$invoiceid)

-	{

-		$invoiceid = 0; // Invoice does not exist yet

-	} else {

-		$invoice->fetch($invoiceid);

-	}

+    $invoice->fetch($invoiceid);

+}

+else

+{

+    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";

+    $resql = $db->query($sql);

+    $obj = $db->fetch_object($resql);

+    if ($obj)

+    {

+        $invoiceid = $obj->rowid;

+    }

+    if (!$invoiceid)

+    {

+        $invoiceid = 0; // Invoice does not exist yet

+    }

+    else

+    {

+        $invoice->fetch($invoiceid);

+    }

 }

 

 $arrayofcss = array('/takepos/css/pos.css.php');

 $arrayofjs = array();

 

-$head = '';

-$title = '';

-$disablejs = 0;

-$disablehead = 0;

-

 top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);

 

-// Define list of possible payments

-$arrayOfValidPaymentModes = array();

-$arrayOfValidBankAccount = array();

+$langs->loadLangs(array("main", "bills", "cashdesk"));

 

 $sql = "SELECT code, libelle as label FROM ".MAIN_DB_PREFIX."c_paiement";

 $sql .= " WHERE entity IN (".getEntity('c_paiement').")";

 $sql .= " AND active = 1";

 $sql .= " ORDER BY libelle";

 $resql = $db->query($sql);

-

+$paiements = array();

 if ($resql) {

 	while ($obj = $db->fetch_object($resql)) {

-		$paycode = $obj->code;

-		if ($paycode == 'LIQ') $paycode = 'CASH';

-		if ($paycode == 'CB')  $paycode = 'CB';

-		if ($paycode == 'CHQ') $paycode = 'CHEQUE';

-

-		$accountname = "CASHDESK_ID_BANKACCOUNT_".$paycode.$_SESSION["takeposterminal"];

-		if (!empty($conf->global->$accountname) && $conf->global->$accountname > 0) {

-			$arrayOfValidBankAccount[$conf->global->$accountname] = $conf->global->$accountname;

-			$arrayOfValidPaymentModes[] = $obj;

-		}

+        $paycode = $obj->code;

+        if ($paycode == 'LIQ') $paycode = 'CASH';

+        if ($paycode == 'CB')  $paycode = 'CB';

+        if ($paycode == 'CHQ') $paycode = 'CHEQUE';

+

+        $accountname = "CASHDESK_ID_BANKACCOUNT_".$paycode.$_SESSION["takeposterminal"];

+		if (!empty($conf->global->$accountname) && $conf->global->$accountname > 0) array_push($paiements, $obj);

 	}

 }

 ?>

@@ -116,7 +108,7 @@
 $remaintopay = 0;

 if ($invoice->id > 0)

 {

-	$remaintopay = $invoice->getRemainToPay();

+    $remaintopay = $invoice->getRemainToPay();

 }

 $alreadypayed = (is_object($invoice) ? ($invoice->total_ttc - $remaintopay) : 0);

 

@@ -129,9 +121,9 @@
 	function addreceived(price)

 	{

     	<?php

-		if (empty($conf->global->TAKEPOS_NUMPAD)) print 'received+=String(price);'."\n";

-		else print 'received+=parseFloat(price);'."\n";

-		?>

+    	if (empty($conf->global->TAKEPOS_NUMPAD)) print 'received+=String(price);'."\n";

+    	else print 'received+=parseFloat(price);'."\n";

+    	?>

     	$('.change1').html(pricejs(parseFloat(received), 'MT'));

     	$('.change1').val(parseFloat(received));

 		alreadypaydplusreceived=price2numjs(alreadypayed + parseFloat(received));

@@ -184,22 +176,14 @@
 	function Validate(payment)

 	{

 		var invoiceid = <?php echo ($invoiceid > 0 ? $invoiceid : 0); ?>;

-		var accountid = $("#selectaccountid").val();

 		var amountpayed = $("#change1").val();

-		var excess = $("#change2").val();

 		if (amountpayed > <?php echo $invoice->total_ttc; ?>) {

 			amountpayed = <?php echo $invoice->total_ttc; ?>;

 		}

 		console.log("We click on the payment mode to pay amount = "+amountpayed);

-		parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay="+payment+"&amount="+amountpayed+"&excess="+excess+"&invoiceid="+invoiceid+"&accountid="+accountid, function() {

-		    if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) {

-		    	console.log("Close popup");

-		    	parent.$.colorbox.close();

-		    }

-			else {

-				console.log("Amount is not comple, so we do NOT close popup and reload it.");

-				location.reload();

-			}

+		parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay="+payment+"&amount="+amountpayed+"&invoiceid="+invoiceid, function() {

+		    if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) parent.$.colorbox.close();

+			else location.reload();

 		});

 	}

 

@@ -216,7 +200,7 @@
         window.open('sumupmerchant://pay/1.0?affiliate-key=<?php echo $conf->global->TAKEPOS_SUMUP_AFFILIATE ?>&app-id=<?php echo $conf->global->TAKEPOS_SUMUP_APPID ?>&total=' + amountpayed + '&currency=EUR&title=' + invoiceid + '&callback=<?php echo DOL_MAIN_URL_ROOT ?>/takepos/smpcb.php');

 

         var loop = window.setInterval(function () {

-            $.ajax('<?php echo DOL_URL_ROOT ?>/takepos/smpcb.php?status').done(function (data) {

+            $.ajax('/takepos/smpcb.php?status').done(function (data) {

                 console.log(data);

                 if (data === "SUCCESS") {

                     parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay=CB&amount=" + amountpayed + "&invoiceid=" + invoiceid, function () {

@@ -234,53 +218,39 @@
     }

 </script>

 

-<div style="position:relative; padding-top: 20px; left:5%; height:150px; width:90%;">

-

+<div style="position:relative; padding-top: 10px; left:5%; height:150px; width:91%;">

+<center>

 <div class="paymentbordline paymentbordlinetotal">

-	<center><span class="takepospay"><font color="white"><?php echo $langs->trans('TotalTTC'); ?>: </font><span id="totaldisplay" class="colorwhite"><?php echo price($invoice->total_ttc, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span></center>

+<center><span class="takepospay"><font color="white"><?php echo $langs->trans('TotalTTC'); ?>: </font><span id="totaldisplay" class="colorwhite"><?php echo price($invoice->total_ttc, 1, '', 1, -1, -1) ?></span></font></span></center>

 </div>

 <?php if ($remaintopay != $invoice->total_ttc) { ?>

 <div class="paymentbordline paymentbordlineremain">

-	<center><span class="takepospay"><font color="white"><?php echo $langs->trans('RemainToPay'); ?>: </font><span id="remaintopaydisplay" class="colorwhite"><?php echo price($remaintopay, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span></center>

+<center><span class="takepospay"><font color="white"><?php echo $langs->trans('RemainToPay'); ?>: </font><span id="remaintopaydisplay" class="colorwhite"><?php echo price($remaintopay, 1, '', 1, -1, -1) ?></span></font></span></center>

 </div>

 <?php } ?>

 <div class="paymentbordline paymentbordlinereceived">

-    <center><span class="takepospay"><font color="white"><?php echo $langs->trans("Received"); ?>: </font><span class="change1 colorred"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change1" class="change1" value="0"></span></center>

+    <center><span class="takepospay"><font color="white"><?php echo $langs->trans("Received"); ?>: </font><span class="change1 colorred"><?php echo price(0) ?></span><input type="hidden" id="change1" class="change1" value="0"></font></span></center>

 </div>

 <div class="paymentbordline paymentbordlinechange">

-	<center><span class="takepospay"><font color="white"><?php echo $langs->trans("Change"); ?>: </font><span class="change2 colorwhite"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change2" class="change2" value="0"></span></center>

-</div>

-<?php

-if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {

-	print '<div class="paymentbordline paddingtop paddingbottom">

-	<center>';

-	$filter = '';

-	$form = new Form($db);

-	print '<span class="takepospay"><font color="white">'.$langs->trans("BankAccount").': </font></span>';

-	$form->select_comptes(0, 'accountid', 0, $filter, 1, '');

-	print ajax_combobox('selectaccountid');

-	print '</center>

-	</div>';

-}

-?>

-

-</div>

-

-

-<div style="position:absolute; left:5%; height:52%; width:90%;">

+<center><span class="takepospay"><font color="white"><?php echo $langs->trans("Change"); ?>: </font><span class="change2 colorwhite"><?php echo price(0) ?></span><input type="hidden" id="change2" class="change2" value="0"></font></span></center>

+</div>

+</center>

+</div>

+

+<div style="position:absolute; left:5%; height:52%; width:92%;">

 <?php

 $action_buttons = array(

 	array(

 		"function" =>"reset()",

 		"span" => "style='font-size: 150%;'",

 		"text" => "C",

-		"class" => "poscolorblue"

+	    "class" => "poscolorblue"

 	),

 	array(

 		"function" => "parent.$.colorbox.close();",

 		"span" => "id='printtext' style='font-weight: bold; font-size: 18pt;'",

 		"text" => "X",

-		"class" => "poscolordelete"

+	    "class" => "poscolordelete"

 	),

 );

 $numpad = $conf->global->TAKEPOS_NUMPAD;

@@ -289,21 +259,21 @@
 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '8' : '20').');">'.($numpad == 0 ? '8' : '20').'</button>';

 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '9' : '50').');">'.($numpad == 0 ? '9' : '50').'</button>';

 ?>

-<?php if (count($arrayOfValidPaymentModes) > 0) {

-	$paycode = $arrayOfValidPaymentModes[0]->code;

+<?php if (count($paiements) > 0) {

+    $paycode = $paiements[0]->code;

 	$payIcon = '';

 	if ($paycode == 'LIQ') {

 		$paycode = 'cash';

-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';

+		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';

 	} elseif ($paycode == 'CB') {

 		$paycode = 'card';

-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';

+		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';

 	} elseif ($paycode == 'CHQ') {

 		$paycode = 'cheque';

-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';

-	}

-

-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><span class="hideonsmartphone"><br>'. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</span></button>';

+		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';

+	}

+

+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$paiements[0]->code)).'</button>';

 } else {

 	print '<button type="button" class="calcbutton2">'.$langs->trans("NoPaimementModesDefined").'</button>';

 }

@@ -312,21 +282,21 @@
 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '5' : '2').');">'.($numpad == 0 ? '5' : '2').'</button>';

 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '6' : '5').');">'.($numpad == 0 ? '6' : '5').'</button>';

 ?>

-<?php if (count($arrayOfValidPaymentModes) > 1) {

-	$paycode = $arrayOfValidPaymentModes[1]->code;

+<?php if (count($paiements) > 1) {

+    $paycode = $paiements[1]->code;

 	$payIcon = '';

 	if ($paycode == 'LIQ') {

 		$paycode = 'cash';

-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';

+		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';

 	} elseif ($paycode == 'CB') {

 		$paycode = 'card';

-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';

+		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';

 	} elseif ($paycode == 'CHQ') {

 		$paycode = 'cheque';

-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';

-	}

-

-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';

+		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';

+	}

+

+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$paiements[1]->code)).'</button>';

 } else {

 	$button = array_pop($action_buttons);

 	print '<button type="button" class="calcbutton2" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';

@@ -336,23 +306,23 @@
 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '2' : '0.20').');">'.($numpad == 0 ? '2' : '0.20').'</button>';

 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '3' : '0.50').');">'.($numpad == 0 ? '3' : '0.50').'</button>';

 ?>

-<?php if (count($arrayOfValidPaymentModes) > 2) {

-	$paycode = $arrayOfValidPaymentModes[2]->code;

+<?php if (count($paiements) > 2) {

+    $paycode = $paiements[2]->code;

 	$payIcon = '';

 	if ($paycode == 'LIQ') {

 		$paycode = 'cash';

-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';

+		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';

 	} elseif ($paycode == 'CB') {

 		$paycode = 'card';

-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';

+		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';

 	} elseif ($paycode == 'CHQ') {

 		$paycode = 'cheque';

-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';

-	}

-

-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';

+		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';

+	}

+

+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$paiements[2]->code)).'</button>';

 } else {

-	$button = array_pop($action_buttons);

+    $button = array_pop($action_buttons);

 	print '<button type="button" class="calcbutton2" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';

 }

 

@@ -361,8 +331,8 @@
 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '\'.\'' : '0.05').');">'.($numpad == 0 ? '.' : '0.05').'</button>';

 

 $i = 3;

-while ($i < count($arrayOfValidPaymentModes)) {

-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($arrayOfValidPaymentModes[$i]->code).'\');">'.$langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[$i]->code).'</button>';

+while ($i < count($paiements)) {

+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paiements[$i]->code).'\');">'.$langs->trans("PaymentTypeShort".$paiements[$i]->code).'</button>';

 	$i = $i + 1;

 }

 

@@ -371,19 +341,16 @@
 	if (!empty($conf->global->$keyforsumupbank)) {

 		print '<button type="button" class="calcbutton2" onclick="ValidateSumup();">Sumup</button>';

 	} else {

-		$langs->loadLangs(array("errors", "admin"));

+		$langs->load("errors");

+		$langs->load("admin");

 		print '<button type="button" class="calcbutton2 disabled" title="'.$langs->trans("SetupNotComplete").'">Sumup</button>';

 	}

 }

 

 $class = ($i == 3) ? "calcbutton3" : "calcbutton2";

 foreach ($action_buttons as $button) {

-	$newclass = $class.($button["class"] ? " ".$button["class"] : "");

+    $newclass = $class.($button["class"] ? " ".$button["class"] : "");

 	print '<button type="button" class="'.$newclass.'" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';

-}

-

-if ($conf->global->TAKEPOS_DELAYED_PAYMENT) {

-	print '<button type="button" class="calcbutton2" onclick="Validate(\'delayed\');">'.$langs->trans("Reported").'</button>';

 }

 ?>

 </div>

--- /tmp/dsg/dolibarr/htdocs/takepos/github_phone.php
+++ /tmp/dsg/dolibarr/htdocs/takepos/client_phone.php
@@ -43,7 +43,7 @@
 } else {

 	$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant

 }

-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

 $setterminal = GETPOST('setterminal', 'int');

 $idproduct = GETPOST('idproduct', 'int');

 

@@ -64,7 +64,7 @@
 

 if ($action == "productinfo") {

 	$prod = new Product($db);

-	$prod->fetch($idproduct);

+    $prod->fetch($idproduct);

 	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="AddProductConfirm(place, '.$idproduct.');">'.$langs->trans('Add').'</button>';

 	print "<br><b>".$prod->label."</b><br>";

 	print '<img class="imgwrapper" width="60%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$idproduct.'">';

@@ -104,7 +104,7 @@
 		$printer->printer->feed();

 		$printer->printer->feed();

 		$printer->close();

-	} else {

+	}	else {

 		print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease(\'Cash\');">'.$langs->trans('Cash').'</button>';

 		print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease(\'CreditCard\');">'.$langs->trans('CreditCard').'</button>';

 		print '<br>';

@@ -115,8 +115,8 @@
 	$invoice = new Facture($db);

 	$invoice->fetch($placeid);

 	foreach ($invoice->lines as $line)

-	{

-		if ($line->id == $selectedline)

+    {

+        if ($line->id == $selectedline)

 		{

 			$prod = new Product($db);

 			$prod->fetch($line->fk_product);

@@ -128,8 +128,8 @@
 			print '<button type="button" class="publicphonebutton2 phonered width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty - 1).');">-</button>';

 			print '<button type="button" class="publicphonebutton2 phonegreen width24" onclick="SetQty(place, '.$selectedline.', '.($line->qty + 1).');">+</button>';

 			print '<button type="button" class="publicphonebutton2 phoneblue width24" onclick="SetNote(place, '.$selectedline.');">'.$langs->trans('Note').'</button>';

-		}

-	}

+        }

+    }

 } else {

 	// Title

 	$title = 'TakePOS - Dolibarr '.DOL_VERSION;

@@ -151,14 +151,14 @@
 	$levelofrootcategory = 0;

 	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)

 	{

-		foreach ($categories as $key => $categorycursor)

-		{

-			if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)

-			{

-				$levelofrootcategory = $categorycursor['level'];

-				break;

-			}

-		}

+    	foreach ($categories as $key => $categorycursor)

+    	{

+        	if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)

+        	{

+            	$levelofrootcategory = $categorycursor['level'];

+            	break;

+        	}

+    	}

 	}

 	$levelofmaincategories = $levelofrootcategory + 1;

 

@@ -166,12 +166,14 @@
 	$subcategories = array();

 	foreach ($categories as $key => $categorycursor)

 	{

-		if ($categorycursor['level'] == $levelofmaincategories)

-		{

-			$maincategories[$key] = $categorycursor;

-		} else {

-			$subcategories[$key] = $categorycursor;

-		}

+    	if ($categorycursor['level'] == $levelofmaincategories)

+    	{

+        	$maincategories[$key] = $categorycursor;

+    	}

+    	else

+    	{

+        	$subcategories[$key] = $categorycursor;

+    	}

 	}

 

 	sort($maincategories);

@@ -200,11 +202,11 @@
 function LoadPlace(placeid){

     place=placeid;

 	<?php

-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {

+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){

 		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&place="+place, function() {

 		});';

 	}

-	else {

+	else{

 		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {

 		});';

 	}

@@ -215,12 +217,12 @@
 function AddProduct(placeid, productid){

 	<?php

 	// If is a public terminal first show product information

-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {

+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){

 		print 'place=placeid;

 		$("#phonediv1").load("auto_order.php?action=productinfo&place="+place+"&idproduct="+productid, function() {

 		});';

 	}

-	else {

+	else{

 		print 'AddProductConfirm(placeid, productid);';

 	}

 	?>

@@ -234,11 +236,11 @@
 function AddProductConfirm(placeid, productid){

 	place=placeid;

 	<?php

-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {

+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){

 		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {

 		});';

 	}

-	else {

+	else{

 		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {

 		});';

 	}

@@ -250,7 +252,7 @@
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {

 		?>

 	if (qty==0){

-		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=deleteline&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline, function() {

+		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=deleteline&place="+place+"&idline="+selectedline, function() {

 		});

 	}

 	else{

@@ -262,7 +264,7 @@
 	else {

 		?>

 	if (qty==0){

-		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=deleteline&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline, function() {

+		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=deleteline&place="+place+"&idline="+selectedline, function() {

 		});

 	}

 	else{

@@ -271,7 +273,7 @@
 	}

 		<?php

 	}

-	?>

+	?>	

 	LoadCats();

 }

 

@@ -284,11 +286,11 @@
 

 function LoadCats(){

 	<?php

-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {

+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){

 		echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {

 		});';

 	}

-	else {

+	else{

 		echo '$("#phonediv1").load("invoice.php?mobilepage=cats&place="+place, function() {

 		});';

 	}

@@ -296,13 +298,13 @@
 }

 

 function LoadProducts(idcat){

-

-	<?php

-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {

+    

+	<?php

+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){

 		echo '$("#phonediv1").load("auto_order.php?mobilepage=products&catid="+idcat+"&place="+place, function() {

 		});';

 	}

-	else {

+	else{

 		echo '$("#phonediv1").load("invoice.php?mobilepage=products&catid="+idcat+"&place="+place, function() {

 		});';

 	}

@@ -341,7 +343,7 @@
 	}

 	else{

 		console.log("Request the check to the waiter");

-		$("#phonediv1").load("auto_order.php?action=checkplease&place=<?php echo $place; ?>&payment="+payment, function() {

+		$("#phonediv1").load("auto_order.php?action=checkplease&place=<?php echo $place;?>&payment="+payment, function() {

 		});

 	}

 }

@@ -355,7 +357,7 @@
 <div class="container">

 	<div class="phonebuttonsrow">

 		<?php

-		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {

+		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){

 			print '<button type="button" class="phonebutton" onclick="LoadPlacesList();">'.strtoupper(substr($langs->trans('Floors'), 0, 3)).'</button>';

 			print '<button type="button" class="phonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 3)).'</button>';

 			print '<button type="button" class="phonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 3)).'</button>';

--- /tmp/dsg/dolibarr/htdocs/takepos/github_receipt.php
+++ /tmp/dsg/dolibarr/htdocs/takepos/client_receipt.php
@@ -20,23 +20,12 @@
  */

 

 /**

- *	\file       htdocs/takepos/receipt.php

+ *	\file       htdocs/takepos/floors.php

  *	\ingroup    takepos

  *	\brief      Page to show a receipt.

  */

 

-if (!isset($action)) {

-	//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER', '1');	// Not disabled cause need to load personalized language

-	//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB', '1');		// Not disabled cause need to load personalized language

-	//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');

-	//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');

-	if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');

-	if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');

-	if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');

-	if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');

-

-	require '../main.inc.php'; // If this file is called from send.php avoid load again

-}

+if (!isset($action)) require '../main.inc.php'; // If this file is called from send.php avoid load again

 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

 

 $langs->loadLangs(array("main", "cashdesk", "companies"));

@@ -44,8 +33,6 @@
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant

 

 $facid = GETPOST('facid', 'int');

-

-$gift = GETPOST('gift', 'int');

 

 if (empty($user->rights->takepos->run)) {

 	accessforbidden();

@@ -60,13 +47,13 @@
 

 if ($place > 0)

 {

-	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";

-	$resql = $db->query($sql);

-	$obj = $db->fetch_object($resql);

-	if ($obj)

-	{

-		$facid = $obj->rowid;

-	}

+    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";

+    $resql = $db->query($sql);

+    $obj = $db->fetch_object($resql);

+    if ($obj)

+    {

+        $facid = $obj->rowid;

+    }

 }

 $object = new Facture($db);

 $object->fetch($facid);

@@ -75,7 +62,7 @@
 $hookmanager->initHooks(array('takeposfrontend'), $facid);

 $reshook = $hookmanager->executeHooks('TakeposReceipt', $parameters, $object);

 if (!empty($hookmanager->resPrint)) {

-	print $hookmanager->resPrint;

+    print $hookmanager->resPrint;

 	exit;

 }

 

@@ -102,14 +89,12 @@
 <br>

 <p class="left">

 <?php

-$constFreeText = 'TAKEPOS_HEADER'.$_SESSION['takeposterminal'];

-if (!empty($conf->global->TAKEPOS_HEADER) || !empty($conf->global->{$constFreeText}))

+if (!empty($conf->global->TAKEPOS_HEADER))

 {

-	$newfreetext = '';

 	$substitutionarray = getCommonSubstitutionArray($langs);

-	if (!empty($conf->global->TAKEPOS_HEADER))      $newfreetext .= make_substitutions($conf->global->TAKEPOS_HEADER, $substitutionarray);

-	if (!empty($conf->global->{$constFreeText}))    $newfreetext .= make_substitutions($conf->global->{$constFreeText}, $substitutionarray);

-	print $newfreetext;

+	if (!empty($conf->global->TAKEPOS_HEADER))

+	$newfreetext = make_substitutions($conf->global->TAKEPOS_HEADER, $substitutionarray);

+	echo $newfreetext;

 }

 ?>

 </p>

@@ -138,34 +123,34 @@
 	<tr>

         <th class="center"><?php print $langs->trans("Label"); ?></th>

         <th class="right"><?php print $langs->trans("Qty"); ?></th>

-        <th class="right"><?php if ($gift != 1) print $langs->trans("Price"); ?></th>

-        <th class="right"><?php if ($gift != 1) print $langs->trans("TotalTTC"); ?></th>

+        <th class="right"><?php print $langs->trans("Price"); ?></th>

+        <th class="right"><?php print $langs->trans("TotalTTC"); ?></th>

 	</tr>

     </thead>

     <tbody>

     <?php

-	foreach ($object->lines as $line)

-	{

-		?>

+    foreach ($object->lines as $line)

+    {

+        ?>

     <tr>

         <td>

 		<?php if (!empty($line->product_label)) echo $line->product_label;

-		else echo $line->description; ?>

+        else echo $line->description; ?>

         </td>

         <td class="right"><?php echo $line->qty; ?></td>

-        <td class="right"><?php if ($gift != 1) echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1); ?></td>

-        <td class="right"><?php if ($gift != 1) echo price($line->total_ttc, 1); ?></td>

+        <td class="right"><?php echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1); ?></td>

+        <td class="right"><?php echo price($line->total_ttc, 1); ?></td>

     </tr>

         <?php

-	}

-	?>

+    }

+    ?>

     </tbody>

 </table>

 <br>

 <table class="right">

 <tr>

-    <th class="right"><?php if ($gift != 1) echo $langs->trans("TotalHT"); ?></th>

-    <td class="right"><?php if ($gift != 1) echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>

+    <th class="right"><?php echo $langs->trans("TotalHT"); ?></th>

+    <td class="right"><?php echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>

 </tr>

 <?php if ($conf->global->TAKEPOS_TICKET_VAT_GROUPPED) {

 	$vat_groups = array();

@@ -177,86 +162,32 @@
 		$vat_groups[$line->tva_tx] += $line->total_tva;

 	}

 	foreach ($vat_groups as $key => $val) {

-		?>

+	    ?>

 	<tr>

-		<th align="right"><?php if ($gift != 1) echo $langs->trans("VAT").' '.vatrate($key, 1); ?></th>

-		<td align="right"><?php if ($gift != 1) echo price($val, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>

+		<th align="right"><?php echo $langs->trans("VAT").' '.vatrate($key, 1); ?></th>

+		<td align="right"><?php echo price($val, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>

 	</tr>

         <?php

 	}

 } else { ?>

 <tr>

-	<th class="right"><?php if ($gift != 1) echo $langs->trans("TotalVAT").'</th><td class="right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>

+	<th class="right"><?php echo $langs->trans("TotalVAT").'</th><td class="right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>

 </tr>

 <?php } ?>

 <tr>

-	<th class="right"><?php if ($gift != 1) echo ''.$langs->trans("TotalTTC").'</th><td class="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>

+	<th class="right"><?php echo ''.$langs->trans("TotalTTC").'</th><td class="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>

 </tr>

-<?php

-if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {

-	//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency

-	include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';

-	$multicurrency = new MultiCurrency($db);

-	$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);

-	echo '<tr><th class="right">';

-	if ($gift != 1) echo ''.$langs->trans("TotalTTC").' '.$_SESSION["takeposcustomercurrency"].'</th><td class="right">'.price($object->total_ttc * $multicurrency->rate->rate, 1, '', 1, - 1, - 1, $_SESSION["takeposcustomercurrency"])."\n";

-	echo '</td></tr>';

-}

-

-if ($conf->global->TAKEPOS_PRINT_PAYMENT_METHOD) {

-	$sql = "SELECT p.pos_change as pos_change, p.datep as date, p.fk_paiement, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";

-	$sql .= " cp.code";

-	$sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";

-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";

-	$sql .= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$facid;

-	$sql .= " ORDER BY p.datep";

-	$resql = $db->query($sql);

-	if ($resql)

-	{

-		$num = $db->num_rows($resql);

-		$i = 0;

-		while ($i < $num) {

-			$row = $db->fetch_object($resql);

-			echo '<tr>';

-			echo '<td class="right">';

-			echo $langs->transnoentitiesnoconv("PaymentTypeShort".$row->code);

-			echo '</td>';

-			echo '<td class="right">';

-			$amount_payment = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;

-			if ($row->code == "LIQ") $amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment

-			echo price($amount_payment, 1, '', 1, - 1, - 1, $conf->currency);

-			echo '</td>';

-			echo '</tr>';

-			if ($row->code == "LIQ" && $row->pos_change > 0) // Print change only in cash payments

-			{

-				echo '<tr>';

-				echo '<td class="right">';

-				echo $langs->trans("Change");

-				echo '</td>';

-				echo '<td class="right">';

-				echo price($row->pos_change, 1, '', 1, - 1, - 1, $conf->currency);

-				echo '</td>';

-				echo '</tr>';

-			}

-			$i++;

-		}

-	}

-}

-?>

 </table>

 <div style="border-top-style: double;">

 <br>

 <br>

 <br>

 <?php

-$constFreeText = 'TAKEPOS_FOOTER'.$_SESSION['takeposterminal'];

-if (!empty($conf->global->TAKEPOS_FOOTER) || !empty($conf->global->{$constFreeText}))

+if (!empty($conf->global->TAKEPOS_FOOTER))

 {

-	$newfreetext = '';

 	$substitutionarray = getCommonSubstitutionArray($langs);

-	if (!empty($conf->global->{$constFreeText}))    $newfreetext .= make_substitutions($conf->global->{$constFreeText}, $substitutionarray);

-	if (!empty($conf->global->TAKEPOS_FOOTER))      $newfreetext .= make_substitutions($conf->global->TAKEPOS_FOOTER, $substitutionarray);

-	print $newfreetext;

+	$newfreetext = make_substitutions($conf->global->TAKEPOS_FOOTER, $substitutionarray);

+	echo $newfreetext;

 }

 ?>

 

--- /tmp/dsg/dolibarr/htdocs/takepos/github_reduction.php
+++ /tmp/dsg/dolibarr/htdocs/takepos/client_reduction.php
@@ -50,21 +50,25 @@
 $invoice = new Facture($db);

 if ($invoiceid > 0)

 {

-	$invoice->fetch($invoiceid);

-} else {

-	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";

-	$resql = $db->query($sql);

-	$obj = $db->fetch_object($resql);

-	if ($obj)

-	{

-		$invoiceid = $obj->rowid;

-	}

-	if (!$invoiceid)

-	{

-		$invoiceid = 0; // Invoice does not exist yet

-	} else {

-		$invoice->fetch($invoiceid);

-	}

+    $invoice->fetch($invoiceid);

+}

+else

+{

+    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";

+    $resql = $db->query($sql);

+    $obj = $db->fetch_object($resql);

+    if ($obj)

+    {

+        $invoiceid = $obj->rowid;

+    }

+    if (!$invoiceid)

+    {

+        $invoiceid = 0; // Invoice does not exist yet

+    }

+    else

+    {

+        $invoice->fetch($invoiceid);

+    }

 }

 

 $arrayofcss = array('/takepos/css/pos.css.php');

@@ -74,9 +78,9 @@
 

 $langs->loadLangs(array('main', 'bills', 'cashdesk'));

 

-if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {

+if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {

 	$htmlReductionPercent = '<span class="fa fa-2x fa-percent"></span>';

-	$htmlReductionAmount = '<span class="fa fa-2x fa-money"></span><br>'.$langs->trans('Amount');

+	$htmlReductionAmount = '<span class="fa fa-2x fa-money"></span>';

 } else {

 	$htmlReductionPercent = $langs->trans('ReductionShort').'<br>%';

 	$htmlReductionAmount = $langs->trans('ReductionShort').'<br>'.$langs->trans('Amount');

@@ -198,7 +202,7 @@
 <div style="position:absolute; top:2%; left:5%; width:91%;">

 <center>

 <?php

-	print '<input type="text" class="takepospay" id="reduction_total" name="reduction_total" style="width: 50%;" placeholder="'.$langs->trans('Reduction').'">';

+    print '<input type="text" class="takepospay" id="reduction_total" name="reduction_total" style="width: 50%;" placeholder="'.$langs->trans('Reduction').'">';

 ?>

 </center>

 </div>

--- /tmp/dsg/dolibarr/htdocs/takepos/github_send.php
+++ /tmp/dsg/dolibarr/htdocs/takepos/client_send.php
@@ -24,20 +24,20 @@
 

 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER', '1');	// Not disabled cause need to load personalized language

 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB', '1');		// Not disabled cause need to load personalized language

-//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC', '1');

-//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN', '1');

-if (!defined('NOCSRFCHECK'))	define('NOCSRFCHECK', '1');

+//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');

+//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');

+if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');

 if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');

-if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');

-if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');

-if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');

+if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');

+if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');

+if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');

 

 require '../main.inc.php'; // Load $user and permissions

 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';

 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

 

 $facid = GETPOST('facid', 'int');

-$action = GETPOST('action', 'aZ09');

+$action = GETPOST('action', 'alpha');

 $email = GETPOST('email', 'alpha');

 

 if (empty($user->rights->takepos->run)) {

@@ -51,31 +51,29 @@
 $customer = new Societe($db);

 $customer->fetch($invoice->socid);

 

-if ($action == "send")

+if ($action=="send")

 {

-	include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';

-	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';

-	$formmail = new FormMail($db);

-	$outputlangs = new Translate('', $conf);

-	$model_id = $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE;

-	$arraydefaultmessage = $formmail->getEMailTemplate($db, 'facture_send', $user, $outputlangs, $model_id);

-	$subject = $arraydefaultmessage->topic;

-

-	ob_start(); // turn on output receipt

-	include 'receipt.php';

-	$receipt = ob_get_contents(); // get the contents of the output buffer

-	ob_end_clean();

-

-	$msg = "<html>".$arraydefaultmessage->content."<br>".$receipt."</html>";

-	$sendto = $email;

-	$from = $mysoc->email;

-	$mail = new CMailFile($subject, $sendto, $from, $msg, array(), array(), array(), '', '', 0, 1);

-	if ($mail->error || $mail->errors) {

-		setEventMessages($mail->error, $mail->errors, 'errors');

-	} else {

-		$result = $mail->sendfile();

-	}

-	exit;

+    include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';

+    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';

+    $formmail = new FormMail($db);

+    $outputlangs = new Translate('', $conf);

+    $model_id = $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE;

+    $arraydefaultmessage = $formmail->getEMailTemplate($db, 'facture_send', $user, $outputlangs, $model_id);

+    $subject = $arraydefaultmessage->topic;

+    ob_start(); // turn on output receipt

+    include 'receipt.php';

+    $receipt = ob_get_contents(); // get the contents of the output buffer

+    ob_end_clean();

+    $msg="<html>".$arraydefaultmessage->content."<br>".$receipt."</html>";

+    $sendto=$email;

+    $from=$mysoc->email;

+    $mail = new CMailFile($subject, $sendto, $from, $msg, array(), array(), array(), '', '', 0, 1);

+    if ($mail->error || $mail->errors) {

+        setEventMessages($mail->error, $mail->errors, 'errors');

+    } else {

+        $result = $mail->sendfile();

+    }

+    exit;

 }

 $arrayofcss = array('/takepos/css/pos.css.php');

 $arrayofjs  = array();

--- /tmp/dsg/dolibarr/htdocs/takepos/github_smpcb.php
+++ /tmp/dsg/dolibarr/htdocs/takepos/client_smpcb.php
@@ -1,26 +1,4 @@
 <?php

-/* Copyright (C) 2020	Andreu Bisquerra Gaya <jove@bisquerra.com>

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 3 of the License, or

- * (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program. If not, see <http://www.gnu.org/licenses/>.

- */

-

-/**

- *	\file       htdocs/takepos/smpcb.php

- *	\ingroup	takepos

- *	\brief      Page with the content for smpcb payment

- */

-

 if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');

 if (!defined('NOTOKENRENEWAL'))	    define('NOTOKENRENEWAL', '1');

 if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');

@@ -33,25 +11,25 @@
 	accessforbidden();

 }

 

-if (GETPOSTISSET('status')) {

+if (isset($_GET['status'])) {

 	die(strtoupper($_SESSION['SMP_CURRENT_PAYMENT']));

 }

 

-if (GETPOST('smp-status')) {

-	print '<html lang="en">';

-	print '<head>';

-	print '<meta charset="utf-8">

+if ($_GET['smp-status']) {

+	print '<html lang="en">

+<head>

+    <meta charset="utf-8">

 

     <title>The HTML5 Herald</title>

     <meta name="description" content="The HTML5 Herald">

     <meta name="author" content="SitePoint">

 

-    <link rel="stylesheet" href="css/styles.css?v=1.0">';

+    <link rel="stylesheet" href="css/styles.css?v=1.0">

 

-	print '</head>';

+</head>

 

-	print '<body>';

-	$_SESSION['SMP_CURRENT_PAYMENT'] = GETPOST('smp-status');

+<body>';

+	$_SESSION['SMP_CURRENT_PAYMENT'] = $_GET['smp-status'];

 

 	print '<script type="application/javascript">

                 window.onload = function() {

@@ -61,8 +39,7 @@
 

 	print "Transaction status registered, you can close this";

 

-	print '</body></html>';

-	exit();

+	die('</body></html>');

 }

 

-print 'NOOP';

+    print 'NOOP';