Index: APPS/common/impl/StockNiveauService.cls.xml
===================================================================
diff -u -r33161 -r33165
--- APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 33161)
+++ APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 33165)
@@ -193,21 +193,21 @@
 <ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	If ($Length(..AantalInReservatie) = 0) {
-		#dim Result As %Numeric = 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.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()
+				If (..IsGeldigeLeverweek(WinkelOrder.GeefLeverweek())) {
+					Set Resultaat = Resultaat + WinkelOrder.GeefAantal()
 				}	
 			}	
 		}
 		
-		Set ..AantalInReservatie = Result
+		Set ..AantalInReservatie = Resultaat
 	}
 	
 	Quit ..AantalInReservatie
@@ -218,21 +218,21 @@
 <ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	If ($Length(..AantalInOrder) = 0) {
-		#dim Result As %Numeric = 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.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()
+				If (..IsGeldigeLeverweek(WinkelOrder.GeefLeverweek())) {
+					Set Resultaat = Resultaat + WinkelOrder.GeefAantal()
 				}	
 			}	
 		}
 		
-		Set ..AantalInOrder = Result
+		Set ..AantalInOrder = Resultaat
 	}
 	
 	Quit ..AantalInOrder
@@ -242,26 +242,23 @@
 <Method name="GeefAantalInTransfer">
 <ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	quit:$length(..AantalInTransfer) ..AantalInTransfer
-
-	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
-		 }
+	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.GeefWinkelOrderIterator()
+		
+		While (Iterator.HasNext()) {
+			#dim WinkelOrder As zTryout.MVI.KPR.Product.WinkelOrder = Iterator.Next()
+			
+			If (..IsTransferOrder(WinkelOrder.GeefOrderNummer()) && ..IsGeldigeLeverweek(WinkelOrder.GeefLeverweek())) {
+				Set Resultaat = Resultaat + WinkelOrder.GeefAantal()
+			}	
+		}
+		
+		Set ..AantalInTransfer = Resultaat
 	}
 	
-	set ..AantalInTransfer = Result
-	
-	quit Result
+	Quit ..AantalInTransfer
 ]]></Implementation>
 </Method>
 
@@ -295,6 +292,14 @@
 ]]></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>