Index: vhTest/Fake/AXimpl/Admin/VKP/OrderLevenCyclus.cls.xml
===================================================================
diff -u -r43230 -r43405
--- vhTest/Fake/AXimpl/Admin/VKP/OrderLevenCyclus.cls.xml	(.../OrderLevenCyclus.cls.xml)	(revision 43230)
+++ vhTest/Fake/AXimpl/Admin/VKP/OrderLevenCyclus.cls.xml	(.../OrderLevenCyclus.cls.xml)	(revision 43405)
@@ -9,8 +9,7 @@
 
 <Method name="GenereerOrder">
 <FormalSpec>AxCustomerId:%String,AxSalesId:%String</FormalSpec>
-<ReturnType>DOM.VKP.Order</ReturnType>
-<Implementation><![CDATA[	Quit ""
+<Implementation><![CDATA[
 ]]></Implementation>
 </Method>
 </Class>
Index: WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder.cls.xml
===================================================================
diff -u -r43287 -r43405
--- WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder.cls.xml	(.../CreateAndNavigateToTemporaryOrder.cls.xml)	(revision 43287)
+++ WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder.cls.xml	(.../CreateAndNavigateToTemporaryOrder.cls.xml)	(revision 43405)
@@ -30,7 +30,7 @@
 <FormalSpec>CANTORequest:WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderRequest</FormalSpec>
 <ReturnType>WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderResponse</ReturnType>
 <Implementation><![CDATA[
-	#dim order as DOM.VKP.Order = ..OrderLevenCyclus.GenereerOrder(CANTORequest.CustomerNumber,CANTORequest.SalesIdAX)
+	Do ..OrderLevenCyclus.GenereerOrder(CANTORequest.CustomerNumber,CANTORequest.SalesIdAX)
 	Do ..TerminalNavigationService.RaadpleegOrder(CANTORequest.SalesIdAX,CANTORequest.ActiveDirectoryUserName,CANTORequest.WorkstationName )
 	Quit ##class(WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderResponse).%New()
 ]]></Implementation>
Index: AXimpl/Admin/VKP/OrderLevenCyclus.cls.xml
===================================================================
diff -u -r43296 -r43405
--- AXimpl/Admin/VKP/OrderLevenCyclus.cls.xml	(.../OrderLevenCyclus.cls.xml)	(revision 43296)
+++ AXimpl/Admin/VKP/OrderLevenCyclus.cls.xml	(.../OrderLevenCyclus.cls.xml)	(revision 43405)
@@ -13,28 +13,31 @@
 <Private>1</Private>
 </Property>
 
+<Property name="OrderRepository">
+<Type>DOM.VKP.Order.OrderRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>KlantLookup:AXimpl.Admin.VKP.KlantLookup,OrderLevenCyclusService:APPS.VKP.OrderLevenCyclusService</FormalSpec>
+<FormalSpec>KlantLookup:AXimpl.Admin.VKP.KlantLookup,OrderLevenCyclusService:APPS.VKP.OrderLevenCyclusService,OrderRepository:DOM.VKP.Order.OrderRepository</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..KlantLookup = $$$Inject(KlantLookup,##class(AXimpl.Admin.VKP.KlantLookup).%New())
 	Set ..OrderLevenCyclusService = $$$Inject(OrderLevenCyclusService,##class(APPS.VKP.OrderLevenCyclusService).%New())
+	Set ..OrderRepository = $$$Inject(OrderRepository,##class(DOM.VKP.Order.OrderRepository).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GenereerOrder">
 <FormalSpec>AxCustomerId:%String,AxSalesId:%String</FormalSpec>
-<ReturnType>DOM.VKP.Order</ReturnType>
 <Implementation><![CDATA[
 	#Dim Order as DOM.VKP.Order = ..OrderLevenCyclusService.MaakOrderMetKlantGegevens(..KlantLookup.GeefKlantId(AxCustomerId))
 	Do Order.ZetAxSalesId(AxSalesId)
-	Do Order.Save()
-	
-	Quit Order
+	Do ..OrderRepository.Bewaar(Order)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Mock/AXimpl/Admin/VKP/OrderLevenCyclus.cls.xml
===================================================================
diff -u -r43230 -r43405
--- vhTest/Mock/AXimpl/Admin/VKP/OrderLevenCyclus.cls.xml	(.../OrderLevenCyclus.cls.xml)	(revision 43230)
+++ vhTest/Mock/AXimpl/Admin/VKP/OrderLevenCyclus.cls.xml	(.../OrderLevenCyclus.cls.xml)	(revision 43405)
@@ -10,8 +10,7 @@
 
 <Method name="GenereerOrder">
 <FormalSpec>AxCustomerId:%String,AxSalesId:%String</FormalSpec>
-<ReturnType>DOM.VKP.Order</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GenereerOrder",AxCustomerId,AxSalesId)
+<Implementation><![CDATA[	do ..VerwerkMethodCall("GenereerOrder",AxCustomerId,AxSalesId)
 ]]></Implementation>
 </Method>
 </Class>
Index: DOM/VKP/Order/OrderRepository.cls.xml
===================================================================
diff -u -r43328 -r43405
--- DOM/VKP/Order/OrderRepository.cls.xml	(.../OrderRepository.cls.xml)	(revision 43328)
+++ DOM/VKP/Order/OrderRepository.cls.xml	(.../OrderRepository.cls.xml)	(revision 43405)
@@ -5,6 +5,8 @@
 
 <Method name="Bewaar">
 <FormalSpec>Order:DOM.VKP.Order</FormalSpec>
+<Implementation><![CDATA[	Do Order.Save()
+]]></Implementation>
 </Method>
 </Class>
 
Index: vhUnitTest/AXimpl/Admin/VKP/OrderLevenCyclus/Test.cls.xml
===================================================================
diff -u -r43296 -r43405
--- vhUnitTest/AXimpl/Admin/VKP/OrderLevenCyclus/Test.cls.xml	(.../Test.cls.xml)	(revision 43296)
+++ vhUnitTest/AXimpl/Admin/VKP/OrderLevenCyclus/Test.cls.xml	(.../Test.cls.xml)	(revision 43405)
@@ -10,18 +10,21 @@
 	
 	Set OrderMock = ##class(vhTest.Mock.DOM.VKP.Order).%New()
 	Do OrderMock.VerwachtMethodCall("ZetAxSalesId","AxSalesId").DanDoeNiks()
-	Do OrderMock.VerwachtMethodCall("Save").DanDoeNiks()
+	
+	Set OrderRepositoryMock = ##class(vhTest.Mock.DOM.VKP.Order.OrderRepository).%New()
+	Do OrderRepositoryMock.VerwachtMethodCall("Bewaar",OrderMock).DanDoeNiks()
 
 	Set OrderLevenCyclusMock = ##class(vhTest.Mock.APPS.VKP.OrderLevenCyclusService).%New()
 	Do OrderLevenCyclusMock.VerwachtMethodCall("MaakOrderMetKlantGegevens","K||1234","").DanReturn(OrderMock)
 		
-	set OrderLevenCyclus = ##class(AXimpl.Admin.VKP.OrderLevenCyclus).%New(KlantLookupMock,OrderLevenCyclusMock)
+	Set OrderLevenCyclus = ##class(AXimpl.Admin.VKP.OrderLevenCyclus).%New(KlantLookupMock,OrderLevenCyclusMock,OrderRepositoryMock)
 	
-	#dim Order as DOM.VKP.Order = OrderLevenCyclus.GenereerOrder("01234","AxSalesId")
+	Do OrderLevenCyclus.GenereerOrder("01234","AxSalesId")
 
 	Do KlantLookupMock.Verifieer()
 	Do OrderLevenCyclusMock.Verifieer()
 	Do OrderMock.Verifieer()
+	Do OrderRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>