Merge branch 'ACP2E-1994' of https://github.com/magento-l3/magento2ce into PR-07032023

Author: chittima

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

@@ -640,10 +640,13 @@ protected function prepareCatalogInventory(array $productIds)
             if ($stockItemRow['use_config_max_sale_qty']) {
                 $stockItemRow['max_sale_qty'] = $this->stockConfiguration->getMaxSaleQty();
             }
-
             if ($stockItemRow['use_config_min_sale_qty']) {
                 $stockItemRow['min_sale_qty'] = $this->stockConfiguration->getMinSaleQty();
             }
+            if ($stockItemRow['use_config_manage_stock']) {
+                $stockItemRow['manage_stock'] = $this->stockConfiguration->getManageStock();
+            }
+
             $stockItemRows[$productId] = $stockItemRow;
         }
         return $stockItemRows;

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php

@@ -148,6 +148,7 @@ public function testExport(): void
     /**
      * Verify successful export of product with stock data with 'use config max sale quantity is enabled
      *
+     * @magentoConfigFixture default/cataloginventory/item_options/manage_stock 1
      * @magentoDataFixture /Magento/Catalog/_files/product_without_options_with_stock_data.php
      * @magentoDbIsolation enabled
      * @return void
@@ -166,6 +167,8 @@ public function testExportWithStock(): void
         $stockItem = $product->getExtensionAttributes()->getStockItem();
         $stockItem->setMaxSaleQty($maxSaleQty);
         $stockItem->setMinSaleQty($minSaleQty);
+        $stockItem->setManageStock(0);
+        $stockItem->setUseConfigManageStock(1);
         $stockRepository->save($stockItem);
 
         $this->model->setWriter(
@@ -174,10 +177,14 @@ public function testExportWithStock(): void
             )
         );
         $exportData = $this->model->export();
+        $rows = $this->csvToArray($exportData);
+
         $this->assertStringContainsString((string)$stockConfiguration->getMaxSaleQty(), $exportData);
         $this->assertStringNotContainsString($maxSaleQty, $exportData);
         $this->assertStringNotContainsString($minSaleQty, $exportData);
         $this->assertStringContainsString('Simple Product Without Custom Options', $exportData);
+        $this->assertEquals(1, $rows[0]['use_config_manage_stock']);
+        $this->assertEquals(1, $rows[0]['manage_stock']);
     }
 
     /**