Index: vhUnitTest/APPS/common/KlantKost/TestAfhalingKosten.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/common/KlantKost/TestAfhalingKosten.cls.xml	(revision 0)
+++ vhUnitTest/APPS/common/KlantKost/TestAfhalingKosten.cls.xml	(revision 1933)
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.APPS.common.KlantKost.TestAfhalingKosten">
+<Description>
+Do ##class(vhUnitTest.Manager).RunTest("","APPS.common.KlantKost.TestAfhalingKosten")</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Datum">
+<Type>%Date</Type>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set Status = $$$OK
+	
+	/// Opzetten KFAP
+	Set ^KFAP("F",1,0,0) = "1000\F\13.10.01\1\EUR\13.10.01\0\0\0\0\0\0\0\0\\\8#0.00\\\\\\\\\\"
+	Set ^KFAP("F",1,0,1) = "\\\\\\\\\\\\\\\\\\\\\\\\\\"
+	Set ^KFAP("F",1,0,2) = "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+	Set ^KFAP("F",1,0,3) = "\\\\\1000\\\\\\\\\\\\\\\##\12.19555\\\\\\\\\"
+	Set ^KFAP("F",1,"U358178",0)="\"
+	Set ^KFAP("F",1,"U358178",1)="\12.10.01\\225398\\1000\OD1 #Door onze diensten 1\\\051-30 35 01\\\0.00##12.19555\\\12.10.01\\EUR\\\00\2\\###\M\\\F\F\\\\\\\61646\\OD1/3243\\\\OD1;61646;175696;58205\51834"
+	Set ^KFAP("F",1,"U358178",2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+	Set ^KFAP("F",1,"U358178",3)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+	Set ^KFAP("F",1,"U358178",4)=7
+	Set ^KFAP("F",1,"U358178",101)="\\\1055#1100#61640,31224\158401 - 06.10.01 - 06.10.01 o/bez LDS/\\\\\\\\\\100\\KF5\\1055#61640,31224#158401\\\\\\\"
+	Set ^KFAP("F",1,"U358178",102)="\\\\ªBVoor de voorgemonteerde TANDEMBOX(en) in dit orderªb\\\\\\\\\F\200\\KF11#\31230;T;;O\\\\\\\\\\\\\\\\\\\\\\\\"
+	Set ^KFAP("F",1,"U358178",103)="\\\\ªBgeldt een extra productietijd van 48 uur.ªb\\\\\\\\\F\300\\KF11#\31230;T;;O\\\\\\\\\\\\\\\\\\\\\\\\"
+	Set ^KFAP("F",1,"U358178",104)="\\\\Tav P. Lepoutre\\\\\\\\\F\400\\KF11#1\31207;T;;OWBF\\\\\\\\\\\\\\\\\\\\\\\\"
+	Set ^KFAP("F",1,"U358178",105)="703000 \165716\2\\\1.28\20#\8\2.56\2.56\703000 \L\\F\500\2.56\KF6\\\\E1\EUR\\\09/42\\\\\\\\1.5342\\\\\\\\1\1\\\\1"
+	Set ^KFAP("F",1,"U358178",106)="703100 \499069\1\\\96.07\20#\8\96.07\96.07\703100 \L\\F\600\96.07\KF6\\\\E1\EUR\\1\09/42\\\KOM\\\\\59.3424\\\\\\\\1\1\\\\1"	
+	
+	
+	Set DatumHulp = "13.10.01"
+	Set ..Datum = ##class(TECH.DateTime).TextToDate(DatumHulp)
+	Set ^KFAP1("F",1000,-..Datum,1)=""
+	
+	Quit Status
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set Status = $$$OK	
+	Kill ^KFAP("F",1)
+	Kill ^KFAP1("F",1000,-..Datum,1)
+	Quit Status
+]]></Implementation>
+</Method>
+
+<Method name="TestMonsterKost">
+<Description>
+Bezoekkosten voor één maand voor testklant1000 berekenen en vgl met maandkost.</Description>
+<Implementation><![CDATA[
+	Set KlantKostService = ##class(APPS.common.KlantKost.impl.KlantKostService).%New()
+	
+	Set Jaar = 2001
+	Set Maand = 10
+	Set KostType = ##class(APPS.common.KlantKost.enu.KostType).Afhaling()
+	
+	Do KlantKostService.BerekenAfhalingKlantKosten(Jaar,Maand)
+	Kill TotaalKost,MaandKost
+	&SQL(Select SUM(Kost) INTO :TotaalKost From APPS_common_KlantKost_impl_data.AfhalingKostItem WHERE KlantNr = 1000 
+			AND DatePart('yy',Datum) = :Jaar
+			AND DatePart('mm',Datum) = :Maand
+			AND KostType = :KostType)	
+	
+	&SQL(Select Kost INTO :MaandKost From APPS_common_KlantKost_impl_data.MaandKost
+		 WHERE KlantNr = 1000 
+			AND Jaar = :Jaar
+			AND Maand = :Maand
+			AND KostType = :KostType)
+			
+	Do $$$AssertEquals(TotaalKost,MaandKost,"Kosten voor één maand komen overeen met de gemaakte afhalingkosten.")
+	
+	/// Er is één afhaling gebeurd. Vermenigvuldig met de factor 4.85 euro
+	Do $$$AssertEquals(TotaalKost,4.85,"Komen overeen voor de afhaling die gedefinieerd is.")
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/common/KlantKost/enu/KostType.cls.xml
===================================================================
diff -u -r1384 -r1933
--- APPS/common/KlantKost/enu/KostType.cls.xml	(.../KostType.cls.xml)	(revision 1384)
+++ APPS/common/KlantKost/enu/KostType.cls.xml	(.../KostType.cls.xml)	(revision 1933)
@@ -9,11 +9,11 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="VALUELIST">
-<Default>,Bezoek,Monster</Default>
+<Default>,Bezoek,Monster,Afhaling</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;Bezoek,Monster</Default>
+<Default>;Bezoek;Monster;Afhaling</Default>
 </Parameter>
 
 <Method name="Bezoek">
@@ -29,5 +29,12 @@
 <Implementation><![CDATA["Monster"
 ]]></Implementation>
 </Method>
+
+<Method name="Afhaling">
+<ClassMethod>1</ClassMethod>
+<CodeMode>expression</CodeMode>
+<Implementation><![CDATA["Afhaling"
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: APPS/common/KlantKost/impl/data/AfhalingKostItem.cls.xml
===================================================================
diff -u
--- APPS/common/KlantKost/impl/data/AfhalingKostItem.cls.xml	(revision 0)
+++ APPS/common/KlantKost/impl/data/AfhalingKostItem.cls.xml	(revision 1933)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.KlantKost.impl.data.AfhalingKostItem">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.common.KlantKost.impl.data.IndividueelKostItem</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="AantalAdressen">
+<Type>%String</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Datum:%Date,KlantNr:%Integer,Kost:%Integer,AantalAdressen:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Datum = Datum
+	Set ..KlantNr = KlantNr
+	Set ..KostType = ##class(APPS.common.KlantKost.enu.KostType).Afhaling()
+	Set ..Kost = Kost
+	Set ..AantalAdressen = AantalAdressen
+	Quit ##super()
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DefaultData>AfhalingKostItemDefaultData</DefaultData>
+<Data name="AfhalingKostItemDefaultData">
+<Structure>listnode</Structure>
+<Subscript>"AfhalingKostItem"</Subscript>
+<Value name="1">
+<Value>BonNr</Value>
+</Value>
+<Value name="2">
+<Value>FactuurNr</Value>
+</Value>
+<Value name="3">
+<Value>OrderNr</Value>
+</Value>
+<Value name="4">
+<Value>AantalAdressen</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+</Export>
Index: APPS/common/KlantKost/KlantKostService.cls.xml
===================================================================
diff -u -r1384 -r1933
--- APPS/common/KlantKost/KlantKostService.cls.xml	(.../KlantKostService.cls.xml)	(revision 1384)
+++ APPS/common/KlantKost/KlantKostService.cls.xml	(.../KlantKostService.cls.xml)	(revision 1933)
@@ -33,6 +33,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BerekenAfhalingKlantKosten">
+<Abstract>1</Abstract>
+<FormalSpec>Jaar:%Integer,Maand:%Integer</FormalSpec>
+<Implementation><![CDATA[	
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
 <DataLocation>^APPS.common7B4.KlantKostSer66CD</DataLocation>
Index: APPS/common/KlantKost/impl/data/IndividueelKostItem.cls.xml
===================================================================
diff -u -r1426 -r1933
--- APPS/common/KlantKost/impl/data/IndividueelKostItem.cls.xml	(.../IndividueelKostItem.cls.xml)	(revision 1426)
+++ APPS/common/KlantKost/impl/data/IndividueelKostItem.cls.xml	(.../IndividueelKostItem.cls.xml)	(revision 1933)
@@ -25,7 +25,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Datum:%Date,KlantNr:%Integer,Kost:%Integer,BezoekID:%String</FormalSpec>
+<FormalSpec>Datum:%Date,KlantNr:%Integer,Kost:%Integer,Info:%String</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
Index: APPS/common/KlantKost/impl/AfhalingKostCalculator.cls.xml
===================================================================
diff -u
--- APPS/common/KlantKost/impl/AfhalingKostCalculator.cls.xml	(revision 0)
+++ APPS/common/KlantKost/impl/AfhalingKostCalculator.cls.xml	(revision 1933)
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="APPS.common.KlantKost.impl.AfhalingKostCalculator">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.common.KlantKost.impl.KostCalculator</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="DatumAdresAantal">
+<Type>%String</Type>
+<MultiDimensional>1</MultiDimensional>
+<Private>1</Private>
+</Property>
+
+<Method name="BerekenKostenPerKlant">
+<FormalSpec>Jaar:%Integer,Maand:%Integer</FormalSpec>
+<Implementation><![CDATA[
+	Do ..VerwijderKosten(Jaar,Maand)
+	
+	Kill ..DatumAdresAantal
+	
+	Set Datum = +$zdh("01/"_Maand_"/"_Jaar,4)	
+	Set StartDatum = ##class(TECH.DateTime).EersteDagVanMaand(Datum)
+	Set EindDatum = ##class(TECH.DateTime).LaatsteDagVanMaand(Datum)
+	Set KostFactor = ..GeefFactor(Datum)
+	
+	Set KlantAPI=##class(DOM.DomeinContext).Instance().GeefKlantAPI()
+	Set KlantIterator = KlantAPI.GeefKlantenIterator().%New()	
+	While KlantIterator.HasNext()
+	{
+		Set Klant = KlantIterator.Next()
+		Set KlantNr = Klant.GeefNummer()
+		Set ProformaIt = Klant.GeefProformasIterator(StartDatum, EindDatum)		
+		Do ..BerekenAdressenPerDatum(ProformaIt)
+		
+		Set FactuurIt = Klant.GeefFacturenIterator(StartDatum, EindDatum)		
+		Do ..BerekenAdressenPerDatum(FactuurIt)		
+		
+		/// Voor deze klant, alle verschillende adressen per dag.
+		Set Datum = ""
+		Set Datum = $O(..DatumAdresAantal(Datum))
+		While Datum '= "" 
+		{		
+			Set AantalAdressen = 0	
+			Set AdresKey = ""
+			Set AdresKey = $O(..DatumAdresAantal(Datum, AdresKey))
+			While AdresKey '= ""
+			{
+				Set AantalAdressen = AantalAdressen + 1
+				Set AdresKey = $O(..DatumAdresAantal(Datum, AdresKey))
+			}	
+			
+			Set Kost = AantalAdressen * KostFactor
+			Set KostItem = ##class(APPS.common.KlantKost.impl.data.AfhalingKostItem).%New(Datum,KlantNr,Kost,AantalAdressen)
+			Set Status = KostItem.%Save()
+			If ($SYSTEM.Status.IsError(Status)){
+				Set Bericht = "Failed to save "_KostItem.%ClassName(1)_": "	
+				Set Bericht = Bericht_": "_Datum_","_KlantNr_","_AantalAdressen
+				Set Bericht = Bericht_$c(13,10)_$$ParseStatus^vhLib(Status)
+				Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).SaveFailed(),Bericht))
+			}
+			Set Datum = $O(..DatumAdresAantal(Datum))
+		}
+		Kill ..DatumAdresAantal
+	}
+]]></Implementation>
+</Method>
+
+<Method name="BerekenAdressenPerDatum">
+<Description>
+Proformas of facturen overlopen en gegevens invullen.
+Per unieke combinatie van datum en adres, het aantal bijhouden.</Description>
+<FormalSpec>Iterator:TECH.Iterator</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	/// in code kan Proforma door Factuur vervangen worden als term, kunnen beide iterators binnenkomen.
+	While (Iterator.HasNext()) {
+		Set Proforma = Iterator.Next()
+		Set ProformaNr = Proforma.GeefNr()
+							
+		/// alle bonnen overlopen van een proforma
+		Set BonIt = Proforma.GeefBonIterator()
+		While (BonIt.HasNext()) {
+			Set Bon = BonIt.Next()			
+			
+			Set Datum = Bon.GeefLeveringsDatum()
+			Set Adres=Bon.GeefLeveringsAdres()
+			Set AdresKey=Adres.GeefAdresKey()			
+			
+			If $Data(..DatumAdresAantal(Datum,AdresKey)) {
+				Set ..DatumAdresAantal(Datum,AdresKey) = ..DatumAdresAantal(Datum,AdresKey) + 1	
+			}Else {
+				Set ..DatumAdresAantal(Datum,AdresKey) = 1	
+			}				
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderKosten">
+<Description>
+Verwijderen van de kosten van dat specifiek jaar en maand voor alle klanten.</Description>
+<FormalSpec>Jaar:%Integer,Maand:%Integer</FormalSpec>
+<Implementation><![CDATA[
+	&SQL(DELETE FROM APPS_common_KlantKost_impl_data.AfhalingKostItem
+ 	WHERE DatePart('yy',Datum) = :Jaar AND DatePart('mm',Datum) = :Maand)
+]]></Implementation>
+</Method>
+
+<Method name="GeefFactor">
+<FormalSpec>Datum:%Date</FormalSpec>
+<ReturnType>%Float</ReturnType>
+<Implementation><![CDATA[
+	Set EnkelvoudigeFactor = ##class(APPS.common.KlantKost.impl.data.EnkelvoudigeFactor).%OpenId("Afhaling")
+	
+	If ($IsObject(EnkelvoudigeFactor)){
+		Set FactorWaarde = EnkelvoudigeFactor.ZoekFactorWaarde(Datum)	
+	}
+	Quit FactorWaarde
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: DOM/OV/impl/DataM/DataMFactuur.cls.xml
===================================================================
diff -u -r1076 -r1933
--- DOM/OV/impl/DataM/DataMFactuur.cls.xml	(.../DataMFactuur.cls.xml)	(revision 1076)
+++ DOM/OV/impl/DataM/DataMFactuur.cls.xml	(.../DataMFactuur.cls.xml)	(revision 1933)
@@ -44,5 +44,14 @@
 <Implementation><![CDATA[	Quit ##class(DOM.OV.impl.DataM.DataMFactuurBonIterator).%New(##this)
 ]]></Implementation>
 </Method>
+
+<Method name="GeefDatum">
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[
+	Set Datum = $P(..GetDataLijn(0),"\",6)
+	Set Datum = ##class(TECH.DateTime).TextToDate(Datum)
+	Quit Datum
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: DOM/OV/Factuur.cls.xml
===================================================================
diff -u -r1076 -r1933
--- DOM/OV/Factuur.cls.xml	(.../Factuur.cls.xml)	(revision 1076)
+++ DOM/OV/Factuur.cls.xml	(.../Factuur.cls.xml)	(revision 1933)
@@ -24,5 +24,10 @@
 <Method name="GeefBonIterator">
 <ReturnType>TECH.Iterator</ReturnType>
 </Method>
+
+<Method name="GeefDatum">
+<Abstract>1</Abstract>
+<ReturnType>%Date</ReturnType>
+</Method>
 </Class>
 </Export>
Index: APPS/common/KlantKost/impl/data/EnkelvoudigeFactor.cls.xml
===================================================================
diff -u -r1426 -r1933
--- APPS/common/KlantKost/impl/data/EnkelvoudigeFactor.cls.xml	(.../EnkelvoudigeFactor.cls.xml)	(revision 1426)
+++ APPS/common/KlantKost/impl/data/EnkelvoudigeFactor.cls.xml	(.../EnkelvoudigeFactor.cls.xml)	(revision 1933)
@@ -10,6 +10,13 @@
 <Type>%String</Type>
 </Property>
 
+<Index name="PrimaryKey">
+<IdKey>1</IdKey>
+<PrimaryKey>1</PrimaryKey>
+<Properties>Naam</Properties>
+<Unique>1</Unique>
+</Index>
+
 <Method name="ZoekFactorWaarde">
 <FormalSpec>Datum:%Date</FormalSpec>
 <Implementation><![CDATA[
Index: DOM/CRM/Stat/KlantBeoordeling.cls.xml
===================================================================
diff -u -r1075 -r1933
--- DOM/CRM/Stat/KlantBeoordeling.cls.xml	(.../KlantBeoordeling.cls.xml)	(revision 1075)
+++ DOM/CRM/Stat/KlantBeoordeling.cls.xml	(.../KlantBeoordeling.cls.xml)	(revision 1933)
@@ -95,7 +95,7 @@
 		  ;k %x	
 		  ;m %x=rs.Data
 		  ;zw %x 
-		  ;w rs.Data("KlantNr"),!
+		  w rs.Data("KlantNr"),!
 		}
 ]]></Implementation>
 </Method>
@@ -199,6 +199,7 @@
 	
 	Set ..BeginDatum=$$CALCDATE^vhDTyp($H,"M",-AantalMaanden,"FD")
 	Set ..EindDatum=$$CALCDATE^vhDTyp($H,"M",-1,"LD")
+	d WLIP^vhDBG(127,$zdt(..BeginDatum,4)_" - "_$zdt(..EindDatum,4))
 	Set ..KlantAPI=##class(DOM.DomeinContext).Instance().GeefKlantAPI()
 	Set ..KlantenIterator=..KlantAPI.GeefKlantenIterator().%New()
 	
Index: Prod/Kenmerk/DataDefinitie.cls.xml
===================================================================
diff -u -r1806 -r1933
--- Prod/Kenmerk/DataDefinitie.cls.xml	(.../DataDefinitie.cls.xml)	(revision 1806)
+++ Prod/Kenmerk/DataDefinitie.cls.xml	(.../DataDefinitie.cls.xml)	(revision 1933)
@@ -149,7 +149,6 @@
 <ReturnType>%Library.Status</ReturnType>
 <Implementation><![CDATA[
  //w "Pre : "_$zobjval(,5,0,3,5),!
- 
  //DataIndex waarden verwijderen
  Do ##class(Prod.Kenmerk.DataIndex).DeleteWaarden(%this.Kenmerk.Groep.Code,%this.Kenmerk.Kenmerk,..UnID)   ; %this.ProductGetObjectId())
 
Index: Stat/OmzetKlantProductMaand.cls.xml
===================================================================
diff -u -r1841 -r1933
--- Stat/OmzetKlantProductMaand.cls.xml	(.../OmzetKlantProductMaand.cls.xml)	(revision 1841)
+++ Stat/OmzetKlantProductMaand.cls.xml	(.../OmzetKlantProductMaand.cls.xml)	(revision 1933)
@@ -178,7 +178,7 @@
 <SqlProc>1</SqlProc>
 <SqlQuery>	</SqlQuery>
 <Parameter name="CONTAINID" value="0"/>
-<Parameter name="ROWSPEC" value="KLNr:%Integer,Naam:%String,Tel1:%String,Straat:%String,Postkode:%String,Gemeente:%String,Taal:%String,Regio:%Integer,Aktiviteit:%String,Kwantiteit:%String,Kwaliteit:%String,NonAkt:%Integer,Vervallen:%Integer,AantalBezoeken:%String,LaatsteBezoek:%String,KlachtenJr:%Integer,KlachtenMnd:%Integer,Codex:%String,Uitz:%String,Trend:%String,VoBlum:%Float,VoHAL:%Float,VoTBX:%Float,VoGRP:%Float,VoRest:%Float,VoOL:%Float,HuBlum:%Float,HuHAL:%Float,HuTBX:%Float,HuGRP:%Float,HuRest:%Float,HuOL:%Float,VoMaBlum:%Float,VoMaHAL:%Float,VoMaTBX:%Float,VoMaGRP:%Float,VoMaRest:%Float,VoMaOL:%Float,HuMaBlum:%Float,HuMaHAL:%Float,HuMaTBX:%Float,HuMaGRP:%Float,HuMaRest:%Float,HuMaOL:%Float,IndicVoBlum:%Float,IndicVoHAL:%Float,IndicVoTBX:%Float,IndicVoGRP:%Float,IndicVoRest:%Float,IndicVoOL:%Float,IndicHuBlum:%Float,IndicHuHAL:%Float,IndicHuTBX:%Float,IndicHuGRP:%Float,IndicHuRest:%Float,IndicHuOL:%Float,IndicVoMaBlum:%Float,IndicVoMaHAL:%Float,IndicVoMaTBX:%Float,IndicVoMaGRP:%Float,IndicVoMaRest:%Float,IndicVoMaOL:%Float,IndicHuMaBlum:%Float,IndicHuMaHAL:%Float,IndicHuMaTBX:%Float,IndicHuMaGRP:%Float,IndicHuMaRest:%Float,IndicHuMaOL:%Float,CatalogusInfo:%String,KostprijsVertegenwoordiging:%Float,KostprijsMonster:%Float,KostprijsTotaal:%Float"/>
+<Parameter name="ROWSPEC" value="KLNr:%Integer,Naam:%String,Tel1:%String,Straat:%String,Postkode:%String,Gemeente:%String,Taal:%String,Regio:%Integer,Aktiviteit:%String,Kwantiteit:%String,Kwaliteit:%String,NonAkt:%Integer,Vervallen:%Integer,AantalBezoeken:%String,LaatsteBezoek:%String,KlachtenJr:%Integer,KlachtenMnd:%Integer,Codex:%String,Uitz:%String,Trend:%String,VoBlum:%Float,VoHAL:%Float,VoTBX:%Float,VoGRP:%Float,VoRest:%Float,VoOL:%Float,HuBlum:%Float,HuHAL:%Float,HuTBX:%Float,HuGRP:%Float,HuRest:%Float,HuOL:%Float,VoMaBlum:%Float,VoMaHAL:%Float,VoMaTBX:%Float,VoMaGRP:%Float,VoMaRest:%Float,VoMaOL:%Float,HuMaBlum:%Float,HuMaHAL:%Float,HuMaTBX:%Float,HuMaGRP:%Float,HuMaRest:%Float,HuMaOL:%Float,IndicVoBlum:%Float,IndicVoHAL:%Float,IndicVoTBX:%Float,IndicVoGRP:%Float,IndicVoRest:%Float,IndicVoOL:%Float,IndicHuBlum:%Float,IndicHuHAL:%Float,IndicHuTBX:%Float,IndicHuGRP:%Float,IndicHuRest:%Float,IndicHuOL:%Float,IndicVoMaBlum:%Float,IndicVoMaHAL:%Float,IndicVoMaTBX:%Float,IndicVoMaGRP:%Float,IndicVoMaRest:%Float,IndicVoMaOL:%Float,IndicHuMaBlum:%Float,IndicHuMaHAL:%Float,IndicHuMaTBX:%Float,IndicHuMaGRP:%Float,IndicHuMaRest:%Float,IndicHuMaOL:%Float,CatalogusInfo:%String,KostprijsVertegenwoordiging:%Float,KostprijsMonster:%Float,KostprijsAfhaling:%Float,KostprijsTotaal:%Float"/>
 </Query>
 
 <Method name="VerschilOmzetProdGrpExecute">
@@ -367,9 +367,10 @@
 	/// Kosten toevoegen
 	Set KostprijsVertegenw = ..GeefKostprijsKlant(KLNr,##class(APPS.common.KlantKost.enu.KostType).Bezoek())
 	Set KostprijsMonsters = ..GeefKostprijsKlant(KLNr,##class(APPS.common.KlantKost.enu.KostType).Monster())
-	Set KostprijsTotaal = KostprijsVertegenw + KostprijsMonsters
+	Set KostprijsAfhaling = ..GeefKostprijsKlant(KLNr,##class(APPS.common.KlantKost.enu.KostType).Afhaling())
+	Set KostprijsTotaal = KostprijsVertegenw + KostprijsMonsters + KostprijsAfhaling
 	
-	Set Row=Row_$LB(KostprijsVertegenw,KostprijsMonsters,KostprijsTotaal)
+	Set Row=Row_$LB(KostprijsVertegenw,KostprijsMonsters,KostprijsAfhaling,KostprijsTotaal)
 		
 	Quit $$$OK
 ]]></Implementation>
Index: APPS/common/KlantKost/impl/KlantKostService.cls.xml
===================================================================
diff -u -r1669 -r1933
--- APPS/common/KlantKost/impl/KlantKostService.cls.xml	(.../KlantKostService.cls.xml)	(revision 1669)
+++ APPS/common/KlantKost/impl/KlantKostService.cls.xml	(.../KlantKostService.cls.xml)	(revision 1933)
@@ -34,6 +34,7 @@
 	/// Kosten berekenen
 	Do ..BerekenBezoekKlantKosten(Jaar,Maand)
 	Do ..BerekenMonsterKlantKosten(Jaar,Maand)
+	Do ..BerekenAfhalingKlantKosten(Jaar,Maand)
 ]]></Implementation>
 </Method>
 
@@ -57,6 +58,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BerekenAfhalingKlantKosten">
+<FormalSpec>Jaar:%Integer,Maand:%Integer</FormalSpec>
+<Implementation><![CDATA[
+	Set Calculator = ##class(APPS.common.KlantKost.impl.AfhalingKostCalculator).%New()
+	Do Calculator.BerekenKostenPerKlant(Jaar,Maand)
+	
+	Do ..MaandKostAggregator.AggregeerVoorMaandEnType(Jaar,Maand,##class(APPS.common.KlantKost.enu.KostType).Afhaling())
+]]></Implementation>
+</Method>
+
 <Method name="InitFactoren">
 <Description>
 Maak factoren éénmalig aan in cache databank voor het berekenen van kosten.
Index: JBL KPI Klant Product Anlayse Kosten.prj.xml
===================================================================
diff -u -r1603 -r1933
--- JBL KPI Klant Product Anlayse Kosten.prj.xml	(.../JBL KPI Klant Product Anlayse Kosten.prj.xml)	(revision 1603)
+++ JBL KPI Klant Product Anlayse Kosten.prj.xml	(.../JBL KPI Klant Product Anlayse Kosten.prj.xml)	(revision 1933)
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="JBL KPI Klant Product Anlayse Kosten" LastModified="2011-07-05 17:54:37">
+<Project name="JBL KPI Klant Product Anlayse Kosten" LastModified="2011-08-30 17:09:17">
   <Items>
     <ProjectItem name="APPS.common.KlantKost.KlantKostService" type="CLS"/>
     <ProjectItem name="APPS.common.KlantKost.enu.KostType" type="CLS"/>
+    <ProjectItem name="APPS.common.KlantKost.impl.AfhalingKostCalculator" type="CLS"/>
     <ProjectItem name="APPS.common.KlantKost.impl.BezoekKostCalculator" type="CLS"/>
     <ProjectItem name="APPS.common.KlantKost.impl.KlantKostService" type="CLS"/>
     <ProjectItem name="APPS.common.KlantKost.impl.KostCalculator" type="CLS"/>
     <ProjectItem name="APPS.common.KlantKost.impl.MaandKostAggregator" type="CLS"/>
     <ProjectItem name="APPS.common.KlantKost.impl.MonsterKostCalculator" type="CLS"/>
+    <ProjectItem name="APPS.common.KlantKost.impl.data.AfhalingKostItem" type="CLS"/>
     <ProjectItem name="APPS.common.KlantKost.impl.data.BezoekKostItem" type="CLS"/>
     <ProjectItem name="APPS.common.KlantKost.impl.data.EnkelvoudigeFactor" type="CLS"/>
     <ProjectItem name="APPS.common.KlantKost.impl.data.Factor" type="CLS"/>
@@ -21,6 +23,7 @@
     <ProjectItem name="DOM.AKP.info.AankoopPrijsInfo" type="CLS"/>
     <ProjectItem name="DOM.CRM.Klant" type="CLS"/>
     <ProjectItem name="DOM.CRM.KlantAPI" type="CLS"/>
+    <ProjectItem name="DOM.CRM.Stat.KlantBeoordeling" type="CLS"/>
     <ProjectItem name="DOM.CRM.impl.DataM.DataMFacturenIterator" type="CLS"/>
     <ProjectItem name="DOM.CRM.impl.DataM.DataMProformasIterator" type="CLS"/>
     <ProjectItem name="DOM.OV.enu.OrderType" type="CLS"/>
@@ -37,6 +40,7 @@
     <ProjectItem name="TECH.DateTime" type="CLS"/>
     <ProjectItem name="vhDeploy.Deploy201106081058" type="CLS"/>
     <ProjectItem name="vhDeploy.JBL.Deploy20110704x1341" type="CLS"/>
+    <ProjectItem name="vhDeploy.JBL.Deploy20110830x1447" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.common.KlantKost.TestBezoekKosten" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.common.KlantKost.TestFactor" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.common.KlantKost.TestMonsterKosten" type="CLS"/>