Index: APPS/common/impl/StockNiveauService.cls.xml
===================================================================
diff -u -r917 -r946
--- APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 917)
+++ APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 946)
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-04 17:15:06">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-23 09:24:36">
 <Class name="APPS.common.impl.StockNiveauService">
 <IncludeCode>TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.common.StockNiveauService,%RegisteredObject</Super>
-<TimeChanged>62154,62104.89916</TimeChanged>
+<TimeChanged>62173,33961.755646</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="PRNr">
+<Description>
+Bij de berekeningen wordt er momenteel nog geen rekening gehouden met magazijn waarin de goederen zich bevinden.</Description>
 <Type>%Integer</Type>
 <Private>1</Private>
 </Property>
@@ -22,63 +24,217 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Product">
+<Type>DOM.PM.Product</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Fysisch">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Praktisch">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="FysischMinReservatie">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Theoretisch">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="AantalInOrder">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="AantalInToelevering">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="AantalInReservatie">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>PRNr:%Integer,Datum:%Date="",Magazijn:APPS.common.enu.MagazijnMetStock=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	#define enuStockType ##class(APPS.common.enu.StockType)
+	
+	set ..Product = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(PRNr)
 	set ..PRNr = PRNr
 	set ..Datum = Datum
 	set ..Magazijn = Magazijn
-
 	quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAlleStockTypeNiveaus">
 <ReturnType>APPS.common.dto.StockNiveaus</ReturnType>
-<Implementation><![CDATA[	set dtoStock = ##class(APPS.common.dto.StockNiveaus).%New()
+<Implementation><![CDATA[
+	set dtoStock = ##class(APPS.common.dto.StockNiveaus).%New()
+	set dtoStock.Fysisch = ..GeefFysischeStock()
+	set dtoStock.Praktisch = ..GeefPraktischeStock()
+	set dtoStock.FysischMinReservaties = ..GeefFysischeStockMinReservaties()
+	set dtoStock.Theoretisch = ..GeefTheoretischeStock()
+	set dtoStock.InOrder = ..GeefAantalInOrder()
+	set dtoStock.InToelevering = ..GeefAantalInToelevering()
+	set dtoStock.InReservatie = ..GeefAantalInReservatie()
+	quit dtoStock
 ]]></Implementation>
 </Method>
 
-<Method name="GeefDynamischeStock">
+<Method name="GeefFysischeStock">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
-	if ..Magazijn'=##class(APPS.common.enu.MagazijnMetStock).VanHoeckeMagazijn() $$$ThrowError($$$errInvalidInput,Magazijn)
-	Quit $$DYNSTOCK^PRODUKT4(..PRNr,Type,$$EXTDATE^vhDTyp(Datum))
+	quit:$length(..Fysisch) ..Fysisch
+	
+	set Result = 0
+	if ..Product.IsStockOverKinderen() { 
+		set implStockOverKinderen = ##class(APPS.common.impl.StockOverKinderen).%New(..PRNr,$$$enuStockType.Fysisch())
+		set Result = implStockOverKinderen.Beschikbaarheid()
+	}
+	else {	set Result = +$piece(^KPR(..PRNr,0),"\",14)
+	}
+	
+	set ..Fysisch = Result
+	quit Result
 ]]></Implementation>
 </Method>
 
-<Method name="GeefFysischeStock">
+<Method name="GeefFysischeStockMinReservaties">
 <ReturnType>%Float</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefDynamischeStock(PRNr,"F",,Magazijn)
+<Implementation><![CDATA[
+	quit:$length(..FysischMinReservatie) ..FysischMinReservatie
+	
+	set Result = 0
+	if ..Product.IsStockOverKinderen() {
+		set implStockOverKinderen = ##class(APPS.common.impl.StockOverKinderen).%New(..PRNr,$$$enuStockType.FysischMinReservaties(),..Datum)
+		set Result = implStockOverKinderen.Beschikbaarheid()
+	}
+	else  { set Result = ..GeefFysischeStock()-..GeefAantalInReservatie() }
+	
+	set ..FysischMinReservatie = Result 
+	
+	quit Result
 ]]></Implementation>
 </Method>
 
 <Method name="GeefPraktischeStock">
 <ReturnType>%Float</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefDynamischeStock(PRNr,"P",,Magazijn)
+<Implementation><![CDATA[
+	quit:$length(..Praktisch) ..Praktisch
+	
+	set Result = 0
+	if ..Product.IsStockOverKinderen() {
+		set implStockOverKinderen = ##class(APPS.common.impl.StockOverKinderen).%New(..PRNr,$$$enuStockType.Praktisch(),..Datum)
+		set Result = implStockOverKinderen.Beschikbaarheid()
+	}
+	else { set Result = ..GeefFysischeStock() - ..GeefAantalInOrder()}
+	
+	set ..Praktisch = Result 
+	
+	quit Result
 ]]></Implementation>
 </Method>
 
+<Method name="GeefTheoretischeStock">
+<ReturnType>%Float</ReturnType>
+<Implementation><![CDATA[
+	quit:$length(..Theoretisch) ..Theoretisch
+	
+	set Result = 0
+	if ..Product.IsStockOverKinderen() {
+		set implStockOverKinderen = ##class(APPS.common.impl.StockOverKinderen).%New(..PRNr,$$$enuStockType.Theoretisch(),..Datum)
+		
+		set Result = implStockOverKinderen.Beschikbaarheid()
+	}
+	else  { set Result = ..GeefPraktischeStock() + ..GeefAantalInToelevering() }
+	
+	set ..Theoretisch = Result
+	
+	quit Result
+]]></Implementation>
+</Method>
+
 <Method name="GeefAantalInReservatie">
 <ReturnType>%Float</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefDynamischeStock(PRNr,"R",,Magazijn)
+<Implementation><![CDATA[
+	quit:$length(..AantalInReservatie) ..AantalInReservatie
+	
+	set Result = 0
+	if $length(..Datum) {
+		set itProductOrderLijnen = ##class(APPS.PM.DataMProductOrderLijnIterator).%New(..PRNr)
+		while itProductOrderLijnen.HasNext() {
+			set OrderLijn = itProductOrderLijnen.Next()
+			continue:($$$Not(OrderLijn.IsInReservatie()))
+			continue:( ( $length(..Datum) ) && ( OrderLijn.GeefLeverdag()>(..Datum) ) )
+			set Result = Result + OrderLijn.GeefAantal()			 
+		}
+	}
+	else  { 
+		set Result = +$piece(^PRSTOCK("D",..PRNr),"\",2) 
+	}
+	set ..AantalInReservatie = Result
+	
+	quit Result
 ]]></Implementation>
 </Method>
 
-<Method name="GeefFysischeStockMinReservaties">
+<Method name="GeefAantalInToelevering">
 <ReturnType>%Float</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefFysischeStock(PRNr,Magazijn)-..GeefAantalInReservatie(PRNr,Magazijn)
+<Implementation><![CDATA[
+	quit:$length(..AantalInToelevering) ..AantalInToelevering
+	set Result = 0
+
+	if $length(..Datum) { 
+		set itProductToelevLijnen = ##class(APPS.PM.DataMProductToelevLijnIterator).%New(..PRNr)
+		while itProductToelevLijnen.HasNext() {
+			set ToelevLijn = itProductToelevLijnen.Next()
+			continue:( ( $length(..Datum) ) && ( ToelevLijn.GeefLeverdag()>(..Datum) ) )
+			set Result = Result + ToelevLijn.GeefAantal()
+		}
+	}
+	else  { set Result = +$piece($piece(^KPR(..PRNr,0),"\",17),"#",1) }
+	
+	set ..AantalInToelevering = Result
+	
+	quit Result
 ]]></Implementation>
 </Method>
 
-<Method name="GeefTheoretischeStock">
+<Method name="GeefAantalInOrder">
 <ReturnType>%Float</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefDynamischeStock(PRNr,"T",,Magazijn)
+<Implementation><![CDATA[
+	quit:$length(..AantalInOrder) ..AantalInOrder
+	set Result = 0
+
+	if $length(..Datum) { 
+		set itProductOrderLijnen = ##class(APPS.PM.DataMProductOrderLijnIterator).%New(..PRNr)
+		while itProductOrderLijnen.HasNext() {
+			set OrderLijn = itProductOrderLijnen.Next()
+			continue:(OrderLijn.IsInReservatie())
+			continue:( ( $length(..Datum) ) && ( OrderLijn.GeefLeverdag()>(..Datum) ) )
+			set Result = Result + OrderLijn.GeefAantal()
+		}
+	}
+	else  { set Result = +$piece(^PRSTOCK("D",..PRNr),"\",3) }
+	
+	set ..AantalInOrder = Result
+	quit Result
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="2312695540"/>
+<Checksum value="334448305"/>
 </Export>