Index: APPS/common/impl/StockNiveauServiceObj.cls.xml
===================================================================
diff -u -r29059 -r33085
--- APPS/common/impl/StockNiveauServiceObj.cls.xml	(.../StockNiveauServiceObj.cls.xml)	(revision 29059)
+++ APPS/common/impl/StockNiveauServiceObj.cls.xml	(.../StockNiveauServiceObj.cls.xml)	(revision 33085)
@@ -59,162 +59,108 @@
 <Private>1</Private>
 </Property>
 
-<Property name="implStockOverKinderen">
-<Type>APPS.common.impl.StockOverKinderen</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
 <FormalSpec>Product:DOM.PM.Product,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 = Product
-	set ..implStockOverKinderen = ##class(APPS.common.impl.StockOverKinderenObj).%New(Product,Datum)
+	set ..StockOverKinderen = ##class(APPS.common.impl.StockOverKinderenObj).%New(Product, Datum)
 	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()
 	
-	;d StartTimer^vhLib
-	set dtoStock.Fysisch = ..GeefFysischeStock()
-	;d StopTimer^vhLib
-	;D WLIP^vhDBG(195,"Fys : "_$$GetInterval^vhLib())
-	;d StartTimer^vhLib
-	set dtoStock.Praktisch = ..GeefPraktischeStock()
-	;d StopTimer^vhLib
-	;D WLIP^vhDBG(195,"Pra : "_$$GetInterval^vhLib())
-	;d StartTimer^vhLib
-	set dtoStock.FysischMinReservaties = ..GeefFysischeStockMinReservaties()
-	;d StopTimer^vhLib
-	;D WLIP^vhDBG(195,"Fys-Res : "_$$GetInterval^vhLib())
-	;d StartTimer^vhLib
-	set dtoStock.Theoretisch = ..GeefTheoretischeStock()
-	;d StopTimer^vhLib
-	;D WLIP^vhDBG(195,"Theo : "_$$GetInterval^vhLib())
-	;d StartTimer^vhLib
-	set dtoStock.InOrder = ..GeefAantalInOrder()
-	;d StopTimer^vhLib
-	;D WLIP^vhDBG(195,"InOrder : "_$$GetInterval^vhLib())
-	;d StartTimer^vhLib
-	set dtoStock.InToelevering = ..GeefAantalInToelevering()
-	;d StopTimer^vhLib
-	;D WLIP^vhDBG(195,"InToelev : "_$$GetInterval^vhLib())
-	;d StartTimer^vhLib
-	set dtoStock.InReservatie = ..GeefAantalInReservatie()
-	;d StopTimer^vhLib
-	;D WLIP^vhDBG(195,"InReser : "_$$GetInterval^vhLib())
-	
-	quit dtoStock
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GeefFysischeStock">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	quit:$length(..Fysisch) ..Fysisch
-	
-	set Result = 0
-	if ..Product.IsStockOverKinderen() { 
-		do ..implStockOverKinderen.SetStockType($$$enuStockType.Fysisch())
-		set Result = ..implStockOverKinderen.Beschikbaarheid()
+	If $$$Not($Length(..Fysisch)) {	
+		If (..Product.IsStockOverKinderen()) {
+			Set ..Fysisch = ..StockOverKinderen.GeefBeschikbaarheid(..StockType.Fysisch)	
+		} Else {
+			Set ..Fysisch = +$piece(^KPR(..Product.GeefPRNr(), 0), "\", 14)
+		}
 	}
-	else {	set Result = +$piece(^KPR(..Product.GeefPRNr(),0),"\",14)
-	}
-	
-	set ..Fysisch = Result
-	quit Result
+
+	Quit ..Fysisch
 ]]></Implementation>
 </Method>
 
 <Method name="GeefFysischeStockMinReservaties">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	quit:$length(..FysischMinReservatie) ..FysischMinReservatie
-	
-	set Result = 0
-	if ..Product.IsStockOverKinderen() {
-		do ..implStockOverKinderen.SetStockType($$$enuStockType.FysischMinReservaties())
-		set Result = ..implStockOverKinderen.Beschikbaarheid()
+	If $$$Not($Length(..FysischMinReservatie)) {	
+		If (..Product.IsStockOverKinderen()) {
+			Set ..FysischMinReservatie = ..StockOverKinderen.GeefBeschikbaarheid(..StockType.FysischMinReservatie)	
+		} Else {
+			Set ..FysischMinReservatie = ..GeefFysischeStock() - ..GeefAantalInReservatie()
+		}
 	}
-	else  { set Result = ..GeefFysischeStock()-..GeefAantalInReservatie() }
-	
-	set ..FysischMinReservatie = Result 
-	
-	quit Result
+
+	Quit ..FysischMinReservatie
 ]]></Implementation>
 </Method>
 
 <Method name="GeefPraktischeStock">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	quit:$length(..Praktisch) ..Praktisch
-	set Result = 0
-	if ..Product.IsStockOverKinderen() {
-		//set Result = ..implStockOverKinderen.PraktischeStock()
-		do ..implStockOverKinderen.SetStockType($$$enuStockType.Praktisch())
-		set Result = ..implStockOverKinderen.Beschikbaarheid()
+	If $$$Not($Length(..Praktisch)) {	
+		If (..Product.IsStockOverKinderen()) {
+			Set ..Praktisch = ..StockOverKinderen.GeefBeschikbaarheid(..StockType.Praktisch)	
+		} Else {
+			Set ..Praktisch = ..GeefFysischeStock() - ..GeefAantalInOrder()
+		}
 	}
-	else { set Result = ..GeefFysischeStock() - ..GeefAantalInOrder()}
-	
-	set ..Praktisch = Result 
-	
-	quit Result
+
+	Quit ..Praktisch
 ]]></Implementation>
 </Method>
 
 <Method name="GeefTheoretischeStock">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	quit:$length(..Theoretisch) ..Theoretisch
-	
-	set Result = 0
-	if ..Product.IsStockOverKinderen() {
-		do ..implStockOverKinderen.SetStockType($$$enuStockType.Theoretisch())
-		set Result = ..implStockOverKinderen.Beschikbaarheid()
+	If $$$Not($Length(..Theoretisch)) {	
+		If (..Product.IsStockOverKinderen()) {
+			Set ..Theoretisch = ..StockOverKinderen.GeefBeschikbaarheid(..StockType.Theoretisch)	
+		} Else {
+			Set ..Theoretisch = ..GeefPraktischeStock() - ..GeefAantalInToelevering()
+		}
 	}
-	else  { set Result = ..GeefPraktischeStock() + ..GeefAantalInToelevering() }
-	
-	set ..Theoretisch = Result
-	
-	quit Result
+
+	Quit ..Theoretisch
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAantalInReservatie">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	quit:$length(..AantalInReservatie) ..AantalInReservatie
 	
 	set Result = 0
 	if $length(..Datum) {
 		set itProductOrderLijnen = ##class(APPS.PM.ProductOpOrderLijnIt).%New(..Product)
+		
 		while itProductOrderLijnen.HasNext() {
 			set OrderLijn = itProductOrderLijnen.Next()
 			continue:($$$Not(OrderLijn.IsInReservatie()))
 			continue:( ( $length(..Datum) ) && ( OrderLijn.GeefLeverdag()>(..Datum) ) )
 			set Result = Result + OrderLijn.GeefAantal()			 
 		}
-	}
-	else  { 
+	} else {
 		set Result = +$piece($get(^PRSTOCK("D",..Product.GeefPRNr())),"\",2) 
 	}
+	
 	set ..AantalInReservatie = Result
 	
 	quit Result
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAantalInToelevering">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	quit:$length(..AantalInToelevering) ..AantalInToelevering
 	set Result = 0
@@ -226,8 +172,9 @@
 			continue:( ( $length(..Datum) ) && ( ToelevLijn.GeefLeverdag()>(..Datum) ) )
 			set Result = Result + ToelevLijn.GeefAantal()
 		}
+	} else {
+		set Result = +$piece($piece(^KPR(..Product.GeefPRNr(),0),"\",17),"#",1)
 	}
-	else  { set Result = +$piece($piece(^KPR(..Product.GeefPRNr(),0),"\",17),"#",1) }
 	
 	set ..AantalInToelevering = Result
 	
@@ -236,7 +183,7 @@
 </Method>
 
 <Method name="GeefAantalInOrder">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	quit:$length(..AantalInOrder) ..AantalInOrder
 	set Result = 0
@@ -249,16 +196,17 @@
 			continue:( ( $length(..Datum) ) && ( OrderLijn.GeefLeverdag()>(..Datum) ) )
 			set Result = Result + OrderLijn.GeefAantal()
 		}
+	} else { 
+		set Result = +$piece($get(^PRSTOCK("D",..Product.GeefPRNr())),"\",3)
 	}
-	else  { set Result = +$piece($get(^PRSTOCK("D",..Product.GeefPRNr())),"\",3) }
 	
 	set ..AantalInOrder = Result
 	quit Result
 ]]></Implementation>
 </Method>
 
 <Method name="IsInReservatie">
-<FormalSpec>OrderNr,OrderLijnNr</FormalSpec>
+<FormalSpec>OrderNr:TECH.String,OrderLijnNr:%Integer</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	set KlantNr = $piece(^KO1(OrderNr,"F"),"\",1)
Index: APPS/common/impl/StockNiveauService.cls.xml
===================================================================
diff -u -r29059 -r33085
--- APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 29059)
+++ APPS/common/impl/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 33085)
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.common.impl.StockNiveauService">
-<ClassType/>
 <IncludeCode>TECH.Error</IncludeCode>
-<ProcedureBlock>1</ProcedureBlock>
-<Super>APPS.common.StockNiveauService,%RegisteredObject</Super>
-<Inheritance>right</Inheritance>
+<Super>APPS.common.StockNiveauService</Super>
 
 <Property name="EindDatumVanBerekeningBereik">
 <Type>%Date</Type>
@@ -77,124 +74,97 @@
 <Private>1</Private>
 </Property>
 
-<Property name="implStockOverKinderen">
-<Type>APPS.common.impl.StockOverKinderen</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
 <FormalSpec>PRNr:%Integer,EindDatumVanBerekeningBereik:%Date=##class(TECH.DateTime).MaxDate(),Magazijn:APPS.common.enu.MagazijnMetStock=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	#define enuStockType ##class(APPS.common.enu.StockType)
-	#define IsStockOverKinderen $piece($Get(^KPR(..PRNr,0)),"\",23)="S"
-	
 	set ..PRNr = PRNr
-	set ..implStockOverKinderen = ##class(APPS.common.impl.StockOverKinderen).%New(PRNr,EindDatumVanBerekeningBereik)
+	set ..StockOverKinderen = ##class(APPS.common.impl.StockOverKinderen).%New(PRNr, EindDatumVanBerekeningBereik)
 	set ..EindDatumVanBerekeningBereik = EindDatumVanBerekeningBereik
 	set ..Magazijn = Magazijn
-	quit $$$OK
+	
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAlleStockTypeNiveaus">
 <ReturnType>APPS.common.dto.StockNiveaus</ReturnType>
 <Implementation><![CDATA[
-	set dtoStock = ##class(APPS.common.dto.StockNiveaus).%New()
+	#dim StockNiveaus As APPS.common.dto.StockNiveaus = ##super()
+
+	Set StockNiveaus.InReceptie = ..GeefAantalInReceptie()
+	Set StockNiveaus.InReceptieGestockeerd = ..GeefAantalInReceptieGestockeerd()
+	Set StockNiveaus.InTransfert = ..GeefAantalInTransfert()
+	Set StockNiveaus.KlaarGezet = ..GeefAantalKlaarGezet()
 	
-	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()
-	set dtoStock.InReceptie = ..GeefAantalInReceptie()
-	set dtoStock.InReceptieGestockeerd = ..GeefAantalInReceptieGestockeerd()
-	set dtoStock.InTransfert = ..GeefAantalInTransfert()
-	set dtoStock.KlaarGezet = ..GeefAantalKlaarGezet()
-	
-	quit dtoStock
+	Quit StockNiveaus
 ]]></Implementation>
 </Method>
 
 <Method name="GeefFysischeStock">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	quit:$length(..Fysisch) ..Fysisch
-	
-	set Result = 0
-	if $$$IsStockOverKinderen { 
-		do ..implStockOverKinderen.SetStockType($$$enuStockType.Fysisch())
-		set Result = ..implStockOverKinderen.Beschikbaarheid()
+	If $$$Not($Length(..Fysisch)) {	
+		If (..IsStockOverKinderen()) {
+			Set ..Fysisch = ..StockOverKinderen.GeefBeschikbaarheid(..StockType.Fysisch)	
+		} Else {
+			Set ..Fysisch = +$Piece($Get(^KPR(..PRNr, 0)), "\", 14)
+		}
 	}
-	else {	
-		set Result = +$piece($Get(^KPR(..PRNr,0)),"\",14)
-	}
-	
-	set ..Fysisch = Result
-	quit Result
+
+	Quit ..Fysisch
 ]]></Implementation>
 </Method>
 
 <Method name="GeefFysischeStockMinReservaties">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	quit:$length(..FysischMinReservatie) ..FysischMinReservatie
-	
-	set Result = 0
-	if $$$IsStockOverKinderen {
-		do ..implStockOverKinderen.SetStockType($$$enuStockType.FysischMinReservaties())
-		set Result = ..implStockOverKinderen.Beschikbaarheid()
+	If $$$Not($Length(..FysischMinReservatie)) {	
+		If (..IsStockOverKinderen()) {
+			Set ..FysischMinReservatie = ..StockOverKinderen.GeefBeschikbaarheid(..StockType.FysischMinReservatie)	
+		} Else {
+			Set ..FysischMinReservatie = ..GeefFysischeStock() - ..GeefAantalInReservatie()
+		}
 	}
-	else  { set Result = ..GeefFysischeStock()-..GeefAantalInReservatie() }
-	
-	set ..FysischMinReservatie = Result 
-	
-	quit Result
+
+	Quit ..FysischMinReservatie
 ]]></Implementation>
 </Method>
 
 <Method name="GeefPraktischeStock">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	quit:$length(..Praktisch) ..Praktisch
-	
-	set Result = 0
-	if $$$IsStockOverKinderen {
-		do ..implStockOverKinderen.SetStockType($$$enuStockType.Praktisch())
-		set Result = ..implStockOverKinderen.Beschikbaarheid()
+	If $$$Not($Length(..Praktisch)) {	
+		If (..IsStockOverKinderen()) {
+			Set ..Praktisch = ..StockOverKinderen.GeefBeschikbaarheid(..StockType.Praktisch)	
+		} Else {
+			Set ..Praktisch = ..GeefFysischeStock() - ..GeefAantalInOrder()
+		}
 	}
-	else { set Result = ..GeefFysischeStock() - ..GeefAantalInOrder()}
-	
-	set ..Praktisch = Result 
-	
-	quit Result
+
+	Quit ..Praktisch
 ]]></Implementation>
 </Method>
 
 <Method name="GeefTheoretischeStock">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	quit:$length(..Theoretisch) ..Theoretisch
-	
-	set Result = 0
-	if $$$IsStockOverKinderen {
-		do ..implStockOverKinderen.SetStockType($$$enuStockType.Theoretisch())
-		set Result = ..implStockOverKinderen.Beschikbaarheid()
+	If $$$Not($Length(..Theoretisch)) {	
+		If (..IsStockOverKinderen()) {
+			Set ..Theoretisch = ..StockOverKinderen.GeefBeschikbaarheid(..StockType.Theoretisch)	
+		} Else {
+			Set ..Theoretisch = ..GeefPraktischeStock() + ..GeefAantalInToelevering()
+		}
 	}
-	else  { set Result = ..GeefPraktischeStock() + ..GeefAantalInToelevering() }
-	
-	set ..Theoretisch = Result
-	
-	quit Result
+
+	Quit ..Theoretisch
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAantalInReceptie">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	quit:$length(..AantalInReceptie) ..AantalInReceptie
 	
@@ -207,7 +177,7 @@
 </Method>
 
 <Method name="GeefAantalInReceptieGestockeerd">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	quit:$length(..AantalInReceptieGestockeerd) ..AantalInReceptieGestockeerd
 	
@@ -231,7 +201,7 @@
 </Method>
 
 <Method name="GeefAantalInReservatie">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	quit:$length(..AantalInReservatie) ..AantalInReservatie
 	
@@ -256,7 +226,7 @@
 </Method>
 
 <Method name="GeefAantalInOrder">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	quit:$length(..AantalInOrder) ..AantalInOrder
 	set Result = 0
@@ -292,7 +262,7 @@
 </Method>
 
 <Method name="GeefAantalInToelevering">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	quit:$length(..AantalInToelevering) ..AantalInToelevering
 	set Result = 0
@@ -317,7 +287,7 @@
 </Method>
 
 <Method name="GeefAantalInTransfert">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	quit:$length(..AantalInTransfert) ..AantalInTransfert
 
@@ -352,7 +322,7 @@
 </Method>
 
 <Method name="GeefAantalKlaarGezet">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	quit:$length(..AantalKlaarGezet) ..AantalKlaarGezet
 	
@@ -379,6 +349,13 @@
 	quit Result
 ]]></Implementation>
 </Method>
+
+<Method name="IsStockOverKinderen">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ($Piece($Get(^KPR(..PRNr, 0)), "\", 23) = "S")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/common/StockNiveauService.cls.xml
===================================================================
diff -u -r29059 -r33085
--- APPS/common/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 29059)
+++ APPS/common/StockNiveauService.cls.xml	(.../StockNiveauService.cls.xml)	(revision 33085)
@@ -1,103 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.common.StockNiveauService">
+<Abstract>1</Abstract>
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.RegisteredObject</Super>
 
+<Property name="StockOverKinderen">
+<Type>APPS.common.StockOverKinderen</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="StockType">
+<Type>APPS.common.enu.StockType.AutoComplete</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="GeefService">
 <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)
+<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=""</FormalSpec>
-<Implementation><![CDATA[	quit ##class(APPS.common.impl.StockNiveauService).%New(PRNr, Datum , Magazijn)
+<Implementation><![CDATA[	Quit ##class(APPS.common.impl.StockNiveauService).%New(PRNr, Datum , Magazijn)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAlleStockTypeNiveaus">
-<Abstract>1</Abstract>
 <ReturnType>APPS.common.dto.StockNiveaus</ReturnType>
+<Implementation><![CDATA[
+	#dim StockNiveaus As APPS.common.dto.StockNiveaus = ##class(APPS.common.dto.StockNiveaus).%New()
+	
+	Set StockNiveaus.Fysisch = ..GeefFysischeStock()
+	Set StockNiveaus.Praktisch = ..GeefPraktischeStock()
+	Set StockNiveaus.FysischMinReservaties = ..GeefFysischeStockMinReservaties()
+	Set StockNiveaus.Theoretisch = ..GeefTheoretischeStock()
+	Set StockNiveaus.InOrder = ..GeefAantalInOrder()
+	Set StockNiveaus.InToelevering = ..GeefAantalInToelevering()
+	Set StockNiveaus.InReservatie = ..GeefAantalInReservatie()
+	
+	Quit StockNiveaus
+]]></Implementation>
 </Method>
 
 <Method name="GeefFysischeStock">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefPraktischeStock">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefTheoretischeStock">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefFysischeStockHalux">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefPraktischeStockHalux">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefTheoretischeStockHalux">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefAantalInReservatie">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefAantalInOrder">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefAantalInToelevering">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefAantalInReceptie">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefAantalInReceptieGestockeerd">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefFysischeStockMinReservaties">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefAantalInTransfert">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefAantalKlaarGezet">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefAantalInStocktoeleveringen">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 </Class>
 
Index: APPS/common/impl/StockNiveauViaProdResService.cls.xml
===================================================================
diff -u -r29059 -r33085
--- APPS/common/impl/StockNiveauViaProdResService.cls.xml	(.../StockNiveauViaProdResService.cls.xml)	(revision 29059)
+++ APPS/common/impl/StockNiveauViaProdResService.cls.xml	(.../StockNiveauViaProdResService.cls.xml)	(revision 33085)
@@ -4,7 +4,7 @@
 <Super>APPS.common.impl.StockNiveauService</Super>
 
 <Method name="GeefFysischeStockMinReservaties">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	#dim VerwachteUitvoerAPI As DOM.ProdRes.VerwachteUitvoerAPI = ##class(DOM.DomeinContext).Instance().GeefVerwachteUitvoerAPI()
 	#dim ReservatieFasen As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
@@ -18,7 +18,7 @@
 </Method>
 
 <Method name="GeefPraktischeStock">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	#dim VerwachteUitvoerAPI As DOM.ProdRes.VerwachteUitvoerAPI = ##class(DOM.DomeinContext).Instance().GeefVerwachteUitvoerAPI()
 	#dim ReservatieFasen As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
@@ -33,7 +33,7 @@
 </Method>
 
 <Method name="GeefTheoretischeStock">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	#dim VerwachteInvoerAPI As DOM.ProdRes.VerwachteInvoerAPI = ##class(DOM.DomeinContext).Instance().GeefVerwachteInvoerAPI()
 	#dim InclusiefGelinkte As %Boolean = 1
@@ -45,7 +45,7 @@
 </Method>
 
 <Method name="GeefFysischeStock">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	#dim Stock As %Float = $P($Get(^KPR(..PRNr,0)),"\",14)
 	If (Stock = "") Set Stock = 0
@@ -54,7 +54,7 @@
 </Method>
 
 <Method name="GeefFysischeStockHalux">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	#dim R As %String = $G(^PRSTOCK("D",..PRNr))
 	#dim WVStock As %Float =$P(R,"\",5)
@@ -64,7 +64,7 @@
 </Method>
 
 <Method name="GeefPraktischeStockHalux">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	#dim VerwachteUitvoerAPI As DOM.ProdRes.VerwachteUitvoerAPI = ##class(DOM.DomeinContext).Instance().GeefVerwachteUitvoerAPI()
 	#dim ReservatieFasen As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
@@ -79,7 +79,7 @@
 </Method>
 
 <Method name="GeefTheoretischeStockHalux">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	#dim VerwachteInvoerAPI As DOM.ProdRes.VerwachteInvoerAPI = ##class(DOM.DomeinContext).Instance().GeefVerwachteInvoerAPI()
 	#dim InclusiefGelinkte As %Boolean = 1
@@ -91,7 +91,7 @@
 </Method>
 
 <Method name="GeefAantalInStocktoeleveringen">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	#dim VerwachteInvoerAPI As DOM.ProdRes.VerwachteInvoerAPI = ##class(DOM.DomeinContext).Instance().GeefVerwachteInvoerAPI()
 	#dim InclusiefGelinkte As %Boolean = 0
Index: APPS/common/impl/StockNiveauOverKinderenProdResService.cls.xml
===================================================================
diff -u -r29059 -r33085
--- APPS/common/impl/StockNiveauOverKinderenProdResService.cls.xml	(.../StockNiveauOverKinderenProdResService.cls.xml)	(revision 29059)
+++ APPS/common/impl/StockNiveauOverKinderenProdResService.cls.xml	(.../StockNiveauOverKinderenProdResService.cls.xml)	(revision 33085)
@@ -9,14 +9,13 @@
 </Parameter>
 
 <Method name="GeefFysischeStock">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	#dim FysischeStock As %Float = ..#MAXFLOAT
 	#dim KinderenMetAantal As %ArrayOfDataTypes = ..GeefKinderenMetAantal()
 	
 	#dim Iterator As TECH.Iterator = ##class(TECH.ListIterator).%New(KinderenMetAantal)
-	While (Iterator.HasNext())
-	{
+	While (Iterator.HasNext()) {
 		#dim Aantal As %Float = Iterator.Next()
 		#dim ProductID As %String = Iterator.Key()
 		#dim StockNiveauService = ##class(APPS.common.StockNiveauServiceFactory).Maak(ProductID)
@@ -29,14 +28,13 @@
 </Method>
 
 <Method name="GeefFysischeStockMinReservaties">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	#dim Stock As %Float = ..#MAXFLOAT
 	#dim KinderenMetAantal As %ArrayOfDataTypes = ..GeefKinderenMetAantal()
 	
 	#dim Iterator As TECH.Iterator = ##class(TECH.ListIterator).%New(KinderenMetAantal)
-	While (Iterator.HasNext())
-	{
+	While (Iterator.HasNext()) {
 		#dim Aantal As %Float = Iterator.Next()
 		#dim ProductID As %String = Iterator.Key()
 		#dim StockNiveauService = ##class(APPS.common.StockNiveauServiceFactory).Maak(ProductID)
@@ -49,14 +47,13 @@
 </Method>
 
 <Method name="GeefPraktischeStock">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	#dim Stock As %Float = ..#MAXFLOAT
 	#dim KinderenMetAantal As %ArrayOfDataTypes = ..GeefKinderenMetAantal()
 	
 	#dim Iterator As TECH.Iterator = ##class(TECH.ListIterator).%New(KinderenMetAantal)
-	While (Iterator.HasNext())
-	{
+	While (Iterator.HasNext()) {
 		#dim Aantal As %Float = Iterator.Next()
 		#dim ProductID As %String = Iterator.Key()
 		#dim StockNiveauService = ##class(APPS.common.StockNiveauServiceFactory).Maak(ProductID)
@@ -69,14 +66,13 @@
 </Method>
 
 <Method name="GeefTheoretischeStock">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
 	#dim Stock As %Float = ..#MAXFLOAT
 	#dim KinderenMetAantal As %ArrayOfDataTypes = ..GeefKinderenMetAantal()
 	
 	#dim Iterator As TECH.Iterator = ##class(TECH.ListIterator).%New(KinderenMetAantal)
-	While (Iterator.HasNext())
-	{
+	While (Iterator.HasNext()) {
 		#dim Aantal As %Float = Iterator.Next()
 		#dim ProductID As %String = Iterator.Key()
 		#dim StockNiveauService = ##class(APPS.common.StockNiveauServiceFactory).Maak(ProductID)
@@ -94,10 +90,8 @@
 <Implementation><![CDATA[
 	#dim KinderenMetAantal As %ArrayOfDataTypes = ##class(%ArrayOfDataTypes).%New()
 	#dim BSLabel As %String = $Order(^PRBS("BS",..PRNr,""))
-	While (BSLabel '= "")
-	{
-		If ($Piece(^PRBS("BS",..PRNr,BSLabel),"\",3) = "K") && ($Piece(^PRBS("BS",..PRNr,BSLabel),"\",2) > 0)
-		{
+	While (BSLabel '= "") {
+		If ($Piece(^PRBS("BS",..PRNr,BSLabel),"\",3) = "K") && ($Piece(^PRBS("BS",..PRNr,BSLabel),"\",2) > 0) {
 			#dim Aantal = 0
 			#dim ProductID = $Piece(^PRBS("BS",..PRNr,BSLabel),"\",1)
 			If (KinderenMetAantal.IsDefined(ProductID))
@@ -113,25 +107,25 @@
 </Method>
 
 <Method name="GeefFysischeStockHalux">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit 0
 ]]></Implementation>
 </Method>
 
 <Method name="GeefPraktischeStockHalux">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit 0
 ]]></Implementation>
 </Method>
 
 <Method name="GeefTheoretischeStockHalux">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit 0
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAantalInStocktoeleveringen">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit 0
 ]]></Implementation>
 </Method>