Merge branch 'MAGETWO-51479' of https://github.corp.magento.com/magento-tango/magento2ce into MAGETWO-52010

Author: shiftedreality

app/code/Magento/CatalogInventory/Model/Source/StockConfiguration.php

@@ -31,6 +31,7 @@ public function __construct(StockConfigurationInterface $stockConfiguration)
      */
     public function getValue($name)
     {
-        return $this->stockConfiguration->getDefaultConfigValue($name);
+        $value= $this->stockConfiguration->getDefaultConfigValue($name);
+        return is_numeric($value) ? (float)$value : $value;
     }
 }

app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

@@ -51,6 +51,7 @@
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="formElement" xsi:type="string">select</item>
+                            <item name="rawOptions" xsi:type="boolean">true</item>
                             <item name="dataScope" xsi:type="string">manage_stock</item>
                             <item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
                         </item>
@@ -314,6 +315,7 @@
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="formElement" xsi:type="string">select</item>
+                            <item name="rawOptions" xsi:type="boolean">true</item>
                             <item name="dataScope" xsi:type="string">backorders</item>
                             <item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
                         </item>
@@ -361,6 +363,7 @@
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="formElement" xsi:type="string">select</item>
+                            <item name="rawOptions" xsi:type="boolean">true</item>
                             <item name="dataScope" xsi:type="string">deferred_stock_update</item>
                             <item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
                         </item>
@@ -460,6 +463,7 @@
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="formElement" xsi:type="string">select</item>
+                            <item name="rawOptions" xsi:type="boolean">true</item>
                             <item name="dataScope" xsi:type="string">enable_qty_increments</item>
                             <item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
                         </item>
@@ -471,7 +475,7 @@
                         <item name="config" xsi:type="array">
                             <item name="description" xsi:type="string" translate="true">Use Config Settings</item>
                             <item name="formElement" xsi:type="string">checkbox</item>
-                            <item name="dataScope" xsi:type="string">use_config_enable_qty_increments</item>
+                            <item name="dataScope" xsi:type="string">use_config_enable_qty_inc</item>
                             <item name="valueMap" xsi:type="array">
                                 <item name="true" xsi:type="string">1</item>
                                 <item name="false" xsi:type="string">0</item>

app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php

@@ -53,7 +53,9 @@ public function prepare()
             } else {
                 $options = array_values($this->options);
             }
-            $options = $this->convertOptionsValueToString($options);
+            if (empty($config['rawOptions'])) {
+                $options = $this->convertOptionsValueToString($options);
+            }
             $config['options'] = array_values(array_merge_recursive($config['options'], $options));
         }
         $this->setData('config', (array)$config);