Index: APPS/common/impl/StockNiveauService.cls.xml
===================================================================
diff -u -r33145 -r33149
--- APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 33145)
+++ APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 33149)
@@ -192,25 +192,25 @@
 <Method name="GeefAantalInReservatie">
 <ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	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
-		 }
+	If ($Length(..AantalInReservatie) = 0) {
+		#dim Result As %Numeric = 0
+		#dim Product As zTryout.MVI.KPR.Product = ##class(zTryout.MVI.KPR.Product).%New(..PRNr)
+		#dim Iterator As TECH.Iterator = Product.GeefWinkelOrderIterator()
+		
+		While (Iterator.HasNext()) {
+			#dim WinkelOrder As zTryout.MVI.KPR.Product.WinkelOrder = Iterator.Next()
+			
+			If (..IsInReservatie(WinkelOrder.GeefOrderNummer(), WinkelOrder.GeefOrderLijnNummer())) {
+				If $$$Not($Length(..EindDatumVanBerekeningBereik) && (WinkelOrder.GeefLeverweek() > ..EindDatumVanBerekeningBereik)) {
+					Set Result = Result + WinkelOrder.GeefAantal()
+				}	
+			}	
+		}
+		
+		Set ..AantalInReservatie = Result
 	}
-
-	set ..AantalInReservatie = Result
 	
-	quit Result
+	Quit ..AantalInReservatie
 ]]></Implementation>
 </Method>
 
@@ -244,10 +244,11 @@
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	#dim KlantNummer As %String = $Piece(^KO1(OrderNummer, "F"), "\", 1)
-	#dim UniekOrderLijnNummer As %String = $Piece(^KOD(KlantNummer, "F", OrderNummer, OrderLijnNummer), "\", 15)
+	#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 IOOrder As zTryout.MVI.ORDW.IO.Order = ##class(zTryout.MVI.ORDW.IO.Order).%New(OrderNummer, Order.GeefOrderLijn(OrderLijnNummer).GeefUniekOrderLijnNummer())
 
-	Quit $Data(^ORDW("IO", OrderNummer, UniekOrderLijnNummer))
+	Quit $Data(IOOrder)
 ]]></Implementation>
 </Method>