Index: zTryout/ARC/DOM/OV/impl/DataM/DataMProductOrderlijn.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/OV/impl/DataM/DataMProductOrderlijn.cls.xml	(.../DataMProductOrderlijn.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/OV/impl/DataM/DataMProductOrderlijn.cls.xml	(.../DataMProductOrderlijn.cls.xml)	(revision 1214)
@@ -7,14 +7,14 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="%OnNew">
-<FormalSpec>Nr:%Integer,lineinfo:%String,Order:Order,LijnNode:GlobalNode</FormalSpec>
+<FormalSpec>Nr:%Integer,Order:Order,LijnNode:GlobalNode</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	// Initialize object first
-	Set Super =  ##super(Nr, lineinfo, Order, LijnNode)
-	if (lineinfo = "") { 
+	Set Super =  ##super(Nr, Order, LijnNode)
+	if (LijnNode = "") { 
 		Do ..ZetField(17, $$$LinetypeProduct) 
 	}
 	Quit Super
Index: zTryout/ARC/DOM/OV/impl/DataM/DataMOrderlijnBase.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/OV/impl/DataM/DataMOrderlijnBase.cls.xml	(.../DataMOrderlijnBase.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/OV/impl/DataM/DataMOrderlijnBase.cls.xml	(.../DataMOrderlijnBase.cls.xml)	(revision 1214)
@@ -30,7 +30,7 @@
 </UDLText>
 
 <Method name="%OnNew">
-<FormalSpec>Nr:%Integer,lineinfo:%String,Order:Order,LijnNode:GlobalNode</FormalSpec>
+<FormalSpec>Nr:%Integer,Order:Order,LijnNode:GlobalNode</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
Index: zTryout/ARC/DOM/OV/impl/DataM/OrderlineFactory.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/OV/impl/DataM/OrderlineFactory.cls.xml	(.../OrderlineFactory.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/OV/impl/DataM/OrderlineFactory.cls.xml	(.../OrderlineFactory.cls.xml)	(revision 1214)
@@ -9,13 +9,13 @@
 
 <Method name="Create">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>olijn:%Integer,lineinfo:%String,Order:Order,LijnNode:GlobalNode</FormalSpec>
+<FormalSpec>olijn:%Integer,Order:Order,LijnNode:GlobalNode</FormalSpec>
 <ReturnType>Orderlijn</ReturnType>
 <Implementation><![CDATA[
-		Set Type = $P(lineinfo,$$$D,17)
-		if (Type = $$$LinetypeProduct) Quit ##class(DataMProductOrderlijn).%New(olijn, lineinfo, Order, LijnNode)
-		if (Type = $$$LinetypeManual) Quit ##class(DataMManueleOrderlijn).%New(olijn, lineinfo, Order, LijnNode)
-		if (Type [ $$$LinetypeText) Quit ##class(DataMTextOrderlijn).%New(olijn, lineinfo, Order, LijnNode)
+		Set Type = LijnNode.GeefPiece(17)
+		if (Type = $$$LinetypeProduct) Quit ##class(DataMProductOrderlijn).%New(olijn, Order, LijnNode)
+		if (Type = $$$LinetypeManual) Quit ##class(DataMManueleOrderlijn).%New(olijn, Order, LijnNode)
+		if (Type [ $$$LinetypeText) Quit ##class(DataMTextOrderlijn).%New(olijn, Order, LijnNode)
 		//Quit ##class(Orderlijn).%New(olijn, lineinfo, Order)
 		Quit ""
 ]]></Implementation>
Index: zTryout/ARC/TECH/DataMContext.cls.xml
===================================================================
diff -u
--- zTryout/ARC/TECH/DataMContext.cls.xml	(revision 0)
+++ zTryout/ARC/TECH/DataMContext.cls.xml	(revision 1214)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="zTryout.ARC.TECH.DataMContext">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="InitConstanten">
+<ClassMethod>1</ClassMethod>
+<ProcedureBlock>0</ProcedureBlock>
+<Implementation><![CDATA[
+	Set Q="K"
+	Set D="\"
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: zTryout/ARC/DOM/OV/impl/DataM/DataMOrderLineIterator.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/OV/impl/DataM/DataMOrderLineIterator.cls.xml	(.../DataMOrderLineIterator.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/OV/impl/DataM/DataMOrderLineIterator.cls.xml	(.../DataMOrderLineIterator.cls.xml)	(revision 1214)
@@ -32,11 +32,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="Lijn">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="LijnNode">
 <Type>GlobalNode</Type>
 <Private>1</Private>
@@ -58,7 +53,6 @@
 	Set ..LaatsteOLijn = Order.GeefLeegOLijn() - 1
 	If (..LaatsteOLijn = "") { Set ..LaatsteOLijn = 100 }
 	Set ..OLijn = 100
-	Set ..Lijn = ""
 	set ..LijnNode = ""
 	// Advance to the first relevant line, if any
 	Do ..GotoNext()
@@ -82,16 +76,17 @@
 <ReturnType>%RegisteredObject</ReturnType>
 <Implementation><![CDATA[
 	// Causes an error if '..HasNext()
-	Set result = ..Lijn
 	Set LijnNodeTeGeven = ..LijnNode
 	Set olijn = ..OLijn
 	Set obj = ..CurrentInMemoryOrderline
+	
 	// Advance to the next relevant line
 	Do ..GotoNext()
+	
 	// Return the in-memory object if present
-	if (obj '= "") { Quit obj }
+	Quit:(obj '= "") obj
 	// Otherwise return a new object
-	Quit ##class(OrderlineFactory).Create(olijn, result, ..Order, LijnNodeTeGeven)
+	Quit ##class(OrderlineFactory).Create(olijn, ..Order, LijnNodeTeGeven)
 ]]></Implementation>
 </Method>
 
@@ -102,37 +97,30 @@
 	Set Lijnen = ..Order.Orderlijnen
 	while LookFurther {
 		Set ..OLijn = ..OLijn + 1
- //		w "GotoNext OLijn="_..OLijn, " LaatsteOLijn=", ..LaatsteOLijn,!
 		Set MemOLijn = Lijnen.GetAt(..OLijn)
 		If ((MemOLijn '= "")) { // TODO: waarom stond hier deze extra conditie:  && MemOLijn.IsDirty()
 			// Prefer in-memory version if it exists
 			w ..OLijn, " in memory", !
-			Set ..Lijn = MemOLijn.AsString()
 			Set ..LijnNode = MemOLijn.GeefNode()
 			Set ..CurrentInMemoryOrderline = MemOLijn
 		} Else {
-			Set ..Lijn = $G(^KOD(..KLNr,"F",..ORDNr,..OLijn))
 			Set ..LijnNode = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KOD", "\", ..KLNr, "F", ..ORDNr, ..OLijn)
 			Set ..CurrentInMemoryOrderline = ""
-			w:(..Lijn '= "") ..OLijn, " in db", !
+			w:(..LijnNode '= "") ..OLijn, " in db", !
 		}
-		// Lijn kan ook niet bestaan
-		Set LookFurther = ((..Lijn = "") || '..IsValidItem(..Lijn, ..LijnNode)) && ..HasNext() 
- //		w "GotoNext LF=", LookFurther,!
+		
+		Set LookFurther = ((..LijnNode.IsLeeg()) || '..IsValidItem(..LijnNode)) && ..HasNext()
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="IsValidItem">
 <Description>
 Override this method in derived classes to specify the types of entries to iterate over</Description>
-<FormalSpec>InternalRepr:%String,LijnNode:GlobalNode</FormalSpec>
+<FormalSpec>LijnNode:GlobalNode</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
- //	w "ÏsvalidItem line="_line,!
- Quit (LijnNode.GeefPiece(17) [ $$$LinetypeAllLines)		// Match all lines by default
- //	Quit ($P(InternalRepr, "\", 17) [ $$$LinetypeAllLines)		// Match all lines by default
+<Implementation><![CDATA[  Quit (LijnNode.GeefPiece(17) [ $$$LinetypeAllLines)		// Match all lines by default
 ]]></Implementation>
 </Method>
 </Class>
Index: zTryout/ARC/DOM/OV/impl/DataM/DataMOrderAPI.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/OV/impl/DataM/DataMOrderAPI.cls.xml	(.../DataMOrderAPI.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/OV/impl/DataM/DataMOrderAPI.cls.xml	(.../DataMOrderAPI.cls.xml)	(revision 1214)
@@ -4,13 +4,15 @@
 <Import>zTryout.ARC.DOM.OV</Import>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>OrderAPI,%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="GeefOrder">
 <FormalSpec>Nr:%Integer</FormalSpec>
 <ReturnType>Order</ReturnType>
 <Implementation><![CDATA[
 		Set Order = ##class(DataMOrder).%New(Nr)
-		Do Order.Open()
+		Set sc = Order.Open()
+		Quit:($$$ISERR(sc)) sc
 		Quit Order
 ]]></Implementation>
 </Method>
Index: zTryout/ARC/DOM/OV/impl/DataM/DataMTextOrderlijn.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/OV/impl/DataM/DataMTextOrderlijn.cls.xml	(.../DataMTextOrderlijn.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/OV/impl/DataM/DataMTextOrderlijn.cls.xml	(.../DataMTextOrderlijn.cls.xml)	(revision 1214)
@@ -8,14 +8,14 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="%OnNew">
-<FormalSpec>olijn:%Integer,lineinfo:%String,Order:Order,LijnNode:GlobalNode</FormalSpec>
+<FormalSpec>olijn:%Integer,Order:Order,LijnNode:GlobalNode</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	// Initialize object first
-	Set Super =  ##super(olijn, lineinfo, Order, LijnNode)
-	if (lineinfo = "") { 
+	Set Super =  ##super(olijn, Order, LijnNode)
+	if (' LijnNode.IsPersistent()) { 
 		Do ..ZetInFaktuur(0) 
 	}
 	Quit Super
Index: zTryout/ARC/DOM/KLANT/impl/DataM/DataMKlant.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/KLANT/impl/DataM/DataMKlant.cls.xml	(.../DataMKlant.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/KLANT/impl/DataM/DataMKlant.cls.xml	(.../DataMKlant.cls.xml)	(revision 1214)
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="zTryout.ARC.DOM.KLANT.impl.DataM.DataMKlant">
-<Import>zTryout.ARC.BASE,zTryout.ARC.DOM.KLANT,zTryout.ARC.BASE.impl.DataM</Import>
+<Import>zTryout.ARC.BASE,zTryout.ARC.DOM.KLANT,zTryout.ARC.BASE.impl.DataM,zTryout.ARC.TECH.Persistentie</Import>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>Klant,%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="Info">
-<Type>%String</Type>
+<Property name="KklId0">
+<Type>GlobalNode</Type>
 <Private>1</Private>
 </Property>
 
@@ -21,18 +22,19 @@
 
 <Method name="GeefAdres">
 <ReturnType>Adres</ReturnType>
-<Implementation><![CDATA[	Quit ##class(DataMAdres).%New(..Nr, ..Info)
+<Implementation><![CDATA[	Quit ##class(DataMAdres).%New(..Nr, ..KklId0)
 ]]></Implementation>
 </Method>
 
 <Method name="InfoGet">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (i%Info = "") {
-		Set i%Info = ^KKL(^KK1(..Nr),0)
+	If (' $IsObject(r%KklId0)) {
+		Set IdInKkl = ^KK1(..Nr)
+		Set r%KklId0 = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KPR", "\", IdInKkl, 0)
 	}
-	Quit i%Info
+	Quit r%KklId0
 ]]></Implementation>
 </Method>
 </Class>
Index: zTryout/ARC/Client/OVClient.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/Client/OVClient.cls.xml	(.../OVClient.cls.xml)	(revision 1206)
+++ zTryout/ARC/Client/OVClient.cls.xml	(.../OVClient.cls.xml)	(revision 1214)
@@ -7,7 +7,9 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="OrderNr">
-<Default>123552</Default>
+<Description>
+Dit is een test-order; kan gerust vervangen worden door eender welk ander bestaand order.</Description>
+<Default>123492</Default>
 </Parameter>
 
 <Parameter name="ProductKorttekst">
Index: zTryout/ARC/DOM/OV/impl/DataM/DataMOrderBase.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/OV/impl/DataM/DataMOrderBase.cls.xml	(.../DataMOrderBase.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/OV/impl/DataM/DataMOrderBase.cls.xml	(.../DataMOrderBase.cls.xml)	(revision 1214)
@@ -17,12 +17,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="Hoofding">
-<Type>%String</Type>
-<InitialExpression>"\"</InitialExpression>
-<Private>1</Private>
-</Property>
-
 <Property name="HoofdingNode">
 <Type>zTryout.ARC.TECH.Persistentie.GlobalNode</Type>
 <Private>1</Private>
Index: zTryout/ARC/TECH/Persistentie/GlobalNode.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/TECH/Persistentie/GlobalNode.cls.xml	(.../GlobalNode.cls.xml)	(revision 1206)
+++ zTryout/ARC/TECH/Persistentie/GlobalNode.cls.xml	(.../GlobalNode.cls.xml)	(revision 1214)
@@ -126,6 +126,28 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsLeeg">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ('..IsDirty() && '..IsInDatabase())
+]]></Implementation>
+</Method>
+
+<Method name="IsDirty">
+<CodeMode>expression</CodeMode>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[("" '= ..DirtyPieces.Next(""))
+]]></Implementation>
+</Method>
+
+<Method name="IsInDatabase">
+<CodeMode>expression</CodeMode>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[(..Persistent && (($Data(@..NodeKey) = 1) || ($Data(@..NodeKey) = 11)))
+]]></Implementation>
+</Method>
+
 <Method name="ZetPersistenteLokatie">
 <Description>
 Deze method mag alleen opgeroepen worden door de GlobalPersistenceMgr.
Index: zTryout/ARC/DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 1214)
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="zTryout.ARC.DOM.PM.impl.DataM.DataMProduct">
-<Import>zTryout.ARC.DOM.PM</Import>
+<Import>zTryout.ARC.DOM.PM,zTryout.ARC.TECH.Persistentie</Import>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>Product,%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="Info">
-<Type>%String</Type>
+<Property name="KprPrnr0">
+<Type>GlobalNode</Type>
 <Private>1</Private>
 </Property>
 
@@ -21,24 +22,24 @@
 
 <Method name="GeefKorttekst">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $P(..Info,"\",1)
+<Implementation><![CDATA[	Quit ..KprPrnr0.GeefPiece(1)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefOmschrijving">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $P(..Info,"\",2) _ " " _ $P(..Info,"\",11)
+<Implementation><![CDATA[	Quit ..KprPrnr0.GeefPiece(2) _ " " _ ..KprPrnr0.GeefPiece(11)
 ]]></Implementation>
 </Method>
 
-<Method name="InfoGet">
+<Method name="KprPrnr0Get">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (i%Info = "") {
-		Set i%Info = ^KPR(..Nr,0)
+	If (' $IsObject(r%KprPrnr0)) {
+		Set r%KprPrnr0 = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KPR", "\", ..Nr, 0)
 	}
-	Quit i%Info
+	Quit r%KprPrnr0
 ]]></Implementation>
 </Method>
 </Class>
Index: zTryout/ARC/DOM/OV/impl/DataM/DataMOrder.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/OV/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/OV/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 1214)
@@ -53,16 +53,14 @@
 	while (key '= "") {
 		Set LijnNr = Lijn.GeefNr()
 		//Set:(LijnNr > MaxOLijn) MaxOLijn = LijnNr
-		If (Lijn.IsDirty()) {
-			w "Save ol ", LijnNr, !
-			// Dirty lijnen krijgen hier een uniek nummer als ze er nog geen hebben
-			If (Lijn.GeefOLU() = "") {
-				Do Lijn.ZetOLU(..VolgendeOLUNrNode.GeefPiece(1) * 100)
-				Do ..VolgendeOLUNrNode.ZetPiece(1, (1 + ..VolgendeOLUNrNode.GeefPiece(1)))
-			}
-			Set ^KOD(..KlantNr, "F", ..Nr, LijnNr) = Lijn.AsString()
-			Do Lijn.GeefNode().Save()
+
+		w "Save ol (indien gewijzigd) ", LijnNr, !
+		// Dirty lijnen krijgen hier een uniek nummer als ze er nog geen hebben
+		If (Lijn.GeefOLU() = "") {
+			Do Lijn.ZetOLU(..VolgendeOLUNrNode.GeefPiece(1) * 100)
+			Do ..VolgendeOLUNrNode.ZetPiece(1, (1 + ..VolgendeOLUNrNode.GeefPiece(1)))
 		}
+		Do Lijn.GeefNode().Save()
 		Set Lijn=..Orderlijnen.GetNext(.key)
 	}
 	//Set ..LeegOLijn = MaxOLijn + 1
@@ -87,7 +85,7 @@
 <Method name="MaakProductlijn">
 <ReturnType>ProductOrderlijn</ReturnType>
 <Implementation><![CDATA[
-	Set Lijn = ##class(DataMProductOrderlijn).%New("", "", ##this, ##class(GlobalPersistenceMgr).Instance().MaakLegeNode($$$D))
+	Set Lijn = ##class(DataMProductOrderlijn).%New("", ##this, ##class(GlobalPersistenceMgr).Instance().MaakLegeNode($$$D))
 	Do ..InitializeLijn(Lijn)
 	Quit Lijn
 ]]></Implementation>
@@ -97,7 +95,7 @@
 <FormalSpec>Tekst:%String</FormalSpec>
 <ReturnType>TextOrderlijn</ReturnType>
 <Implementation><![CDATA[
-	Set Lijn = ##class(DataMTextOrderlijn).%New("", "", ##this, ##class(GlobalPersistenceMgr).Instance().MaakLegeNode($$$D))
+	Set Lijn = ##class(DataMTextOrderlijn).%New("", ##this, ##class(GlobalPersistenceMgr).Instance().MaakLegeNode($$$D))
 	Do Lijn.ZetTekst(Tekst)
 	Do ..InitializeLijn(Lijn)
 	Quit Lijn
@@ -107,7 +105,7 @@
 <Method name="MaakManueleLijn">
 <ReturnType>ManueleOrderlijn</ReturnType>
 <Implementation><![CDATA[
-	Set Lijn = ##class(DataMManueleOrderlijn).%New("", "", ##this, ##class(GlobalPersistenceMgr).Instance().MaakLegeNode($$$D))
+	Set Lijn = ##class(DataMManueleOrderlijn).%New("", ##this, ##class(GlobalPersistenceMgr).Instance().MaakLegeNode($$$D))
 	Do ..InitializeLijn(Lijn)
 	Quit Lijn
 ]]></Implementation>
Index: zTryout/ARC/DOM/OV/impl/DataM/DataMOrderlijn.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/OV/impl/DataM/DataMOrderlijn.cls.xml	(.../DataMOrderlijn.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/OV/impl/DataM/DataMOrderlijn.cls.xml	(.../DataMOrderlijn.cls.xml)	(revision 1214)
@@ -6,28 +6,15 @@
 <Super>DataMOrderlijnBase</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="Dirty">
-<Type>%Boolean</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>Nr:%Integer,Info:%String,Order:Order,LijnNode:GlobalNode</FormalSpec>
+<FormalSpec>Nr:%Integer,Order:Order,LijnNode:GlobalNode</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set ..Dirty = 0
-	Quit ##super(Nr, Info, Order, LijnNode)
+<Implementation><![CDATA[	Quit ##super(Nr, Order, LijnNode)
 ]]></Implementation>
 </Method>
 
-<Method name="IsDirty">
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ..Dirty
-]]></Implementation>
-</Method>
-
 <UDLText name="T">
 <Content><![CDATA[
 // -------------- ECHTE PUBLIC METHODS TOT HIER ------------------------------------
@@ -57,7 +44,6 @@
 	// Als er velden gewijzigd worden zorgen we ervoor dat het order ons kent
 	// zodat de wijzigingen zichtbaar zijn voor gebruikers van het order.
 	// We overschrijven een eventueel bestaande kopie.
-	Set ..Dirty = 1
 	w "Veranderd OLijn=", ..Nr, !
 	Set BestaandeLijn = ""
 	If (..Nr '= "") {
Index: zTryout/ARC/DOM/PM/impl/DataM/DataMProductClassificatie.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/PM/impl/DataM/DataMProductClassificatie.cls.xml	(.../DataMProductClassificatie.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/PM/impl/DataM/DataMProductClassificatie.cls.xml	(.../DataMProductClassificatie.cls.xml)	(revision 1214)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="zTryout.ARC.DOM.PM.impl.DataM.DataMProductClassificatie">
-<Import>zTryout.ARC.DOM.PM</Import>
+<Import>zTryout.ARC.DOM.PM,zTryout.ARC.TECH.Persistentie</Import>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>zTryout.ARC.DOM.PM.ProductClassificatie,%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Nr">
 <Type>%Integer</Type>
@@ -14,6 +15,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="KprPrnrI1">
+<Type>GlobalNode</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>Nr:%Integer</FormalSpec>
 <Private>1</Private>
@@ -27,30 +33,30 @@
 
 <Method name="GeefHoofdGroep">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $P(..Info,"\",1)
+<Implementation><![CDATA[	Quit ..KprPrnrI1.GeefPiece(1)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefGroep">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $P(..Info,"\",2)
+<Implementation><![CDATA[	Quit ..KprPrnrI1.GeefPiece(2)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefSubGroep">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $P(..Info,"\",3)
+<Implementation><![CDATA[	Quit ..KprPrnrI1.GeefPiece(3)
 ]]></Implementation>
 </Method>
 
-<Method name="InfoGet">
+<Method name="KprPrnrI1Get">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (i%Info = "") {
-		Set i%Info = ^KPR(..Nr,"I1")
+	If (' $IsObject(r%KprPrnrI1)) {
+		Set r%KprPrnrI1 = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KPR", "\", ..Nr, "I1")
 	}
-	Quit i%Info
+	Quit r%KprPrnrI1
 ]]></Implementation>
 </Method>
 </Class>
Index: zTryout/ARC/DOM/OV/impl/DataM/DataMManueleOrderlijn.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/OV/impl/DataM/DataMManueleOrderlijn.cls.xml	(.../DataMManueleOrderlijn.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/OV/impl/DataM/DataMManueleOrderlijn.cls.xml	(.../DataMManueleOrderlijn.cls.xml)	(revision 1214)
@@ -6,14 +6,14 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="%OnNew">
-<FormalSpec>Nr:%Integer,lineinfo:%String,Order:Order,LijnNode:GlobalNode</FormalSpec>
+<FormalSpec>Nr:%Integer,Order:Order,LijnNode:GlobalNode</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	// Initialize object first
-	Set Super =  ##super(Nr, lineinfo, Order, LijnNode)
-	if (lineinfo = "") { 
+	Set Super =  ##super(Nr, Order, LijnNode)
+	if (LijnNode = "") { 
 		Do ..ZetField(17, $$$LinetypeManual)
 	}
 	Quit Super
Index: zTryout/ARC/DOM/MB/impl/DataM/DataMProductMagazijnInfo.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/MB/impl/DataM/DataMProductMagazijnInfo.cls.xml	(.../DataMProductMagazijnInfo.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/MB/impl/DataM/DataMProductMagazijnInfo.cls.xml	(.../DataMProductMagazijnInfo.cls.xml)	(revision 1214)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="zTryout.ARC.DOM.MB.impl.DataM.DataMProductMagazijnInfo">
-<Import>zTryout.ARC.DOM.MB</Import>
+<Import>zTryout.ARC.DOM.MB,zTryout.ARC.TECH.Persistentie</Import>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>ProductMagazijnInfo,%RegisteredObject</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Nr">
 <Type>%Integer</Type>
@@ -14,6 +15,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="KprPrnr2">
+<Type>GlobalNode</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>Nr:%Integer</FormalSpec>
 <Private>1</Private>
@@ -38,20 +44,31 @@
 
 <Method name="GeefStock">
 <ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[		Quit $P($P(..Info,"\",9), "#", 2)
+<Implementation><![CDATA[		Quit $P(..KprPrnr2.GeefPiece(9), "#", 2)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefKOM">
 <ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[		Quit $P($P(..Info,"\",9), "#", 3)
+<Implementation><![CDATA[		Quit $P(..KprPrnr2.GeefPiece(9), "#", 3)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefPalletQty">
 <ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[		Quit $P(..Info,"\",16)
+<Implementation><![CDATA[		Quit ..KprPrnr2.GeefPiece(16)
 ]]></Implementation>
 </Method>
+
+<Method name="KprPrnr2Get">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If (' $IsObject(r%KprPrnr2)) {
+		Set r%KprPrnr2 = ##class(GlobalPersistenceMgr).Instance().GeefNode("^KPR", "\", ..Nr, 2)
+	}
+	Quit r%KprPrnr2
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: zTryout/ARC/DOM/OV/impl/DataM/DataMTypedOrderlineIterator.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/OV/impl/DataM/DataMTypedOrderlineIterator.cls.xml	(.../DataMTypedOrderlineIterator.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/OV/impl/DataM/DataMTypedOrderlineIterator.cls.xml	(.../DataMTypedOrderlineIterator.cls.xml)	(revision 1214)
@@ -26,7 +26,7 @@
 <Method name="IsValidItem">
 <Description>
 Override this method in derived classes to specify the types of entries to iterate over</Description>
-<FormalSpec>line:%String,LijnNode:GlobalNode</FormalSpec>
+<FormalSpec>LijnNode:GlobalNode</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
  //	w "Typed IsvalidItem line="_ line,!
Index: zTryout/ARC/DOM/VKP/VerkoopbaarProduct.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/ARC/DOM/VKP/VerkoopbaarProduct.cls.xml	(.../VerkoopbaarProduct.cls.xml)	(revision 1206)
+++ zTryout/ARC/DOM/VKP/VerkoopbaarProduct.cls.xml	(.../VerkoopbaarProduct.cls.xml)	(revision 1214)
@@ -6,6 +6,12 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="GeefLinkType">
+<Description>
+Dit bevat een allegaartje aan informaties:
+- Halux versus Van Hoecke
+- Stock versus niet-stock
+- Standaard versus Moeder versus Kind versus halffabricaat
+TODO: bekijken of die info hier thuishoort, en opgesplitst kan worden.</Description>
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.LinkType</ReturnType>
 </Method>
FishEye: Tag 1189 refers to a dead (removed) revision in file `zTryout/JCL/Rel/Child.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1189 refers to a dead (removed) revision in file `zTryout/JCL/Validation/dtoKind.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1202 refers to a dead (removed) revision in file `zTryout/JCL/Datum.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1189 refers to a dead (removed) revision in file `zTryout/JCL/Validation/dtoMain.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1147 refers to a dead (removed) revision in file `zTryout/CSC/ChangePackage/PersKlasse.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1202 refers to a dead (removed) revision in file `zTryout/CSC/TimingCopy/Writer.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1191 refers to a dead (removed) revision in file `zTryout/WV/APPS/PM/OL/AfterImport.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1202 refers to a dead (removed) revision in file `zTryout/ARC/DOM/OV/Order.inc.rou'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1189 refers to a dead (removed) revision in file `zTryout/JCL/Trap.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1202 refers to a dead (removed) revision in file `zTryout/FM/Util/Orders.inc.rou'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1202 refers to a dead (removed) revision in file `zTryout/JCL/LocationFinder.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1194 refers to a dead (removed) revision in file `zTryout/JCL/FOPTest.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1189 refers to a dead (removed) revision in file `zTryout/JCL/VertaaldeData.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1189 refers to a dead (removed) revision in file `zTryout/JCL/Rel/Main.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: zTryout/PRAFMA/Design/DOM/OV/ConsLijnIterator.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/PRAFMA/Design/DOM/OV/ConsLijnIterator.cls.xml	(.../ConsLijnIterator.cls.xml)	(revision 1206)
+++ zTryout/PRAFMA/Design/DOM/OV/ConsLijnIterator.cls.xml	(.../ConsLijnIterator.cls.xml)	(revision 1214)
@@ -2,62 +2,70 @@
 <Export generator="Cache" version="9">
 <Class name="zTryout.PRAFMA.Design.DOM.OV.ConsLijnIterator">
 <Description>
-Volledig onafgewerkt achtergelaten...
-[JCL] Volledig in commentaar geplaatst...</Description>
+Volledig onafgewerkt achtergelaten...</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*
-Property ConsNr As %Integer [ Private ];
+<Property name="ConsNr">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
 
-Method %OnNew(consolidatie As Consolidatie) As %Status [ Private, ProcedureBlock = 1 ]
-{
+<Method name="%OnNew">
+<FormalSpec>consolidatie:Consolidatie</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
 	Set ..ConsNr = consolidatie.GetConsNr()
 
 	Set ..OLijn = 100
 	// Advance to the first relevant line, if any
 	Do ..GotoNext()
 	Quit 1
-}
+]]></Implementation>
+</Method>
 
-/// Returns true if the iteration has more elements.
-Method HasNext() As %Boolean
-{
-	Quit (..OLijn '= "")
-}
+<Method name="HasNext">
+<Description>
+Returns true if the iteration has more elements.</Description>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit (..OLijn '= "")
+]]></Implementation>
+</Method>
 
-/// Returns the next element in the iteration.
-/// Only returns a valid element if HasNext() returns true
-/// Causes an error if HasNext() returns false
-Method Next() As %RegisteredObject
-{
+<Method name="Next">
+<Description>
+Returns the next element in the iteration.
+Only returns a valid element if HasNext() returns true
+Causes an error if HasNext() returns false</Description>
+<ReturnType>%RegisteredObject</ReturnType>
+<Implementation><![CDATA[
 	// Causes an error if '..HasNext()
 	Set result = ..CurrentValue()
 	Set olijn = ..OLijn
 	// Advance to the next relevant line
 	Do ..GotoNext()
 	Quit ##class(OrderlineFactory).Create(olijn, result)
-}
+]]></Implementation>
+</Method>
 
-Method GotoNext() [ Private ]
-{
+<Method name="GotoNext">
+<Private>1</Private>
+<Implementation><![CDATA[
 	Set LookFurther = 1
 	while LookFurther {
 		Set ..OLijn=$O(^ORDW("D",CONSNr,"D",..ORDNr,..OLijn))
 		Set LookFurther = (..OLijn '= "") && '..IsValidItem(..CurrentValue())
 	}
-}
+]]></Implementation>
+</Method>
 
-Method CurrentValue() [ Private ]
-{
-	Quit ^KOD(..KLNr,"F",..ORDNr,..OLijn)
-}
-
-*/
-]]></Content>
-</UDLText>
+<Method name="CurrentValue">
+<Private>1</Private>
+<Implementation><![CDATA[	Quit ^KOD(..KLNr,"F",..ORDNr,..OLijn)
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: zTryout/FM/DOM/EC/OL/Verlanglijst/VerlanglijstVisitor.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/FM/DOM/EC/OL/Verlanglijst/VerlanglijstVisitor.cls.xml	(.../VerlanglijstVisitor.cls.xml)	(revision 1206)
+++ zTryout/FM/DOM/EC/OL/Verlanglijst/VerlanglijstVisitor.cls.xml	(.../VerlanglijstVisitor.cls.xml)	(revision 1214)
@@ -6,8 +6,16 @@
 alsook verlanglijsten en groepen binnen verlanglijsten.</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<ClassDefinitionError>0</ClassDefinitionError>
 
+<Method name="VerwerkFilterLijn">
+<Description>
+</Description>
+<FormalSpec>FilterLijn:FilterLijn</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="VerwerkGroepLijn">
 <FormalSpec>GroepLijn:GroepLijn</FormalSpec>
 <ReturnType>%Status</ReturnType>
FishEye: Tag 1202 refers to a dead (removed) revision in file `zTryout/CSC/TestKlasjeuuuh.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1194 refers to a dead (removed) revision in file `zTryout/JCL/Error.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1202 refers to a dead (removed) revision in file `zTryout/PRA/TbxStatistiek.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1202 refers to a dead (removed) revision in file `zTryout/Verdeling.mac.rou'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1202 refers to a dead (removed) revision in file `zTryout/JCL/Mapping/BouwsteenKindIndex.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1194 refers to a dead (removed) revision in file `zTryout/JCL/ErrorHandler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1189 refers to a dead (removed) revision in file `zTryout/JCL/TestProcedureBlock.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1202 refers to a dead (removed) revision in file `zTryout/JBL/Proc/1.int.rou'.
FishEye: No comparison available.  Pass `N' to diff?
Index: zTryout/FM/Util/Temp/KlantAdres.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/FM/Util/Temp/KlantAdres.cls.xml	(.../KlantAdres.cls.xml)	(revision 1206)
+++ zTryout/FM/Util/Temp/KlantAdres.cls.xml	(.../KlantAdres.cls.xml)	(revision 1214)
@@ -194,7 +194,7 @@
 <Implementation><![CDATA[
 		Set LandCode = $P(..AdresStr,$$$D,8)
 		// Default taal: taal van de klant
-		Set taalStr = $G(taal,##class(Customer).GetLanguage(..KLNr))
+		Set taalStr = $G(taal,##class(Klant).GetTaal(..KLNr))
 		Set Index = $S(taalStr="E":32,taalStr="F":12,taalStr="D":22,1:2)
 		Quit $P(^ISO(0,"ISO.LAND",LandCode,0),$$$D,Index)
 ]]></Implementation>
FishEye: Tag 1202 refers to a dead (removed) revision in file `zTryout/JCL/Mapping/BouwsteenKind.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1197 refers to a dead (removed) revision in file `zTryout/JCL/Queries.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1202 refers to a dead (removed) revision in file `zTryout/JCL/Mapping/WNode.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1147 refers to a dead (removed) revision in file `zTryout/CSC/ChangePackage/Change2.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1147 refers to a dead (removed) revision in file `zTryout/CSC/ChangePackage/ChangeInfo.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: zTryout/FM/PR/Maatwerk/GUI/KAD/Core/BeperkingContext.cls.xml
===================================================================
diff -u -r1206 -r1214
--- zTryout/FM/PR/Maatwerk/GUI/KAD/Core/BeperkingContext.cls.xml	(.../BeperkingContext.cls.xml)	(revision 1206)
+++ zTryout/FM/PR/Maatwerk/GUI/KAD/Core/BeperkingContext.cls.xml	(.../BeperkingContext.cls.xml)	(revision 1214)
@@ -5,15 +5,14 @@
 Geeft aan in welke context de beperkingen bekeken worden.  De context bepaalt welke beperkingen toegelaten zijn.  Bijvorbeld, in een interactieve wizard kan je aan de gebruiker waarschuwingen geven en vragen of ze effectief willen verdergaan ondanks de waarschuwingen, maar bij een automatische verwerking wil je wellicht alle beperkingen "hard" maken.</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="%OnNew">
 <FormalSpec>initvalue:%CacheString</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	;Set ..ExacteZoneControle = 0
+	Set ..ExacteZoneControle = 0
 	Quit $$$OK
 ]]></Implementation>
 </Method>
FishEye: Tag 1202 refers to a dead (removed) revision in file `zTryout/JCL/Validation/Webserver.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1214 refers to a dead (removed) revision in file `zTryout/ARC/APPS/VKP/OrderIngaveService.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1214 refers to a dead (removed) revision in file `zTryout/WS/Webserver/Test.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1214 refers to a dead (removed) revision in file `zTryout/JCL/Export.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 1214 refers to a dead (removed) revision in file `zTryout/FM/Util/Temp/CustomerAddress.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?