Index: vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45990 -r46017
--- vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45990)
+++ vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46017)
@@ -467,7 +467,7 @@
 </Method>
 
 <Method name="ZetLeverancierId">
-<FormalSpec>LeverancierId:%String</FormalSpec>
+<FormalSpec>LeverancierId:DOM.common.PartijID</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
Index: vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml
===================================================================
diff -u -r45991 -r46017
--- vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml	(.../Test.cls.xml)	(revision 45991)
+++ vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml	(.../Test.cls.xml)	(revision 46017)
@@ -112,9 +112,9 @@
 	Set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
 	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId,DataMProductMock)
 	
-	Do DataMProductMock.VerwachtMethodCall("ZetIdentNr","IdentNummer").DanDoeNiks()
+	Do DataMProductMock.VerwachtMethodCall("ZetIdentNr","1.234.567.8").DanDoeNiks()
 	
-	Do Product.ZetIdentNr("IdentNummer")
+	Do Product.ZetIdentNr("1.234.567.8")
 	
 	Do DataMProductMock.Verifieer()
 ]]></Implementation>
@@ -125,9 +125,9 @@
 	Set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
 	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId,DataMProductMock)
 	
-	Do DataMProductMock.VerwachtMethodCall("ZetLeverancierId","LeverancierId").DanDoeNiks()
+	Do DataMProductMock.VerwachtMethodCall("ZetLeverancierId","L||1234").DanDoeNiks()
 	
-	Do Product.ZetLeverancierId("LeverancierId")
+	Do Product.ZetLeverancierId("L||1234")
 	
 	Do DataMProductMock.Verifieer()
 ]]></Implementation>
@@ -346,9 +346,9 @@
 	Set DataMProductMock = ##class(vhTest.Mock.DOM.PM.impl.DataM.DataMProduct).%New()
 	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId,DataMProductMock)
 	
-	Do DataMProductMock.VerwachtMethodCall("ZetUitverkoopSinds",555555).DanDoeNiks()
+	Do DataMProductMock.VerwachtMethodCall("ZetUitverkoopSinds",55555).DanDoeNiks()
 	
-	Do Product.ZetUitverkoopSinds(555555)
+	Do Product.ZetUitverkoopSinds(55555)
 	
 	Do DataMProductMock.Verifieer()
 ]]></Implementation>
Index: vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Test.cls.xml
===================================================================
diff -u -r45991 -r46017
--- vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Test.cls.xml	(.../Test.cls.xml)	(revision 45991)
+++ vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Test.cls.xml	(.../Test.cls.xml)	(revision 46017)
@@ -39,47 +39,47 @@
 <Implementation><![CDATA[
 	Set Product = ##class(DOM.PM.impl.DataM.DataMProduct).%New(..#ProductId)
 	
-	Do Product.ZetIdentNr("IdentNummer")
+	Do Product.ZetIdentNr("1.234.567.8")
 	Do Product.ZetKorttekst("Korttekst")
-	Do Product.ZetLeverancierId("L||LeverancierId")
+	Do Product.ZetLeverancierId("L||1234")
 	Do Product.ZetHoofdGroep("HoofdGroep")	
 	Do Product.ZetGroep("Groep")
 	Do Product.ZetSubGroep("SubGroep")
 	Do Product.ZetFSCHout("FSCHout")
-	Do Product.ZetTelbaar("Telbaar")
-	Do Product.ZetGewichtPerDuizendStuksInKG("123.45")
-	Do Product.ZetAantalInGrootVerpakking("333")
-	Do Product.ZetAantalInKleinVerpakking("111")
-	Do Product.ZetAantalInNormaleVerpakking("222")
-	Do Product.ZetPalletAantal("456")
+	Do Product.ZetTelbaar(".5")
+	Do Product.ZetGewichtPerDuizendStuksInKG(123.45)
+	Do Product.ZetAantalInGrootVerpakking(333)
+	Do Product.ZetAantalInKleinVerpakking(111)
+	Do Product.ZetAantalInNormaleVerpakking(222)
+	Do Product.ZetPalletAantal(456)
 	Do Product.ZetLeverancierReferentie("LeverancierReferentie")
 	Do Product.ZetStockNietStock("1")
-	Do Product.ZetCifPPL("7.6")
-	Do Product.ZetCifPercentage("5.4")
+	Do Product.ZetCifPPL(7.6)
+	Do Product.ZetCifPercentage(5.4)
 	Do Product.ZetBarcodeWaarde("B4rc0dewaarde")
-	Do Product.ZetMinimumBestelhoeveelheid("5")
-	Do Product.ZetUitverkoopSinds(555555)
+	Do Product.ZetMinimumBestelhoeveelheid(5)
+	Do Product.ZetUitverkoopSinds(55555)
 	
-	Do $$$AssertEquals(Product.GeefUitverkoopSinds(),555555)
-	Do $$$AssertEquals(Product.GeefMinimumBestelhoeveelheid(),"5")
+	Do $$$AssertEquals(Product.GeefUitverkoopSinds(),55555)
+	Do $$$AssertEquals(Product.GeefMinimumBestelhoeveelheid(),5)
 	Do $$$AssertEquals(Product.GeefBarcodeWaarde(),"B4rc0dewaarde")
-	Do $$$AssertEquals(Product.GeefCifPercentage(),"5.4")
-	Do $$$AssertEquals(Product.GeefCifPPL(),"7.6")
+	Do $$$AssertEquals(Product.GeefCifPercentage(),5.4)
+	Do $$$AssertEquals(Product.GeefCifPPL(),7.6)
 	Do $$$AssertEquals(Product.GeefStockNietStock(),"1")
 	Do $$$AssertEquals(Product.GeefLeverancierReferentie(),"LeverancierReferentie")
-	Do $$$AssertEquals(Product.GeefPalletAantal(),"456")
-	Do $$$AssertEquals(Product.GeefAantalInStukVerpakking(),"222")
-	Do $$$AssertEquals(Product.GeefAantalInKleinVerpakking(),"111")
-	Do $$$AssertEquals(Product.GeefAantalInGrootVerpakking(),"333")
-	Do $$$AssertEquals(Product.GeefGewichtPerDuizendStuksInKG(),"123.45")
-	Do $$$AssertEquals(Product.GeefTelbaar(),"Telbaar")
+	Do $$$AssertEquals(Product.GeefPalletAantal(),456)
+	Do $$$AssertEquals(Product.GeefAantalInStukVerpakking(),222)
+	Do $$$AssertEquals(Product.GeefAantalInKleinVerpakking(),111)
+	Do $$$AssertEquals(Product.GeefAantalInGrootVerpakking(),333)
+	Do $$$AssertEquals(Product.GeefGewichtPerDuizendStuksInKG(),123.45)
+	Do $$$AssertEquals(Product.GeefTelbaar(),".5")
 	Do $$$AssertEquals(Product.GeefFSCHout(),"FSCHout")
 	Do $$$AssertEquals(Product.GeefSubGroep(),"SubGroep")
 	Do $$$AssertEquals(Product.GeefGroep(),"Groep")
 	Do $$$AssertEquals(Product.GeefHoofdGroep(),"HoofdGroep")
-	Do $$$AssertEquals(Product.GeefLeverancierID(),"L||LeverancierId")
+	Do $$$AssertEquals(Product.GeefLeverancierID(),"L||1234")
 	Do $$$AssertEquals(Product.GeefKorttekst(),"Korttekst")
-	Do $$$AssertEquals(Product.GeefIdentNr(),"IdentNummer")
+	Do $$$AssertEquals(Product.GeefIdentNr(),"1.234.567.8")
 ]]></Implementation>
 </Method>
 
Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45990 -r46017
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45990)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46017)
@@ -273,7 +273,7 @@
 </Method>
 
 <Method name="ZetLeverancierId">
-<FormalSpec>LeverancierId:%String</FormalSpec>
+<FormalSpec>LeverancierId:DOM.common.PartijID</FormalSpec>
 <Implementation><![CDATA[
 	Set ..LeverancierNr = $Piece(LeverancierId,"||",2)
 	Do ..DataJ.ZetPiece(1,..LeverancierNr)
@@ -573,17 +573,17 @@
 </Method>
 
 <Method name="GeefHoofdGroep">
-<Implementation><![CDATA[	Quit ..DataI1.GeefPiece(1)
+<Implementation><![CDATA[	Quit $Extract(..DataI1.GeefPiece(1),1,*-1)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefGroep">
-<Implementation><![CDATA[	Quit ..DataI1.GeefPiece(2)
+<Implementation><![CDATA[	Quit $Extract(..DataI1.GeefPiece(2),1,*-1)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefSubGroep">
-<Implementation><![CDATA[	Quit ..DataI1.GeefPiece(3)
+<Implementation><![CDATA[	Quit $Extract(..DataI1.GeefPiece(3),1,*-1)
 ]]></Implementation>
 </Method>
 
@@ -640,19 +640,19 @@
 
 <Method name="ZetHoofdGroep">
 <FormalSpec>HoofdGroep:%String</FormalSpec>
-<Implementation><![CDATA[	Do ..DataI1.ZetPiece(1,HoofdGroep)
+<Implementation><![CDATA[	Do ..DataI1.ZetPiece(1,HoofdGroep_" ")
 ]]></Implementation>
 </Method>
 
 <Method name="ZetGroep">
 <FormalSpec>Groep:%String</FormalSpec>
-<Implementation><![CDATA[	Do ..DataI1.ZetPiece(2,Groep)
+<Implementation><![CDATA[	Do ..DataI1.ZetPiece(2,Groep_" ")
 ]]></Implementation>
 </Method>
 
 <Method name="ZetSubGroep">
 <FormalSpec>SubGroep:%String</FormalSpec>
-<Implementation><![CDATA[	Do ..DataI1.ZetPiece(3,SubGroep)
+<Implementation><![CDATA[	Do ..DataI1.ZetPiece(3,SubGroep_" ")
 ]]></Implementation>
 </Method>
 
Index: vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45990 -r46017
--- vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45990)
+++ vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 46017)
@@ -450,7 +450,7 @@
 </Method>
 
 <Method name="ZetLeverancierId">
-<FormalSpec>LeverancierId:%String</FormalSpec>
+<FormalSpec>LeverancierId:DOM.common.PartijID</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLeverancierId",LeverancierId)
 ]]></Implementation>
 </Method>