Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0

Browse Source
This commit is contained in:
Laurent Destailleur
2023-07-12 16:41:11 +02:00
parent a4663291a7 1998248e96
commit 42fea0090d
5 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/takepos/receipt.php
View File

@@ -136,7 +136,7 @@ if ($object->statut == Facture::STATUS_DRAFT) {
} else {
print $object->ref;
}
if ($conf->global->TAKEPOS_SHOW_CUSTOMER) {
if (!empty($conf->global->TAKEPOS_SHOW_CUSTOMER)) {
if ($object->socid != getDolGlobalInt('CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"])) {
$soc = new Societe($db);
if ($object->socid > 0) {
@@ -147,6 +147,9 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER) {
print "<br>".$langs->trans("Customer").': '.$soc->name;
}
}
if (!empty($conf->global->TAKEPOS_SHOW_DATE_OF_PRINING)) {
print "<br>".$langs->trans("DateOfPrinting").': '.dol_print_date(dol_now(), 'dayhour', 'tzuserrel').'<br>';
}
?>
</p>
<br>