Index: APPS/common/impl/StockNiveauService.cls.xml
===================================================================
diff -u -r1376 -r1383
--- APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1376)
+++ APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1383)
@@ -222,24 +222,19 @@
 	quit:$length(..AantalInReservatie) ..AantalInReservatie
 	
 	set Result = 0
-	if $length(..Datum) {
-		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)
-				 if (Leverdag<..Datum) {
-				 	 set Aantal = $piece(Rec,"\",1)
-				 	 set Result = Result + Aantal
-				 }
-			 }
-		}
+	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(..Datum)&&(Leverdag'>..Datum))
+		 	 set Aantal = $piece(Rec,"\",1)
+		 	 set Result = Result + Aantal
+		 }
 	}
-	else  { 
-		set Result = +$piece($get(^PRSTOCK("D",..PRNr)),"\",2) 
-	}
+
 	set ..AantalInReservatie = Result
 	
 	quit Result
@@ -252,24 +247,21 @@
 	quit:$length(..AantalInOrder) ..AantalInOrder
 	set Result = 0
 
-	if $length(..Datum) { 
-		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)
-				 if (Leverdag<..Datum) {
-				 	 set Aantal = $piece(Rec,"\",1)
-				 	 set Result = Result + Aantal
-				 }
-			 }
-		}
+	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(..Datum)&&(Leverdag'>..Datum))
+			 set Aantal = $piece(Rec,"\",1)
+			 set Result = Result + Aantal
+		 }
 	}
-	else  { set Result = +$piece($get(^PRSTOCK("D",..PRNr)),"\",3) }
 	
 	set ..AantalInOrder = Result
+
 	quit Result
 ]]></Implementation>
 </Method>
Index: APPS/common/impl/StockOverKinderen.cls.xml
===================================================================
diff -u -r1133 -r1383
--- APPS/common/impl/StockOverKinderen.cls.xml	(.../StockOverKinderen.cls.xml)	(revision 1133)
+++ APPS/common/impl/StockOverKinderen.cls.xml	(.../StockOverKinderen.cls.xml)	(revision 1383)
@@ -241,11 +241,6 @@
 		set AantalInReservatie = ..KinderenInReservatie.GetAt(KindPRNr) 
 		set FysischeStock = ..FysischeStock(KindPRNr)
 		set AantalBeschikbaar = FysischeStock-AantalInOrder+AantalInToelev-AantalInReservatie
-		do WLIP^vhDBG(195,"AantalBeschikbaar ("_KindPRNr_") : "_AantalBeschikbaar)
-		do WLIP^vhDBG(195,"FysischeStock ("_KindPRNr_") : "_FysischeStock)
-		do WLIP^vhDBG(195,"AantalInOrder ("_KindPRNr_") : "_AantalInOrder)
-		do WLIP^vhDBG(195,"AantalInToelev ("_KindPRNr_") : "_AantalInToelev)
-		do WLIP^vhDBG(195,"AantalInReservatie ("_KindPRNr_") : "_AantalInReservatie)
 		do ..KinderenBeschikbaar.SetAt(AantalBeschikbaar,KindPRNr)
 	}