Index: APPS/common/impl/StockNiveauService.cls.xml
===================================================================
diff -u -r33154 -r33158
--- APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 33154)
+++ APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 33158)
@@ -239,13 +239,38 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefAantalInTransfert">
+<ReturnType>%Numeric</ReturnType>
+<Implementation><![CDATA[
+	quit:$length(..AantalInTransfert) ..AantalInTransfert
+
+	set Result = 0
+	
+	set idxWNode = "W    0.0R"
+	for { set idxWNode = $Order(^KPR(..PRNr,idxWNode)) Quit:'$$$StartsWith(idxWNode,"W    0.0R")
+		 set OrderNr = $extract(idxWNode,18,23)
+		 set OrderLijnNr = $translate($extract(idxWNode,24,26)," ","")+100
+		 if ( ..IsTransferOrder(OrderNr) ) {
+			 set Rec = ^KPR(..PRNr,idxWNode)
+			 set Leverdag = $P(Rec,"\",2)
+			 continue:($length(..EindDatumVanBerekeningBereik)&&(Leverdag>..EindDatumVanBerekeningBereik))
+			 set Aantal = $piece(Rec,"\",1)
+			 set Result = Result + Aantal
+		 }
+	}
+	
+	set ..AantalInTransfert = Result
+	
+	quit Result
+]]></Implementation>
+</Method>
+
 <Method name="IsInReservatie">
 <FormalSpec>OrderNummer:%String,OrderLijnNummer:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	#dim OrderIndex1 As zTryout.MVI.KOD.Order.Index1 = ##class(zTryout.MVI.KOD.Order.Index1).%New(OrderNummer)
-	#dim Order As zTryout.MVI.KOD.Order = ##class(zTryout.MVI.KOD.Order).%New(OrderNummer, OrderIndex1.GeefKlantNummer())
+	#dim Order As zTryout.MVI.KOD.Order = ##class(zTryout.MVI.KOD.Order).%New(OrderNummer, ..GeefKlantNummer(OrderNummer))
 	#dim IsInReservatie As %Boolean = $$$False
 	
 	Try {
@@ -259,6 +284,25 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsTransferOrder">
+<FormalSpec>OrderNummer:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim Order As zTryout.MVI.KOD.Order = ##class(zTryout.MVI.KOD.Order).%New(OrderNummer, ..GeefKlantNummer(OrderNummer))
+	#dim OrderType As DOM.VKP.enu.OrderType.AutoComplete =  ##class(DOM.VKP.enu.OrderType.AutoComplete).%New()
+	
+	Quit (Order.GeefOrderType() = OrderType.Transfer)
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlantNummer">
+<FormalSpec>OrderNummer:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##class(zTryout.MVI.KOD.Order.Index1).%New(OrderNummer).GeefKlantNummer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefAantalInToelevering">
 <ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
@@ -275,50 +319,16 @@
 			 	 set Result = Result + Aantal
 			 }
 		}
+	} else { 
+		set Result = +$piece($piece(^KPR(..PRNr,0),"\",17),"#",1)
 	}
-	else  { set Result = +$piece($piece(^KPR(..PRNr,0),"\",17),"#",1) }
 	
 	set ..AantalInToelevering = Result
 	
 	quit Result
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAantalInTransfert">
-<ReturnType>%Numeric</ReturnType>
-<Implementation><![CDATA[
-	quit:$length(..AantalInTransfert) ..AantalInTransfert
-
-	set Result = 0
-	
-	set idxWNode = "W    0.0R"
-	for { set idxWNode = $Order(^KPR(..PRNr,idxWNode)) Quit:'$$$StartsWith(idxWNode,"W    0.0R")
-		 set OrderNr = $extract(idxWNode,18,23)
-		 set OrderLijnNr = $translate($extract(idxWNode,24,26)," ","")+100
-		 if ( ..IsTransfertOrder(OrderNr) ) {
-			 set Rec = ^KPR(..PRNr,idxWNode)
-			 set Leverdag = $P(Rec,"\",2)
-			 continue:($length(..EindDatumVanBerekeningBereik)&&(Leverdag>..EindDatumVanBerekeningBereik))
-			 set Aantal = $piece(Rec,"\",1)
-			 set Result = Result + Aantal
-		 }
-	}
-	
-	set ..AantalInTransfert = Result
-	
-	quit Result
-]]></Implementation>
-</Method>
-
-<Method name="IsTransfertOrder">
-<FormalSpec>OrderNr</FormalSpec>
-<Implementation><![CDATA[
-	set KlantNr = $piece(^KO1(OrderNr,"F"),"\",1)
-	set Result = $piece(^KOD(KlantNr,"F",OrderNr,1),"\",25)="T"
-	quit Result
-]]></Implementation>
-</Method>
-
 <Method name="GeefAantalKlaarGezet">
 <ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[