Index: Derde/Agenda/Catering.cls.xml
===================================================================
diff -u -r1074 -r1479
--- Derde/Agenda/Catering.cls.xml	(.../Catering.cls.xml)	(revision 1074)
+++ Derde/Agenda/Catering.cls.xml	(.../Catering.cls.xml)	(revision 1479)
@@ -6,6 +6,15 @@
 <Super>%Persistent</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
+<Index name="IndexOnActief">
+<Properties>Actief</Properties>
+</Index>
+
+<Index name="IndexOnNaam">
+<Properties>Naam</Properties>
+<Unique>1</Unique>
+</Index>
+
 <Property name="Actief">
 <Type>%Boolean</Type>
 </Property>
Index: vhDeploy/Deploy20110617x1332.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20110617x1332.cls.xml	(revision 0)
+++ vhDeploy/Deploy20110617x1332.cls.xml	(revision 1479)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.Deploy20110617x1332">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="Omschrijving">
+<Default><![CDATA[Aanmaken leads & catering types voor doelen]]></Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+
+	do ##class(Derde.Agenda.Aanleiding).%BuildIndices()
+	
+	do ##class(Derde.Agenda.Aanleiding).%KillExtent()
+	
+	set x = ##class(Derde.Agenda.Aanleiding).%New()
+	set x.Naam = "Geen"
+	set x.Actief = 1
+	do x.%Save()
+		
+	set x = ##class(Derde.Agenda.Aanleiding).%New()
+	set x.Naam = "Advertentie"
+	set x.Actief = 1
+	do x.%Save()
+		
+	set x = ##class(Derde.Agenda.Aanleiding).%New()
+	set x.Naam = "Internet"
+	set x.Actief = 1
+	do x.%Save()
+	
+	set x = ##class(Derde.Agenda.Aanleiding).%New()
+	set x.Naam = "Via klant"
+	set x.Actief = 1
+	do x.%Save()
+	
+	
+	do ##class(Derde.Agenda.Catering).%BuildIndices()
+	
+	set x = ##class(Derde.Agenda.Catering).%New()
+	set x.Naam = "Geen"
+	set x.Actief = 1
+	do x.%Save()
+	
+	set x = ##class(Derde.Agenda.Catering).%New()
+	set x.Naam = "Broodjes met dranken"
+	set x.Actief = 1
+	do x.%Save()
+
+	set x = ##class(Derde.Agenda.Catering).%New()
+	set x.Naam = "Dranken"
+	set x.Actief = 1
+	do x.%Save()
+	
+
+	
+
+
+	
+	
+    quit
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhDeploy/Deploy201106081001.cls.xml
===================================================================
diff -u -r1385 -r1479
--- vhDeploy/Deploy201106081001.cls.xml	(.../Deploy201106081001.cls.xml)	(revision 1385)
+++ vhDeploy/Deploy201106081001.cls.xml	(.../Deploy201106081001.cls.xml)	(revision 1479)
@@ -17,8 +17,8 @@
 	 	kill ^KPRNL(0,Index)
 	}
 	
-	set ^KPR(0,702)="RESERVATIE;7;2;;7;25;;$S($G(PR):$P($G(^PRSTOCK(""D"",PR)),D,6),1:"""");6;;K?.N;1;;;1;"";;;;;;1;;"
-	set ^KPR(0,703)="KLAARGEZET;8;2;;8;25;;$S($G(PR):$$KlaarGezet^APPS.common.StockNiveauService(PR),1:"""");6;;K?.N;1;;;1;"";;;;;;1;;"
+	set ^KPR(0,702)="KLAARGEZET;7;2;;7;25;;$S($G(PR):$$KlaarGezet^APPS.common.StockNiveauService(PR),1:"""");6;;K?.N;1;;;1;"";;;;;;1;;"
+	set ^KPR(0,703)="RESERVATIE;8;2;;8;25;;$S($G(PR):$P($G(^PRSTOCK(""D"",PR)),D,6),1:"""");6;;K?.N;1;;;1;"";;;;;;1;;"
 	set ^KPR(0,704)="IN TRANSFERT;9;2;;9;25;;$S($G(PR):$$InTransfert^APPS.common.StockNiveauService(PR),1:"""");6;;K?.N;1;;;1;"";;;;;;1;;"
 	set ^KPR(0,705)="VOORRAAD;10;2;;10;25;;$S($G(PR):$P($G(^PRSTOCK(""D"",PR)),D,5),1:"""");6;;K?.N;1;;;1;"";;;;;;1;;"
 	set ^KPR(0,706)="HERBESTELSURPLUS;12;2;;12;25;;$S(K:+K_"" ""_$P(""\Stuk\Kleinverpakking\Normverpakking\Grootverpakking\Pallet"",D,$F(""KNGP"",$P(K,+K,2))+1),1:K)_$S(+K>1:$P(""\s\en\en\en\ten"",D,$F(""KNGP"",$P(K,+K,2))+1),1:"""")_$S(K:"" (""_$$QTYVPK^MRP(PR,K)_"")"",1:"""");7;xxx, xxxK, xxxN, xxxG, xxxP[] = xxx stuks,klein-, norm-, grootverpakkingen      of palletten;K?.N!(K?.N1""K"")!(K?.N1""N"")!(K?.N1""G"")!(K?.N1""P"");;22;;;1605;;;;;;1;;"
Index: vhDeploy/Deploy20110616x1644.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20110616x1644.cls.xml	(revision 0)
+++ vhDeploy/Deploy20110616x1644.cls.xml	(revision 1479)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.Deploy20110616x1644">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="Omschrijving">
+<Default>Import metadata voor doelen - toonzaalbezoek</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	set filename = "\\notes01\MSMGATEWAY\VHDeploy\Deploy20110616x1644.txt"
+	
+	do ##class(DOM.CRM.BehandeldOnderwerp.Groep).%KillExtent()
+	do ##class(DOM.CRM.BehandeldOnderwerp.Onderwerp).%KillExtent()
+	do ##class(DOM.CRM.Interacties.MetadataActie).%KillExtent()
+	do ##class(DOM.CRM.Interacties.Metadata).%KillExtent()
+	
+	do ##class(DOM.CRM.Interacties.Metadata).Import(filename)
+    quit
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: Derde/Agenda/Aanleiding.cls.xml
===================================================================
diff -u -r1074 -r1479
--- Derde/Agenda/Aanleiding.cls.xml	(.../Aanleiding.cls.xml)	(revision 1074)
+++ Derde/Agenda/Aanleiding.cls.xml	(.../Aanleiding.cls.xml)	(revision 1479)
@@ -6,6 +6,15 @@
 <Super>%Persistent</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
+<Index name="IndexOnActief">
+<Properties>Actief</Properties>
+</Index>
+
+<Index name="IndexOnNaam">
+<Properties>Naam</Properties>
+<Unique>1</Unique>
+</Index>
+
 <Property name="Actief">
 <Type>%Boolean</Type>
 </Property>
Index: APPS/CRM/Interacties/BehandeldOnderwerp.cls.xml
===================================================================
diff -u -r1089 -r1479
--- APPS/CRM/Interacties/BehandeldOnderwerp.cls.xml	(.../BehandeldOnderwerp.cls.xml)	(revision 1089)
+++ APPS/CRM/Interacties/BehandeldOnderwerp.cls.xml	(.../BehandeldOnderwerp.cls.xml)	(revision 1479)
@@ -98,9 +98,15 @@
 	set dtoMetadata = ##class(APPS.CRM.Interacties.dto.Metadata).%New()
 	
 	set query = " SELECT Metadata , Metadata->Onderwerp AS Onderwerp , Toepassingen_Toepassing AS Toepassing" _
-				" FROM DOM_CRM_Interacties.Metadata_Toepassingen "
+				" FROM DOM_CRM_Interacties.Metadata_Toepassingen " _
+				" WHERE Toepassingen_KlantDivisie = ? AND Toepassingen_Toepassing = ?"
+				
+	set KlantDivisie = "KS"  ; klant divisie wordt hardcoded overruled aangezien er toch geen verschil wordt gemaakt in de verschillende divisies
+	;set Toepassing = "B"     ; Toepassing zelfde regeling als KlantDivisie
 	
-	set qHandler = $$ExecDynQuery^vhQUERYLIB(query)
+	do WLIP^vhDBG(195,KlantDivisie_" "_Toepassing)
+				
+	set qHandler = $$ExecDynQuery^vhQUERYLIB(query,$listbuild(KlantDivisie,Toepassing))
 	while qHandler.Next()
 	 { set Metadata = ##class(DOM.CRM.Interacties.Metadata).%OpenId(qHandler.Get("Metadata"))
 	   
Index: vhDeploy/Deploy20110616x1657.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20110616x1657.cls.xml	(revision 0)
+++ vhDeploy/Deploy20110616x1657.cls.xml	(revision 1479)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.Deploy20110616x1657">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="Omschrijving">
+<Default>Aanmaken van toepassingen voor doelen</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	set x = ##class(DOM.CRM.BehandeldOnderwerp.Toepassing).%New()
+	set x.Code = "B"
+	set x.Omschrijving = "Bezoek"
+	do x.%Save()
+	
+	set x = ##class(DOM.CRM.BehandeldOnderwerp.Toepassing).%New()
+	set x.Code = "TZ"
+	set x.Omschrijving = "ToonzaalBezoek"
+	do x.%Save()
+	
+	
+    quit
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: WS/CRM/Interacties.cls.xml
===================================================================
diff -u -r1378 -r1479
--- WS/CRM/Interacties.cls.xml	(.../Interacties.cls.xml)	(revision 1378)
+++ WS/CRM/Interacties.cls.xml	(.../Interacties.cls.xml)	(revision 1479)
@@ -76,7 +76,7 @@
 	$$$AddToLog($$$logGrpDoelen,"CRM.Interacties","GetMetadata","")
 
 	if $length($get(Klant)) {
-		Set KlantDivisie = ##class(Derde.Klant.Klant).%OpenId(Klant).Divisie
+		set KlantDivisie = ##class(Derde.Klant.Klant).%OpenId(Klant).Divisie
 		set Metadata = ##class(APPS.CRM.Interacties.BehandeldOnderwerp).GetMetadata(Toepassing,KlantDivisie)
 		
 		$$$LogOutgoing(WS.Derde.AgendaServerLogger,GetMetadata,Metadata)
Index: vhDeploy/Deploy20110616x1609.cls.xml
===================================================================
diff -u -r1460 -r1479
--- vhDeploy/Deploy20110616x1609.cls.xml	(.../Deploy20110616x1609.cls.xml)	(revision 1460)
+++ vhDeploy/Deploy20110616x1609.cls.xml	(.../Deploy20110616x1609.cls.xml)	(revision 1479)
@@ -12,7 +12,7 @@
 <Method name="ExecCode">
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
-	Kill ^RES("Derde.Agenda","PI","TYPE","D")
+	kill ^RES("Derde.Agenda","PI","TYPE","D")
 	set ^RES("Derde.Agenda","PI","TYPE","D","*")="1`Onbep.`DC``1"
     set ^RES("Derde.Agenda","PI","TYPE","D","B")="2`Bezoek`DC``2`W"
     set ^RES("Derde.Agenda","PI","TYPE","D","T")="3`Telefoon`DC`D``W"
Index: DOM/CRM/Interacties/Metadata.cls.xml
===================================================================
diff -u -r1075 -r1479
--- DOM/CRM/Interacties/Metadata.cls.xml	(.../Metadata.cls.xml)	(revision 1075)
+++ DOM/CRM/Interacties/Metadata.cls.xml	(.../Metadata.cls.xml)	(revision 1479)
@@ -55,11 +55,6 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Filename:%String</FormalSpec>
 <Implementation><![CDATA[
-	;do ..%KillExtent()
-	;do ##class(DOM.CRM.BehandeldOnderwerp.Groep).%KillExtent()
-	;do ##class(DOM.CRM.BehandeldOnderwerp.Onderwerp).%KillExtent()
-	;do ##class(DOM.CRM.Interacties.MetadataActie).%KillExtent()
-
 	set aStream = ##class(%FileCharacterStream).%New()
 	set aStream.Filename = Filename