Merge remote-tracking branch 'origin/MAGETWO-37819' into Troll_S40_bugfix

Author: Roman Ganin

app/code/Magento/Sales/Model/Resource/Report/Order/Collection.php

@@ -102,16 +102,16 @@ protected function _getSelectedColumns()
     }
 
     /**
-     * Add selected data
+     * Apply custom columns before load
      *
      * @return $this
      */
-    protected function _initSelect()
+    protected function _beforeLoad()
     {
         $this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
         if (!$this->isTotals()) {
             $this->getSelect()->group($this->_periodFormat);
         }
-        return parent::_initSelect();
+        return parent::_beforeLoad();
     }
 }

app/code/Magento/Sales/Model/Resource/Report/Refunded/Collection/Order.php

@@ -83,16 +83,16 @@ protected function _getSelectedColumns()
     }
 
     /**
-     * Add selected data
+     * Apply custom columns before load
      *
-     * @return \Magento\Sales\Model\Resource\Report\Refunded\Collection\Order
+     * @return $this
      */
-    protected function _initSelect()
+    protected function _beforeLoad()
     {
         $this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
         if (!$this->isTotals()) {
             $this->getSelect()->group($this->_periodFormat);
         }
-        return parent::_initSelect();
+        return parent::_beforeLoad();
     }
 }

app/code/Magento/Sales/Model/Resource/Report/Shipping/Collection/Order.php

@@ -87,11 +87,11 @@ protected function _getSelectedColumns()
     }
 
     /**
-     * Add selected data
+     * Apply custom columns before load
      *
      * @return $this
      */
-    protected function _initSelect()
+    protected function _beforeLoad()
     {
         $this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
 
@@ -101,6 +101,6 @@ protected function _initSelect()
         if ($this->isSubTotals()) {
             $this->getSelect()->group([$this->_periodFormat]);
         }
-        return parent::_initSelect();
+        return parent::_beforeLoad();
     }
 }

app/code/Magento/Tax/Model/Resource/Report/Collection.php

@@ -85,11 +85,11 @@ protected function _getSelectedColumns()
     }
 
     /**
-     * Add selected data
+     * Apply custom columns before load
      *
      * @return $this
      */
-    protected function _initSelect()
+    protected function _beforeLoad()
     {
         $this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
         if (!$this->isTotals() && !$this->isSubTotals()) {
@@ -99,6 +99,6 @@ protected function _initSelect()
         if ($this->isSubTotals()) {
             $this->getSelect()->group([$this->_periodFormat]);
         }
-        return parent::_initSelect();
+        return parent::_beforeLoad();
     }
 }