Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r47151 -r47438
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 47151)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 47438)
@@ -84,7 +84,8 @@
 			Do ##class(TECH.Exceptions.InvalidInputException).Throw("Product '"_ProductNummer_"' bestaat reeds!")
 		} ElseIf (($Data(^KPRO(ProductNummer)))) {
 			Do ##class(TECH.Exceptions.InvalidInputException).Throw("Product '"_ProductNummer_"' heeft al ooit bestaan en mag niet opnieuw gemaakt worden!")
-	}}
+		}
+	}
 	Set ..ProductNummer = ProductNummer
 	Set ..PersistentMgr = ##class(TECH.Persistentie.GlobalPersistenceMgr).Instance()
 	Quit $$$OK
@@ -115,6 +116,7 @@
 	For NodeIndex = 0,1,2,3,15,"I1","J","G" {
 		Set:IsGewijzigdProduct=0 IsGewijzigdProduct = $method($property($this,"Data"_NodeIndex),"IsGewijzigd")
 	}
+	/* check voor gewijzigde leverancier ? -> subscript van de j-node wijzigt dan. */
 	
 	If IsGewijzigdProduct {
 		For NodeIndex = 0,1,2,3,15,"I1","J","G" {
@@ -784,89 +786,90 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If ( i%Data0 = "")  {
-		Set i%Data0 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,0)
+	If ( r%Data0 = "")  {
+		Set r%Data0 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,0)
 	}
-	Quit i%Data0
+	Quit r%Data0
 ]]></Implementation>
 </Method>
 
 <Method name="Data1Get">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (i%Data1 = "") {
-		Set i%Data1 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,1)
+	If (r%Data1 = "") {
+		Set r%Data1 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,1)
 	}
-	Quit i%Data1
+	Quit r%Data1
 ]]></Implementation>
 </Method>
 
 <Method name="Data2Get">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If ( i%Data2 = "") {
-		Set i%Data2 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,2)
+	If ( r%Data2 = "") {
+		Set r%Data2 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,2)
 	}
-	Quit i%Data2
+	Quit r%Data2
 ]]></Implementation>
 </Method>
 
 <Method name="Data3Get">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (i%Data3 = "") {
-		Set i%Data3 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,3)
+	If (r%Data3 = "") {
+		Set r%Data3 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,3)
 	}
-	Quit i%Data3
+	Quit r%Data3
 ]]></Implementation>
 </Method>
 
 <Method name="Data15Get">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (i%Data15 = "") {
-		Set i%Data15 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,15)
+	If (r%Data15 = "") {
+		Set r%Data15 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,15)
 	}
-	Quit i%Data15
+	Quit r%Data15
 ]]></Implementation>
 </Method>
 
 <Method name="DataI1Get">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (i%DataI1 = "") {
-		Set i%DataI1 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,"I1")
+	If (r%DataI1 = "") {
+		Set r%DataI1 = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,"I1")
 	}
-	Quit i%DataI1
+	Quit r%DataI1
 ]]></Implementation>
 </Method>
 
 <Method name="DataJGet">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (i%DataJ = "") {
+	If (r%DataJ = "") {
 		#dim JIndex As %String = "J"_..LeverancierNr
-		If $Length(JIndex)<2 Set JIndex = $Order(^KPR(..ProductNummer,"J"))
-		Set:$Length(JIndex)>1 i%DataJ = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,JIndex)
+		If $Length(JIndex)<2 Set JIndex = $Order(^KPR(..ProductNummer,"J"))		
+		Set:($Length(JIndex)>1) r%DataJ = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,JIndex)
+		Do:($Length(JIndex)<2) ##class(Tools.Wlip).%New(207).String("J node : leverancier niet gekend")
 	}
-	Quit i%DataJ
+	Quit r%DataJ
 ]]></Implementation>
 </Method>
 
 <Method name="DataGGet">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (i%DataG = "") {
-		Set i%DataG = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,"G")
+	If (r%DataG = "") {
+		Set r%DataG = ..PersistentMgr.GeefNode("^KPR",..ProductNummer,"G")
 	}
-	Quit i%DataG
+	Quit r%DataG
 ]]></Implementation>
 </Method>