Merge branch 'MAGETWO-69714' of github.com:magento-troll/magento2ce into PR_Troll

Author: slopukhov

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

@@ -179,7 +179,7 @@ public function initializeFromData(\Magento\Catalog\Model\Product $product, arra
         } else {
             $productOptions = [];
         }
-
+        $productData['tier_price'] = isset($productData['tier_price']) ? $productData['tier_price'] : [];
         $product->addData($productData);
 
         if ($wasLockedMedia) {

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php

@@ -180,8 +180,15 @@ protected function updateValues(array $valuesToUpdate, array $oldValues)
     {
         $isChanged = false;
         foreach ($valuesToUpdate as $key => $value) {
-            if ($oldValues[$key]['price'] != $value['value']
-                || $this->getPercentage($oldValues[$key]) != $this->getPercentage($value)
+            $oldPrice = $this->prepareFloatValue($oldValues[$key]['price']);
+            $newPrice = $this->prepareFloatValue($value['value']);
+            $oldQty = $this->prepareFloatValue($oldValues[$key]['price_qty']);
+            $newQty = $this->prepareFloatValue($value['qty']);
+            $oldPercentageValue = $this->prepareFloatValue($this->getPercentage($oldValues[$key]));
+            $newPercentageValue = $this->prepareFloatValue($this->getPercentage($value));
+            if (($oldPrice !== $newPrice)
+                || ($oldQty !== $newQty)
+                || ($oldPercentageValue !== $newPercentageValue)
             ) {
                 $price = new \Magento\Framework\DataObject(
                     [
@@ -198,6 +205,17 @@ protected function updateValues(array $valuesToUpdate, array $oldValues)
         return $isChanged;
     }
 
+    /**
+     * Prepare float value for comparison
+     *
+     * @param string|float|int $value
+     * @return float
+     */
+    private function prepareFloatValue($value)
+    {
+        return floatval(str_replace(',', '.', (string)$value));
+    }
+
     /**
      * Check whether price has percentage value.
      *