Merge branch 'FearlessKiwis-MAGETWO-48452-GITHUB-2451-base_tax_amount-is-inaccurate-for-Credit-Memo-items_NEW' into develop

Author: Mike Weis

app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php

@@ -42,7 +42,7 @@ public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
                  */
 
                 $tax = $orderItemTax - $orderItem->getTaxRefunded();
-                $baseTax = $baseOrderItemTax - $orderItem->getTaxRefunded();
+                $baseTax = $baseOrderItemTax - $orderItem->getBaseTaxRefunded();
                 $discountTaxCompensation = $orderItem->getDiscountTaxCompensationInvoiced() -
                     $orderItem->getDiscountTaxCompensationRefunded();
                 $baseDiscountTaxCompensation = $orderItem->getBaseDiscountTaxCompensationInvoiced() -

app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php

@@ -232,6 +232,95 @@ public function collectDataProvider()
             ],
         ];
 
+        $currencyRatio = 2;
+        // scenario 1: 3 item_1, 3 item_2, $99 each, 8.19 tax rate
+        // 1 item_1 and 2 item_2 are invoiced and base currency <> display currency
+        $result['partial_invoice_partial_creditmemo_different_currencies'] = [
+            'order_data' => [
+                'data_fields' => [
+                    'shipping_tax_amount' => 2.45 * $currencyRatio,
+                    'base_shipping_tax_amount' => 2.45,
+                    'shipping_discount_tax_compensation_amount' => 0.00,
+                    'base_shipping_discount_tax_compensation_amount' => 0.00,
+                    'tax_amount' => 53.56 * $currencyRatio,
+                    'base_tax_amount' => 53.56,
+                    'tax_invoiced' => 24.33 * $currencyRatio,
+                    'base_tax_invoiced' => 24.33,
+                    'tax_refunded' => 0.00,
+                    'base_tax_refunded' => 0.00,
+                    'base_shipping_amount' => 30.00,
+                ],
+            ],
+            'creditmemo_data' => [
+                'items' => [
+                    'item_1' => [
+                        'order_item' => [
+                            'qty_invoiced' => 1,
+                            'tax_invoiced' => 8.11 * $currencyRatio,
+                            'tax_refunded' => 0,
+                            'base_tax_invoiced' => 8.11,
+                            'base_tax_refunded' => 0,
+                            'discount_tax_compensation_amount' => 0,
+                            'base_discount_tax_compensation_amount' => 0,
+                            'qty_refunded' => 0,
+                        ],
+                        'is_last' => false,
+                        'qty' => 1,
+                    ],
+                    'item_2' => [
+                        'order_item' => [
+                            'qty_invoiced' => 2,
+                            'tax_refunded' => 0,
+                            'tax_invoiced' => 16.22 * $currencyRatio,
+                            'base_tax_refunded' => 0,
+                            'base_tax_invoiced' => 16.22,
+                            'discount_tax_compensation_amount' => 0,
+                            'base_discount_tax_compensation_amount' => 0,
+                            'qty_refunded' => 0,
+                        ],
+                        'is_last' => false,
+                        'qty' => 1,
+                    ],
+                ],
+                'is_last' => false,
+                'data_fields' => [
+                    'grand_total' => 198 * $currencyRatio,
+                    'base_grand_total' => 198,
+                    'base_shipping_amount' => 30,
+                    'tax_amount' => 0.82 * $currencyRatio,
+                    'base_tax_amount' => 0.82,
+                    'invoice' => new MagentoObject(
+                        [
+                            'shipping_tax_amount' => 2.45 * $currencyRatio,
+                            'base_shipping_tax_amount' => 2.45,
+                            'shipping_discount_tax_compensation_amount' => 0,
+                            'base_shipping_discount_tax_compensation_amount' => 0,
+                        ]
+                    ),
+                ],
+            ],
+            'expected_results' => [
+                'creditmemo_items' => [
+                    'item_1' => [
+                        'tax_amount' => 8.11 * $currencyRatio,
+                        'base_tax_amount' => 8.11,
+                    ],
+                    'item_2' => [
+                        'tax_amount' => 8.11 * $currencyRatio,
+                        'base_tax_amount' => 8.11,
+                    ],
+                ],
+                'creditmemo_data' => [
+                    'grand_total' => 216.67 * $currencyRatio,
+                    'base_grand_total' => 216.67,
+                    'tax_amount' => 19.49 * $currencyRatio,
+                    'base_tax_amount' => 19.49,
+                    'shipping_tax_amount' => 2.45 * $currencyRatio,
+                    'base_shipping_tax_amount' => 2.45,
+                ],
+            ],
+        ];
+
         // scenario 2: 3 items, 2 invoiced, rowtotal of 150 with 8.25 tax rate
         // extra tax amount exist (weee tax), make sure that tax amount
         // is not over the amount invoiced