diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 94ace4ab64f..621d6421d2d 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2307,8 +2307,12 @@ if ($action == 'create')
 								foreach ($lines[$i]->detail_batch as $dbatch)	// $dbatch is instance of ExpeditionLineBatch
 								{
 									$detail .= $langs->trans("Batch").': '.$dbatch->batch;
-									$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
-									$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
+									if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+										$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
+									}
+									if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+										$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
+									}
 									$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
 									$detail .= '<br>';
 								}
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index f43ccd3dcd4..e281d45ee74 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -143,6 +143,12 @@ $arrayfields = array(
 	//'m.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	//'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
+if (!empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+	unset($arrayfields['pl.eatby']);
+}
+if (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+	unset($arrayfields['pl.sellby']);
+}
 $objectlist->fields = dol_sort_array($objectlist->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index fc43d5e8ce3..5a7cd3b2d3d 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -159,8 +159,12 @@ if ($resql)
 	if (!empty($conf->productbatch->enabled))
 	{
 		print '<th>'.$langs->trans("Batch").'</th>';
-		print '<th>'.$langs->trans("SellByDate").'</th>';
-		print '<th>'.$langs->trans("EatByDate").'</th>';
+		if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+			print '<th>'.$langs->trans("SellByDate").'</th>';
+		}
+		if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+			print '<th>'.$langs->trans("EatByDate").'</th>';
+		}
 	}
 	print '<th>'.$langs->trans("Warehouse").'</th>';
 	print '<th class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/product/stock/movement_list.php">'.$langs->trans("FullList").'</a></th>';
@@ -191,8 +195,12 @@ if ($resql)
 		if (!empty($conf->productbatch->enabled))
 		{
 			print '<td>'.$objp->batch.'</td>';
-			print '<td>'.dol_print_date($db->jdate($objp->sellby), 'day').'</td>';
-			print '<td>'.dol_print_date($db->jdate($objp->eatby), 'day').'</td>';
+			if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+				print '<td>'.dol_print_date($db->jdate($objp->sellby), 'day').'</td>';
+			}
+			if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+				print '<td>'.dol_print_date($db->jdate($objp->eatby), 'day').'</td>';
+			}
 		}
 		print '<td class="tdoverflowmax200">';
 		print $warehouse->getNomUrl(1);
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index c844bae01e2..ee4c77eb2e4 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -121,6 +121,12 @@ $arrayfields = array(
 		//'m.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
     //'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
+if (!empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+	unset($arrayfields['pl.eatby']);
+}
+if (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+	unset($arrayfields['pl.sellby']);
+}
 
 // Security check
 if (!$user->rights->stock->mouvement->lire) {