From cbc352e0d0235f1e8e200eee1f6587d08b1ec7ca Mon Sep 17 00:00:00 2001
From: niravkrish <niravpatel5393@gmail.com>
Date: Tue, 24 Mar 2020 19:48:34 +0530
Subject: [PATCH 1/4] resolve can not create shipment for remaining item issue

---
 app/code/Magento/Sales/Model/Order/Item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php
index c133d3aea267d..ba01090e5abff 100644
--- a/app/code/Magento/Sales/Model/Order/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Item.php
@@ -232,7 +232,7 @@ public function getQtyToShip()
      */
     public function getSimpleQtyToShip()
     {
-        $qty = $this->getQtyOrdered() - $this->getQtyShipped() - $this->getQtyRefunded() - $this->getQtyCanceled();
+        $qty = $this->getQtyOrdered() - max($this->getQtyShipped(), $this->getQtyRefunded()) - $this->getQtyCanceled();
         return max(round($qty, 8), 0);
     }
 

From c85bcd0fb0e1b97df1d8b116ba3647c28f3f33f4 Mon Sep 17 00:00:00 2001
From: niravkrish <niravpatel5393@gmail.com>
Date: Wed, 25 Mar 2020 19:16:21 +0530
Subject: [PATCH 2/4] added unit test changes

---
 app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
index 3c7042c10f4d3..9733a14b289c8 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
@@ -314,7 +314,7 @@ public function getItemQtyVariants()
                     'qty_ordered' => 12, 'qty_invoiced' => 12, 'qty_refunded' => 5, 'qty_shipped' => 4,
                     'qty_canceled' => 0
                 ],
-                'expectedResult' => ['to_ship' => 3.0, 'to_invoice' => 0.0]
+                'expectedResult' => ['to_ship' => 7.0, 'to_invoice' => 0.0]
             ],
             'complete' => [
                 'options' => [
@@ -335,7 +335,7 @@ public function getItemQtyVariants()
                     'qty_ordered' => 4.4, 'qty_invoiced' => 0.4, 'qty_refunded' => 0.4, 'qty_shipped' => 4,
                     'qty_canceled' => 0,
                 ],
-                'expectedResult' => ['to_ship' => 0.0, 'to_invoice' => 4.0]
+                'expectedResult' => ['to_ship' => 0.4, 'to_invoice' => 4.0]
             ],
             'completely_invoiced_using_decimals' => [
                 'options' => [

From 20e30c62bf04cb38a2a2a2650d7ae775559e759b Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Mon, 4 May 2020 08:56:59 +0300
Subject: [PATCH 3/4] Resolved Cannot create shipment for remaining items

Fix static tests
---
 app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
index 9733a14b289c8..81fa5d8a9c65b 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Model\ResourceModel\OrderFactory;
+use PHPUnit\Framework\MockObject\MockObject
 
 /**
  * Unit test for order item class.
@@ -26,12 +27,12 @@ class ItemTest extends \PHPUnit\Framework\TestCase
     protected $objectManager;
 
     /**
-     * @var OrderFactory |\PHPUnit_Framework_MockObject_MockObject
+     * @var OrderFactory|MockObject
      */
     protected $orderFactory;
 
     /**
-     * @var Json|\PHPUnit_Framework_MockObject_MockObject
+     * @var Json|MockObject
      */
     private $serializerMock;
 

From 2d34f0567db56eca6626848009b7bf08ff4afd5e Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Tue, 5 May 2020 10:26:42 +0300
Subject: [PATCH 4/4] Resolved Cannot create shipment for remaining items

Fix static tests
---
 app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
index 81fa5d8a9c65b..08c989c1615ac 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
@@ -9,7 +9,7 @@
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Model\ResourceModel\OrderFactory;
-use PHPUnit\Framework\MockObject\MockObject
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Unit test for order item class.