From d6b936dd6ecb9d08abeaa5fe7682e8966fdd78b0 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Wed, 28 Apr 2021 16:36:15 +0200
Subject: [PATCH] add lifetime and qc_frequency in product card

---
 htdocs/product/card.php | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index f3dc87f41ba..b715bab29c2 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -473,6 +473,8 @@ if (empty($reshook)) {
 				$object->customcode             = GETPOST('customcode', 'alpha');
 				$object->country_id = GETPOST('country_id', 'int');
 				$object->state_id = GETPOST('state_id', 'int');
+				$object->lifetime = GETPOST('lifetime', 'int');
+				$object->qc_frequency = GETPOST('qc_frequency', 'int');
 				$object->status                 = GETPOST('statut', 'int');
 				$object->status_buy             = GETPOST('statut_buy', 'int');
 				$object->status_batch = GETPOST('status_batch', 'aZ09');
@@ -1535,7 +1537,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$object->country = $tmparray['label'];
 			}
 
-
 			$type = $langs->trans('Product');
 			if ($object->isService()) {
 				$type = $langs->trans('Service');
@@ -1604,10 +1605,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						$tooltip .= $langs->trans("GenericMaskCodes5");
 						print '<td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
 						if ($object->status_batch == '1' && $conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
-							$mask = !is_empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK;
+							$mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->LOT_ADVANCED_MASK;
 						}
 						if ($object->status_batch == '2' && $conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced') {
-							$mask = !is_empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK;
+							$mask = !empty($object->batch_mask) ? $object->batch_mask : $conf->global->SN_ADVANCED_MASK;
 						}
 						$inherited_mask_lot = $conf->global->LOT_ADVANCED_MASK;
 						$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK;
@@ -1798,6 +1799,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</tr>';
 			}
 
+			// Traceability
+			if (empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
+				print '<tr><td>'.$langs->trans("LifeTime").'</td><td><input name="lifetime" class="maxwidth100onsmartphone" value="'.$object->lifetime.'"></td></tr>';
+				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td><input name="qc_frequency" class="maxwidth100onsmartphone" value="'.$object->qc_frequency.'"></td></tr>';
+			}
+
 			// Other attributes
 			$parameters = array('colspan' => ' colspan="3"', 'cols' => 3);
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -2275,6 +2282,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</td>';
 			}
 
+			// Traceability
+			if (empty($conf->global->PRODUCT_DISABLE_TRACEABILITY)) {
+				print '<tr><td>'.$langs->trans("LifeTime").'</td><td colspan="2">'.$object->lifetime.' ';
+				!empty($object->lifetime) ? print $langs->trans('Days') : print '';
+				print '</td></tr>';
+				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td colspan="2">'.$object->qc_frequency.' ';
+				!empty($object->qc_frequency) ? print $langs->trans('Days') : print '';
+				print '</td></tr>';
+			}
+
 			// Other attributes
 			$parameters = array('colspan' => ' colspan="'.(2 + (($showphoto || $showbarcode) ? 1 : 0)).'"', 'cols' => (2 + (($showphoto || $showbarcode) ? 1 : 0)));
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';