merge magento/2.4-develop into magento-tsg/2.4-develop-pr43

magento-mts-svc · web-flow · commit 97d7b193e673 · 2020-05-20T14:42:41.000-07:00
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -695,7 +695,7 @@ public function updateItemTaxInfo($quoteItem, $itemTaxDetails, $baseItemTaxDetai
         //The price should be base price
         $quoteItem->setPrice($baseItemTaxDetails->getPrice());
         if ($quoteItem->getCustomPrice() && $this->taxHelper->applyTaxOnCustomPrice()) {
-            $quoteItem->setCustomPrice($baseItemTaxDetails->getPrice());
+            $quoteItem->setCustomPrice($itemTaxDetails->getPrice());
         }
         $quoteItem->setConvertedPrice($itemTaxDetails->getPrice());
         $quoteItem->setPriceInclTax($itemTaxDetails->getPriceInclTax());

Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ public function updateItemTaxInfo($quoteItem, $itemTaxDetails, $baseItemTaxDetai`
`695`	`695`	`//The price should be base price`
`696`	`696`	`$quoteItem->setPrice($baseItemTaxDetails->getPrice());`
`697`	`697`	`if ($quoteItem->getCustomPrice() && $this->taxHelper->applyTaxOnCustomPrice()) {`
`698`		`- $quoteItem->setCustomPrice($baseItemTaxDetails->getPrice());`
	`698`	`+ $quoteItem->setCustomPrice($itemTaxDetails->getPrice());`
`699`	`699`	`}`
`700`	`700`	`$quoteItem->setConvertedPrice($itemTaxDetails->getPrice());`
`701`	`701`	`$quoteItem->setPriceInclTax($itemTaxDetails->getPriceInclTax());`