MAGETWO-97423: Price column in sales_order_item table shows the price including tax when Custom Price is applied on admin order

Author: rostyslav-hymon

app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/CommonTaxCollectorTest.php

@@ -83,7 +83,7 @@ class CommonTaxCollectorTest extends TestCase
     /**
      * @var TaxHelper
      */
-    protected $taxHelper;
+    private $taxHelper;
 
     /**
      * {@inheritdoc}
@@ -152,6 +152,8 @@ protected function setUp()
      * @param bool $useBaseCurrency
      * @param string $shippingTaxClass
      * @param bool $shippingPriceInclTax
+     *
+     * @return void
      * @dataProvider getShippingDataObjectDataProvider
      */
     public function testGetShippingDataObject(

dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SetupUtil.php

@@ -7,10 +7,15 @@
 namespace Magento\Tax\Model\Sales\Total\Quote;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Quote\Model\Quote;
 use Magento\Tax\Model\Config;
 use Magento\Tax\Model\Calculation;
 use Magento\Quote\Model\Quote\Item\Updater;
-use \Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\Search\FilterGroup;
+use Magento\Framework\Api\SearchCriteriaInterface;
 
 /**
  * Setup utility for quote
@@ -598,7 +603,7 @@ protected function createCartRule($ruleDataOverride)
      *
      * @param array $quoteData
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
-     * @return \Magento\Quote\Model\Quote
+     * @return Quote
      */
     protected function createQuote($quoteData, $customer)
     {
@@ -623,8 +628,8 @@ protected function createQuote($quoteData, $customer)
         $quoteBillingAddress = $this->objectManager->create(\Magento\Quote\Model\Quote\Address::class);
         $quoteBillingAddress->importCustomerAddressData($addressService->getById($billingAddress->getId()));
 
-        /** @var \Magento\Quote\Model\Quote $quote */
-        $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class);
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
         $quote->setStoreId(1)
             ->setIsActive(true)
             ->setIsMultiShipping(false)
@@ -638,7 +643,7 @@ protected function createQuote($quoteData, $customer)
     /**
      * Add products to quote
      *
-     * @param \Magento\Quote\Model\Quote $quote
+     * @param Quote $quote
      * @param array $itemsData
      * @return $this
      */
@@ -661,7 +666,8 @@ protected function addProductToQuote($quote, $itemsData)
      * Create a quote based on given data
      *
      * @param array $quoteData
-     * @return \Magento\Quote\Model\Quote
+     *
+     * @return Quote
      */
     public function setupQuote($quoteData)
     {
@@ -671,16 +677,7 @@ public function setupQuote($quoteData)
 
         $this->addProductToQuote($quote, $quoteData['items']);
         if (isset($quoteData['update_items'])) {
-            $updater = $this->objectManager->get(Updater::class);
-            $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-            foreach ($quoteData['update_items'] as $sku => $updateItem) {
-                $product = $productRepository->get($sku);
-                $quoteItem = $quote->getItemByProduct($product);
-                $updater->update(
-                    $quoteItem,
-                    $updateItem
-                );
-            }
+            $this->updateItems($quote, $quoteData['update_items']);
         }
         //Set shipping amount
         if (isset($quoteData['shipping_method'])) {
@@ -698,4 +695,33 @@ public function setupQuote($quoteData)
 
         return $quote;
     }
+
+    /**
+     * Update quote items
+     *
+     * @param Quote $quote
+     * @param array $items
+     *
+     * @return void
+     */
+    private function updateItems(Quote $quote, array $items): void
+    {
+        $updater = $this->objectManager->get(Updater::class);
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $filter = $this->objectManager->create(Filter::class);
+        $filter->setField('sku')->setValue(array_keys($items));
+        $filterGroup = $this->objectManager->create(FilterGroup::class);
+        $filterGroup->setFilters([$filter]);
+        $searchCriteria = $this->objectManager->create(SearchCriteriaInterface::class);
+        $searchCriteria->setFilterGroups([$filterGroup]);
+        $products = $productRepository->getList($searchCriteria)->getItems();
+        /** @var ProductInterface $product */
+        foreach ($products as $product) {
+            $quoteItem = $quote->getItemByProduct($product);
+            $updater->update(
+                $quoteItem,
+                $items[$product->getSku()]
+            );
+        }
+    }
 }

dev/tests/integration/testsuite/Magento/Tax/_files/scenarios/including_tax_with_custom_price.php

@@ -12,7 +12,7 @@
     'config_data' => [
         SetupUtil::CONFIG_OVERRIDES => [
             Config::CONFIG_XML_PATH_PRICE_INCLUDES_TAX => 1,
-            Config::CONFIG_XML_PATH_APPLY_ON => 0
+            Config::CONFIG_XML_PATH_APPLY_ON => 0,
         ],
         SetupUtil::TAX_RATE_OVERRIDES => [
             SetupUtil::TAX_RATE_TX => 8.25,