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

Author: eldy

dev/build/makepack-dolibarrmodule.pl

@@ -157,7 +157,7 @@
 		  . ucfirst($PROJECT)
 		  . ".class.php"
 	);
-	$custom = 0;
+	$custom = 1;
 	if ( !$result ) {
 		$result = open(
 			$IN,
@@ -180,7 +180,7 @@
 		}
 	}
 	else {
-		$custom = 1;
+		$custom = 0;
 	}
 	while (<$IN>) {
 		if ( $_ =~ /this->version\s*=\s*'([\d\.]+)'/ ) {

htdocs/commande/list.php

@@ -3003,6 +3003,8 @@
 					$generic_commande->getLinesArray(); 	// Load array ->lines
 					$generic_commande->loadExpeditions();	// Load array ->expeditions
 
+					$stock = [];
+
 					$numlines = count($generic_commande->lines); // Loop on each line of order
 					for ($lig = 0; $lig < $numlines; $lig++) {
 						$orderLine = $generic_commande->lines[$lig];
@@ -3027,9 +3029,15 @@
 								$generic_product->stock_theorique = $productstat_cachevirtual[$orderLine->fk_product]['stock_reel'];
 							}
 
-							if ($reliquat > $generic_product->stock_reel) {
+							if (!array_key_exists($orderLine->fk_product, $stock)) {
+								$stock[$orderLine->fk_product] = $generic_product->stock_reel;
+							}
+
+							if ($reliquat > $stock[$orderLine->fk_product]) {
 								$notshippable++;
 							}
+
+							$stock[$orderLine->fk_product] = $stock[$orderLine->fk_product] - $reliquat;
 							if (!getDolGlobalString('SHIPPABLE_ORDER_ICON_IN_LIST')) {  // Default code. Default should be this case.
 								$text_info .= $reliquat.' x '.$orderLine->product_ref.'&nbsp;'.dol_trunc($orderLine->product_label, 20);
 								$text_info .= ' - '.$langs->trans("Stock").': <span class="'.($generic_product->stock_reel > 0 ? 'ok' : 'error').'">'.$generic_product->stock_reel.'</span>';