Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0

Dolibarr · Feb 23, 2024 · 80f3bc6 · 80f3bc6
2 parents 2acfea2 + 38095cf
commit 80f3bc6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
@@ -1486,7 +1486,7 @@
 			print '</td></tr>';
 		}
 
-		if ($type != 1 && isModEnabled('stock')) {
+		if (($type != 1 || getDolGlobalInt('STOCK_SUPPORTS_SERVICES')) && isModEnabled('stock')) {
 			// Default warehouse
 			print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
 			print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
@@ -2053,7 +2053,7 @@
 			}
 
 			// Stock
-			if ($object->isProduct() && isModEnabled('stock')) {
+			if (($object->isProduct() || getDolGlobalInt('STOCK_SUPPORTS_SERVICES')) && isModEnabled('stock')) {
 				// Default warehouse
 				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
 				print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
@@ -2557,7 +2557,7 @@
 			}
 
 			// Default warehouse
-			if ($object->isProduct() && isModEnabled('stock')) {
+			if (($object->isProduct() || getDolGlobalInt('STOCK_SUPPORTS_SERVICES')) && isModEnabled('stock')) {
 				$warehouse = new Entrepot($db);
 				$warehouse->fetch($object->fk_default_warehouse);