Index: vhUnitTest/AXimpl/Admin/VKP/OrderLookup/Test.cls.xml
===================================================================
diff -u -r44582 -r44600
--- vhUnitTest/AXimpl/Admin/VKP/OrderLookup/Test.cls.xml	(.../Test.cls.xml)	(revision 44582)
+++ vhUnitTest/AXimpl/Admin/VKP/OrderLookup/Test.cls.xml	(.../Test.cls.xml)	(revision 44600)
@@ -8,21 +8,21 @@
 ]]></Content>
 </UDLText>
 
-<Method name="Test prepare query statement en Order bestaat">
+<Method name="Test prepare query statement en Tijdelijk Order bestaat">
 <Implementation><![CDATA[
 	#dim Columns as %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("ID")
 	#dim Values as %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($ListBuild("1000"))
 	Set QueryAPIFake = ##class(vhTest.Fake.TECH.Query.PrepareOnlyQueryAPI).%New(Values,Columns)
 	
 	Set OrderLookup = ##class(AXimpl.Admin.VKP.OrderLookup).%New(QueryAPIFake)
 	
-	#dim OrderId as %String = OrderLookup.GeefOrderId("AxSalesId")
+	#dim OrderId as %String = OrderLookup.GeefOrderIdVanTijdelijkOrder("AxSalesId")
 	
 	Do $$$AssertEquals(OrderId,1000)
 ]]></Implementation>
 </Method>
 
-<Method name="Test prepare query statement en Order niet gevonden">
+<Method name="Test prepare query statement en tijdelijk Order niet gevonden">
 <Implementation><![CDATA[
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("!!! Ernstig probleem : Order is niet meer in sync - AxId : 'AxSalesId' - AdminId : '' !!!!")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(AXimpl.Admin.DatabaseOutOfSyncException).%ClassName($$$True),Substrings))
@@ -32,34 +32,29 @@
 	
 	Set OrderLookup = ##class(AXimpl.Admin.VKP.OrderLookup).%New(QueryAPIFake)
 		
-	#dim OrderId as %String = OrderLookup.GeefOrderId("AxSalesId")
+	#dim OrderId as %String = OrderLookup.GeefOrderIdVanTijdelijkOrder("AxSalesId")
 ]]></Implementation>
 </Method>
 
-<Method name="Test prepare query statement en meerdere orders gevonden">
+<Method name="Test prepare query statement en meerdere tijdelijke orders gevonden">
 <Implementation><![CDATA[
 	#dim Columns as %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("ID")
 	#dim Values as %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($ListBuild("1000"),$ListBuild("1001"))
 	Set QueryAPIFake = ##class(vhTest.Fake.TECH.Query.PrepareOnlyQueryAPI).%New(Values,Columns)
 	
 	Set OrderLookup = ##class(AXimpl.Admin.VKP.OrderLookup).%New(QueryAPIFake)
 	Try {		
-		#dim OrderId as %String = OrderLookup.GeefOrderId("AxSalesId")
+		#dim OrderId as %String = OrderLookup.GeefOrderIdVanTijdelijkOrder("AxSalesId")
 		Do ..Fail("Er werd een exceptie verwacht")
 	} Catch {
 		#dim Exception as TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do $$$AssertEquals(Exception.%ClassName($$$True),##class(AXimpl.Admin.DatabaseOutOfSyncException).%ClassName($$$True))
 		Do $$$AssertEquals(Exception.GeefOmschrijving(),"!!! Ernstig probleem : Order is niet meer in sync - AxId : 'AxSalesId' - AdminId : '1000,1001' !!!!")
-		Do $$$AssertContains(Exception.GeefExtraInfo(),"Minstens 2 orders met dezelfde Ax SalesId gevonden")
+		Do $$$AssertContains(Exception.GeefExtraInfo(),"Minstens 2 tijdelijke orders met dezelfde Ax SalesId gevonden")
 	}
 ]]></Implementation>
 </Method>
 
-<UDLText name="T">
-<Content><![CDATA[/* testen confirmed order */
-]]></Content>
-</UDLText>
-
 <Method name="Test prepare query statement en Bevestigd Order bestaat">
 <Implementation><![CDATA[
 	#dim Columns as %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("ID")
@@ -96,16 +91,27 @@
 	
 	Set OrderLookup = ##class(AXimpl.Admin.VKP.OrderLookup).%New(QueryAPIFake)
 	Try {		
-		#dim OrderId as %String = OrderLookup.GeefOrderId("AxSalesId")
+		#dim OrderId as %String = OrderLookup.GeefOrderIdVanBevestigdOrder("AxSalesId")
 		Do ..Fail("Er werd een exceptie verwacht")
 	} Catch {
 		#dim Exception as TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do $$$AssertEquals(Exception.%ClassName($$$True),##class(AXimpl.Admin.DatabaseOutOfSyncException).%ClassName($$$True))
 		Do $$$AssertEquals(Exception.GeefOmschrijving(),"!!! Ernstig probleem : Order is niet meer in sync - AxId : 'AxSalesId' - AdminId : '1000,1001' !!!!")
-		Do $$$AssertContains(Exception.GeefExtraInfo(),"Minstens 2 orders met dezelfde Ax SalesId gevonden")
+		Do $$$AssertContains(Exception.GeefExtraInfo(),"Minstens 2 bevestigde orders met dezelfde Ax SalesId gevonden")
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="Test prepare query BestaatTijdelijkOrder">
+<Implementation><![CDATA[
+	#dim Columns as %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("ID")
+	Set QueryAPIFake = ##class(vhTest.Fake.TECH.Query.PrepareOnlyQueryAPI).%New("",Columns)
+	
+	Set OrderLookup = ##class(AXimpl.Admin.VKP.OrderLookup).%New(QueryAPIFake)
+		
+	#dim OrderId as %String = OrderLookup.BestaatTijdelijkOrder("AxSalesId")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXimpl/Admin/VKP/OrderLookup.cls.xml
===================================================================
diff -u -r44582 -r44600
--- AXimpl/Admin/VKP/OrderLookup.cls.xml	(.../OrderLookup.cls.xml)	(revision 44582)
+++ AXimpl/Admin/VKP/OrderLookup.cls.xml	(.../OrderLookup.cls.xml)	(revision 44600)
@@ -21,18 +21,18 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefOrderId">
+<Method name="GeefOrderIdVanBevestigdOrder">
 <FormalSpec>AxSalesId:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set Query = ##class(TECH.DynamicQuery).%New("SELECT ID FROM Flow_Order.Hoofding WHERE AXSalesid = ?",$ListBuild(AxSalesId))
+	Set Query = ##class(TECH.DynamicQuery).%New("SELECT ID FROM Flow_Order.Hoofding WHERE ID > 100999 and AXSalesid = ?",$ListBuild(AxSalesId))
 	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(Query)
 	#dim OrderId as %String = ""
 	if ResultSet.Next() {
 		Set OrderId = ResultSet.GetDataByName("ID")
 		if ResultSet.Next() {
 			Set Exception  = ##class(AXimpl.Admin.DatabaseOutOfSyncException).%New(##class(AXimpl.Admin.EntiteitType).Order(),AxSalesId,OrderId _ "," _ ResultSet.GetDataByName("ID"))
-			Do Exception.VoegToeExtraInfo("Minstens 2 orders met dezelfde Ax SalesId gevonden")
+			Do Exception.VoegToeExtraInfo("Minstens 2 bevestigde orders met dezelfde Ax SalesId gevonden")
 			Do ##class(TECH.ExceptionHandler).Throw(Exception)			
 		}		
 	} else {
@@ -42,18 +42,27 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefOrderIdVanBevestigdOrder">
+<Method name="BestaatTijdelijkOrder">
 <FormalSpec>AxSalesId:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set Query = ##class(TECH.DynamicQuery).%New("SELECT ID FROM Flow_Order.Hoofding WHERE ID < 101000 and OrderType is null and AXSalesid = ?",$ListBuild(AxSalesId))	
+	quit ..QueryAPI.GetResultSet(Query).Next()
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrderIdVanTijdelijkOrder">
+<FormalSpec>AxSalesId:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set Query = ##class(TECH.DynamicQuery).%New("SELECT ID FROM Flow_Order.Hoofding WHERE ID > 100999 and AXSalesid = ?",$ListBuild(AxSalesId))
+	Set Query = ##class(TECH.DynamicQuery).%New("SELECT ID FROM Flow_Order.Hoofding WHERE ID < 101000 and OrderType is null and AXSalesid = ?",$ListBuild(AxSalesId))
 	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetResultSet(Query)
 	#dim OrderId as %String = ""
 	if ResultSet.Next() {
 		Set OrderId = ResultSet.GetDataByName("ID")
 		if ResultSet.Next() {
 			Set Exception  = ##class(AXimpl.Admin.DatabaseOutOfSyncException).%New(##class(AXimpl.Admin.EntiteitType).Order(),AxSalesId,OrderId _ "," _ ResultSet.GetDataByName("ID"))
-			Do Exception.VoegToeExtraInfo("Minstens 2 orders met dezelfde Ax SalesId gevonden")
+			Do Exception.VoegToeExtraInfo("Minstens 2 tijdelijke orders met dezelfde Ax SalesId gevonden")
 			Do ##class(TECH.ExceptionHandler).Throw(Exception)			
 		}		
 	} else {
Index: vhTest/Fake/AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml
===================================================================
diff -u -r44582 -r44600
--- vhTest/Fake/AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml	(.../TerminalNavigationService.cls.xml)	(revision 44582)
+++ vhTest/Fake/AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml	(.../TerminalNavigationService.cls.xml)	(revision 44600)
@@ -17,6 +17,12 @@
 <Implementation><![CDATA[
 ]]></Implementation>
 </Method>
+
+<Method name="RaadpleegTijdelijkOrder">
+<FormalSpec>AxSalesId:%String,AxGebruiker:%String,WorkstationName:%String</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Fake/AXimpl/Admin/VKP/OrderLookup.cls.xml
===================================================================
diff -u -r44582 -r44600
--- vhTest/Fake/AXimpl/Admin/VKP/OrderLookup.cls.xml	(.../OrderLookup.cls.xml)	(revision 44582)
+++ vhTest/Fake/AXimpl/Admin/VKP/OrderLookup.cls.xml	(.../OrderLookup.cls.xml)	(revision 44600)
@@ -7,6 +7,13 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>AXimpl.Admin.VKP.OrderLookup</Super>
 
+<Method name="BestaatTijdelijkOrder">
+<FormalSpec>AxSalesId:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="GeefOrderId">
 <FormalSpec>AxSalesId:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
@@ -20,6 +27,20 @@
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
+
+<Method name="GeefOrderIdVanTijdelijkOrder">
+<FormalSpec>AxSalesId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="xGeefOrderId">
+<FormalSpec>AxSalesId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml
===================================================================
diff -u -r44582 -r44600
--- vhTest/Mock/AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml	(.../TerminalNavigationService.cls.xml)	(revision 44582)
+++ vhTest/Mock/AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml	(.../TerminalNavigationService.cls.xml)	(revision 44600)
@@ -14,9 +14,9 @@
 ]]></Implementation>
 </Method>
 
-<Method name="RaadpleegOrder">
+<Method name="RaadpleegTijdelijkOrder">
 <FormalSpec>AxSalesId:%String,AxGebruiker:%String,WorkstationName:%String</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("RaadpleegOrder",AxSalesId,AxGebruiker,WorkstationName)
+<Implementation><![CDATA[	do ..VerwerkMethodCall("RaadpleegTijdelijkOrder",AxSalesId,AxGebruiker,WorkstationName)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/AXimpl/Admin/CHUI/TerminalNavigationService/Test.cls.xml
===================================================================
diff -u -r43692 -r44600
--- vhUnitTest/AXimpl/Admin/CHUI/TerminalNavigationService/Test.cls.xml	(.../Test.cls.xml)	(revision 43692)
+++ vhUnitTest/AXimpl/Admin/CHUI/TerminalNavigationService/Test.cls.xml	(.../Test.cls.xml)	(revision 44600)
@@ -3,25 +3,47 @@
 <Class name="vhUnitTest.AXimpl.Admin.CHUI.TerminalNavigationService.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test standaard gedrag">
+<Method name="Test standaard gedrag tijdelijk order">
 <Implementation><![CDATA[
 	Set OrderLookupMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLookup).%New()
-	Do OrderLookupMock.VerwachtMethodCall("GeefOrderId","AxSalesId").DanReturn("1000")
 	
+	Do OrderLookupMock.VerwachtMethodCall("GeefOrderIdVanTijdelijkOrder","AxSalesId").DanReturn("1000")
+	
 	Set GebruikerLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.GebruikerLookup).%New()
 	Do GebruikerLookupMock.VerwachtMethodCall("GeefGebruikerId","vhepn\adgebruiker").DanReturn("AdminGebruiker")
 	
 	Set AppsTerminalNavigationServiceMock = ##class(vhTest.Mock.APPS.CHUI.TerminalNavigatieService).%New()
 	Do AppsTerminalNavigationServiceMock.VerwachtMethodCall("RaadpleegOrder","AdminGebruiker","workstationname.vanhoecke.be","1000").DanDoeNiks()
 	
 	Set TerminalNavigationService = ##class(AXimpl.Admin.CHUI.TerminalNavigationService).%New(OrderLookupMock,GebruikerLookupMock,AppsTerminalNavigationServiceMock)
-	Do TerminalNavigationService.RaadpleegOrder("AxSalesId","vhepn\adgebruiker","workstationname")
+	Do TerminalNavigationService.RaadpleegTijdelijkOrder("AxSalesId","vhepn\adgebruiker","workstationname")
 
 	Do OrderLookupMock.Verifieer()
 	Do GebruikerLookupMock.Verifieer()
 	Do AppsTerminalNavigationServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test standaard gedrag bevestigd order">
+<Implementation><![CDATA[
+	Set OrderLookupMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLookup).%New()
+	
+	Do OrderLookupMock.VerwachtMethodCall("GeefOrderIdVanBevestigdOrder","AxSalesId").DanReturn("1000")
+	
+	Set GebruikerLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.GebruikerLookup).%New()
+	Do GebruikerLookupMock.VerwachtMethodCall("GeefGebruikerId","vhepn\adgebruiker").DanReturn("AdminGebruiker")
+	
+	Set AppsTerminalNavigationServiceMock = ##class(vhTest.Mock.APPS.CHUI.TerminalNavigatieService).%New()
+	Do AppsTerminalNavigationServiceMock.VerwachtMethodCall("RaadpleegOrder","AdminGebruiker","workstationname.vanhoecke.be","1000").DanDoeNiks()
+	
+	Set TerminalNavigationService = ##class(AXimpl.Admin.CHUI.TerminalNavigationService).%New(OrderLookupMock,GebruikerLookupMock,AppsTerminalNavigationServiceMock)
+	Do TerminalNavigationService.RaadpleegBevestigdOrder("AxSalesId","vhepn\adgebruiker","workstationname")
+
+	Do OrderLookupMock.Verifieer()
+	Do GebruikerLookupMock.Verifieer()
+	Do AppsTerminalNavigationServiceMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WS/AX/CHUI/TerminalNavigationService.cls.xml
===================================================================
diff -u -r43943 -r44600
--- WS/AX/CHUI/TerminalNavigationService.cls.xml	(.../TerminalNavigationService.cls.xml)	(revision 43943)
+++ WS/AX/CHUI/TerminalNavigationService.cls.xml	(.../TerminalNavigationService.cls.xml)	(revision 44600)
@@ -21,15 +21,21 @@
 <Private>1</Private>
 </Property>
 
+<Property name="NavigateToConfirmedOrder">
+<Type>WSimpl.AX.CHUI.TerminalNavigationService.NavigateToConfirmedOrder</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>CreateAndNavigateToTemporaryOrder:WSimpl.AX.CHUI.TerminalNavigationService.CreateAndNavigateToTemporaryOrder</FormalSpec>
+<FormalSpec>CreateAndNavigateToTemporaryOrder:WSimpl.AX.CHUI.TerminalNavigationService.CreateAndNavigateToTemporaryOrder,NavigateToConfirmedOrder:WSimpl.AX.CHUI.TerminalNavigationService.NavigateToConfirmedOrder</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..ObjectApi = ##class(TECH.Context).Instance().GeefObjectAPI()
 	Set ..CreateAndNavigateToTemporaryOrder = $$$Inject(CreateAndNavigateToTemporaryOrder,##class(WSimpl.AX.CHUI.TerminalNavigationService.CreateAndNavigateToTemporaryOrder).%New())
+	Set ..NavigateToConfirmedOrder = $$$Inject(NavigateToConfirmedOrder,##class(WSimpl.AX.CHUI.TerminalNavigationService.NavigateToConfirmedOrder).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -46,19 +52,9 @@
 <FormalSpec>NavigateToConfirmedOrderRequest:WS.AX.CHUI.dto.NavigateToConfirmedOrderRequest</FormalSpec>
 <ReturnType>WS.AX.CHUI.dto.NavigateToConfirmedOrderResponse</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit ..MaakKlasseInstance("NavigateToConfirmedOrder").NavigateToConfirmedOrder(NavigateToConfirmedOrderRequest)
+<Implementation><![CDATA[	Quit ..NavigateToConfirmedOrder.NavigateToConfirmedOrder(NavigateToConfirmedOrderRequest)
 ]]></Implementation>
 </Method>
-
-<Method name="MaakKlasseInstance">
-<FormalSpec>KlasseNaam:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>TECH.RegisteredObject</ReturnType>
-<Implementation><![CDATA[
-	#dim VolledigeKlasseNaam As TECH.String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("WSimpl.AX.CHUI.TerminalNavigatieService." _KlasseNaam _"_Implementatie")
-	Quit ..ObjectApi.New(VolledigeKlasseNaam)
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Mock/AXimpl/Admin/VKP/OrderLookup.cls.xml
===================================================================
diff -u -r44582 -r44600
--- vhTest/Mock/AXimpl/Admin/VKP/OrderLookup.cls.xml	(.../OrderLookup.cls.xml)	(revision 44582)
+++ vhTest/Mock/AXimpl/Admin/VKP/OrderLookup.cls.xml	(.../OrderLookup.cls.xml)	(revision 44600)
@@ -8,10 +8,10 @@
 <Super>AXimpl.Admin.VKP.OrderLookup,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
-<Method name="GeefOrderId">
+<Method name="BestaatTijdelijkOrder">
 <FormalSpec>AxSalesId:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefOrderId",AxSalesId)
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("BestaatTijdelijkOrder",AxSalesId)
 ]]></Implementation>
 </Method>
 
@@ -21,6 +21,13 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefOrderIdVanBevestigdOrder",AxSalesId)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefOrderIdVanTijdelijkOrder">
+<FormalSpec>AxSalesId:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefOrderIdVanTijdelijkOrder",AxSalesId)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder.cls.xml
===================================================================
diff -u -r44013 -r44600
--- WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder.cls.xml	(.../CreateAndNavigateToTemporaryOrder.cls.xml)	(revision 44013)
+++ WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder.cls.xml	(.../CreateAndNavigateToTemporaryOrder.cls.xml)	(revision 44600)
@@ -13,15 +13,21 @@
 <Private>1</Private>
 </Property>
 
+<Property name="OrderLookup">
+<Type>AXimpl.Admin.VKP.OrderLookup</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>OrderLevenCyclus:AXimpl.Admin.VKP.OrderLevenCyclus,TerminalNavigationService:AXimpl.Admin.CHUI.TerminalNavigationService</FormalSpec>
+<FormalSpec>OrderLevenCyclus:AXimpl.Admin.VKP.OrderLevenCyclus,TerminalNavigationService:AXimpl.Admin.CHUI.TerminalNavigationService,OrderLookup:AXimpl.Admin.VKP.OrderLookup</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..OrderLevenCyclus = $$$Inject(OrderLevenCyclus,##class(AXimpl.Admin.VKP.OrderLevenCyclus).%New())
 	Set ..TerminalNavigationService = $$$Inject(TerminalNavigationService,##class(AXimpl.Admin.CHUI.TerminalNavigationService).%New())
+	Set ..OrderLookup = $$$Inject(OrderLookup, ##class(AXimpl.Admin.VKP.OrderLookup).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -32,9 +38,11 @@
 <Implementation><![CDATA[
 	Set Response = ##class(WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderResponse).%New()
 	Try{
-		Do ..OrderLevenCyclus.GenereerOrder(CANTORequest.CustomerNumber,CANTORequest.SalesIdAX)
+		if $$$Not(..OrderLookup.BestaatTijdelijkOrder(CANTORequest.SalesIdAX)){
+			Do ..OrderLevenCyclus.GenereerOrder(CANTORequest.CustomerNumber,CANTORequest.SalesIdAX)
+		}
 		Try{
-			Do ..TerminalNavigationService.RaadpleegOrder(CANTORequest.SalesIdAX,CANTORequest.ActiveDirectoryUserName,CANTORequest.WorkstationName )
+			Do ..TerminalNavigationService.RaadpleegTijdelijkOrder(CANTORequest.SalesIdAX,CANTORequest.ActiveDirectoryUserName,CANTORequest.WorkstationName )
 		} catch {
 			#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 			do ##class(vhLib.Logger).LogExceptie(Exceptie)
Index: vhUnitTest/WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder/Test.cls.xml
===================================================================
diff -u -r43693 -r44600
--- vhUnitTest/WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder/Test.cls.xml	(.../Test.cls.xml)	(revision 43693)
+++ vhUnitTest/WSimpl/AX/CHUI/TerminalNavigationService/CreateAndNavigateToTemporaryOrder/Test.cls.xml	(.../Test.cls.xml)	(revision 44600)
@@ -3,54 +3,89 @@
 <Class name="vhUnitTest.WSimpl.AX.CHUI.TerminalNavigationService.CreateAndNavigateToTemporaryOrder.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test CANTO Laat een Order aanmaken en registreert de navigatie opdracht">
+<Method name="Test CANTO Laat een nieuw tijdelijk order aanmaken en registreert de navigatie opdracht">
 <Implementation><![CDATA[
-	Set OrderLevenCyclusMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLevenCyclus).%New()
+	Set OrderLookupMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLookup).%New()
+	Do OrderLookupMock.VerwachtMethodCall("BestaatTijdelijkOrder","AxSalesId").DanReturn($$$False)
+
 	Set TerminalNavigatieService = ##class(vhTest.Mock.AXimpl.Admin.CHUI.TerminalNavigationService).%New()
-	
-	Set Service = ##class(WSimpl.AX.CHUI.TerminalNavigationService.CreateAndNavigateToTemporaryOrder).%New(OrderLevenCyclusMock,TerminalNavigatieService)
+	Do TerminalNavigatieService.VerwachtMethodCall("RaadpleegTijdelijkOrder","AxSalesId","AxUser","AxWorkStation").DanDoeNiks()
 
+	Set OrderLevenCyclusMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLevenCyclus).%New()
 	Do OrderLevenCyclusMock.VerwachtMethodCall("GenereerOrder","AxCustomerId","AxSalesId").DanDoeNiks()
-	Do TerminalNavigatieService.VerwachtMethodCall("RaadpleegOrder","AxSalesId","AxUser","AxWorkStation").DanDoeNiks()
 
+	Set Service = ##class(WSimpl.AX.CHUI.TerminalNavigationService.CreateAndNavigateToTemporaryOrder).%New(OrderLevenCyclusMock,TerminalNavigatieService,OrderLookupMock)
+
 	#dim Response as WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderResponse = Service.CreateAndNavigateToTemporaryOrder(..GeefRequest())
 
 	do $$$AssertEquals(Response.Message,"")
 
+	Do OrderLookupMock.Verifieer()
 	Do OrderLevenCyclusMock.Verifieer()
 	Do TerminalNavigatieService.Verifieer()
 ]]></Implementation>
 </Method>
 
+<Method name="Test CANTO maakt geen nieuw tijdelijk order aan en registreert de navigatie opdracht">
+<Implementation><![CDATA[
+	Set OrderLookupMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLookup).%New()
+	Do OrderLookupMock.VerwachtMethodCall("BestaatTijdelijkOrder","AxSalesId").DanReturn($$$True)
+
+	Set TerminalNavigatieService = ##class(vhTest.Mock.AXimpl.Admin.CHUI.TerminalNavigationService).%New()
+	Do TerminalNavigatieService.VerwachtMethodCall("RaadpleegTijdelijkOrder","AxSalesId","AxUser","AxWorkStation").DanDoeNiks()
+
+	Set OrderLevenCyclusMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLevenCyclus).%New()
+	Do OrderLevenCyclusMock.VerwachtMethodCall("GenereerOrder","AxCustomerId","AxSalesId").DanDoeNiks().ExactAantalKeer(0)
+
+	Set Service = ##class(WSimpl.AX.CHUI.TerminalNavigationService.CreateAndNavigateToTemporaryOrder).%New(OrderLevenCyclusMock,TerminalNavigatieService,OrderLookupMock)
+
+	#dim Response as WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderResponse = Service.CreateAndNavigateToTemporaryOrder(..GeefRequest())
+
+	do $$$AssertEquals(Response.Message,"")
+
+	Do OrderLookupMock.Verifieer()
+	Do OrderLevenCyclusMock.Verifieer()
+	Do TerminalNavigatieService.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test opvangen exception tijdens Order creatie en aangepast response message">
 <Implementation><![CDATA[
+	Set OrderLookupMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLookup).%New()
+	Do OrderLookupMock.VerwachtMethodCall("BestaatTijdelijkOrder","AxSalesId").DanReturn($$$False)
+
 	Set OrderLevenCyclusMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLevenCyclus).%New()
 	Set TerminalNavigatieService = ##class(vhTest.Mock.AXimpl.Admin.CHUI.TerminalNavigationService).%New()
 	
 	Set Exception  = ##class(TECH.Exceptions.AbstractOmschrijvingException).%New("Er liep iets mis tijdens de order generatie")
 	Do OrderLevenCyclusMock.IndienMethodCall("GenereerOrder","AxCustomerId","AxSalesId").DanException(Exception)
 
-	Set Service = ##class(WSimpl.AX.CHUI.TerminalNavigationService.CreateAndNavigateToTemporaryOrder).%New(OrderLevenCyclusMock,TerminalNavigatieService)
+	Set Service = ##class(WSimpl.AX.CHUI.TerminalNavigationService.CreateAndNavigateToTemporaryOrder).%New(OrderLevenCyclusMock,TerminalNavigatieService, OrderLookupMock)
 	#dim Response as WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderResponse = Service.CreateAndNavigateToTemporaryOrder(..GeefRequest())
 
 	do $$$AssertEquals(Response.Message,"Er liep iets mis tijdens de order generatie")
+	Do OrderLookupMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="Test response message indien exception tijdens navigatie opdracht">
 <Implementation><![CDATA[
+	Set OrderLookupMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLookup).%New()
+	Do OrderLookupMock.VerwachtMethodCall("BestaatTijdelijkOrder","AxSalesId").DanReturn($$$False)
+
 	Set OrderLevenCyclusMock = ##class(vhTest.Mock.AXimpl.Admin.VKP.OrderLevenCyclus).%New()
 	Do OrderLevenCyclusMock.VerwachtMethodCall("GenereerOrder","AxCustomerId","AxSalesId").DanDoeNiks()
 
 	Set Exception = ##class(AXimpl.Admin.DatabaseOutOfSyncException).%New(##class(AXimpl.Admin.EntiteitType).Gebruiker(),"AxGebruiker","")
 	Set TerminalNavigatieService = ##class(vhTest.Mock.AXimpl.Admin.CHUI.TerminalNavigationService).%New()
-	Do TerminalNavigatieService.IndienMethodCall("RaadpleegOrder","AxSalesId","AxUser","AxWorkStation").DanException(Exception)
+	Do TerminalNavigatieService.IndienMethodCall("RaadpleegTijdelijkOrder","AxSalesId","AxUser","AxWorkStation").DanException(Exception)
 
-	Set Service = ##class(WSimpl.AX.CHUI.TerminalNavigationService.CreateAndNavigateToTemporaryOrder).%New(OrderLevenCyclusMock,TerminalNavigatieService)
+	Set Service = ##class(WSimpl.AX.CHUI.TerminalNavigationService.CreateAndNavigateToTemporaryOrder).%New(OrderLevenCyclusMock,TerminalNavigatieService,OrderLookupMock)
 	#dim Response as WS.AX.CHUI.dto.CreateAndNavigateToTemporaryOrderResponse = Service.CreateAndNavigateToTemporaryOrder(..GeefRequest())
 
 	do $$$AssertEquals(Response.Message,"Het order is gegenereerd, maar er is iets fout gegaan met het registreren van de Admin navigatie opdracht")
 	
+	Do OrderLookupMock.Verifieer()
 	Do OrderLevenCyclusMock.Verifieer()
 ]]></Implementation>
 </Method>
Index: AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml
===================================================================
diff -u -r44582 -r44600
--- AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml	(.../TerminalNavigationService.cls.xml)	(revision 44582)
+++ AXimpl/Admin/CHUI/TerminalNavigationService.cls.xml	(.../TerminalNavigationService.cls.xml)	(revision 44600)
@@ -32,11 +32,11 @@
 ]]></Implementation>
 </Method>
 
-<Method name="RaadpleegOrder">
+<Method name="RaadpleegTijdelijkOrder">
 <FormalSpec>AxSalesId:%String,AxGebruiker:%String,WorkstationName:%String</FormalSpec>
 <Implementation><![CDATA[
 	#dim ComputerNaam as %String = WorkstationName _ ".vanhoecke.be"
-	Do ..TerminalNavigatieService.RaadpleegOrder(..GebruikerLookup.GeefGebruikerId(AxGebruiker),ComputerNaam,..OrderLookup.GeefOrderId(AxSalesId))
+	Do ..TerminalNavigatieService.RaadpleegOrder(..GebruikerLookup.GeefGebruikerId(AxGebruiker),ComputerNaam,..OrderLookup.GeefOrderIdVanTijdelijkOrder(AxSalesId))
 ]]></Implementation>
 </Method>