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

@@ -3399,7 +3399,7 @@ private function formatStockDataForRow(array $rowData): array
     {
         $sku = $rowData[self::COL_SKU];
         $row['product_id'] = $this->skuProcessor->getNewSku($sku)['entity_id'];
-        $row['website_id'] = $this->stockConfiguration->getDefaultScopeId();//here be the problem
+        $row['website_id'] = $this->stockConfiguration->getDefaultScopeId();
         $row['stock_id'] = $this->stockRegistry->getStock($row['website_id'])->getStockId();
 
         $stockItemDo = $this->stockRegistry->getStockItem($row['product_id'], $row['website_id']);

app/code/Magento/CatalogImportExport/Model/StockItemProcessor.php

@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogImportExport\Model;
 
+use Magento\CatalogImportExport\Model\Import\Product;
 use Magento\Store\Model\Store;
 
 class StockItemProcessor implements StockItemProcessorInterface
@@ -32,8 +33,8 @@ public function process(array $stockData, array $importedData): void
     {
         $importStockData = [];
         foreach ($stockData as $sku => $productStockData) {
-            if (isset($stockData[Store::DEFAULT_STORE_ID])) {
-                $importStockData[$sku] = $productStockData[Store::DEFAULT_STORE_ID];
+            if (isset($stockData[Product::SCOPE_DEFAULT])) {
+                $importStockData[$sku] = $productStockData[Product::SCOPE_DEFAULT];
             } else {
                 $importStockData[$sku] = reset($productStockData);
             }