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>