From 6c8c41aaba976bc725f183c51d7f6a98239b3eac Mon Sep 17 00:00:00 2001 From: andreubisquerra Date: Thu, 24 Oct 2019 19:14:12 +0200 Subject: [PATCH 1/3] REF to customer readable place in TakePOS BAR Convert the invoice reference to a readable format for customers and waiters in non validated printed vouchers. (PROV-POS1-5) to: Terminal 1 Place 5 --- htdocs/takepos/receipt.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php index 38ad9103ab9..8f7a0ec5ca1 100644 --- a/htdocs/takepos/receipt.php +++ b/htdocs/takepos/receipt.php @@ -100,7 +100,8 @@ if ($conf->global->TAKEPOS_CUSTOM_RECEIPT) trans('Date')." ".dol_print_date($object->date, 'day').'
'; if ($conf->global->TAKEPOS_CUSTOM_RECEIPT) print $conf->global->TAKEPOS_RECEIPT_NAME." "; -print $object->ref; +if ($object->statut == Facture::STATUS_DRAFT) print str_replace(")","",str_replace("-"," ".$langs->trans('Place')." ",str_replace("(PROV-POS",$langs->trans("Terminal")." ",$object->ref))); +else print $object->ref; if ($conf->global->TAKEPOS_CUSTOM_RECEIPT && $conf->global->TAKEPOS_SHOW_CUSTOMER) { $soc = new Societe($db); From 5904b0bea4264b35dda32c4c9e858de54c869dad Mon Sep 17 00:00:00 2001 From: andreubisquerra Date: Thu, 24 Oct 2019 20:00:17 +0200 Subject: [PATCH 2/3] Travis errors --- htdocs/takepos/receipt.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php index 8f7a0ec5ca1..8743a770739 100644 --- a/htdocs/takepos/receipt.php +++ b/htdocs/takepos/receipt.php @@ -100,7 +100,7 @@ if ($conf->global->TAKEPOS_CUSTOM_RECEIPT) trans('Date')." ".dol_print_date($object->date, 'day').'
'; if ($conf->global->TAKEPOS_CUSTOM_RECEIPT) print $conf->global->TAKEPOS_RECEIPT_NAME." "; -if ($object->statut == Facture::STATUS_DRAFT) print str_replace(")","",str_replace("-"," ".$langs->trans('Place')." ",str_replace("(PROV-POS",$langs->trans("Terminal")." ",$object->ref))); +if ($object->statut == Facture::STATUS_DRAFT) print str_replace(")", "", str_replace("-"," ".$langs->trans('Place')." ", str_replace("(PROV-POS", $langs->trans("Terminal")." ", $object->ref))); else print $object->ref; if ($conf->global->TAKEPOS_CUSTOM_RECEIPT && $conf->global->TAKEPOS_SHOW_CUSTOMER) { From 709f2c08b0815dd1fe9c4821774d9da0d0d05c07 Mon Sep 17 00:00:00 2001 From: andreubisquerra Date: Thu, 24 Oct 2019 21:39:47 +0200 Subject: [PATCH 3/3] travis errors --- htdocs/takepos/receipt.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php index 8743a770739..2c3a0617362 100644 --- a/htdocs/takepos/receipt.php +++ b/htdocs/takepos/receipt.php @@ -100,7 +100,7 @@ if ($conf->global->TAKEPOS_CUSTOM_RECEIPT) trans('Date')." ".dol_print_date($object->date, 'day').'
'; if ($conf->global->TAKEPOS_CUSTOM_RECEIPT) print $conf->global->TAKEPOS_RECEIPT_NAME." "; -if ($object->statut == Facture::STATUS_DRAFT) print str_replace(")", "", str_replace("-"," ".$langs->trans('Place')." ", str_replace("(PROV-POS", $langs->trans("Terminal")." ", $object->ref))); +if ($object->statut == Facture::STATUS_DRAFT) print str_replace(")", "", str_replace("-", " ".$langs->trans('Place')." ", str_replace("(PROV-POS", $langs->trans("Terminal")." ", $object->ref))); else print $object->ref; if ($conf->global->TAKEPOS_CUSTOM_RECEIPT && $conf->global->TAKEPOS_SHOW_CUSTOMER) {