Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45918 -r45921
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45918)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45921)
@@ -41,18 +41,13 @@
 <Private>1</Private>
 </Property>
 
-<Property name="IdentNr">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="IsNieuwProduct">
 <Type>%Boolean</Type>
 <InitialExpression>1</InitialExpression>
 <Private>1</Private>
 </Property>
 
-<Property name="Korttekst">
+<Property name="LeverancierNr">
 <Type>%String</Type>
 <Private>1</Private>
 </Property>
@@ -106,6 +101,14 @@
 
 <Method name="Save">
 <ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ..Valideer()
+	
+	#dim NodeIndex As %String
+	for NodeIndex = 0,1,2,3,15,"J","G" {
+		do $method($property($this,"Data"_NodeIndex),"Save")
+	}
+]]></Implementation>
 </Method>
 
 <Method name="IsNieuwProduct">
@@ -253,6 +256,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetLeverancierId">
+<FormalSpec>LeverancierId:%String</FormalSpec>
+<Implementation><![CDATA[
+	set ..LeverancierNr = $P(LeverancierId,"||",2)
+	do ..DataJ.ZetPiece(1,..LeverancierNr)
+]]></Implementation>
+</Method>
+
 <Method name="GeefOmschrijving">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ..Data0.GeefPiece(2) _ " " _ ..Data0.GeefPiece(11)
@@ -545,9 +556,7 @@
 
 <Method name="ZetIdentNr">
 <FormalSpec>IdentNr:%String</FormalSpec>
-<Implementation><![CDATA[
-	Set ..IdentNr = IdentNr
-	Do ..Data2.ZetPiece(25, IdentNr)
+<Implementation><![CDATA[	Do ..Data2.ZetPiece(25, IdentNr)
 ]]></Implementation>
 </Method>
 
@@ -557,7 +566,6 @@
 	If ($Length(Korttekst) > 25) {
 		Do ##class(TECH.Exceptions.InvalidInputException).Throw("Maximum toegelaten aantal karakters is 25. De ingegeven tekst is "_$Length(Korttekst)_" lang.")
 	}
-	Set ..Korttekst = Korttekst
 	Do ..Data0.ZetPiece(1, Korttekst)
 ]]></Implementation>
 </Method>
@@ -567,7 +575,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If ( i%Data0 = "")  {
-		Set i%Data0 = $$$If($$$Not(..IsNieuwProduct),..PersistentMgr.GeefNode("^KPR",..ProductNummer,0),..PersistentMgr.MaakLegeNode())
+		Set i%Data0 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,0)
 	}
 	Quit i%Data0
 ]]></Implementation>
@@ -578,7 +586,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%Data1 = "") {
-		Set i%Data1 = $$$If($$$Not(..IsNieuwProduct),..PersistentMgr.GeefNode("^KPR",..ProductNummer,1),..PersistentMgr.MaakLegeNode())
+		Set i%Data1 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,1)
 	}
 	Quit i%Data1
 ]]></Implementation>
@@ -589,7 +597,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If ( i%Data2 = "") {
-		Set i%Data2 = $$$If($$$Not(..IsNieuwProduct),..PersistentMgr.GeefNode("^KPR",..ProductNummer,2),..PersistentMgr.MaakLegeNode())
+		Set i%Data2 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,2)
 	}
 	Quit i%Data2
 ]]></Implementation>
@@ -600,7 +608,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%Data3 = "") {
-		Set i%Data3 = $$$If($$$Not(..IsNieuwProduct),..PersistentMgr.GeefNode("^KPR",..ProductNummer,3),..PersistentMgr.MaakLegeNode())
+		Set i%Data3 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,3)
 	}
 	Quit i%Data3
 ]]></Implementation>
@@ -611,7 +619,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%Data15 = "") {
-		Set i%Data15 = $$$If($$$Not(..IsNieuwProduct),..PersistentMgr.GeefNode("^KPR",..ProductNummer,15),..PersistentMgr.MaakLegeNode())
+		Set i%Data15 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,15)
 	}
 	Quit i%Data15
 ]]></Implementation>
@@ -622,8 +630,9 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%DataJ = "") {
-		#dim JIndex As %String = $Order(^KPR(..ProductNummer,"J"))
-		Set i%DataJ = $$$If($$$Not(..IsNieuwProduct),..PersistentMgr.GeefNode("^KPR",..ProductNummer,JIndex),..PersistentMgr.MaakLegeNode())
+		#dim JIndex As %String = "J"_..LeverancierNr
+		If $L(JIndex)<2 set JIndex = $O(^KPR(..ProductNummer,"J"))
+		Set:$length(JIndex)>1 i%DataJ = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,JIndex)
 	}
 	Quit i%DataJ
 ]]></Implementation>
@@ -634,11 +643,21 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%DataG = "") {
-		Set i%DataG = $$$If($$$Not(..IsNieuwProduct),..PersistentMgr.GeefNode("^KPR",..ProductNummer,"G"),..PersistentMgr.MaakLegeNode())
+		Set i%DataG = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,"G")
 	}
 	Quit i%DataG
 ]]></Implementation>
 </Method>
+
+<Method name="Valideer">
+<Implementation><![CDATA[
+	set Messages = ##class(%ListOfDataTypes).%New()
+	
+	do:'$length(..GeefKorttekst()) Messages.Insert("Korttekst is vereist.")
+	
+	do:Messages.Count() ##class(TECH.Exceptions.InvalidInputException).Throw(##class(TECH.ListUtils).ListToPieces(Messages,$$$CRLF))
+]]></Implementation>
+</Method>
 </Class>