Index: vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml
===================================================================
diff -u -r45918 -r45934
--- vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml	(.../Test.cls.xml)	(revision 45918)
+++ vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml	(.../Test.cls.xml)	(revision 45934)
@@ -117,6 +117,45 @@
 	Do DataMProductMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: ZetLeverancierId zet het LeverancierId">
+<Implementation><![CDATA[
+	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 Product.ZetLeverancierId("LeverancierId")
+	
+	Do DataMProductMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: ZetHoofdGroep zet de HoofdGroep">
+<Implementation><![CDATA[
+	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("ZetHoofdGroep","HoofdGroep").DanDoeNiks()
+	
+	Do Product.ZetHoofdGroep("HoofdGroep")
+	
+	Do DataMProductMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: ZetGroep zet de Groep">
+<Implementation><![CDATA[
+	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("ZetGroep","Groep").DanDoeNiks()
+	
+	Do Product.ZetGroep("Groep")
+	
+	Do DataMProductMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Save/TestVereisteVelden.cls.xml
===================================================================
diff -u -r45926 -r45934
--- vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Save/TestVereisteVelden.cls.xml	(.../TestVereisteVelden.cls.xml)	(revision 45926)
+++ vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Save/TestVereisteVelden.cls.xml	(.../TestVereisteVelden.cls.xml)	(revision 45934)
@@ -18,6 +18,39 @@
 	Do Product.Save()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Het LeverancierId is vereist om een product te kunnen saven">
+<Implementation><![CDATA[
+	Set Product = ##class(DOM.PM.impl.DataM.DataMProduct).%New(..#ProductId)
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("LeverancierId is vereist.")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
+	
+	Do Product.Save()
+]]></Implementation>
+</Method>
+
+<Method name="Test: De HoofdGroep is vereist om een product te kunnen saven">
+<Implementation><![CDATA[
+	Set Product = ##class(DOM.PM.impl.DataM.DataMProduct).%New(..#ProductId)
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Hoofdgroep is vereist.")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
+	
+	Do Product.Save()
+]]></Implementation>
+</Method>
+
+<Method name="Test: De Groep is vereist om een product te kunnen saven">
+<Implementation><![CDATA[
+	Set Product = ##class(DOM.PM.impl.DataM.DataMProduct).%New(..#ProductId)
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Groep is vereist.")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
+	
+	Do Product.Save()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Test.cls.xml
===================================================================
diff -u -r45925 -r45934
--- vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Test.cls.xml	(.../Test.cls.xml)	(revision 45925)
+++ vhUnitTest/DOM/PM/impl/DataM/DataMProduct/Test.cls.xml	(.../Test.cls.xml)	(revision 45934)
@@ -26,8 +26,7 @@
 
 <Method name="Test: De Korttekst mag maximaal 25 karakters bevatten">
 <Implementation><![CDATA[
-	Do ##class(vhTest.Utils.DOM.PM.Product).CreeerProduct(..#ProductId)
-	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).OpenId(..#ProductId)
+	Set Product = ##class(DOM.PM.impl.DataM.DataMProduct).%New(..#ProductId)
 	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Maximum toegelaten aantal karakters is 25. De ingegeven tekst is 26 lang.")
 	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings))
@@ -36,13 +35,18 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ZetKorttekst zet de korttekst">
+<Method name="Test: Opzetten Product">
 <Implementation><![CDATA[
-	Do ##class(vhTest.Utils.DOM.PM.Product).CreeerProduct(..#ProductId)
-	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).OpenId(..#ProductId)
+	Set Product = ##class(DOM.PM.impl.DataM.DataMProduct).%New(..#ProductId)
 	
 	Do Product.ZetKorttekst("Korttekst")
+	Do Product.ZetLeverancierId("L||LeverancierId")
+	Do Product.ZetHoofdGroep("HoofdGroep")	
+	Do Product.ZetGroep("Groep")
 	
+	Do $$$AssertEquals(Product.GeefGroep(),"Groep")
+	Do $$$AssertEquals(Product.GeefHoofdGroep(),"HoofdGroep")
+	Do $$$AssertEquals(Product.GeefLeverancierID(),"L||LeverancierId")
 	Do $$$AssertEquals(Product.GeefKorttekst(),"Korttekst")
 ]]></Implementation>
 </Method>
Index: DOM/PM/Product.cls.xml
===================================================================
diff -u -r45921 -r45934
--- DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 45921)
+++ DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 45934)
@@ -311,6 +311,16 @@
 <ReturnType>DOM.PM.enu.GrootteOrde</ReturnType>
 </Method>
 
+<Method name="GeefHoofdGroep">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
+<Method name="GeefGroep">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
 <Method name="IsFysiekHetzelfdeProductAls">
 <Abstract>1</Abstract>
 <FormalSpec>AnderProductID:%String</FormalSpec>
@@ -327,11 +337,21 @@
 <FormalSpec>Korttekst:%String</FormalSpec>
 </Method>
 
-<Method name="ZetLeverancierID">
+<Method name="ZetLeverancierId">
 <Abstract>1</Abstract>
-<FormalSpec>LeverancierID:%Integer</FormalSpec>
+<FormalSpec>LeverancierId:%Integer</FormalSpec>
 </Method>
 
+<Method name="ZetHoofdGroep">
+<Abstract>1</Abstract>
+<FormalSpec>HoofdGroep:%String</FormalSpec>
+</Method>
+
+<Method name="ZetGroep">
+<Abstract>1</Abstract>
+<FormalSpec>Groep:%String</FormalSpec>
+</Method>
+
 <Method name="Save">
 <Abstract>1</Abstract>
 </Method>
Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45921 -r45934
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45921)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45934)
@@ -31,6 +31,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="DataI1">
+<Type>TECH.Persistentie.GlobalNode</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="DataJ">
 <Type>TECH.Persistentie.GlobalNode</Type>
 <Private>1</Private>
@@ -105,7 +110,7 @@
 	Do ..Valideer()
 	
 	#dim NodeIndex As %String
-	for NodeIndex = 0,1,2,3,15,"J","G" {
+	for NodeIndex = 0,1,2,3,15,"I1","J","G" {
 		do $method($property($this,"Data"_NodeIndex),"Save")
 	}
 ]]></Implementation>
@@ -259,8 +264,8 @@
 <Method name="ZetLeverancierId">
 <FormalSpec>LeverancierId:%String</FormalSpec>
 <Implementation><![CDATA[
-	set ..LeverancierNr = $P(LeverancierId,"||",2)
-	do ..DataJ.ZetPiece(1,..LeverancierNr)
+	Set ..LeverancierNr = $Piece(LeverancierId,"||",2)
+	Do ..DataJ.ZetPiece(1,..LeverancierNr)
 ]]></Implementation>
 </Method>
 
@@ -362,7 +367,9 @@
 
 <Method name="GeefLeverancierID">
 <ReturnType>DOM.common.PartijID</ReturnType>
-<Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefLeverancierPartijID(..DataJ.GeefPiece(1))
+<Implementation><![CDATA[
+	Quit:$$$Not($IsObject(..DataJ)) ""
+	Quit ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefLeverancierPartijID(..DataJ.GeefPiece(1))
 ]]></Implementation>
 </Method>
 
@@ -554,6 +561,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefHoofdGroep">
+<Implementation><![CDATA[	Quit ..DataI1.GeefPiece(1)
+]]></Implementation>
+</Method>
+
+<Method name="GeefGroep">
+<Implementation><![CDATA[	Quit ..DataI1.GeefPiece(2)
+]]></Implementation>
+</Method>
+
 <Method name="ZetIdentNr">
 <FormalSpec>IdentNr:%String</FormalSpec>
 <Implementation><![CDATA[	Do ..Data2.ZetPiece(25, IdentNr)
@@ -570,6 +587,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetHoofdGroep">
+<FormalSpec>HoofdGroep:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..DataI1.ZetPiece(1,HoofdGroep)
+]]></Implementation>
+</Method>
+
+<Method name="ZetGroep">
+<FormalSpec>Groep:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..DataI1.ZetPiece(2,Groep)
+]]></Implementation>
+</Method>
+
 <Method name="Data0Get">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
@@ -625,6 +654,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="DataI1Get">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If (i%DataI1 = "") {
+		Set i%DataI1 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,"I1")
+	}
+	Quit i%DataI1
+]]></Implementation>
+</Method>
+
 <Method name="DataJGet">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
@@ -651,11 +691,14 @@
 
 <Method name="Valideer">
 <Implementation><![CDATA[
-	set Messages = ##class(%ListOfDataTypes).%New()
+	Set Messages = ##class(%ListOfDataTypes).%New()
 	
-	do:'$length(..GeefKorttekst()) Messages.Insert("Korttekst is vereist.")
+	Do:'$Length(..GeefKorttekst()) Messages.Insert("Korttekst is vereist.")
+	Do:'$Length(..GeefLeverancierID()) Messages.Insert("LeverancierId is vereist.")
+	Do:'$Length(..GeefHoofdGroep()) Messages.Insert("Hoofdgroep is vereist.")
+	Do:'$Length(..GeefGroep()) Messages.Insert("Groep is vereist.")
 	
-	do:Messages.Count() ##class(TECH.Exceptions.InvalidInputException).Throw(##class(TECH.ListUtils).ListToPieces(Messages,$$$CRLF))
+	Do:Messages.Count() ##class(TECH.Exceptions.InvalidInputException).Throw(##class(TECH.ListUtils).ListToPieces(Messages,$$$CRLF))
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45921 -r45934
--- vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45921)
+++ vhTest/Mock/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45934)
@@ -104,6 +104,11 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefGroep">
+<Implementation><![CDATA[	do ..VerwerkMethodCall("GeefGroep")
+]]></Implementation>
+</Method>
+
 <Method name="GeefGrootteOrdeAankoop">
 <ReturnType>DOM.PM.enu.GrootteOrde</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefGrootteOrdeAankoop")
@@ -122,6 +127,11 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefHoofdGroep">
+<Implementation><![CDATA[	do ..VerwerkMethodCall("GeefHoofdGroep")
+]]></Implementation>
+</Method>
+
 <Method name="GeefID">
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefID")
@@ -332,6 +342,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetGroep">
+<FormalSpec>Groep:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetGroep",Groep)
+]]></Implementation>
+</Method>
+
+<Method name="ZetHoofdGroep">
+<FormalSpec>HoofdGroep:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetHoofdGroep",HoofdGroep)
+]]></Implementation>
+</Method>
+
 <Method name="ZetIdentNr">
 <FormalSpec>IdentNr:%String</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetIdentNr",IdentNr)
Index: vhTest/Mock/DOM/PM/Product.cls.xml
===================================================================
diff -u -r45921 -r45934
--- vhTest/Mock/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 45921)
+++ vhTest/Mock/DOM/PM/Product.cls.xml	(.../Product.cls.xml)	(revision 45934)
@@ -92,6 +92,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefGroep">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefGroep")
+]]></Implementation>
+</Method>
+
 <Method name="GeefGrootteOrdeAankoop">
 <ReturnType>DOM.PM.enu.GrootteOrde</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefGrootteOrdeAankoop")
@@ -116,6 +122,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefHoofdGroep">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefHoofdGroep")
+]]></Implementation>
+</Method>
+
 <Method name="GeefHoutCertificaatID">
 <ReturnType>TECH.String</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefHoutCertificaatID")
@@ -376,6 +388,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetGroep">
+<FormalSpec>Groep:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetGroep",Groep)
+]]></Implementation>
+</Method>
+
+<Method name="ZetHoofdGroep">
+<FormalSpec>HoofdGroep:%String</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetHoofdGroep",HoofdGroep)
+]]></Implementation>
+</Method>
+
 <Method name="ZetIdentNr">
 <FormalSpec>IdentNr:%String</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetIdentNr",IdentNr)
@@ -388,9 +412,9 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZetLeverancierID">
-<FormalSpec>LeverancierID:%Integer</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLeverancierID",LeverancierID)
+<Method name="ZetLeverancierId">
+<FormalSpec>LeverancierId:%Integer</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLeverancierId",LeverancierId)
 ]]></Implementation>
 </Method>
 </Class>
Index: DOM/PM/impl/ProductImpl.cls.xml
===================================================================
diff -u -r45921 -r45934
--- DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 45921)
+++ DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 45934)
@@ -524,6 +524,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefHoofdGroep">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Product.GeefHoofdGroep()
+]]></Implementation>
+</Method>
+
+<Method name="GeefGroep">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Product.GeefGroep()
+]]></Implementation>
+</Method>
+
 <Method name="ZetIdentNr">
 <FormalSpec>IdentNr:%String</FormalSpec>
 <Implementation><![CDATA[	Do ..Product.ZetIdentNr(IdentNr)
@@ -536,11 +548,23 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZetLeverancierID">
-<FormalSpec>LeverancierID:%Integer</FormalSpec>
-<Implementation><![CDATA[	Do ..Product.ZetLeverancierID(LeverancierID)
+<Method name="ZetLeverancierId">
+<FormalSpec>LeverancierId:%Integer</FormalSpec>
+<Implementation><![CDATA[	Do ..Product.ZetLeverancierId(LeverancierId)
 ]]></Implementation>
 </Method>
+
+<Method name="ZetHoofdGroep">
+<FormalSpec>HoofdGroep:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..Product.ZetHoofdGroep(HoofdGroep)
+]]></Implementation>
+</Method>
+
+<Method name="ZetGroep">
+<FormalSpec>Groep:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..Product.ZetGroep(Groep)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45921 -r45934
--- vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45921)
+++ vhTest/Fake/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45934)
@@ -110,6 +110,11 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefGroep">
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="GeefGrootteOrdeAankoop">
 <ReturnType>DOM.PM.enu.GrootteOrde</ReturnType>
 <Implementation><![CDATA[	Quit ""
@@ -128,6 +133,11 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefHoofdGroep">
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="GeefID">
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[	Quit ""
@@ -338,6 +348,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetGroep">
+<FormalSpec>Groep:%String</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="ZetHoofdGroep">
+<FormalSpec>HoofdGroep:%String</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="ZetIdentNr">
 <FormalSpec>IdentNr:%String</FormalSpec>
 <Implementation><![CDATA[