lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW show sell-by and eat-by dates only if not empty

Browse Source
This commit is contained in:
lvessiller 2022-08-12 15:20:25 +02:00
parent a570244641
commit 8ac5bd4228
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/expedition/card.php
View File

@ -1315,10 +1315,10 @@ if ($action == 'create') {
$detail = ''; $detail = '';
$detail .= $langs->trans("Batch").': '.$dbatch->batch; $detail .= $langs->trans("Batch").': '.$dbatch->batch;
if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) { if (empty($conf->global->PRODUCT_DISABLE_SELLBY) && !empty($dbatch->sellby)) {
$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day"); $detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
} }
if (empty($conf->global->PRODUCT_DISABLE_EATBY)) { if (empty($conf->global->PRODUCT_DISABLE_EATBY) && !empty($dbatch->eatby)) {
$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day"); $detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
} }
$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty; $detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
@ -1526,10 +1526,10 @@ if ($action == 'create') {
} else { } else {
print 'TableLotIncompleteRunRepairWithParamStandardEqualConfirmed'; print 'TableLotIncompleteRunRepairWithParamStandardEqualConfirmed';
} }
if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) { if (empty($conf->global->PRODUCT_DISABLE_SELLBY) && !empty($dbatch->sellby)) {
print ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day"); print ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
} }
if (empty($conf->global->PRODUCT_DISABLE_EATBY)) { if (empty($conf->global->PRODUCT_DISABLE_EATBY) && !empty($dbatch->eatby)) {
print ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day"); print ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
} }
print ' ('.$dbatch->qty.')'; print ' ('.$dbatch->qty.')';