Merge remote-tracking branch 'origin/MAGETWO-44980' into develop

Author: Yaroslav Onischenko

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

@@ -120,8 +120,8 @@ public function updateProductStockStatus($productId, $websiteId)
             $status = $item->getIsInStock();
             $qty = $item->getQty();
         }
-        $this->processChildren($productId, $websiteId, $qty, $status);
-        $this->processParents($productId, $websiteId);
+        $this->processChildren($productId, $item->getWebsiteId(), $qty, $status);
+        $this->processParents($productId, $item->getWebsiteId());
     }
 
     /**

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

@@ -72,8 +72,10 @@ public function __construct(
      */
     public function verifyStock(StockItemInterface $stockItem)
     {
-        if ($stockItem->getQty() !== null
-            && $stockItem->getBackorders() == StockItemInterface::BACKORDERS_NO
+        if ($stockItem->getQty() === null && $stockItem->getManageStock()) {
+            return false;
+        }
+        if ($stockItem->getBackorders() == StockItemInterface::BACKORDERS_NO
             && $stockItem->getQty() <= $stockItem->getMinQty()
         ) {
             return false;

app/code/Magento/CatalogInventory/Test/Unit/Model/Spi/StockStateProviderTest.php

@@ -384,6 +384,33 @@ protected function getVariations()
                     'checkQtyIncrements' => false,
                     'checkQuoteItemQty' => true,
                 ]
+            ],
+            [
+                'values' => [
+                    'getIsInStock' => true,
+                    'getQty' => null,
+                    'getMinQty' => 60,
+                    'getMinSaleQty' => 1,
+                    'getMaxSaleQty' => 99,
+                    'getNotifyStockQty' => 101,
+                    'getManageStock' => true,
+                    'getBackorders' => 0,
+                    'getQtyIncrements' => 1,
+                    '_stock_qty_' => null,
+                    '_suppress_check_qty_increments_' => false,
+                    '_is_saleable_' => true,
+                    '_ordered_items_' => 0,
+                    '_product_' => 'Test product Name',
+                ],
+                'results' => [
+                    'verifyStock' => false,
+                    'verifyNotification' => true,
+                    'checkQty' => false,
+                    'suggestQty' => 50.5,
+                    'getStockQty' => null,
+                    'checkQtyIncrements' => false,
+                    'checkQuoteItemQty' => true,
+                ]
             ]
         ];
     }

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml

@@ -117,6 +117,7 @@
             <data name="product/data/price/value" xsi:type="string">10</data>
             <data name="product/data/product_has_weight" xsi:type="string">No</data>
             <data name="product/data/category" xsi:type="string">category_%isolation%</data>
+            <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">999</data>
             <data name="tag" xsi:type="string">test_type:acceptance_test</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />