Index: DOM/CRM/impl/DataM/DataMKlantAPI.cls.xml
===================================================================
diff -u -r950 -r966
--- DOM/CRM/impl/DataM/DataMKlantAPI.cls.xml	(.../DataMKlantAPI.cls.xml)	(revision 950)
+++ DOM/CRM/impl/DataM/DataMKlantAPI.cls.xml	(.../DataMKlantAPI.cls.xml)	(revision 966)
@@ -1,10 +1,10 @@
 <?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-24 10:53:42">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-28 08:43:59">
 <Class name="DOM.CRM.impl.DataM.DataMKlantAPI">
 <IncludeCode>TECH.Error,BL.Derde.KlantSpecifiek</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>DOM.CRM.KlantAPI,%RegisteredObject</Super>
-<TimeChanged>62174,39308.180731</TimeChanged>
+<TimeChanged>62178,31438.324418</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="Delimiter">
@@ -39,7 +39,7 @@
 </Method>
 
 <Method name="MaakKlant">
-<FormalSpec>Klant:DOM.CRM.dto.Klant,TypeTemplateKlant:DOM.CRM.enu.TypeTemplateKlant</FormalSpec>
+<FormalSpec>dtoKlant:DOM.CRM.dto.Klant,TypeTemplateKlant:DOM.CRM.enu.TypeTemplateKlant</FormalSpec>
 <ReturnType>DOM.CRM.Klant</ReturnType>
 <Implementation><![CDATA[
 
@@ -48,77 +48,54 @@
 		$$$ThrowError($$$errGeneralError,"Er is geen klant template meegegeven.")	
 	}
 	
-	/// Ophalen van template uit ^KBA("%A",1,"KL")
-	Set KBAIdConsument = ""
-	Set Key = ""
-	Set Key = $Order(^KBA("%A",1,"KL",Key))
-	While ((Key '= "") && (KBAIdConsument = ""))
-	{
-		If (^KBA("%A",1,"KL",Key) = TypeTemplateKlant)
-		{
-			Set KBAIdConsument = Key	
-		}
-		Set Key = $Order(^KBA("%A",1,"KL",Key))
-	}
+	Set KBAIdTemplate = ..GeefTemplateId(TypeTemplateKlant)
 	
-	If (KBAIdConsument = ""){
+	If (KBAIdTemplate = ""){
 		$$$ThrowError($$$errGeneralError,"Er is geen klant template gevonden van '"_TypeTemplateKlant_"'")	
 	}
-	Set Data0 = ^KBA("%A",1,"KL",KBAIdConsument,0)
-	Set Data1 = ^KBA("%A",1,"KL",KBAIdConsument,1)
-	Set Data2 = ^KBA("%A",1,"KL",KBAIdConsument,2)
-	Set Data3 = ^KBA("%A",1,"KL",KBAIdConsument,3)
-	Set Data4 = ^KBA("%A",1,"KL",KBAIdConsument,4)
-	Set Data5 = ^KBA("%A",1,"KL",KBAIdConsument,5)
-	Set Data6 = ^KBA("%A",1,"KL",KBAIdConsument,6)
-	Set Data7 = ^KBA("%A",1,"KL",KBAIdConsument,7)
-	Set Data8 = ^KBA("%A",1,"KL",KBAIdConsument,8)
 	
-	Set KlantIndex = $$COMPRES^KLANT(Klant.KlantNaam,KlantNummer)
+	/// Data inladen vanuit de template
+	for i = 0 : 1 : 8 Set Data(i) = ^KBA("%A",1,"KL",KBAIdTemplate,i)
 	
+	Set KlantIndex = $$COMPRES^KLANT(dtoKlant.KlantNaam,KlantNummer)
+	
 	/// Data invullen in template
-	Set $Piece(Data0,..#Delimiter,1) = KlantNummer
-	Set $Piece(Data0,..#Delimiter,2) = $$$UCase(Klant.KlantNaam)
-	Set $Piece(Data0,..#Delimiter,3) = Klant.Toenaam
-	Set $Piece(Data0,..#Delimiter,4) = Klant.Aanspreking
-	Set $Piece(Data0,..#Delimiter,5) = Klant.Adres.GeefStraat()
-	Set $Piece(Data0,..#Delimiter,6) = Klant.Adres.GeefPostcode()
-	Set $Piece(Data0,..#Delimiter,7) = Klant.Adres.GeefGemeente()
-	Set $Piece(Data0,..#Delimiter,8) = Klant.Adres.GeefLandNr()
-	Set $Piece(Data0,..#Delimiter,13) = Klant.Telefoon1
-	Set $Piece(Data0,..#Delimiter,16) = Klant.BTWNummer
-	Set $Piece(Data0,..#Delimiter,28) = $h
-	Set $Piece(Data0,..#Delimiter,29) = "SYS"
-	Set $Piece(Data0,..#Delimiter,31) = KlantIndex
-	Set $Piece(Data0,..#Delimiter,48) = KlantNummer
-	Set $Piece(Data0,..#Delimiter,49) = "K"
-	Set $Piece(Data0,..#Delimiter,50) = KlantIndex
+	Set $Piece(Data(0),..#Delimiter,1) = KlantNummer
+	Set $Piece(Data(0),..#Delimiter,2) = $$$UCase(dtoKlant.KlantNaam)
+	Set $Piece(Data(0),..#Delimiter,3) = dtoKlant.Toenaam
+	Set $Piece(Data(0),..#Delimiter,4) = dtoKlant.Aanspreking
+	Set $Piece(Data(0),..#Delimiter,5) = dtoKlant.Adres.GeefStraat()
+	Set $Piece(Data(0),..#Delimiter,6) = dtoKlant.Adres.GeefPostcode()
+	Set $Piece(Data(0),..#Delimiter,7) = dtoKlant.Adres.GeefGemeente()
+	Set $Piece(Data(0),..#Delimiter,8) = dtoKlant.Adres.GeefLandNr()
+	Set $Piece(Data(0),..#Delimiter,13) = dtoKlant.Telefoon1
+	Set $Piece(Data(0),..#Delimiter,16) = dtoKlant.BTWNummer
+	Set $Piece(Data(0),..#Delimiter,28) = $h
+	Set $Piece(Data(0),..#Delimiter,29) = "SYS"
+	Set $Piece(Data(0),..#Delimiter,31) = KlantIndex
+	Set $Piece(Data(0),..#Delimiter,48) = KlantNummer
+	Set $Piece(Data(0),..#Delimiter,49) = "K"
+	Set $Piece(Data(0),..#Delimiter,50) = KlantIndex
 	
-	Set $Piece(Data2,..#Delimiter,19) = Klant.Email
+	Set $Piece(Data(2),..#Delimiter,19) = dtoKlant.Email
 	
-	Set $Piece(Data5,..#Delimiter,5) = Klant.Opmerking12
+	Set $Piece(Data(5),..#Delimiter,5) = dtoKlant.Opmerking12
 	
 	/// Data wegschrijven in global DKL
-	Set ^DKL("K","KL.A",KlantNummer,0) = Data0
-	Set ^DKL("K","KL.A",KlantNummer,1) = Data1
-	Set ^DKL("K","KL.A",KlantNummer,2) = Data2
-	Set ^DKL("K","KL.A",KlantNummer,3) = Data3
-	Set ^DKL("K","KL.A",KlantNummer,4) = Data4
-	Set ^DKL("K","KL.A",KlantNummer,5) = Data5
-	Set ^DKL("K","KL.A",KlantNummer,6) = Data6
-	Set ^DKL("K","KL.A",KlantNummer,7) = Data7
-	Set ^DKL("K","KL.A",KlantNummer,8) = Data8
-
+	for i = 0 : 1 : 8 Set ^DKL("K","KL.A",KlantNummer,i)=Data(i)
+	
+	
 	/// NIET GEBRUIKEN, nieuwe code schrijven om indexen op te bouwen !
 	/// Om DoP^cAN220 te doen werken is het nodig om onderstaande regel uit te voeren
+	/// Staat hier nog ter info in code
 	//Set Q="K" Do ^cA604
 	//Do P^cAN220("KL","","","Kl","") 
 	
 	/// Data overkopieren naar global KKL
 	Set Klant = ..GeefKlant(KlantNummer)
-	Set KlantIndex = Klant.GeefKlantIndex()
+	Set KlantIndex = Klant.GeefKlantIndexKKL()
+	
 	Merge ^KKL(KlantIndex) = ^DKL("K","KL.A",KlantNummer) 
-	Set ^KK1(KlantNummer) = KlantIndex
 	
 	/// Indexen opbouwen
 	Do Klant.BouwIndexenOp()
@@ -132,7 +109,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefMedewerker">
+<Method name="GeefKlantViaProtimeNr">
 <Description>
 Zoekt tussen de klanten de medewerkers van VanHoecke en Halux
 Dit op basis van het PersNr vanuit ProTime dat kan worden opgegeven.
@@ -155,6 +132,27 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefTemplateId">
+<Description>
+Ophalen van template uit ^KBA("%A",1,"KL")</Description>
+<FormalSpec>TypeTemplateKlant:DOM.CRM.enu.TypeTemplateKlant</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set KBAIdTemplate = ""
+	Set Key = ""
+	Set Key = $Order(^KBA("%A",1,"KL",Key))
+	While ((Key '= "") && (KBAIdTemplate = ""))
+	{
+		If (^KBA("%A",1,"KL",Key) = TypeTemplateKlant)
+		{
+			Set KBAIdTemplate = Key	
+		}
+		Set Key = $Order(^KBA("%A",1,"KL",Key))
+	}	
+	Quit KBAIdTemplate
+]]></Implementation>
+</Method>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
@@ -165,5 +163,5 @@
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="225861606"/>
+<Checksum value="1751233263"/>
 </Export>