ACP2E-4142: Post-Patch ACP2E-4118: Stock Threshold Change in Admin Causes Negative Salable Quantities and Stock Status Mismatch

Author: aplapana

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -3412,7 +3412,11 @@ private function formatStockDataForRow(array $rowData): array
         }
 
         if ($this->stockConfiguration->isQty($this->skuProcessor->getNewSku($sku)['type_id'])) {
-            $initialStatusStock = $existStockData['is_in_stock'] ?? $this->defaultStockData['is_in_stock'];
+            if (empty($existStockData)) {
+                $initialStatusStock = 0;
+            } else {
+                $initialStatusStock = $existStockData['is_in_stock'] ?? $this->defaultStockData['is_in_stock'];
+            }
             unset($existStockData['is_in_stock']);
 
             $row = $this->getMergedRowDetails($row, $existStockData, $rowData);

app/code/Magento/CatalogInventory/Model/StockStateProvider.php

@@ -76,7 +76,10 @@ public function __construct(
      */
     public function verifyStock(StockItemInterface $stockItem)
     {
-        if ($stockItem->getQty() === null && $stockItem->getManageStock()) {
+        if ((int) $stockItem->getQty() === 0 &&
+            $stockItem->getManageStock() &&
+            $stockItem->getBackorders() == StockItemInterface::BACKORDERS_NO
+        ) {
             return false;
         }
         if ($stockItem->getBackorders() == StockItemInterface::BACKORDERS_NO