Merge pull request #431 from magento-tango/MAGETWO-48223

[Tango] Price permissions fixes

Author: Korshenko, Oleksii(okorshenko)

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php

@@ -77,7 +77,7 @@ protected function setUp()
             ->willReturnArgument(1);
         $this->arrayManagerMock->expects($this->any())
             ->method('get')
-            ->willReturnArgument(3);
+            ->willReturnArgument(2);
         $this->arrayManagerMock->expects($this->any())
             ->method('set')
             ->willReturnArgument(1);

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php

@@ -122,9 +122,6 @@ public function modifyMeta(array $meta)
     {
         $this->meta = $meta;
 
-        $this->preparePriceFields(ProductAttributeInterface::CODE_PRICE);
-        $this->preparePriceFields(ProductAttributeInterface::CODE_SPECIAL_PRICE);
-        $this->preparePriceFields(ProductAttributeInterface::CODE_COST);
         $this->specialPriceDataToInline();
         $this->customizeTierPrice();
 
@@ -182,7 +179,7 @@ protected function customizeTierPrice()
         $tierPricePath = $this->getElementArrayPath($this->meta, ProductAttributeInterface::CODE_TIER_PRICE);
 
         if ($tierPricePath) {
-            $this->meta = $this->arrayManager->set(
+            $this->meta = $this->arrayManager->merge(
                 $tierPricePath,
                 $this->meta,
                 $this->getTierPriceStructure($tierPricePath)