Merge remote-tracking branch 'origin/MAGETWO-33071' into bugfix

Author: Andrii Kasian

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
 
+use Magento\Framework\Api\SimpleDataObjectConverter;
+
 /**
  * Product inventory data
  */
@@ -133,7 +135,7 @@ public function getFieldValue($field)
     {
         $stockItem = $this->getStockItem();
         if ($stockItem->getItemId()) {
-            $method = 'get' . \Magento\Framework\Api\SimpleDataObjectConverter::snakeCaseToUpperCamelCase($field);
+            $method = 'get' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase($field);
             if (method_exists($stockItem, $method)) {
                 return $stockItem->{$method}();
             }
@@ -149,7 +151,7 @@ public function getConfigFieldValue($field)
     {
         $stockItem = $this->getStockItem();
         if ($stockItem->getItemId()) {
-            $method = 'getUseConfig' . \Magento\Framework\Api\SimpleDataObjectConverter::snakeCaseToUpperCamelCase(
+            $method = 'getUseConfig' . SimpleDataObjectConverter::snakeCaseToUpperCamelCase(
                 $field
             );
             if (method_exists($stockItem, $method)) {

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml

@@ -50,7 +50,7 @@
                                 class="select" disabled="disabled">
                             <option value="1"><?php echo __('Yes') ?></option>
                             <option
-                                value="0"<?php if ($block->getConfigFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
+                                value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
                         </select>
                     </div>
                     <div class="field choice">

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml

@@ -24,7 +24,7 @@
     <div class="control">
         <select id="inventory_manage_stock" name="<?php echo $block->getFieldSuffix() ?>[stock_data][manage_stock]" <?php echo $_readonly;?>>
             <option value="1"><?php echo __('Yes') ?></option>
-            <option value="0"<?php if ($block->getConfigFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
+            <option value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
         </select>
         <input type="hidden" id="inventory_manage_stock_default" value="<?php echo $block->getDefaultConfigValue('manage_stock'); ?>">
         <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->IsNew()) ? 'checked="checked"' : '' ?>