Merge branch 'fix-issue-36719' of https://github.com/ananth-iyer/magento2 into ACP2E-2944

Author: glanujnehra

app/code/Magento/Sales/Plugin/Model/ResourceModel/Order/OrderGridCollectionFilter.php

@@ -55,7 +55,7 @@ public function aroundAddFieldToFilter(
                 }
             }
 
-            $fieldName = $subject->getConnection()->quoteIdentifier($field);
+            $fieldName = $subject->getConnection()->quoteIdentifier('main_table.' . $field);
             $condition = $subject->getConnection()->prepareSqlCondition($fieldName, $condition);
             $subject->getSelect()->where($condition, null, Select::TYPE_CONDITION);
 

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

@@ -49,9 +49,18 @@
         </arguments>
         <plugin name="orderGridExportFilterColumnPlugin" type="Magento\Sales\Plugin\Model\Export\OrderGridExportFilterColumn"/>
     </type>
-    <type name="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
+    <type name="Magento\Sales\Model\ResourceModel\Order\Grid\Collection">
         <plugin name="orderGridCollectionFilterPlugin" type="Magento\Sales\Plugin\Model\ResourceModel\Order\OrderGridCollectionFilter"/>
     </type>
+    <type name="Magento\Sales\Model\ResourceModel\Order\Invoice\Grid\Collection">
+        <plugin name="invoiceGridCollectionFilterPlugin" type="Magento\Sales\Plugin\Model\ResourceModel\Order\OrderGridCollectionFilter"/>
+    </type>
+    <type name="Magento\Sales\Model\ResourceModel\Order\Creditmemo\Order\Grid\Collection">
+        <plugin name="creditmemoGridCollectionFilterPlugin" type="Magento\Sales\Plugin\Model\ResourceModel\Order\OrderGridCollectionFilter"/>
+    </type>
+    <type name="Magento\Sales\Model\ResourceModel\Order\Shipment\Order\Grid\Collection">
+        <plugin name="shipmentGridCollectionFilterPlugin" type="Magento\Sales\Plugin\Model\ResourceModel\Order\OrderGridCollectionFilter"/>
+    </type>
     <type name="Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\DataProvider\ProductCollection">
         <arguments>
             <argument name="collectionFactory" xsi:type="object">\Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory</argument>

dev/tests/integration/testsuite/Magento/Sales/Plugin/Model/ResourceModel/Order/OrderGridCollectionFilterTest.php

@@ -80,10 +80,10 @@ public function testAroundAddFieldToFilter($mainTable, $resourceModel, $field, $
 
         if ($mainTable == 'sales_order_grid') {
             $condition = ['from' => $fieldValue , 'locale' => "en_US", 'datetime' => true];
-            $selectCondition = "WHERE (`{$field}` >= '{$convertedDate}')";
+            $selectCondition = "WHERE (`main_table`.`{$field}` >= '{$convertedDate}')";
         } else {
             $condition = ['qteq' => $fieldValue];
-            $selectCondition = "WHERE (((`{$field}` = '{$convertedDate}')))";
+            $selectCondition = "WHERE (((`main_table`.`{$field}` = '{$convertedDate}')))";
         }
 
         $this->searchResult = $this->objectManager->create(