Merge remote-tracking branch 'remotes/origin/MAGETWO-29383' into S60

Author: aohorodnyk

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

@@ -90,11 +90,17 @@ protected function _getSelectedColumns()
      */
     protected function _initSelect()
     {
-        $this->getSelect()->from($this->getResource()->getMainTable(), $this->_getSelectedColumns());
+        $this->getSelect()->from($this->getResource()->getMainTable());
+        return parent::_initSelect();
+    }
+
+    protected function _beforeLoad()
+    {
+        $this->getSelect()->columns($this->_getSelectedColumns());
         if (!$this->isTotals()) {
             $this->getSelect()->group($this->_periodFormat);
             $this->getSelect()->having('SUM(orders_count) > 0');
         }
-        return parent::_initSelect();
+        return parent::_beforeLoad();
     }
 }