MAGETWO-34068: Incorrect tax details and amounts in frontend and backend order

- Added custom attributes to order interface
- Removed obsolete code

Author: Manasa Potluri

app/code/Magento/Sales/etc/data_object.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Api/etc/data_object.xsd">
+    <custom_attributes for="Magento\Sales\Api\Data\OrderInterface">
+        <attribute code="applied_taxes" type="Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface[]" />
+        <attribute code="item_applied_taxes" type="Magento\Tax\Api\Data\OrderTaxDetailsItemInterface[]" />
+        <attribute code="converting_from_quote" type="boolean" />
+    </custom_attributes>
+</config>

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

@@ -131,14 +131,22 @@ public function salesEventOrderAfterSave(\Magento\Framework\Event\Observer $obse
             return;
         }
 
-        $getTaxesForItems = $order->getItemAppliedTaxes();
-        $taxes = $order->getAppliedTaxes();
+        $taxesAttr = $order->getCustomAttribute('applied_taxes');
+        if (is_null($taxesAttr) || !is_array($taxesAttr->getValue())) {
+            $taxes = [];
+        } else {
+            $taxes = $taxesAttr->getValue();
+        }
 
-        $ratesIdQuoteItemId = [];
-        if (!is_array($getTaxesForItems)) {
+        $getTaxesForItemsAttr = $order->getCustomAttribute('item_applied_taxes');
+        if (is_null($getTaxesForItemsAttr) || !is_array($getTaxesForItemsAttr->getValue())) {
             $getTaxesForItems = [];
+        } else {
+            $getTaxesForItems = $getTaxesForItemsAttr->getValue();
         }
-        foreach ($getTaxesForItems as $quoteItemId => $taxesArray) {
+
+        $ratesIdQuoteItemId = [];
+        foreach ($getTaxesForItems as $taxesArray) {
             foreach ($taxesArray as $rates) {
                 if (count($rates['rates']) == 1) {
                     $ratesIdQuoteItemId[$rates['id']][] = [
@@ -171,20 +179,12 @@ public function salesEventOrderAfterSave(\Magento\Framework\Event\Observer $obse
                         ];
                         $percentSum += $rate['percent'];
                     }
-
-                    if ($percentDelta != $percentSum) {
-                        $delta = $percentDelta - $percentSum;
-                        foreach ($ratesIdQuoteItemId[$rates['id']] as &$rateTax) {
-                            if ($rateTax['id'] == $quoteItemId) {
-                                $rateTax['percent'] = $rateTax['percent'] / $percentSum * $delta + $rateTax['percent'];
-                            }
-                        }
-                    }
                 }
             }
         }
 
-        foreach ($taxes as $id => $row) {
+        foreach ($taxes as $row) {
+            $id = $row['id'];
             foreach ($row['rates'] as $tax) {
                 if (is_null($row['percent'])) {
                     $baseRealAmount = $row['base_amount'];

app/code/Magento/Tax/Model/Quote/ToOrderConverter.php

@@ -39,21 +39,22 @@ public function afterConvert(QuoteAddressToOrder $subject, OrderInterface $order
     {
         /** @var \Magento\Sales\Model\Order $order */
         $taxes = $this->quoteAddress->getAppliedTaxes();
+        $customAttributes = $order->getCustomAttributes();
         if (is_array($taxes)) {
             if (is_array($order->getAppliedTaxes())) {
                 $taxes = array_merge($order->getAppliedTaxes(), $taxes);
             }
-            $order->setAppliedTaxes($taxes);
-            $order->setConvertingFromQuote(true);
+            $customAttributes = array_merge($customAttributes, ['applied_taxes' => $taxes], ['converting_from_quote' => true]);
         }
 
         $itemAppliedTaxes = $this->quoteAddress->getItemsAppliedTaxes();
         if (is_array($itemAppliedTaxes)) {
             if (is_array($order->getItemAppliedTaxes())) {
                 $itemAppliedTaxes = array_merge($order->getItemAppliedTaxes(), $itemAppliedTaxes);
             }
-            $order->setItemAppliedTaxes($itemAppliedTaxes);
+            $customAttributes = array_merge($customAttributes, ['item_applied_taxes' => $itemAppliedTaxes]);
         }
+        $order->setData('custom_attributes', $customAttributes);
         return $order;
     }
 }

app/code/Magento/Tax/etc/fieldset.xml

@@ -42,5 +42,27 @@
                 <aspect name="to_cm_item" />
             </field>
         </fieldset>
+        <fieldset id="quote_convert_address">
+            <field name="subtotal_incl_tax">
+                <aspect name="to_order" />
+            </field>
+            <field name="base_subtotal_incl_tax">
+                <aspect name="to_order" />
+            </field>
+        </fieldset>
+        <fieldset id="quote_convert_item">
+            <field name="price_incl_tax">
+                <aspect name="to_order_item" />
+            </field>
+            <field name="base_price_incl_tax">
+                <aspect name="to_order_item" />
+            </field>
+            <field name="row_total_incl_tax">
+                <aspect name="to_order_item" />
+            </field>
+            <field name="base_row_total_incl_tax">
+                <aspect name="to_order_item" />
+            </field>
+        </fieldset>
     </scope>
 </config>