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

hide eatby sellby in reception

Browse Source
This commit is contained in:
Christian Foellmann 2020-08-20 12:48:23 +02:00
parent b74113e2eb
commit a5b4fcedb7
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
htdocs/reception/card.php
View File

@ -966,8 +966,12 @@ if ($action == 'create')
if (!empty($conf->productbatch->enabled)) if (!empty($conf->productbatch->enabled))
{ {
print '<td class="left">'.$langs->trans("batch_number").'</td>'; print '<td class="left">'.$langs->trans("batch_number").'</td>';
print '<td class="left">'.$langs->trans("EatByDate").'</td>'; if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
print '<td class="left">'.$langs->trans("SellByDate").'</td>'; print '<td class="left">'.$langs->trans("EatByDate").'</td>';
}
if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
print '<td class="left">'.$langs->trans("SellByDate").'</td>';
}
} }
print "</tr>\n"; print "</tr>\n";
} }
@ -1114,12 +1118,16 @@ if ($action == 'create')
if (!empty($product->status_batch)) if (!empty($product->status_batch))
{ {
print '<td><input name="batch'.$indiceAsked.'" value="'.$dispatchLines[$indiceAsked]['lot'].'"></td>'; print '<td><input name="batch'.$indiceAsked.'" value="'.$dispatchLines[$indiceAsked]['lot'].'"></td>';
print '<td>'; if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
print $form->selectDate($dispatchLines[$indiceAsked]['DLC'], 'dlc'.$indiceAsked, '', '', 1, ""); print '<td>';
print '</td>'; print $form->selectDate($dispatchLines[$indiceAsked]['DLC'], 'dlc'.$indiceAsked, '', '', 1, "");
print '<td>'; print '</td>';
print $form->selectDate($dispatchLines[$indiceAsked]['DLUO'], 'dluo'.$indiceAsked, '', '', 1, ""); }
print '</td>'; if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
print '<td>';
print $form->selectDate($dispatchLines[$indiceAsked]['DLUO'], 'dluo'.$indiceAsked, '', '', 1, "");
print '</td>';
}
} else { } else {
print '<td colspan="3"></td>'; print '<td colspan="3"></td>';
} }
@ -1807,10 +1815,14 @@ if ($action == 'create')
if ($conf->productbatch->enabled && !empty($lines[$i]->product->status_batch)) if ($conf->productbatch->enabled && !empty($lines[$i]->product->status_batch))
{ {
print '<td> <input name="batch'.$line_id.'" id="batch'.$line_id.'" type="text" value="'.$lines[$i]->batch.'"> </br>'; print '<td> <input name="batch'.$line_id.'" id="batch'.$line_id.'" type="text" value="'.$lines[$i]->batch.'"> </br>';
print $langs->trans('EatByDate').' : '; if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
print $form->selectDate($lines[$i]->eatby, 'dlc'.$line_id, '', '', 1, "").'</br>'; print $langs->trans('EatByDate').' : ';
print $langs->trans('SellByDate').' : '; print $form->selectDate($lines[$i]->eatby, 'dlc'.$line_id, '', '', 1, "").'</br>';
print $form->selectDate($lines[$i]->sellby, 'dluo'.$line_id, '', '', 1, ""); }
if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
print $langs->trans('SellByDate').' : ';
print $form->selectDate($lines[$i]->sellby, 'dluo'.$line_id, '', '', 1, "");
}
print '</td>'; print '</td>';
} }
print '</tr>'; print '</tr>';
@ -1856,11 +1868,14 @@ if ($action == 'create')
$detail = ''; $detail = '';
if ($lines[$i]->product->status_batch) if ($lines[$i]->product->status_batch)
{ {
$detail .= $langs->trans("Batch").': '.$lines[$i]->batch; $detail .= $langs->trans("Batch").': '.$lines[$i]->batch;
if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($lines[$i]->sellby, "day"); $detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($lines[$i]->sellby, "day");
}
if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($lines[$i]->eatby, "day"); $detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($lines[$i]->eatby, "day");
}
$detail .= '<br>'; $detail .= '<br>';
print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail); print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail);
} else { } else {