From 79da04780248280be09cb0e5ed19d345db4efca1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Dec 2020 21:43:04 +0100
Subject: [PATCH] FIX Dates of sales start in TakePOS

Conflicts:
	htdocs/langs/en_US/cashdesk.lang
---
 htdocs/langs/en_US/cashdesk.lang | 5 +++--
 htdocs/takepos/index.php         | 2 +-
 htdocs/takepos/invoice.php       | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index ce5cdaf4ba6..a93571d4768 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -99,8 +99,9 @@ CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
-CloseCashFence=Close cash fence
+SaleStartedAt=Sale started at %s
+ControlCashOpening=Control cash popup at opening POS
+CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 4eeb9dcf9a7..4bfeaa57b75 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -778,7 +778,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			</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>
 				<?php if (empty($conf->dol_use_jmobile)) { ?>
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 0bc6087409d..1022308c308 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -763,13 +763,13 @@ $( document ).ready(function() {
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
 			echo '$("#customerandsales").append(\'';
-			echo '<a class="valignmiddle" onclick="place=\\\'';
+			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M'))).'" 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 '\\\';Refresh();">';
 			if ($placeid == $obj->rowid) echo "<b>";
-			echo date('H:i', strtotime($obj->datec));
+			echo dol_print_date($db->jdate($obj->datec), '%H:%M');
 			if ($placeid == $obj->rowid) echo "</b>";
 			echo '</a>\');';
 		}