From 59b0c7b223533822891fdbb07d30216499eebdcf Mon Sep 17 00:00:00 2001
From: RomanKis <romaikiss@gmail.com>
Date: Tue, 31 Oct 2017 17:06:14 +0200
Subject: [PATCH] 10195: Order relation child is not set during edit operation

---
 app/code/Magento/Sales/Model/AdminOrder/Create.php            | 1 +
 .../testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index ccc5c134514f6..ba5f0fce17f3c 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -1907,6 +1907,7 @@ public function createOrder()
             $oldOrder = $this->getSession()->getOrder();
             $oldOrder->setRelationChildId($order->getId());
             $oldOrder->setRelationChildRealId($order->getIncrementId());
+            $oldOrder->save();
             $this->orderManagement->cancel($oldOrder->getEntityId());
             $order->save();
         }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
index a4dac0f285f58..946d15b6a81d7 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -104,6 +104,10 @@ public function testInitFromOrderAndCreateOrderFromQuoteWithAdditionalOptions()
 
         $this->assertEquals(1, $newOrderItems->count());
 
+        $order->loadByIncrementId('100000001');
+        $this->assertEquals($newOrder->getRealOrderId(), $order->getRelationChildRealId());
+        $this->assertEquals($newOrder->getId(), $order->getRelationChildId());
+
         $newOrderItem = $newOrderItems->getFirstItem();
 
         $this->assertEquals(