[EngCom] Public Pull Requests - 2.2-develop

magento-engcom-team · web-flow · commit 589401c3d74b · 2018-08-08T10:11:18.000+03:00
- merged latest code from mainline branch
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
@@ -120,7 +120,6 @@ public function execute()
                 $extendedData = $data;
                 $extendedData['can_save_custom_options'] = $canSaveCustomOptions;
                 $this->copyToStores($extendedData, $productId);
-
                 $this->messageManager->addSuccessMessage(__('You saved the product.'));
                 $this->getDataPersistor()->clear('catalog_product');
                 if ($product->getSku() != $originalSku) {
@@ -142,6 +141,7 @@ public function execute()
                 );
 
                 if ($redirectBack === 'duplicate') {
+                    $product->unsetData('quantity_and_stock_status');
                     $newProduct = $this->productCopier->copy($product);
                     $this->messageManager->addSuccessMessage(__('You duplicated the product.'));
                 }
diff --git a/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php b/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
@@ -74,7 +74,6 @@ private function processStockData(Product $product)
                 $this->setStockDataToProduct($product, $stockItem, $quantityAndStockStatus);
             }
         }
-        $product->unsetData('quantity_and_stock_status');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,6 @@ private function processStockData(Product $product)`
`74`	`74`	`$this->setStockDataToProduct($product, $stockItem, $quantityAndStockStatus);`
`75`	`75`	`}`
`76`	`76`	`}`
`77`		`- $product->unsetData('quantity_and_stock_status');`
`78`	`77`	`}`
`79`	`78`
`80`	`79`	`/**`