diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index a24109fa3d0..4bcf8439271 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -58,7 +58,7 @@ BillsCoinsPad=Coins and banknotes Pad
 DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
 TakeposNeedsCategories=TakePOS needs at least one product categorie to work
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
-OrderNotes=Order Notes
+OrderNotes=Printing the receipt will set all items to 'Order confirmed' 
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Group VAT by rate in tickets|receipts
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index 09f3b13d4d1..863b6eda42c 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -118,14 +118,14 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print '<td class="titlefieldcreate">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
+	print '<td>'.$langs->trans("Parameters").'</td><td class="center">'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
 
-	if ($conf->global->TAKEPOS_PRINT_METHOD != "browser") {
+	if ($conf->global->TAKEPOS_PRINT_METHOD != "browser") {		// Why this ?
 		print '<tr class="oddeven value"><td>';
 		print $langs->trans("OrderPrinters").' (<a href="'.DOL_URL_ROOT.'/takepos/admin/orderprinters.php?leftmenu=setup">'.$langs->trans("Setup").'</a>)';
 		print '</td>';
-		print '<td>';
+		print '<td class="center">';
 		print ajax_constantonoff("TAKEPOS_ORDER_PRINTERS", array(), $conf->entity, 0, 0, 1, 0);
 		//print $form->selectyesno("TAKEPOS_ORDER_PRINTERS", $conf->global->TAKEPOS_ORDER_PRINTERS, 1);
 		print '</td></tr>';
@@ -133,7 +133,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 		print '<tr class="oddeven value"><td>';
 		print $langs->trans("OrderNotes");
 		print '</td>';
-		print '<td>';
+		print '<td class="center">';
 		print ajax_constantonoff("TAKEPOS_ORDER_NOTES", array(), $conf->entity, 0, 0, 1, 0);
 		//print $form->selectyesno("TAKEPOS_ORDER_NOTES", $conf->global->TAKEPOS_ORDER_NOTES, 1);
 		print '</td></tr>';
@@ -142,7 +142,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	print '<tr class="oddeven value"><td>';
 	print $langs->trans("BasicPhoneLayout");
 	print '</td>';
-	print '<td>';
+	print '<td class="center">';
 	//print $form->selectyesno("TAKEPOS_PHONE_BASIC_LAYOUT", $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT, 1);
 	print ajax_constantonoff("TAKEPOS_PHONE_BASIC_LAYOUT", array(), $conf->entity, 0, 0, 1, 0);
 	print '</td></tr>';
@@ -150,7 +150,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	print '<tr class="oddeven value"><td>';
 	print $langs->trans("ProductSupplements");
 	print '</td>';
-	print '<td>';
+	print '<td class="center">';
 	//print $form->selectyesno("TAKEPOS_SUPPLEMENTS", $conf->global->TAKEPOS_SUPPLEMENTS, 1);
 	print ajax_constantonoff("TAKEPOS_SUPPLEMENTS", array(), $conf->entity, 0, 0, 1, 0);
 	print '</td></tr>';
@@ -159,7 +159,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 		print '<tr class="oddeven"><td>';
 		print $langs->trans("SupplementCategory");
 		print '</td>';
-		print '<td>';
+		print '<td class="center">';
 		print $form->select_all_categories(Categorie::TYPE_PRODUCT, $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY, 'TAKEPOS_SUPPLEMENTS_CATEGORY', 64, 0, 0);
 		print ajax_combobox('TAKEPOS_SUPPLEMENTS_CATEGORY');
 		print "</td></tr>\n";
@@ -168,14 +168,14 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	print '<tr class="oddeven value"><td>';
 	print 'QR - '.$langs->trans("CustomerMenu");
 	print '</td>';
-	print '<td>';
+	print '<td class="center">';
 	print ajax_constantonoff("TAKEPOS_QR_MENU", array(), $conf->entity, 0, 0, 1, 0);
 	print '</td></tr>';
 
 	print '<tr class="oddeven value"><td>';
 	print 'QR - '.$langs->trans("AutoOrder");
 	print '</td>';
-	print '<td>';
+	print '<td class="center">';
 	print ajax_constantonoff("TAKEPOS_AUTO_ORDER", array(), $conf->entity, 0, 0, 1, 0);
 	print '</td></tr>';
 
@@ -187,7 +187,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	print '<div class="center"><input type="submit" class="button button-save" value="'.$langs->trans("Save").'"></div>';
 }
 
-if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
+if (!empty($conf->global->TAKEPOS_BAR_RESTAURANT)) {
 	if ($conf->global->TAKEPOS_QR_MENU) {
 		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
@@ -197,10 +197,10 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 		print '<td>'.$langs->trans("URL").'</td><td class="right">'.$langs->trans("QR").'</td>';
 		print "</tr>\n";
 		print '<tr class="oddeven value"><td>';
-		print "<a target='_blank' href='".$urlwithroot."/takepos/public/menu.php'>".$urlwithroot."/takepos/public/menu.php</a>";
+		print '<a target="_blank" href="'.$urlwithroot.'/takepos/public/menu.php">'.$urlwithroot.'/takepos/public/menu.php</a>';
 		print '</td>';
 		print '<td class="right">';
-		print "<a target='_blank' href='printqr.php'><img src='".DOL_URL_ROOT."/takepos/genimg/qr.php' height='42' width='42'></a>";
+		print '<a target="_blank" href="printqr.php"><img src="'.DOL_URL_ROOT.'/takepos/genimg/qr.php" height="42" width="42"></a>';
 		print '</td></tr>';
 		print '</table>';
 	}
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index c7a01e5d8bc..a4fc10c788a 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -974,12 +974,12 @@ if ($action == "search") {
 function SendTicket(id)
 {
 	console.log("Open box to select the Print/Send form");
-	$.colorbox({href:"send.php?facid="+id, width:"70%", height:"30%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("SendTicket"); ?>"});
+	$.colorbox({href:"send.php?facid="+id, width:"70%", height:"30%", transition:"none", iframe:"true", title:'<?php echo dol_escape_js($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"); ?>"});
+	console.log("Call Print() to generate the receipt.");
+	$.colorbox({href:"receipt.php?facid="+id+"&gift="+gift, width:"40%", height:"90%", transition:"none", iframe:"true", title:'<?php echo dol_escape_js($langs->trans("PrintTicket")); ?>'});
 }
 
 function TakeposPrinting(id){
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index e9d721a44e3..d978d2ac792 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -50,7 +50,7 @@ include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 $langs->loadLangs(array("main", "cashdesk", "companies"));
 
-$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
+$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant
 
 $facid = GETPOST('facid', 'int');
 
@@ -318,5 +318,6 @@ if (!empty($conf->global->TAKEPOS_FOOTER) || !empty($conf->global->{$constFreeTe
 <script type="text/javascript">
 	window.print();
 </script>
+
 </body>
 </html>