Index: APPS/common/impl/StockNiveauService.cls.xml
===================================================================
diff -u -r33153 -r33154
--- APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 33153)
+++ APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 33154)
@@ -217,25 +217,25 @@
 <Method name="GeefAantalInOrder">
 <ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	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 $$$Not(..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(..AantalInOrder) = 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 $$$Not(..IsInReservatie(WinkelOrder.GeefOrderNummer(), WinkelOrder.GeefOrderLijnNummer())) {
+				If $$$Not($Length(..EindDatumVanBerekeningBereik) && (WinkelOrder.GeefLeverweek() > ..EindDatumVanBerekeningBereik)) {
+					Set Result = Result + WinkelOrder.GeefAantal()
+				}	
+			}	
+		}
+		
+		Set ..AantalInOrder = Result
 	}
 	
-	set ..AantalInOrder = Result
-
-	quit Result
+	Quit ..AantalInOrder
 ]]></Implementation>
 </Method>