diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 4839f26772f..98fb4132bb8 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1298,8 +1298,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '';
}
- // Traceability
- if ($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY) {
+
+ // Quality control
+ if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
print '
| '.$langs->trans("LifeTime").' | |
';
print '| '.$langs->trans("QCFrequency").' | |
';
}
@@ -1801,8 +1802,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '';
}
- // Traceability
- if ($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY) {
+ // Quality control
+ if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
print '| '.$langs->trans("LifeTime").' | |
';
print '| '.$langs->trans("QCFrequency").' | |
';
}
@@ -2284,8 +2285,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '';
}
- // Traceability
- if ($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY) {
+ // Quality Control
+ if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
print '| '.$langs->trans("LifeTime").' | '.$object->lifetime.' |
';
print '| '.$langs->trans("QCFrequency").' | '.$object->qc_frequency.' |
';
}
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 909782bdbc5..1f60e880442 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -483,17 +483,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '';
}
- // Traceability info
- if ($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY) {
- print '| '.$form->editfieldkey($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer).' | ';
- print ''.$form->editfieldval($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker').' | ';
- print '
';
+ if (!empty($conf->global->PRODUCT_LOT_ENABLE_TRACEABOLITY)) {
print '| '.$form->editfieldkey($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer).' | ';
print ''.$form->editfieldval($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer, 'datepicker').' | ';
print '
';
print '| '.$form->editfieldkey($langs->trans('DestructionDate'), 'scrapping_date', $object->scrapping_date, $object, $user->rights->stock->creer).' | ';
print ''.$form->editfieldval($langs->trans('DestructionDate'), 'scrapping_date', $object->scrapping_date, $object, $user->rights->stock->creer, 'datepicker').' | ';
print '
';
+ }
+
+ // Quality control
+ if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
+ print '| '.$form->editfieldkey($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer).' | ';
+ print ''.$form->editfieldval($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker').' | ';
+ print '
';
// print '| '.$form->editfieldkey($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer).' | ';
// print ''.$form->editfieldval($langs->trans('FirstUseDate'), 'commissionning_date', $object->commissionning_date, $object, $user->rights->stock->creer, 'datepicker').' | ';
// print '
';