Index: PRODUKT4.mac.rou
===================================================================
diff -u -r1656 -r1665
--- PRODUKT4.mac.rou	(.../PRODUKT4.mac.rou)	(revision 1656)
+++ PRODUKT4.mac.rou	(.../PRODUKT4.mac.rou)	(revision 1665)
@@ -79,8 +79,7 @@
 	new StockService set StockService = ##class(APPS.common.StockNiveauService).GeefServiceViaPRNr(PRNr,Datum)
 	new resGetStock
  
- 	
-	if Type="" { 
+ 	if Type="" { 
 		new dto set dto = StockService.GeefAlleStockTypeNiveaus() 
 		set resGetStock = $select(WMSIncl:dto.FysischMinReservaties,1:dto.Fysisch)_"\"_
 						  dto.Praktisch_"\"_dto.Theoretisch_"\\"_dto.InReceptie_"\"_dto.InReceptieGestockeerd
Index: vhUnitTest/APPS/common/StockNiveauService.cls.xml
===================================================================
diff -u -r1074 -r1665
--- vhUnitTest/APPS/common/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1074)
+++ vhUnitTest/APPS/common/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1665)
@@ -36,10 +36,10 @@
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1000)	
 	set dtoStock = implSNS.GeefAlleStockTypeNiveaus()
 	do $$$AssertEquals(dtoStock.Fysisch,1000,"Fysische stock")
-	do $$$AssertEquals(dtoStock.Praktisch,970,"Praktische stock")
+	do $$$AssertEquals(dtoStock.Praktisch,960,"Praktische stock")
 	do $$$AssertEquals(dtoStock.FysischMinReservaties,990,"Fysische stock min aantal in reservatie")
-	do $$$AssertEquals(dtoStock.Theoretisch,1720,"Theorethische stock")
-	do $$$AssertEquals(dtoStock.InOrder,30,"Aantal op order")
+	do $$$AssertEquals(dtoStock.Theoretisch,1710,"Theorethische stock")
+	do $$$AssertEquals(dtoStock.InOrder,40,"Aantal op order")
 	do $$$AssertEquals(dtoStock.InToelevering,750,"Aantal in uitlevering")
 	do $$$AssertEquals(dtoStock.InReservatie,10,"Aantal in reservatie")
 	quit
@@ -62,19 +62,19 @@
 <Method name="TestPraktischeStock">
 <Implementation><![CDATA[
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1000)	
-	do $$$AssertEquals(implSNS.GeefPraktischeStock(),970,"Controle praktische stock")
+	do $$$AssertEquals(implSNS.GeefPraktischeStock(),960,"Controle praktische stock")
 
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1002)	
 	do $$$AssertEquals(implSNS.GeefPraktischeStock(),962,"Controle praktische stock")
 
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1000,$$INTDATE^vhDTyp("22.04.2011"))	
-	do $$$AssertEquals(implSNS.GeefPraktischeStock(),970,"Controle praktische stock - 22.04.2011")
+	do $$$AssertEquals(implSNS.GeefPraktischeStock(),960,"Controle praktische stock - 22.04.2011")
 
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1000,$$INTDATE^vhDTyp("22.03.2011"))	
 	do $$$AssertEquals(implSNS.GeefPraktischeStock(),1000,"Controle praktische stock - 22.03.2011")
 	
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1000,$$INTDATE^vhDTyp("30.03.2011"))
-	do $$$AssertEquals(implSNS.GeefPraktischeStock(),990,"Controle praktische stock - 30.03.2011")
+	do $$$AssertEquals(implSNS.GeefPraktischeStock(),980,"Controle praktische stock - 30.03.2011")
 	
 	quit
 ]]></Implementation>
@@ -83,20 +83,20 @@
 <Method name="TestTheoretischeStock">
 <Implementation><![CDATA[
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1000)
-	do $$$AssertEquals(implSNS.GeefTheoretischeStock(),1720,"Controle theoretische stock")
-	do $$$AssertEquals(implSNS.GeefTheoretischeStock(),1720,"Controle theoretische stock")
+	do $$$AssertEquals(implSNS.GeefTheoretischeStock(),1710,"Controle theoretische stock")
+	do $$$AssertEquals(implSNS.GeefTheoretischeStock(),1710,"Controle theoretische stock")
 	
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1002)	
 	do $$$AssertEquals(implSNS.GeefTheoretischeStock(),962,"Controle theoretische stock")
 
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1000,$$INTDATE^vhDTyp("22.04.2011"))
-	do $$$AssertEquals(implSNS.GeefTheoretischeStock(),1720,"Controle theoretische stock - 22.04.2011")
+	do $$$AssertEquals(implSNS.GeefTheoretischeStock(),1710,"Controle theoretische stock - 22.04.2011")
 
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1000,$$INTDATE^vhDTyp("22.03.2011"))
 	do $$$AssertEquals(implSNS.GeefTheoretischeStock(),1000,"Controle theoretische stock - 22.03.2001")
 	
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1000,$$INTDATE^vhDTyp("30.03.2011"))
-	do $$$AssertEquals(implSNS.GeefTheoretischeStock(),1490,"Controle theoretische stock - 30.03.2011")
+	do $$$AssertEquals(implSNS.GeefTheoretischeStock(),1480,"Controle theoretische stock - 30.03.2011")
 	
 	quit
 ]]></Implementation>
@@ -127,16 +127,16 @@
 <Method name="TestAantalInOrder">
 <Implementation><![CDATA[
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1000)	
-	do $$$AssertEquals(implSNS.GeefAantalInOrder(),30,"Aantal op order")
+	do $$$AssertEquals(implSNS.GeefAantalInOrder(),40,"Aantal op order")
 	
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1000,$$INTDATE^vhDTyp("22.04.2011"))	
-	do $$$AssertEquals(implSNS.GeefAantalInOrder(),30,"Aantal op order - 22.04.2011")
+	do $$$AssertEquals(implSNS.GeefAantalInOrder(),40,"Aantal op order - 22.04.2011")
 		
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1000,$$INTDATE^vhDTyp("22.03.2011"))	
 	do $$$AssertEquals(implSNS.GeefAantalInOrder(),0,"Aantal op order - 22.03.2011")
 	
 	set implSNS = ##class(APPS.common.impl.StockNiveauService).%New(1000,$$INTDATE^vhDTyp("30.03.2011"))	
-	do $$$AssertEquals(implSNS.GeefAantalInOrder(),10,"Aantal op order - 30.03.2011")
+	do $$$AssertEquals(implSNS.GeefAantalInOrder(),20,"Aantal op order - 30.03.2011")
 	
 	quit
 ]]></Implementation>
Index: APPS/common/impl/StockNiveauService.cls.xml
===================================================================
diff -u -r1656 -r1665
--- APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1656)
+++ APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1665)
@@ -81,6 +81,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>PRNr:%Integer,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock=""</FormalSpec>
 <Private>1</Private>
@@ -89,11 +94,14 @@
 <Implementation><![CDATA[
 	#define enuStockType ##class(APPS.common.enu.StockType)
 	#define IsStockOverKinderen $piece(^KPR(..PRNr,0),"\",23)="S"
-	
+
 	set ..PRNr = PRNr
 	set ..implStockOverKinderen = ##class(APPS.common.impl.StockOverKinderen).%New(PRNr,Datum)
 	set ..Datum = Datum
 	set ..Magazijn = Magazijn
+	
+	set ..Logger = ##class(vhLib.Logger).%New("StockNiveauService")
+
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -105,7 +113,7 @@
 	
 	set dtoStock.Fysisch = ..GeefFysischeStock()
 	set dtoStock.Praktisch = ..GeefPraktischeStock()
-	;set dtoStock.FysischMinReservaties = ..GeefFysischeStockMinReservaties()
+	set dtoStock.FysischMinReservaties = ..GeefFysischeStockMinReservaties()
 	set dtoStock.Theoretisch = ..GeefTheoretischeStock()
 	set dtoStock.InOrder = ..GeefAantalInOrder()
 	set dtoStock.InToelevering = ..GeefAantalInToelevering()
@@ -122,14 +130,19 @@
 <Method name="GeefFysischeStock">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
+	#define Actie "GeefFysischeStock"
+	
 	quit:$length(..Fysisch) ..Fysisch
 	
 	set Result = 0
 	if $$$IsStockOverKinderen { 
 		do ..implStockOverKinderen.SetStockType($$$enuStockType.Fysisch())
 		set Result = ..implStockOverKinderen.Beschikbaarheid()
+		do ..Logger.Info($$$Actie,"StockOverKinderen - "_..PRNr_" : "_Result)
 	}
-	else {	set Result = +$piece(^KPR(..PRNr,0),"\",14)
+	else {	
+		set Result = +$piece(^KPR(..PRNr,0),"\",14)
+		do ..Logger.Info($$$Actie,..PRNr_" : "_Result)
 	}
 	
 	set ..Fysisch = Result
@@ -141,14 +154,21 @@
 <Method name="GeefFysischeStockMinReservaties">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
+
+	#define Actie "GeefFysischeStockMinReservaties"
+
 	quit:$length(..FysischMinReservatie) ..FysischMinReservatie
 	
 	set Result = 0
 	if $$$IsStockOverKinderen {
 		do ..implStockOverKinderen.SetStockType($$$enuStockType.FysischMinReservaties())
 		set Result = ..implStockOverKinderen.Beschikbaarheid()
+		do ..Logger.Info($$$Actie,"StockOverKinderen - "_..PRNr_" : "_Result)
 	}
-	else  { set Result = ..GeefFysischeStock()-..GeefAantalInReservatie() }
+	else  { 
+		set Result = ..GeefFysischeStock()-..GeefAantalInReservatie() 
+		do ..Logger.Info($$$Actie,..PRNr_" : "_Result)
+	}
 	
 	set ..FysischMinReservatie = Result 
 	
@@ -159,14 +179,21 @@
 <Method name="GeefPraktischeStock">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
+	#define Actie "GeefPraktischeStock"
+
+
 	quit:$length(..Praktisch) ..Praktisch
 	
 	set Result = 0
 	if $$$IsStockOverKinderen {
 		do ..implStockOverKinderen.SetStockType($$$enuStockType.Praktisch())
 		set Result = ..implStockOverKinderen.Beschikbaarheid()
+		do ..Logger.Info($$$Actie,"StockOverKinderen - "_..PRNr_" : "_Result)
 	}
-	else { set Result = ..GeefFysischeStock() - ..GeefAantalInOrder()}
+	else { 
+		set Result = ..GeefFysischeStock() - ..GeefAantalInOrder()
+		do ..Logger.Info($$$Actie,..PRNr_" : "_Result)
+	}
 	
 	set ..Praktisch = Result 
 	
@@ -177,14 +204,20 @@
 <Method name="GeefTheoretischeStock">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
+	#define Actie "GeefTheoretischeStock"
+	
 	quit:$length(..Theoretisch) ..Theoretisch
 	
 	set Result = 0
 	if $$$IsStockOverKinderen {
 		do ..implStockOverKinderen.SetStockType($$$enuStockType.Theoretisch())
 		set Result = ..implStockOverKinderen.Beschikbaarheid()
+		do ..Logger.Info($$$Actie,"StockOverKinderen - "_..PRNr_" : "_Result)
 	}
-	else  { set Result = ..GeefPraktischeStock() + ..GeefAantalInToelevering() }
+	else  { 
+		set Result = ..GeefPraktischeStock() + ..GeefAantalInToelevering() 
+		do ..Logger.Info($$$Actie,..PRNr_" : "_Result)
+	}
 	
 	set ..Theoretisch = Result
 	
@@ -195,25 +228,33 @@
 <Method name="GeefAantalInReceptie">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
+	#define Actie "GeefAantalInReceptie"
+	
 	quit:$length(..AantalInReceptie) ..AantalInReceptie
 	
-	set lbResult = $$InReceptie^PRODUKT4(..PRNr)
-	set ..AantalInReceptie = $listget(lbResult,1)
-	set ..AantalInReceptieGestockeerd = $listget(lbResult,2)
+	set lbInReceptie = $$InReceptie^PRODUKT4(..PRNr)
+	set ..AantalInReceptie = $listget(lbInReceptie,1)
+	set ..AantalInReceptieGestockeerd = $listget(lbInReceptie,2)
 	
+	do ..Logger.Info($$$Actie,..PRNr_" : "_..AantalInReceptie)
+	
 	quit ..AantalInReceptie
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAantalInReceptieGestockeerd">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
+	#define Actie "GeefAantalInReceptieGestockeerd"
+	
 	quit:$length(..AantalInReceptieGestockeerd) ..AantalInReceptieGestockeerd
 	
-	set lbResult = $$InReceptie^PRODUKT4(..PRNr)
-	set ..AantalInReceptie = $listget(lbResult,1)
-	set ..AantalInReceptieGestockeerd = $listget(lbResult,2)
+	set lbInReceptie = $$InReceptie^PRODUKT4(..PRNr)
+	set ..AantalInReceptie = $listget(lbInReceptie,1)
+	set ..AantalInReceptieGestockeerd = $listget(lbInReceptie,2)
 	
+	do ..Logger.Info($$$Actie,..PRNr_" : "_..AantalInReceptieGestockeerd)
+	
 	quit ..AantalInReceptieGestockeerd
 ]]></Implementation>
 </Method>
@@ -232,6 +273,8 @@
 <Method name="GeefAantalInReservatie">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
+	#define Actie "GeefAantalInReservatie"
+
 	quit:$length(..AantalInReservatie) ..AantalInReservatie
 	
 	set Result = 0
@@ -250,31 +293,36 @@
 	
 	set ..AantalInReservatie = Result
 	
+	do ..Logger.Info($$$Actie,..PRNr_" : "_Result)
+
 	quit Result
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAantalInOrder">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
+	#define Actie "GeefAantalInOrder"
+	
 	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(..Datum)&&(Leverdag>..Datum))
-			 set Aantal = $piece(Rec,"\",1)
-			 set Result = Result + Aantal
-		 }
+		 set Rec = ^KPR(..PRNr,idxWNode)
+		 set Leverdag = $P(Rec,"\",2)
+		 continue:($length(..Datum)&&(Leverdag>..Datum))
+		 set Aantal = $piece(Rec,"\",1)
+		 set Result = Result + Aantal
 	}
 	
 	set ..AantalInOrder = Result
 
+	do ..Logger.Info($$$Actie,..PRNr_" : "_Result)
+
+
 	quit Result
 ]]></Implementation>
 </Method>
@@ -293,6 +341,8 @@
 <Method name="GeefAantalInToelevering">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
+	#define Actie "GeefAantalInToelevering"
+	
 	quit:$length(..AantalInToelevering) ..AantalInToelevering
 	set Result = 0
 
@@ -310,6 +360,8 @@
 	else  { set Result = +$piece($piece(^KPR(..PRNr,0),"\",17),"#",1) }
 	
 	set ..AantalInToelevering = Result
+
+	do ..Logger.Info($$$Actie,..PRNr_" : "_Result)
 	
 	quit Result
 ]]></Implementation>
@@ -318,6 +370,8 @@
 <Method name="GeefAantalInTransfert">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
+	#define Actie "GeefAantalInTransfert"
+
 	quit:$length(..AantalInTransfert) ..AantalInTransfert
 
 	set Result = 0
@@ -337,6 +391,8 @@
 	
 	set ..AantalInTransfert = Result
 	
+	do ..Logger.Info($$$Actie,..PRNr_" : "_Result)
+	
 	quit Result
 ]]></Implementation>
 </Method>
@@ -353,6 +409,9 @@
 <Method name="GeefAantalKlaarGezet">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
+
+	#define Actie "GeefAantalKlaarGezet"
+
 	quit:$length(..AantalKlaarGezet) ..AantalKlaarGezet
 	
 	set Result = 0
@@ -375,6 +434,8 @@
 	
 	set ..AantalKlaarGezet = Result
 	
+	do ..Logger.Info($$$Actie,..PRNr_" : "_Result)
+	
 	quit Result
 ]]></Implementation>
 </Method>