Merge remote-tracking branch 'origin/MAGETWO-65540' into PR_26042017

Author: Dmytro Vilchynskyi

app/code/Magento/Catalog/Model/Product/Copier.php

@@ -54,12 +54,15 @@ public function copy(\Magento\Catalog\Model\Product $product)
         $product->getWebsiteIds();
         $product->getCategoryIds();
 
+        /** @var \Magento\Framework\EntityManager\EntityMetadataInterface $metadata */
+        $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
+
         /** @var \Magento\Catalog\Model\Product $duplicate */
         $duplicate = $this->productFactory->create();
         $duplicate->setData($product->getData());
         $duplicate->setOptions([]);
         $duplicate->setIsDuplicate(true);
-        $duplicate->setOriginalId($product->getEntityId());
+        $duplicate->setOriginalLinkId($product->getData($metadata->getLinkField()));
         $duplicate->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED);
         $duplicate->setCreatedAt(null);
         $duplicate->setUpdatedAt(null);
@@ -81,7 +84,6 @@ public function copy(\Magento\Catalog\Model\Product $product)
             }
         } while (!$isDuplicateSaved);
         $this->getOptionRepository()->duplicate($product, $duplicate);
-        $metadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
         $product->getResource()->duplicate(
             $product->getData($metadata->getLinkField()),
             $duplicate->getData($metadata->getLinkField())

app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php

@@ -297,7 +297,7 @@ protected function duplicate($product)
         $this->resourceModel->duplicate(
             $this->getAttribute()->getAttributeId(),
             isset($mediaGalleryData['duplicate']) ? $mediaGalleryData['duplicate'] : [],
-            $product->getOriginalId(),
+            $product->getOriginalLinkId(),
             $product->getData($this->metadata->getLinkField())
         );
 

app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php

@@ -98,7 +98,7 @@ public function testCopy()
                 'setOptions',
                 'getData',
                 'setIsDuplicate',
-                'setOriginalId',
+                'setOriginalLinkId',
                 'setStatus',
                 'setCreatedAt',
                 'setUpdatedAt',
@@ -117,7 +117,7 @@ public function testCopy()
 
         $duplicateMock->expects($this->once())->method('setOptions')->with([]);
         $duplicateMock->expects($this->once())->method('setIsDuplicate')->with(true);
-        $duplicateMock->expects($this->once())->method('setOriginalId')->with(1);
+        $duplicateMock->expects($this->once())->method('setOriginalLinkId')->with(1);
         $duplicateMock->expects(
             $this->once()
         )->method(