Index: APPS/common/impl/StockNiveauService.cls.xml
===================================================================
diff -u -r1651 -r1656
--- APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1651)
+++ APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1656)
@@ -16,11 +16,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="InclReservatieWMS">
-<Type>%Boolean</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="PRNr">
 <Type>%Integer</Type>
 <Private>1</Private>
@@ -87,7 +82,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>PRNr:%Integer,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock="",InclReservatieWMS:%Boolean=1</FormalSpec>
+<FormalSpec>PRNr:%Integer,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -99,7 +94,6 @@
 	set ..implStockOverKinderen = ##class(APPS.common.impl.StockOverKinderen).%New(PRNr,Datum)
 	set ..Datum = Datum
 	set ..Magazijn = Magazijn
-	set ..InclReservatieWMS = InclReservatieWMS
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -139,18 +133,14 @@
 	}
 	
 	set ..Fysisch = Result
-	
-	if ..InclReservatieWMS set ..Fysisch = ..Fysisch - ..GeefAantalInReservatie()
 
 	quit Result
 ]]></Implementation>
 </Method>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-Method GeefFysischeStockMinReservaties() As %Float
-{
+<Method name="GeefFysischeStockMinReservaties">
+<ReturnType>%Float</ReturnType>
+<Implementation><![CDATA[
 	quit:$length(..FysischMinReservatie) ..FysischMinReservatie
 	
 	set Result = 0
@@ -163,10 +153,8 @@
 	set ..FysischMinReservatie = Result 
 	
 	quit Result
-}
-*/
-]]></Content>
-</UDLText>
+]]></Implementation>
+</Method>
 
 <Method name="GeefPraktischeStock">
 <ReturnType>%Float</ReturnType>
@@ -259,7 +247,7 @@
 		 	 set Result = Result + Aantal
 		 }
 	}
-
+	
 	set ..AantalInReservatie = Result
 	
 	quit Result
Index: PRODUKT4.mac.rou
===================================================================
diff -u -r1654 -r1656
--- PRODUKT4.mac.rou	(.../PRODUKT4.mac.rou)	(revision 1654)
+++ PRODUKT4.mac.rou	(.../PRODUKT4.mac.rou)	(revision 1656)
@@ -76,14 +76,16 @@
 	set WMSIncl = $get(WMSIncl,1)
 	set:$length(Week) Datum = $$INTDATE^vhDTyp(Week,"DW")
 	set Type = $get(Type)
-	new StockService set StockService = ##class(APPS.common.StockNiveauService).GeefServiceViaPRNr(PRNr,Datum,,WMSIncl)
+	new StockService set StockService = ##class(APPS.common.StockNiveauService).GeefServiceViaPRNr(PRNr,Datum)
 	new resGetStock
  
+ 	
 	if Type="" { 
 		new dto set dto = StockService.GeefAlleStockTypeNiveaus() 
-		set resGetStock = dto.Fysisch_"\"_dto.Praktisch_"\"_dto.Theoretisch_"\\"_dto.InReceptie_"\"_dto.InReceptieGestockeerd
+		set resGetStock = $select(WMSIncl:dto.FysischMinReservaties,1:dto.Fysisch)_"\"_
+						  dto.Praktisch_"\"_dto.Theoretisch_"\\"_dto.InReceptie_"\"_dto.InReceptieGestockeerd
 	} elseif Type = "F" {
-		set resGetStock = StockService.GeefFysischeStock()
+		set resGetStock = $select(WMSIncl:StockService.GeefFysischeStockMinReservaties(),1:StockService.GeefFysischeStock())
 	} elseif Type = "P" {		
 		set resGetStock = StockService.GeefPraktischeStock()
 	} elseif Type = "T" {		
Index: APPS/common/StockNiveauService.cls.xml
===================================================================
diff -u -r1653 -r1656
--- APPS/common/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1653)
+++ APPS/common/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1656)
@@ -8,15 +8,15 @@
 <Description>
 Bij de berekeningen wordt er momenteel nog geen rekening gehouden met magazijn waarin de goederen zich bevinden.</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Product:DOM.PM.Product,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock="",InclReservatieWMS:%Boolean=1</FormalSpec>
-<Implementation><![CDATA[	quit ##class(APPS.common.impl.StockNiveauService).%New(Product.GeefPRNr(), Datum , Magazijn,InclReservatieWMS)
+<FormalSpec>Product:DOM.PM.Product,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock=""</FormalSpec>
+<Implementation><![CDATA[	quit ##class(APPS.common.impl.StockNiveauService).%New(Product.GeefPRNr(), Datum , Magazijn)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefServiceViaPRNr">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>PRNr:%Integer,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock="",InclReservatieWMS:%Boolean=1</FormalSpec>
-<Implementation><![CDATA[	quit ##class(APPS.common.impl.StockNiveauService).%New(PRNr, Datum , Magazijn,InclReservatieWMS)
+<FormalSpec>PRNr:%Integer,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock=""</FormalSpec>
+<Implementation><![CDATA[	quit ##class(APPS.common.impl.StockNiveauService).%New(PRNr, Datum , Magazijn)
 ]]></Implementation>
 </Method>