Index: APPS/common/impl/StockNiveauService.cls.xml
===================================================================
diff -u -r33171 -r43671
--- APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 33171)
+++ APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 43671)
@@ -64,7 +64,7 @@
 <Private>1</Private>
 </Property>
 
-<Property name="AantalInTransfer">
+<Property name="AantalInTransfert">
 <Type>%Integer</Type>
 <Private>1</Private>
 </Property>
@@ -96,7 +96,7 @@
 
 	Set StockNiveaus.InReceptie = ..GeefAantalInReceptie()
 	Set StockNiveaus.InReceptieGestockeerd = ..GeefAantalInReceptieGestockeerd()
-	Set StockNiveaus.InTransfer = ..GeefAantalInTransfer()
+	Set StockNiveaus.InTransfert = ..GeefAantalInTransfert()
 	Set StockNiveaus.KlaarGezet = ..GeefAantalKlaarGezet()
 	
 	Quit StockNiveaus
@@ -189,125 +189,78 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAantalInReservatie">
-<ReturnType>%Numeric</ReturnType>
+<Method name="IsInReceptie">
+<FormalSpec>ToeleveringNr,ToeleveringLijnNr</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	If ($Length(..AantalInReservatie) = 0) {
-		#dim Resultaat As %Numeric = 0
-		#dim Product As zTryout.MVI.KPR.Product = ##class(zTryout.MVI.KPR.Product).%New(..PRNr)
-		#dim Iterator As TECH.Iterator = Product.GeefProductOrderIndexIterator()
-		
-		While (Iterator.HasNext()) {
-			#dim ProductOrderIndex As zTryout.MVI.KPR.ProductOrderIndex = Iterator.Next()
-			
-			If (..IsInReservatie(ProductOrderIndex.GeefOrderNummer(), ProductOrderIndex.GeefOrderLijnNummer())) {
-				If (..IsGeldigeLeverweek(ProductOrderIndex.GeefLeverweek())) {
-					Set Resultaat = Resultaat + ProductOrderIndex.GeefAantal()
-				}	
-			}	
-		}
-		
-		Set ..AantalInReservatie = Resultaat
-	}
-	
-	Quit ..AantalInReservatie
+	set LeverancierNr = $piece(^KTO1(ToeleveringNr),"\",1)
+	set TLUNr = $piece(^KTO(LeverancierNr,ToeleveringNr,ToeleveringLijnNr),"\",15)
+	set Result = $data(^RCP("IT",ToeleveringNr,TLUNr))
+	quit Result
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAantalInOrder">
+<Method name="GeefAantalInReservatie">
 <ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	If ($Length(..AantalInOrder) = 0) {
-		#dim Resultaat As %Numeric = 0
-		#dim Product As zTryout.MVI.KPR.Product = ##class(zTryout.MVI.KPR.Product).%New(..PRNr)
-		#dim Iterator As TECH.Iterator = Product.GeefProductOrderIndexIterator()
-				
-		While (Iterator.HasNext()) {
-			#dim ProductOrderIndex As zTryout.MVI.KPR.ProductOrderIndex = Iterator.Next()
-			
-			If $$$Not(..IsInReservatie(ProductOrderIndex.GeefOrderNummer(), ProductOrderIndex.GeefOrderLijnNummer())) {
-				If (..IsGeldigeLeverweek(ProductOrderIndex.GeefLeverweek())) {
-					Set Resultaat = Resultaat + ProductOrderIndex.GeefAantal()
-				}	
-			}	
-		}
-		
-		Set ..AantalInOrder = Resultaat
+	quit:$length(..AantalInReservatie) ..AantalInReservatie
+	
+	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 ..IsInReservatie(OrderNr,OrderLijnNr) {
+			 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 ..AantalInReservatie = Result
 	
-	Quit ..AantalInOrder
+	quit Result
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAantalInTransfer">
+<Method name="GeefAantalInOrder">
 <ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	If ($Length(..AantalInTransfer) = 0) {
-		#dim Resultaat As %Numeric = 0
-		#dim Product As zTryout.MVI.KPR.Product = ##class(zTryout.MVI.KPR.Product).%New(..PRNr)
-		#dim Iterator As TECH.Iterator = Product.GeefProductOrderIndexIterator()
-		
-		While (Iterator.HasNext()) {
-			#dim ProductOrderIndex As zTryout.MVI.KPR.ProductOrderIndex = Iterator.Next()
-			
-			If (..IsTransferOrder(ProductOrderIndex.GeefOrderNummer()) && ..IsGeldigeLeverweek(ProductOrderIndex.GeefLeverweek())) {
-				Set Resultaat = Resultaat + ProductOrderIndex.GeefAantal()
-			}	
-		}
-		
-		Set ..AantalInTransfer = Resultaat
+	quit:$length(..AantalInOrder) ..AantalInOrder
+	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 '..IsInReservatie(OrderNr,OrderLijnNr) {
+			 set Rec = ^KPR(..PRNr,idxWNode)
+			 set Leverdag = $P(Rec,"\",2)
+			 continue:($length(..EindDatumVanBerekeningBereik)&&(Leverdag>..EindDatumVanBerekeningBereik))
+			 set Aantal = $piece(Rec,"\",1)
+			 set Result = Result + Aantal
+		 }
 	}
 	
-	Quit ..AantalInTransfer
+	set ..AantalInOrder = Result
+
+	quit Result
 ]]></Implementation>
 </Method>
 
 <Method name="IsInReservatie">
-<FormalSpec>OrderNummer:%String,OrderLijnNummer:%String</FormalSpec>
+<FormalSpec>OrderNr,OrderLijnNr</FormalSpec>
 <Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	#dim Order As zTryout.MVI.KOD.Order = ##class(zTryout.MVI.KOD.Order).%New(OrderNummer, ..GeefKlantNummer(OrderNummer))
-	#dim IsInReservatie As %Boolean = $$$False
-	
-	Try {
-		#dim IOOrder As zTryout.MVI.ORDW.IO.Order = ##class(zTryout.MVI.ORDW.IO.Order).%New(OrderNummer, Order.GeefOrderLijn(OrderLijnNummer).GeefUniekOrderLijnNummer())
-		Set IsInReservatie = $Data(IOOrder)
-	} Catch {
-		#dim Exception As zTryout.MVI.Excepties.NietGevondenExceptie = ##class(TECH.ExceptionHandler).Catch()
-	}
-
-	Quit IsInReservatie
+	set KlantNr = $piece(^KO1(OrderNr,"F"),"\",1)
+	set OLUNr = $piece(^KOD(KlantNr,"F",OrderNr,OrderLijnNr),"\",15)
+	set Result = $data(^ORDW("IO",OrderNr,OLUNr))
+	quit Result
 ]]></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="IsGeldigeLeverweek">
-<FormalSpec>Leverweek:%Date</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit $$$Not($Length(..EindDatumVanBerekeningBereik) && (Leverweek > ..EindDatumVanBerekeningBereik))
-]]></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[
@@ -324,16 +277,50 @@
 			 	 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[