Merge branch 'MAGETWO-96545' of github.com:magento-epam/magento2ce into EPAM-PR-40

Author: vital-pantsialeyeu

app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php

@@ -271,22 +271,4 @@ public function canShowPriceInfo($item)
         }
         return false;
     }
-
-    /**
-     * Check if this iten should be shipped together
-     *
-     * @param object $item
-     * @return bool
-     */
-    public function isShipTogether($item)
-    {
-        $orderItem = $item->getOrderItem();
-        if ($orderItem->getProductType() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
-            $shipTogether = !$orderItem->isShipSeparately();
-        } else {
-            $shipTogether = !$orderItem->getParentItem()->isShipSeparately();
-        }
-
-        return $shipTogether;
-    }
 }

app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml

@@ -29,7 +29,8 @@
 
 <?php foreach ($items as $_item): ?>
     <?php
-        $shipTogether = $block->isShipTogether($_item);
+    $shipTogether = ($_item->getOrderItem()->getProductType() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) ?
+        !$_item->getOrderItem()->isShipSeparately() : !$_item->getOrderItem()->getParentItem()->isShipSeparately()
     ?>
     <?php $block->setPriceDataObject($_item) ?>
     <?php if ($_item->getOrderItem()->getParentItem()): ?>