Index: vhTest/Dummy/DOM/PM/Product.cls.xml
===================================================================
diff -u -r45984 -r45985
--- vhTest/Dummy/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 45984)
+++ vhTest/Dummy/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 45985)
@@ -46,7 +46,7 @@
 </Method>
 
 <Method name="GeefBrutoAankoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
@@ -88,7 +88,7 @@
 </Method>
 
 <Method name="GeefGewichtInGram">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
@@ -160,7 +160,7 @@
 </Method>
 
 <Method name="GeefKortingsPercentageAankoop">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
@@ -203,7 +203,7 @@
 </Method>
 
 <Method name="GeefLijstVerkoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
@@ -236,15 +236,15 @@
 <Method name="GeefNettoAankoopPrijs">
 <Description>
 Leveranciersprijs per stuk</Description>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
 
 <Method name="GeefNettoAankoopPrijsInclCif">
 <Description>
 Aankoopprijs incl. Cif in EUR per stuk</Description>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
@@ -292,7 +292,7 @@
 </Method>
 
 <Method name="GeefStockDrempelVoorAankoop">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45984 -r45985
--- vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45984)
+++ vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45985)
@@ -45,7 +45,7 @@
 </Method>
 
 <Method name="GeefBrutoAankoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefBrutoAankoopPrijs")
 ]]></Implementation>
 </Method>
@@ -109,7 +109,7 @@
 </Method>
 
 <Method name="GeefGewichtInGram">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefGewichtInGram")
 ]]></Implementation>
 </Method>
@@ -184,7 +184,7 @@
 </Method>
 
 <Method name="GeefKortingsPercentageAankoop">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefKortingsPercentageAankoop")
 ]]></Implementation>
 </Method>
@@ -227,7 +227,7 @@
 </Method>
 
 <Method name="GeefLijstVerkoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLijstVerkoopPrijs")
 ]]></Implementation>
 </Method>
@@ -252,7 +252,7 @@
 </Method>
 
 <Method name="GeefNettoAankoopPrijsInclCif">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefNettoAankoopPrijsInclCif")
 ]]></Implementation>
 </Method>
@@ -299,7 +299,7 @@
 </Method>
 
 <Method name="GeefStockDrempelVoorAankoop">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefStockDrempelVoorAankoop")
 ]]></Implementation>
 </Method>
@@ -333,7 +333,7 @@
 </Method>
 
 <Method name="GeefVorkPercentage">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefVorkPercentage")
 ]]></Implementation>
 </Method>
Index: vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45984 -r45985
--- vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45984)
+++ vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45985)
@@ -16,14 +16,12 @@
 
 <Method name="ZetCifPerc">
 <FormalSpec>CifPerc:%Numeric</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="ZetCifPercentage">
 <FormalSpec>CifPercentage:%Numeric</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefCifPPL">
@@ -133,7 +131,7 @@
 </Method>
 
 <Method name="GeefBrutoAankoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
@@ -187,7 +185,7 @@
 </Method>
 
 <Method name="GeefGewichtInGram">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
@@ -255,7 +253,7 @@
 </Method>
 
 <Method name="GeefKortingsPercentageAankoop">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
@@ -298,7 +296,7 @@
 </Method>
 
 <Method name="GeefLijstVerkoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
@@ -316,7 +314,7 @@
 </Method>
 
 <Method name="GeefNettoAankoopPrijsInclCif">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
@@ -365,7 +363,7 @@
 </Method>
 
 <Method name="GeefStockDrempelVoorAankoop">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
@@ -393,7 +391,7 @@
 </Method>
 
 <Method name="GeefVorkPercentage">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/DOM/PM/Product.cls.xml
===================================================================
diff -u -r45984 -r45985
--- vhTest/Mock/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 45984)
+++ vhTest/Mock/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 45985)
@@ -45,7 +45,7 @@
 </Method>
 
 <Method name="GeefBrutoAankoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefBrutoAankoopPrijs")
 ]]></Implementation>
 </Method>
@@ -105,7 +105,7 @@
 </Method>
 
 <Method name="GeefGewichtInGram">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefGewichtInGram")
 ]]></Implementation>
 </Method>
@@ -201,7 +201,7 @@
 </Method>
 
 <Method name="GeefKortingsPercentageAankoop">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefKortingsPercentageAankoop")
 ]]></Implementation>
 </Method>
@@ -244,7 +244,7 @@
 </Method>
 
 <Method name="GeefLijstVerkoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLijstVerkoopPrijs")
 ]]></Implementation>
 </Method>
@@ -275,13 +275,13 @@
 </Method>
 
 <Method name="GeefNettoAankoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefNettoAankoopPrijs")
 ]]></Implementation>
 </Method>
 
 <Method name="GeefNettoAankoopPrijsInclCif">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefNettoAankoopPrijsInclCif")
 ]]></Implementation>
 </Method>
@@ -335,7 +335,7 @@
 </Method>
 
 <Method name="GeefStockDrempelVoorAankoop">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefStockDrempelVoorAankoop")
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/DOM/PM/MaatwerkProduct.cls.xml
===================================================================
diff -u -r45984 -r45985
--- vhTest/Mock/DOM/PM/MaatwerkProduct.cls.xml	(.../MaatwerkProduct.cls.xml)	(revision 45984)
+++ vhTest/Mock/DOM/PM/MaatwerkProduct.cls.xml	(.../MaatwerkProduct.cls.xml)	(revision 45985)
@@ -45,7 +45,7 @@
 </Method>
 
 <Method name="GeefBrutoAankoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefBrutoAankoopPrijs")
 ]]></Implementation>
 </Method>
@@ -105,7 +105,7 @@
 </Method>
 
 <Method name="GeefGewichtInGram">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefGewichtInGram")
 ]]></Implementation>
 </Method>
@@ -196,7 +196,7 @@
 </Method>
 
 <Method name="GeefKortingsPercentageAankoop">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefKortingsPercentageAankoop")
 ]]></Implementation>
 </Method>
@@ -239,7 +239,7 @@
 </Method>
 
 <Method name="GeefLijstVerkoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLijstVerkoopPrijs")
 ]]></Implementation>
 </Method>
@@ -270,13 +270,13 @@
 </Method>
 
 <Method name="GeefNettoAankoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefNettoAankoopPrijs")
 ]]></Implementation>
 </Method>
 
 <Method name="GeefNettoAankoopPrijsInclCif">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefNettoAankoopPrijsInclCif")
 ]]></Implementation>
 </Method>
@@ -330,7 +330,7 @@
 </Method>
 
 <Method name="GeefStockDrempelVoorAankoop">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefStockDrempelVoorAankoop")
 ]]></Implementation>
 </Method>
Index: DOM/PM/Product.cls.xml
===================================================================
diff -u -r45984 -r45985
--- DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 45984)
+++ DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 45985)
@@ -149,7 +149,7 @@
 
 <Method name="GeefStockDrempelVoorAankoop">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefGenerischProductID">
@@ -169,7 +169,7 @@
 
 <Method name="GeefGewichtInGram">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="IsInUitverkoop">
@@ -254,7 +254,7 @@
 
 <Method name="GeefBrutoAankoopPrijs">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefGrootteOrdeAankoop">
@@ -271,14 +271,14 @@
 <Description>
 Leveranciersprijs per stuk</Description>
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefNettoAankoopPrijsInclCif">
 <Description>
 Aankoopprijs incl. Cif in EUR per stuk</Description>
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefScanType">
@@ -293,7 +293,7 @@
 
 <Method name="GeefKortingsPercentageAankoop">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefVorkPercentage">
@@ -303,7 +303,7 @@
 
 <Method name="GeefLijstVerkoopPrijs">
 <Abstract>1</Abstract>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 </Method>
 
 <Method name="GeefGrootteOrdeVerkoop">
Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45984 -r45985
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45984)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45985)
@@ -421,9 +421,9 @@
 </Method>
 
 <Method name="GeefStockDrempelVoorAankoop">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	#Dim Aantal As %Float = ..Data0.GeefPiece(24)
+	#Dim Aantal As %Numeric = ..Data0.GeefPiece(24)
 	If ('$ISVALIDNUM(Aantal)) Set Aantal = ""
 	
 	Quit Aantal
@@ -465,7 +465,7 @@
 </Method>
 
 <Method name="GeefGewichtInGram">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit +..Data1.GeefPiece(13)
 ]]></Implementation>
 </Method>
@@ -525,7 +525,7 @@
 <Method name="GeefBrutoAankoopPrijs">
 <Description>
 Leveranciersprijs per GrootteOrde zonder korting</Description>
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ..DataJ.GeefPiece(19)
 ]]></Implementation>
 </Method>
@@ -537,7 +537,7 @@
 </Method>
 
 <Method name="GeefNettoAankoopPrijsInclCif">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ..DataJ.GeefPiece(23)
 ]]></Implementation>
 </Method>
@@ -549,19 +549,19 @@
 </Method>
 
 <Method name="GeefKortingsPercentageAankoop">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ..DataJ.GeefPiece(9)/100
 ]]></Implementation>
 </Method>
 
 <Method name="GeefVorkPercentage">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ..DataJ.GeefPiece(27)/100
 ]]></Implementation>
 </Method>
 
 <Method name="GeefLijstVerkoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ..DataJ.GeefPiece(25)
 ]]></Implementation>
 </Method>
Index: DOM/PM/impl/ProductImpl.cls.xml
===================================================================
diff -u -r45984 -r45985
--- DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 45984)
+++ DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 45985)
@@ -232,7 +232,7 @@
 </Method>
 
 <Method name="GeefStockDrempelVoorAankoop">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ..Product.GeefStockDrempelVoorAankoop()
 ]]></Implementation>
 </Method>
@@ -274,7 +274,7 @@
 </Method>
 
 <Method name="GeefGewichtInGram">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ..Product.GeefGewichtInGram()
 ]]></Implementation>
 </Method>
@@ -465,7 +465,7 @@
 </Method>
 
 <Method name="GeefBrutoAankoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ..Product.GeefBrutoAankoopPrijs()
 ]]></Implementation>
 </Method>
@@ -483,13 +483,13 @@
 </Method>
 
 <Method name="GeefNettoAankoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ..GeefBrutoAankoopPrijs()*(1-..GeefKortingsPercentageAankoop())/..GeefGrootteOrdeAankoopGetal()
 ]]></Implementation>
 </Method>
 
 <Method name="GeefNettoAankoopPrijsInclCif">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ..Product.GeefNettoAankoopPrijsInclCif()
 ]]></Implementation>
 </Method>
@@ -501,7 +501,7 @@
 </Method>
 
 <Method name="GeefKortingsPercentageAankoop">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ..Product.GeefKortingsPercentageAankoop()
 ]]></Implementation>
 </Method>
@@ -513,7 +513,7 @@
 </Method>
 
 <Method name="GeefLijstVerkoopPrijs">
-<ReturnType>%Float</ReturnType>
+<ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[	Quit ..Product.GeefLijstVerkoopPrijs()
 ]]></Implementation>
 </Method>