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>