MC-22827: Revert ticket ENGCOM-5194 which cause BIC on 2.3.4

Author: SeruyV

app/code/Magento/Sales/Setup/Patch/Data/UpdateCreditmemoGridCurrencyCode.php

@@ -17,7 +17,7 @@
         <element name="filters" type="button" selector="//div[@id='sales_order_view_tabs_order_invoices_content']//button[@data-action='grid-filter-expand']" timeout="30"/>
         <element name="applyFilters" type="button" selector="//div[@id='sales_order_view_tabs_order_invoices_content']//button[@data-action='grid-filter-apply']" timeout="30"/>
         <element name="invoiceId" type="input" selector="//div[@id='sales_order_view_tabs_order_invoices_content']//input[@name='increment_id']" timeout="30"/>
-        <element name="amountFrom" type="input" selector="[name='base_grand_total[from]']" timeout="30"/>
-        <element name="amountTo" type="input" selector="[name='base_grand_total[to]']" timeout="30"/>
+        <element name="amountFrom" type="input" selector="[name='grand_total[from]']" timeout="30"/>
+        <element name="amountTo" type="input" selector="[name='grand_total[to]']" timeout="30"/>
     </section>
-</sections>
+</sections>

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderInvoicesTabSection.xml

@@ -1386,8 +1386,6 @@
                 comment="Adjustment Negative"/>
         <column xsi:type="decimal" name="order_base_grand_total" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Order Grand Total"/>
-        <column xsi:type="varchar" name="order_currency_code" nullable="true" length="3" comment="Order Currency Code"/>
-        <column xsi:type="varchar" name="base_currency_code" nullable="true" length="3" comment="Base Currency Code"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
         </constraint>

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

@@ -815,9 +815,7 @@
             "shipping_and_handling": true,
             "adjustment_positive": true,
             "adjustment_negative": true,
-            "order_base_grand_total": true,
-            "order_currency_code": true,
-            "base_currency_code": true
+            "order_base_grand_total": true
         },
         "index": {
             "SALES_CREDITMEMO_GRID_ORDER_INCREMENT_ID": true,
@@ -1247,4 +1245,4 @@
             "SALES_ORDER_STATUS_LABEL_STORE_ID_STORE_STORE_ID": true
         }
     }
-}
+}

app/code/Magento/Sales/etc/db_schema_whitelist.json

@@ -641,8 +641,6 @@
                 <item name="adjustment_positive" xsi:type="string">sales_creditmemo.adjustment_positive</item>
                 <item name="adjustment_negative" xsi:type="string">sales_creditmemo.adjustment_negative</item>
                 <item name="order_base_grand_total" xsi:type="string">sales_order.base_grand_total</item>
-                <item name="order_currency_code" xsi:type="string">sales_order.order_currency_code</item>
-                <item name="base_currency_code" xsi:type="string">sales_order.base_currency_code</item>
             </argument>
         </arguments>
     </virtualType>

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

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Sales">
+    <module name="Magento_Sales" >
         <sequence>
             <module name="Magento_Rule"/>
             <module name="Magento_Catalog"/>

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

@@ -119,7 +119,7 @@
         <column name="base_grand_total" class="Magento\Sales\Ui\Component\Listing\Column\Price">
             <settings>
                 <filter>textRange</filter>
-                <label translate="true">Refunded (Base)</label>
+                <label translate="true">Refunded</label>
             </settings>
         </column>
         <column name="order_status" component="Magento_Ui/js/grid/columns/select">
@@ -194,7 +194,7 @@
                 <visible>false</visible>
             </settings>
         </column>
-        <column name="subtotal" class="Magento\Sales\Ui\Component\Listing\Column\PurchasedPrice">
+        <column name="subtotal" class="Magento\Sales\Ui\Component\Listing\Column\Price">
             <settings>
                 <filter>textRange</filter>
                 <label translate="true">Subtotal</label>

app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml

@@ -130,7 +130,7 @@
                 <label translate="true">Status</label>
             </settings>
         </column>
-        <column name="base_grand_total" class="Magento\Sales\Ui\Component\Listing\Column\Price">
+        <column name="grand_total" class="Magento\Sales\Ui\Component\Listing\Column\PurchasedPrice">
             <settings>
                 <filter>textRange</filter>
                 <label translate="true">Amount</label>

app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml

@@ -24,10 +24,10 @@ class Grid extends \Magento\Ui\Test\Block\Adminhtml\DataGrid
             'selector' => 'input[name="order_increment_id"]',
         ],
         'grand_total_from' => [
-            'selector' => 'input[name="base_grand_total[from]"]',
+            'selector' => 'input[name="grand_total[from]"]',
         ],
         'grand_total_to' => [
-            'selector' => 'input[name="base_grand_total[to]"]',
+            'selector' => 'input[name="grand_total[to]"]',
         ],
     ];