Merge branch 'MAGETWO-25084' into bugfixes

Author: Olexandr Lysenko

app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php

@@ -57,7 +57,9 @@ protected function _calculate($rule, $item, $qty, $rulePercent)
         $discountData->setAmount(($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct);
         $discountData->setBaseAmount(($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct);
         $discountData->setOriginalAmount(($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct);
-        $discountData->setBaseOriginalAmount(($qty * $baseItemOriginalPrice - $item->getDiscountAmount()) * $_rulePct);
+        $discountData->setBaseOriginalAmount(
+            ($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct
+        );
 
         if (!$rule->getDiscountQty() || $rule->getDiscountQty() > $qty) {
             $discountPercent = min(100, $item->getDiscountPercent() + $rulePercent);

dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ByPercentTest.php

@@ -209,7 +209,7 @@ public function calculateDataProvider()
                     'amount' => 42,
                     'baseAmount' => 25.5,
                     'originalAmount' => 51,
-                    'baseOriginalAmount' => 46.5,
+                    'baseOriginalAmount' => 34.5,
                 ],
             ]
         ];