diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 8e529fe92f2..bb433583797 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -99,6 +99,7 @@ CashDeskRefNumberingModules=Numbering module for POS sales CashDeskGenericMaskCodes6 =
{TN} tag is used to add the terminal number TakeposGroupSameProduct=Group same products lines StartAParallelSale=Start a new parallel sale +SaleStartedAt=Sale started at %s ControlCashOpening=Control cash desk at opening POS CloseCashFence=Close cash desk control CashReport=Cash report diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php index ef6ca77722a..5e75749dc00 100644 --- a/htdocs/takepos/index.php +++ b/htdocs/takepos/index.php @@ -832,7 +832,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
- " autofocus> + " autofocus> dol_use_jmobile)) { ?> diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 55b576a040d..409ca6b2ce4 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -1019,13 +1019,13 @@ $( document ).ready(function() { if ($resql) { while ($obj = $db->fetch_object($resql)) { echo '$("#customerandsales").append(\''; - echo '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 ""; - echo date('H:i', strtotime($obj->datec)); + echo dol_print_date($db->jdate($obj->datec), '%H:%M'); if ($placeid == $obj->rowid) echo ""; echo '\');'; }