diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index db328807fd1..87f89362f6f 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -627,18 +627,24 @@ function Search2(keyCodeForEnter) {
}
function Edit(number) {
+ console.log("We click on PAD on number="+number);
- if (typeof(selectedtext) == "undefined") return; // We click on an action on the number pad but there is no line selected
+ if (typeof(selectedtext) == "undefined") {
+ return; // We click on an action on the number pad but there is no line selected
+ }
var text=selectedtext+"
";
+
if (number=='c'){
editnumber="";
Refresh();
+ $("#qty").html("trans("Qty"); ?>");
+ $("#price").html("trans("Price"); ?>");
+ $("#reduction").html("trans("ReductionShort"); ?>");
return;
}
else if (number=='qty'){
- console.log("Edit "+number);
if (editaction=='qty' && editnumber!=""){
$("#poslines").load("invoice.php?action=updateqty&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
editnumber="";
@@ -654,7 +660,6 @@ function Edit(number) {
}
}
else if (number=='p'){
- console.log("Edit "+number);
if (editaction=='p' && editnumber!=""){
$("#poslines").load("invoice.php?action=updateprice&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
editnumber="";
@@ -670,7 +675,6 @@ function Edit(number) {
}
}
else if (number=='r'){
- console.log("Edit "+number);
if (editaction=='r' && editnumber!=""){
$("#poslines").load("invoice.php?action=updatereduction&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
editnumber="";
@@ -709,6 +713,7 @@ function Edit(number) {
$('#'+selectedline).find("td:first").html(text+editnumber);
}
+
function TakeposPrintingOrder(){
console.log("TakeposPrintingOrder");
$("#poslines").load("invoice.php?action=order&place="+place, function() {
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index b16cc72aa5c..bc5122f4811 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1241,10 +1241,11 @@ if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
$label = $obj->label;
$floor = $obj->floor;
}
- // In phone version only show when is invoice page
if ($mobilepage == "invoice" || $mobilepage == "") {
- print ''.$langs->trans('Place')." ".$label."
";
- print ''.$langs->trans('Floor')." ".$floor."";
+ // If not on smartphone version or if it is the invoice page
+ //print 'mobilepage='.$mobilepage;
+ print ''.$langs->trans('Place')." ".($label ? $label : '?')."
";
+ print ''.$langs->trans('Floor')." ".($floor ? $floor : '?')."";
} elseif (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
print $mysoc->name;
} elseif ($mobilepage == "cats") {