Index: DOM/CRM/impl/DataM/DataMKlant.cls.xml
===================================================================
diff -u -r903 -r946
--- DOM/CRM/impl/DataM/DataMKlant.cls.xml	(.../DataMKlant.cls.xml)	(revision 903)
+++ DOM/CRM/impl/DataM/DataMKlant.cls.xml	(.../DataMKlant.cls.xml)	(revision 946)
@@ -1,68 +1,191 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-03 11:49:44">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-23 09:58:32">
 <Class name="DOM.CRM.impl.DataM.DataMKlant">
+<IncludeCode>TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>DOM.CRM.Klant,%RegisteredObject</Super>
-<TimeChanged>62153,42652.849333</TimeChanged>
+<Super>DOM.CRM.impl.DataM.DataMKlantBase</Super>
+<TimeChanged>62173,35998.059502</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="KlantIndex">
-<Type>%String</Type>
+<Property name="Persisted">
+<Type>%Boolean</Type>
+<InitialExpression>"0"</InitialExpression>
 <Private>1</Private>
 </Property>
 
-<Property name="KlantNummer">
-<Type>%Integer</Type>
+<Property name="AlgemeneGegevensDirty">
+<Type>%Boolean</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="AlgemeneGegevensCached">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="BetalingsGegevens2Dirty">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="BetalingsGegevens2Cached">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Opmerkingen2Dirty">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Opmerkingen2Cached">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>KlantNummer:%Integer</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..KlantNummer = KlantNummer
+	Do ##super(KlantNummer)
+	Set ..Persisted = 0
+	Set ..AlgemeneGegevensDirty = 1
+	Set ..BetalingsGegevens2Dirty = 1
+	Set ..Opmerkingen2Dirty = 1
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Method name="GeefNummer">
-<ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	Quit ..KlantNummer
+<Method name="Open">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set Status = $$$OK
+	If ($Data(^DKL("K","KL.A",..KlantNummer)))
+	{
+		Set ..Persisted = 1
+		Set ..AlgemeneGegevensDirty = 0
+		Set ..BetalingsGegevens2Dirty = 0		
+		Set ..Opmerkingen2Dirty = 0
+	}Else{
+		Set Status = '($$$OK)
+	}
+	Quit Status
 ]]></Implementation>
 </Method>
 
-<Method name="GeefTaal">
+<Method name="Save">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	If (..KlantNummer = "") $$$ThrowError($$$errGeneralError,"Er is geen KlantNummer ingevuld, kan object niet saven.")	
+	If (..AlgemeneGegevensDirty) {
+		Set ^DKL("K","KL.A",..KlantNummer,0) = ..AlgemeneGegevens		
+		/// Status van actief/buitengebruik/verwijderd wijzigen
+		/// Hierbij worden achterliggend ook de vhisie-accounts verwijderd van deze klant. 
+		If (..ActiefChanged){
+			Set ..ActiefChanged = 0
+			/// vhisie accounts verwijderen
+			Do V6^KCOAK(..GeefKlantIndex())
+		}
+		
+		///Do DLOGMOD^LOG("KL",1000,310,"0","1")
+	}
+	If (..BetalingsGegevens2Dirty){
+		Set ^DKL("K","KL.A",..KlantNummer,2) = ..BetalingsGegevens2		
+	}
+	If (..Opmerkingen2Dirty){
+		Set ^DKL("K","KL.A",..KlantNummer,4) = ..Opmerkingen2
+	}
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="AlgemeneGegevensGewijzigd">
+<Implementation><![CDATA[
+	Set ..AlgemeneGegevensDirty = 1
+	Set ..AlgemeneGegevensCached = 1
+]]></Implementation>
+</Method>
+
+<Method name="BetalingsGegevens2Gewijzigd">
+<Implementation><![CDATA[
+	Set ..BetalingsGegevens2Dirty = 1
+	Set ..BetalingsGegevens2Cached = 1
+]]></Implementation>
+</Method>
+
+<Method name="Opmerkingen2Gewijzigd">
+<Implementation><![CDATA[
+	Set ..Opmerkingen2Dirty = 1
+	Set ..Opmerkingen2Cached = 1
+]]></Implementation>
+</Method>
+
+<Method name="AlgemeneGegevensGet">
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $piece(^KKL(..KlantIndex,0),"\",9)
+<Implementation><![CDATA[
+	If (..Persisted && ('..AlgemeneGegevensCached)){
+		Set i%AlgemeneGegevens = $Get(^DKL("K","KL.A",..KlantNummer,0))
+		Set AlgemeneGegevensCached = 1
+	}
+	Quit i%AlgemeneGegevens
 ]]></Implementation>
 </Method>
 
-<Method name="GeefNaam">
+<Method name="Data1Get">
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $piece(^KKL(..KlantIndex,0),"\",2)
+<Implementation><![CDATA[
+	If (i%Data1 = "") {
+		Set i%Data1 = ^DKL("K","KL.A",..KlantNummer,1)
+	}
+	Quit i%Data1
 ]]></Implementation>
 </Method>
 
-<Method name="GeefLand">
+<Method name="BetalingsGegevens2Get">
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $piece(^KKL(..KlantIndex,0),"\",8)
+<Implementation><![CDATA[
+	If (..Persisted && ('..BetalingsGegevens2Cached)){
+		Set i%BetalingsGegevens2 = ^DKL("K","KL.A",..KlantNummer,2)
+	}
+	Quit i%BetalingsGegevens2
 ]]></Implementation>
 </Method>
 
-<Method name="GeefBTWNr">
+<Method name="Data3Get">
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $piece(^KKL(..KlantIndex,0),"\",16)
+<Implementation><![CDATA[
+	If (i%Data3 = "") {
+		Set i%Data3 = ^DKL("K","KL.A",..KlantNummer,3)
+	}
+	Quit i%Data3
 ]]></Implementation>
 </Method>
 
-<Method name="KlantIndexGet">
+<Method name="Opmerkingen1Get">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (i%KlantIndex = "") {
-		Set i%KlantIndex = ^KK1(..KlantNummer)
-	}	
-	quit i%KlantIndex
+	If (i%Opmerkingen1 = "") {
+		Set i%Opmerkingen1 = ^DKL("K","KL.A",..KlantNummer,4)
+	}
+	Quit i%Opmerkingen1
 ]]></Implementation>
 </Method>
+
+<Method name="Opmerkingen2Get">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If (..Persisted && ('..Opmerkingen2Cached)){
+		Set i%Opmerkingen2 = ^DKL("K","KL.A",..KlantNummer,5)
+	}
+	Quit i%Opmerkingen2
+]]></Implementation>
+</Method>
 </Class>
-<Checksum value="3066865044"/>
+<Checksum value="3343300892"/>
 </Export>