AC-13075: FPT value in cart page and product page are different for same configurations for a dynamic product

Author: wip44850

app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php

@@ -115,13 +115,8 @@ protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $
             $taxId = $appliedRate['id'];
             $taxRate = $appliedRate['percent'];
             $rowTaxPerRate = $this->calculationTool->calcTaxAmount($rowTotalForTaxCalculation, $taxRate, false, false);
-            $deltaRoundingType = self::KEY_REGULAR_DELTA_ROUNDING;
-            if ($applyTaxAfterDiscount) {
-                $deltaRoundingType = self::KEY_TAX_BEFORE_DISCOUNT_DELTA_ROUNDING;
-            }
-            $rowTaxPerRate = $this->roundAmount($rowTaxPerRate, $taxId, false, $deltaRoundingType, $round, $item);
+            $rowTaxPerRate = $this->calculationTool->round($rowTaxPerRate);
             $rowTaxAfterDiscount = $rowTaxPerRate;
-
             //Handle discount
             if ($applyTaxAfterDiscount) {
                 //TODO: handle originalDiscountAmount

app/code/Magento/Weee/Model/Tax.php

@@ -367,6 +367,9 @@ public function getProductWeeeAttributes(
                                 $taxAmount = $value * $currentPercent / 100;
                             }
                         }
+                        if ($round) {
+                            $taxAmount = $this->priceCurrency->round($taxAmount);
+                        }
                     }
                 }