Index: APPS/common/impl/StockNiveauService.cls.xml
===================================================================
diff -u -r1464 -r1651
--- APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1464)
+++ APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1651)
@@ -16,6 +16,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="InclReservatieWMS">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="PRNr">
 <Type>%Integer</Type>
 <Private>1</Private>
@@ -82,7 +87,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>PRNr:%Integer,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock=""</FormalSpec>
+<FormalSpec>PRNr:%Integer,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock="",InclReservatieWMS:%Boolean=1</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -94,6 +99,7 @@
 	set ..implStockOverKinderen = ##class(APPS.common.impl.StockOverKinderen).%New(PRNr,Datum)
 	set ..Datum = Datum
 	set ..Magazijn = Magazijn
+	set ..InclReservatieWMS = InclReservatieWMS
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -105,7 +111,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()
@@ -133,13 +139,18 @@
 	}
 	
 	set ..Fysisch = Result
+	
+	if ..InclReservatieWMS set ..Fysisch = ..Fysisch - ..GeefAantalInReservatie()
+
 	quit Result
 ]]></Implementation>
 </Method>
 
-<Method name="GeefFysischeStockMinReservaties">
-<ReturnType>%Float</ReturnType>
-<Implementation><![CDATA[
+<UDLText name="T">
+<Content><![CDATA[
+/*
+Method GeefFysischeStockMinReservaties() As %Float
+{
 	quit:$length(..FysischMinReservatie) ..FysischMinReservatie
 	
 	set Result = 0
@@ -152,8 +163,10 @@
 	set ..FysischMinReservatie = Result 
 	
 	quit Result
-]]></Implementation>
-</Method>
+}
+*/
+]]></Content>
+</UDLText>
 
 <Method name="GeefPraktischeStock">
 <ReturnType>%Float</ReturnType>
Index: PRODUKT4.mac.rou
===================================================================
diff -u -r1308 -r1651
--- PRODUKT4.mac.rou	(.../PRODUKT4.mac.rou)	(revision 1308)
+++ PRODUKT4.mac.rou	(.../PRODUKT4.mac.rou)	(revision 1651)
@@ -75,7 +75,7 @@
 	set Week = $get(Week)
 	set:$length(Week) Datum = $$INTDATE^vhDTyp(Week,"DW")
 	set Type = $get(Type)
-	new StockService set StockService = ##class(APPS.common.StockNiveauService).GeefServiceViaPRNr(PRNr,Datum)
+	new StockService set StockService = ##class(APPS.common.StockNiveauService).GeefServiceViaPRNr(PRNr,Datum,,WMSIncl)
 	new resGetStock
  
 	if Type="" { 
Index: APPS/common/StockNiveauService.cls.xml
===================================================================
diff -u -r1385 -r1651
--- APPS/common/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1385)
+++ APPS/common/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 1651)
@@ -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=""</FormalSpec>
-<Implementation><![CDATA[	quit ##class(APPS.common.impl.StockNiveauService).%New(Product.GeefPRNr(), Datum , Magazijn)
+<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)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefServiceViaPRNr">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>PRNr:%Integer,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock=""</FormalSpec>
-<Implementation><![CDATA[	quit ##class(APPS.common.impl.StockNiveauService).%New(PRNr, Datum , Magazijn)
+<FormalSpec>PRNr:%Integer,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock="",InclReservatiesWMS:%Boolean=1</FormalSpec>
+<Implementation><![CDATA[	quit ##class(APPS.common.impl.StockNiveauService).%New(PRNr, Datum , Magazijn,,InclReservatieWMS)
 ]]></Implementation>
 </Method>