Merge remote-tracking branch 'origin/MAGETWO-31522' into MAGETWO-31522

Author: vpaladiychuk

app/code/Magento/Sales/Controller/Adminhtml/Order/Invoices.php

@@ -10,17 +10,12 @@ class Invoices extends \Magento\Sales\Controller\Adminhtml\Order
     /**
      * Generate invoices grid for ajax request
      *
-     * @return \Magento\Framework\View\Result\Layout|\Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\View\Result\Layout
      */
     public function execute()
     {
-        $order = $this->_initOrder();
-        if ($order) {
-            $resultLayout = $this->resultLayoutFactory->create();
-            return $resultLayout;
-        }
-        $resultRedirect = $this->resultRedirectFactory->create();
-        $resultRedirect->setPath('sales/*/');
-        return $resultRedirect;
+        $this->_initOrder();
+        $resultLayout = $this->resultLayoutFactory->create();
+        return $resultLayout;
     }
 }

app/code/Magento/Sales/Controller/Adminhtml/Order/Shipments.php

@@ -10,17 +10,12 @@ class Shipments extends \Magento\Sales\Controller\Adminhtml\Order
     /**
      * Generate shipments grid for ajax request
      *
-     * @return \Magento\Framework\View\Result\Layout|\Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\View\Result\Layout
      */
     public function execute()
     {
-        $order = $this->_initOrder();
-        if ($order) {
-            $resultLayout = $this->resultLayoutFactory->create();
-            return $resultLayout;
-        }
-        $resultRedirect = $this->resultRedirectFactory->create();
-        $resultRedirect->setPath('sales/*/');
-        return $resultRedirect;
+        $this->_initOrder();
+        $resultLayout = $this->resultLayoutFactory->create();
+        return $resultLayout;
     }
 }

app/code/Magento/Sales/Controller/Adminhtml/Order/Transactions.php

@@ -12,17 +12,12 @@ class Transactions extends \Magento\Sales\Controller\Adminhtml\Order
     /**
      * Order transactions grid ajax action
      *
-     * @return \Magento\Framework\View\Result\Layout|\Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\View\Result\Layout
      */
     public function execute()
     {
-        $order = $this->_initOrder();
-        if ($order) {
-            $resultLayout = $this->resultLayoutFactory->create();
-            return $resultLayout;
-        }
-        $resultRedirect = $this->resultRedirectFactory->create();
-        $resultRedirect->setPath('sales/*/');
-        return $resultRedirect;
+        $this->_initOrder();
+        $resultLayout = $this->resultLayoutFactory->create();
+        return $resultLayout;
     }
 }