Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45743 -r45758
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45743)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45758)
@@ -7,45 +7,38 @@
 <Super>TECH.RegisteredObject</Super>
 
 <Property name="Data0">
-<Type>%String</Type>
+<Type>TECH.Persistentie.GlobalNode</Type>
 <Private>1</Private>
-<Parameter name="TRUNCATE" value="1"/>
 </Property>
 
 <Property name="Data1">
-<Type>%String</Type>
+<Type>TECH.Persistentie.GlobalNode</Type>
 <Private>1</Private>
-<Parameter name="TRUNCATE" value="1"/>
 </Property>
 
 <Property name="Data2">
-<Type>%String</Type>
+<Type>TECH.Persistentie.GlobalNode</Type>
 <Private>1</Private>
-<Parameter name="TRUNCATE" value="1"/>
 </Property>
 
 <Property name="Data3">
-<Type>%String</Type>
+<Type>TECH.Persistentie.GlobalNode</Type>
 <Private>1</Private>
-<Parameter name="TRUNCATE" value="1"/>
 </Property>
 
 <Property name="Data15">
-<Type>%String</Type>
+<Type>TECH.Persistentie.GlobalNode</Type>
 <Private>1</Private>
-<Parameter name="TRUNCATE" value="1"/>
 </Property>
 
 <Property name="DataJ">
-<Type>%String</Type>
+<Type>TECH.Persistentie.GlobalNode</Type>
 <Private>1</Private>
-<Parameter name="TRUNCATE" value="1"/>
 </Property>
 
 <Property name="DataG">
-<Type>%String</Type>
+<Type>TECH.Persistentie.GlobalNode</Type>
 <Private>1</Private>
-<Parameter name="TRUNCATE" value="1"/>
 </Property>
 
 <Property name="IsNieuwProduct">
@@ -64,6 +57,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="PersistentMgr">
+<Type>TECH.Persistentie.GlobalPersistenceMgr</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>ProductNummer:%Integer=""</FormalSpec>
 <Private>1</Private>
@@ -78,6 +76,7 @@
 			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
 ]]></Implementation>
 </Method>
@@ -102,7 +101,7 @@
 
 <Method name="GeefKorttekst">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $P(..Data0,"\",1)
+<Implementation><![CDATA[	Quit ..Data0.GeefPiece(1)
 ]]></Implementation>
 </Method>
 
@@ -140,7 +139,7 @@
 
 <Method name="GeefDossierNr">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $P(..DataG,"\",1)
+<Implementation><![CDATA[	Quit ..DataG.GeefPiece(1)
 ]]></Implementation>
 </Method>
 
@@ -186,19 +185,19 @@
 
 <Method name="GeefIdentNr">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data2,"\",25)
+<Implementation><![CDATA[	Quit ..Data2.GeefPiece(25)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefLinkType">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data0,"\",23)
+<Implementation><![CDATA[	Quit ..Data0.GeefPiece(23)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefTelbaar">
 <ReturnType>TECH.String</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data1, "\", 7)
+<Implementation><![CDATA[	Quit ..Data1.GeefPiece(7)
 ]]></Implementation>
 </Method>
 
@@ -242,13 +241,13 @@
 
 <Method name="GeefOmschrijving">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $P(..Data0,"\",2) _ " " _ $P(..Data0,"\",11)
+<Implementation><![CDATA[	Quit ..Data0.GeefPiece(2) _ " " _ ..Data0.GeefPiece(11)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefOpeningDatum">
 <ReturnType>%Date</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data0,"\",28)
+<Implementation><![CDATA[	Quit ..Data0.GeefPiece(28)
 ]]></Implementation>
 </Method>
 
@@ -266,7 +265,7 @@
 
 <Method name="IsStockOverKinderen">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit $piece(..Data0,"\",23)="S"
+<Implementation><![CDATA[	Quit ..Data0.GeefPiece(23)="S"
 ]]></Implementation>
 </Method>
 
@@ -314,31 +313,31 @@
 
 <Method name="GeefGADataID">
 <ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..DataG,"\",13)
+<Implementation><![CDATA[	Quit ..DataG.GeefPiece(13)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefScanType">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit $Piece(..Data0,"\",24)
+<Implementation><![CDATA[	quit ..Data0.GeefPiece(24)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefActiefStatus">
 <ReturnType>DOM.PM.enu.ActiefStatus</ReturnType>
-<Implementation><![CDATA[	quit $Piece(..Data1,"\",25)
+<Implementation><![CDATA[	quit ..Data1.GeefPiece(25)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefLeverancierReferentie">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..DataJ,"\",3)
+<Implementation><![CDATA[	Quit ..DataJ.GeefPiece(3)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefLeverancierID">
 <ReturnType>DOM.common.PartijID</ReturnType>
-<Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefLeverancierPartijID($Piece(..DataJ,"\",1))
+<Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefLeverancierPartijID(..DataJ.GeefPiece(1))
 ]]></Implementation>
 </Method>
 
@@ -365,7 +364,7 @@
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
-	#Dim Aantal As %Integer = $Piece(..DataJ, "\", VerpakkingNummer)
+	#Dim Aantal As %Integer = ..DataJ.GeefPiece(VerpakkingNummer)
 	If (Aantal = "") Set Aantal  = 0
 	
 	Quit Aantal
@@ -381,7 +380,7 @@
 <Method name="GeefStockDrempelVoorAankoop">
 <ReturnType>%Float</ReturnType>
 <Implementation><![CDATA[
-	#Dim Aantal As %Float = $Piece(..Data0, "\", 24)
+	#Dim Aantal As %Float = ..Data0.GeefPiece(24)
 	If ('$ISVALIDNUM(Aantal)) Set Aantal = ""
 	
 	Quit Aantal
@@ -390,15 +389,15 @@
 
 <Method name="GeefGenerischProductID">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data0,"\",3)
+<Implementation><![CDATA[	Quit ..Data0.GeefPiece(3)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefStockType">
 <ReturnType>DOM.PM.enu.StockType</ReturnType>
 <Implementation><![CDATA[
 	#dim StockType As DOM.PM.enu.StockType
-	#dim StockData As %String = $Piece(..Data1,"\",20) 
+	#dim StockData As %String = ..Data1.GeefPiece(20)
 	If StockData = "1" { 
 		Set StockType = ##class(DOM.PM.enu.StockType).Stock()
 	}Else{ 
@@ -411,116 +410,116 @@
 <Method name="GeefIntrastatGoederenCode">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim Code As %String = $Piece(..Data2,"\",8)
+	#dim Code As %String = ..Data2.GeefPiece(8)
 	Quit $P($G(^INTRAST(2,Code_" ")),"\",1)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefIntrastatCode">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data2,"\",8)
+<Implementation><![CDATA[	Quit ..Data2.GeefPiece(8)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefGewichtInGram">
 <ReturnType>%Float</ReturnType>
-<Implementation><![CDATA[	Quit +$Piece(..Data1,"\",13)
+<Implementation><![CDATA[	Quit +..Data1.GeefPiece(13)
 ]]></Implementation>
 </Method>
 
 <Method name="IsInUitverkoop">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ($Piece(..Data0,"\",6) '= "") && ($Piece(..Data0,"\",6)<=##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate())
+<Implementation><![CDATA[	Quit (..Data0.GeefPiece(6) '= "") && (..Data0.GeefPiece(6)<=##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate())
 ]]></Implementation>
 </Method>
 
 <Method name="GeefUitverkoopSinds">
 <ReturnType>%Date</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data0,"\",6)
+<Implementation><![CDATA[	Quit ..Data0.GeefPiece(6)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefEANCode">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data2,"\",14)
+<Implementation><![CDATA[	Quit ..Data2.GeefPiece(14)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefKSProductStatus">
 <ReturnType>DOM.PM.enu.KSProductStatus</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data3,"\",3)
+<Implementation><![CDATA[	Quit ..Data3.GeefPiece(3)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefCataloogPrijsCodexVoorIndustrie">
 <Description>
 oude benaming = KATPRIJS</Description>
 <ReturnType>DOM.VKP.enu.PrijsCodex</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data1,"\",19)
+<Implementation><![CDATA[	Quit ..Data1.GeefPiece(19)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefCataloogPrijsCodexVoorHandels">
 <Description>
 oude benaming = KATPRIJS Handels</Description>
 <ReturnType>DOM.VKP.enu.PrijsCodex</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data1,"\",18)
+<Implementation><![CDATA[	Quit ..Data1.GeefPiece(18)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefBTWCode">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data0,"\",5)
+<Implementation><![CDATA[	Quit ..Data0.GeefPiece(5)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefBoekhoudkundigeRekening">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..Data0,"\",10)
+<Implementation><![CDATA[	Quit ..Data0.GeefPiece(10)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefBrutoAankoopPrijs">
 <Description>
 Leveranciersprijs per GrootteOrde zonder korting</Description>
 <ReturnType>%Float</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..DataJ,"\",19)
+<Implementation><![CDATA[	Quit ..DataJ.GeefPiece(19)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefGrootteOrdeAankoop">
 <ReturnType>DOM.PM.enu.GrootteOrde</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..DataJ,"\",28)
+<Implementation><![CDATA[	Quit ..DataJ.GeefPiece(28)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefNettoAankoopPrijsInclCif">
 <ReturnType>%Float</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..DataJ,"\",23)
+<Implementation><![CDATA[	Quit ..DataJ.GeefPiece(23)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefCifPercentage">
 <ReturnType>%Float</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..DataJ,"\",21)/100
+<Implementation><![CDATA[	Quit ..DataJ.GeefPiece(21)/100
 ]]></Implementation>
 </Method>
 
 <Method name="GeefKortingsPercentageAankoop">
 <ReturnType>%Float</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..DataJ,"\",9)/100
+<Implementation><![CDATA[	Quit ..DataJ.GeefPiece(9)/100
 ]]></Implementation>
 </Method>
 
 <Method name="GeefVorkPercentage">
 <ReturnType>%Float</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..DataJ,"\",27)/100
+<Implementation><![CDATA[	Quit ..DataJ.GeefPiece(27)/100
 ]]></Implementation>
 </Method>
 
 <Method name="GeefLijstVerkoopPrijs">
 <ReturnType>%Float</ReturnType>
-<Implementation><![CDATA[	Quit $Piece(..DataJ,"\",25)
+<Implementation><![CDATA[	Quit ..DataJ.GeefPiece(25)
 ]]></Implementation>
 </Method>
 
@@ -535,7 +534,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If ( i%Data0 = "")  {
-		Set i%Data0 = $$$If($$$Not(..IsNieuwProduct),^KPR(..ProductNummer,0),"")
+		Set i%Data0 = $$$If($$$Not(..IsNieuwProduct),..PersistentMgr.GeefNode("^KPR",..ProductNummer,0),..PersistentMgr.MaakLegeNode())
 	}
 	Quit i%Data0
 ]]></Implementation>
@@ -546,7 +545,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%Data1 = "") {
-		Set i%Data1 = $$$If($$$Not(..IsNieuwProduct),^KPR(..ProductNummer,1),"")
+		Set i%Data1 = $$$If($$$Not(..IsNieuwProduct),..PersistentMgr.GeefNode("^KPR",..ProductNummer,1),..PersistentMgr.MaakLegeNode())
 	}
 	Quit i%Data1
 ]]></Implementation>
@@ -557,7 +556,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If ( i%Data2 = "") {
-			Set i%Data2 = $$$If($$$Not(..IsNieuwProduct),^KPR(..ProductNummer,2),"")
+		Set i%Data2 = $$$If($$$Not(..IsNieuwProduct),..PersistentMgr.GeefNode("^KPR",..ProductNummer,2),..PersistentMgr.MaakLegeNode())
 	}
 	Quit i%Data2
 ]]></Implementation>
@@ -568,7 +567,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%Data3 = "") {
-		Set i%Data3 = $$$If($$$Not(..IsNieuwProduct),^KPR(..ProductNummer,3),"")
+		Set i%Data3 = $$$If($$$Not(..IsNieuwProduct),..PersistentMgr.GeefNode("^KPR",..ProductNummer,3),..PersistentMgr.MaakLegeNode())
 	}
 	Quit i%Data3
 ]]></Implementation>
@@ -579,7 +578,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%Data15 = "") {
-		Set i%Data15 = $$$If($$$Not(..IsNieuwProduct),$Get(^KPR(..ProductNummer,15)),"")
+		Set i%Data15 = $$$If($$$Not(..IsNieuwProduct),..PersistentMgr.GeefNode("^KPR",..ProductNummer,15),..PersistentMgr.MaakLegeNode())
 	}
 	Quit i%Data15
 ]]></Implementation>
@@ -590,7 +589,8 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%DataJ = "") {
-		Set i%DataJ = $$$If($$$Not(..IsNieuwProduct),^KPR(..ProductNummer,$Order(^KPR(..ProductNummer,"J"))),"")
+		#dim JIndex As %String = $Order(^KPR(..ProductNummer,"J"))
+		Set i%DataJ = $$$If($$$Not(..IsNieuwProduct),..PersistentMgr.GeefNode("^KPR",..ProductNummer,JIndex),..PersistentMgr.MaakLegeNode())
 	}
 	Quit i%DataJ
 ]]></Implementation>
@@ -601,7 +601,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%DataG = "") {
-		Set i%DataG = $$$If($$$Not(..IsNieuwProduct),^KPR(..ProductNummer,"G"),"")
+		Set i%DataG = $$$If($$$Not(..IsNieuwProduct),..PersistentMgr.GeefNode("^KPR",..ProductNummer,"G"),..PersistentMgr.MaakLegeNode())
 	}
 	Quit i%DataG
 ]]></Implementation>