Index: DOM/OV/impl/DataM/DataMBonAbstract.cls.xml
===================================================================
diff -u -r1940 -r1974
--- DOM/OV/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 1940)
+++ DOM/OV/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 1974)
@@ -48,7 +48,7 @@
 	Set Datum = ""
 	Set VerzendWijze = ..GeefVerzendwijze()
 	If ((VerzendWijze = ##class(DOM.OV.enu.VerzendWijze).Afhaling()) || (VerzendWijze = ##class(DOM.OV.enu.VerzendWijze).AfhalingConsument())){
-		Set Datum = +$P($P(..NodeHoofding,"\",34),"#",2)
+		Set Datum = ##class(TECH.DateTime).HorologToDate($P($P(..NodeHoofding,"\",34),"#",2))
 	}
 	Quit Datum
 ]]></Implementation>
Index: vhDeploy/JBL/Deploy20110902x1147.cls.xml
===================================================================
diff -u
--- vhDeploy/JBL/Deploy20110902x1147.cls.xml	(revision 0)
+++ vhDeploy/JBL/Deploy20110902x1147.cls.xml	(revision 1974)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.JBL.Deploy20110902x1147">
+<Description>
+</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="Omschrijving">
+<Default>Update waarde Afhalingskost factor</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	&SQL(update APPS_common_KlantKost_impl_data.Factor
+	set Waarde = 4.66
+	where ID = 'Afhaling')
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: APPS/common/KlantKost/impl/data/AfhalingKostItem.cls.xml
===================================================================
diff -u -r1964 -r1974
--- APPS/common/KlantKost/impl/data/AfhalingKostItem.cls.xml	(.../AfhalingKostItem.cls.xml)	(revision 1964)
+++ APPS/common/KlantKost/impl/data/AfhalingKostItem.cls.xml	(.../AfhalingKostItem.cls.xml)	(revision 1974)
@@ -16,13 +16,10 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	/// [ Review CSC -> JBL ] Properties van basisklasse doorgeven via constructor
-	Set ..Datum = Datum
-	Set ..KlantNr = KlantNr
+	Do ##super(Datum,KlantNr,Kost)
 	Set ..KostType = ##class(APPS.common.KlantKost.enu.KostType).Afhaling()
-	Set ..Kost = Kost
-	Set ..AantalAfhalingen = AantalAfhalingen
-	Quit ##super()
+	Set ..AantalAfhalingen = AantalAfhalingen	
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
Index: APPS/common/KlantKost/impl/data/IndividueelKostItem.cls.xml
===================================================================
diff -u -r1964 -r1974
--- APPS/common/KlantKost/impl/data/IndividueelKostItem.cls.xml	(.../IndividueelKostItem.cls.xml)	(revision 1964)
+++ APPS/common/KlantKost/impl/data/IndividueelKostItem.cls.xml	(.../IndividueelKostItem.cls.xml)	(revision 1974)
@@ -24,13 +24,20 @@
 <Type>%Float</Type>
 </Property>
 
+<Property name="Info">
+<Type>%String</Type>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>Datum:%Date,KlantNr:%Integer,Kost:%Integer,Info:%String</FormalSpec>
+<FormalSpec>Datum:%Date,KlantNr:%Integer,Kost:%Integer,Info:%String=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	/// [ Review CSC -> JBL ] Hier properties invullen?
+	Set ..Datum = Datum
+	Set ..KlantNr = KlantNr
+	Set ..Kost = Kost
+	Set ..Info = Info
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -63,6 +70,9 @@
 <Value name="6">
 <Value>KlantNr</Value>
 </Value>
+<Value name="7">
+<Value>Info</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: vhUnitTest/APPS/common/KlantKost/TestAfhalingKosten.cls.xml
===================================================================
diff -u -r1940 -r1974
--- vhUnitTest/APPS/common/KlantKost/TestAfhalingKosten.cls.xml	(.../TestAfhalingKosten.cls.xml)	(revision 1940)
+++ vhUnitTest/APPS/common/KlantKost/TestAfhalingKosten.cls.xml	(.../TestAfhalingKosten.cls.xml)	(revision 1974)
@@ -22,11 +22,11 @@
 	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\AFH #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",1)="\12.10.01\\225398\\1000\AFH #Door onze diensten 1\\\051-30 35 01\\\0.00##12.19555\\\12.10.01\\EUR\\\00\2\\###\M\\\F\F\\\\\\\58725\\OD1/3243\\\\OD1;58725;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",101)="\\\1055#1100#58725,31224\158401 - 06.10.01 - 06.10.01 o/bez LDS/\\\\\\\\\\100\\KF5\\1055#58725,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\\\\\\\\\\\\\\\\\\\\\\\\"
@@ -52,7 +52,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="TestMonsterKost">
+<Method name="TestAfhalingKost">
 <Description>
 Bezoekkosten voor één maand voor testklant1000 berekenen en vgl met maandkost.</Description>
 <Implementation><![CDATA[
@@ -62,6 +62,7 @@
 	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 
@@ -78,7 +79,7 @@
 	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.")
+	Do $$$AssertEquals(TotaalKost,4.66,"Komen overeen voor de afhaling die gedefinieerd is.")
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/common/KlantKost/impl/data/BezoekKostItem.cls.xml
===================================================================
diff -u -r1426 -r1974
--- APPS/common/KlantKost/impl/data/BezoekKostItem.cls.xml	(.../BezoekKostItem.cls.xml)	(revision 1426)
+++ APPS/common/KlantKost/impl/data/BezoekKostItem.cls.xml	(.../BezoekKostItem.cls.xml)	(revision 1974)
@@ -20,12 +20,10 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..Datum = Datum
-	Set ..KlantNr = KlantNr
+	Do ##super(Datum,KlantNr,Kost)
 	Set ..KostType = ##class(APPS.common.KlantKost.enu.KostType).Bezoek()
-	Set ..Kost = Kost
 	Set ..BezoekID = BezoekID
-	Quit ##super()
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
Index: APPS/common/KlantKost/impl/AfhalingKostCalculator.cls.xml
===================================================================
diff -u -r1964 -r1974
--- APPS/common/KlantKost/impl/AfhalingKostCalculator.cls.xml	(.../AfhalingKostCalculator.cls.xml)	(revision 1964)
+++ APPS/common/KlantKost/impl/AfhalingKostCalculator.cls.xml	(.../AfhalingKostCalculator.cls.xml)	(revision 1974)
@@ -6,10 +6,7 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="DatumAantal">
-<Description><![CDATA[
-/ [ Review CSC -> JBL ] Mss een array of integer gebruiken ipv multidimensial?]]></Description>
-<Type>%String</Type>
-<MultiDimensional>1</MultiDimensional>
+<Type>%ArrayOfDataTypes</Type>
 <Private>1</Private>
 </Property>
 
@@ -18,21 +15,20 @@
 <Implementation><![CDATA[
 	Do ..VerwijderKosten(Jaar,Maand)
 	
-	Kill ..DatumAantal
-	
 	Set Datum = ..GeefDatum(Jaar,Maand)
 	Set StartDatum = ##class(TECH.DateTime).EersteDagVanMaand(Datum)
 	Set EindDatum = ##class(TECH.DateTime).LaatsteDagVanMaand(Datum)
 	Set Kost = ..GeefFactor(Datum)
 	
 	Set KlantAPI=##class(DOM.DomeinContext).Instance().GeefKlantAPI()
-	/// [ Review CSC -> JBL ] .%New() staat hier teveel.
-	Set KlantIterator = KlantAPI.GeefKlantenIterator().%New()	
+	Set KlantIterator = KlantAPI.GeefKlantenIterator()
 	While KlantIterator.HasNext()
 	{
 		Set Klant = KlantIterator.Next()
 		Set KlantNr = Klant.GeefNummer()
 		
+		Set ..DatumAantal = ##class(%ArrayOfDataTypes).%New()
+		
 		/// Proformas
 		Set ProformaIt = Klant.GeefProformasIterator(StartDatum, EindDatum)		
 		Do ..BerekenPerDatum(ProformaIt)
@@ -42,23 +38,18 @@
 		Do ..BerekenPerDatum(FactuurIt)	
 			
 		/// Voor deze klant, voor één dag.
-		Set Datum = ""
-		/// [ Review CSC -> JBL ] Als je array gebruikt dan kan hier een iterator komen
-		Set Datum = $O(..DatumAantal(Datum))
-		While Datum '= "" 
-		{					
+		Set DatumIterator = ##class(TECH.ListIterator).%New(..DatumAantal)
+		While DatumIterator.HasNext(){				
+			Set Datum = DatumIterator.Next()
 			Set KostItem = ##class(APPS.common.KlantKost.impl.data.AfhalingKostItem).%New(Datum,KlantNr,Kost,1)
 			Set Status = KostItem.%Save()
 			If ($SYSTEM.Status.IsError(Status)){
 				Set Bericht = "Failed to save "_KostItem.%ClassName(1)_": "	
 				Set Bericht = Bericht_": "_Datum_","_KlantNr
-				Set Bericht = Bericht_$c(13,10)_$$ParseStatus^vhLib(Status)
-				/// [ Review CSC -> JBL ] Er is een SaveFailed exception waar je rechtstreeks de status als extra parameter kan meegeven :-)
-				Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).SaveFailed(),Bericht))
+				Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.SaveFailedException).%New(Bericht,Status))
 			}
-			Set Datum = $O(..DatumAantal(Datum))
 		}
-		Kill ..DatumAantal
+		Do ..DatumAantal.Clear()
 	}
 ]]></Implementation>
 </Method>
@@ -84,8 +75,8 @@
 				
 				/// Afhaal datum gebruiken indien die is ingevuld, anders de leverdatum gebruiken.
 				Set Datum = Bon.GeefAfhaalDatum()
-				Set:(Datum=0) Datum = Bon.GeefLeveringsDatum()
-				Set ..DatumAantal(Datum) = 1
+				Set:(Datum="") Datum = Bon.GeefLeveringsDatum()
+				Do ..DatumAantal.SetAt(Datum,1)
 			}
 		}
 	}
Index: TECH/DateTime.cls.xml
===================================================================
diff -u -r1618 -r1974
--- TECH/DateTime.cls.xml	(.../DateTime.cls.xml)	(revision 1618)
+++ TECH/DateTime.cls.xml	(.../DateTime.cls.xml)	(revision 1974)
@@ -21,6 +21,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="HorologToDate">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Horolog:%String</FormalSpec>
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[	Quit $Piece(Horolog,",")
+]]></Implementation>
+</Method>
+
 <Method name="TextToDate">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Text:%String,Type:%String="",Taal:%String=""</FormalSpec>
Index: APPS/common/KlantKost/impl/BezoekKostCalculator.cls.xml
===================================================================
diff -u -r1618 -r1974
--- APPS/common/KlantKost/impl/BezoekKostCalculator.cls.xml	(.../BezoekKostCalculator.cls.xml)	(revision 1618)
+++ APPS/common/KlantKost/impl/BezoekKostCalculator.cls.xml	(.../BezoekKostCalculator.cls.xml)	(revision 1974)
@@ -30,10 +30,8 @@
 		Set Status = KostItem.%Save()
 		If ($SYSTEM.Status.IsError(Status)){
 			Set Bericht = "Failed to save "_KostItem.%ClassName(1)_": "	
-			Set Bericht = Bericht_rset.Data("KlantNr")_$c(9)_rset.Data("Regio")_$c(9)_rset.Data("DuurTijd")_$c(9)_rset.Data("Kost")
-			Set Bericht = Bericht_$c(13,10)_$$ParseStatus^vhLib(Status)
-			w Bericht,!,!,!
-			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).SaveFailed(),Bericht))
+			Set Bericht = Bericht_": "_rset.Data("Datum")_","_rset.Data("KlantNr")_","_rset.Data("Kost")_","_rset.Data("ID")
+			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.SaveFailedException).%New(Bericht,Status))
 		}
 	}
 ]]></Implementation>
Index: JBL KPI Klant Product Anlayse Kosten.prj.xml
===================================================================
diff -u -r1937 -r1974
--- JBL KPI Klant Product Anlayse Kosten.prj.xml	(.../JBL KPI Klant Product Anlayse Kosten.prj.xml)	(revision 1937)
+++ JBL KPI Klant Product Anlayse Kosten.prj.xml	(.../JBL KPI Klant Product Anlayse Kosten.prj.xml)	(revision 1974)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="JBL KPI Klant Product Anlayse Kosten" LastModified="2011-08-31 16:32:23">
+<Project name="JBL KPI Klant Product Anlayse Kosten" LastModified="2011-09-02 12:04:04">
   <Items>
     <ProjectItem name="APPS.common.KlantKost.KlantKostService" type="CLS"/>
     <ProjectItem name="APPS.common.KlantKost.enu.KostType" type="CLS"/>
@@ -27,6 +27,7 @@
     <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"/>
+    <ProjectItem name="DOM.OV.impl.DataM.DataMBonAbstract" type="CLS"/>
     <ProjectItem name="DOM.OV.impl.DataM.DataMBonInProforma" type="CLS"/>
     <ProjectItem name="DOM.OV.impl.DataM.DataMBonInProformalijnIterator" type="CLS"/>
     <ProjectItem name="DOM.OV.impl.DataM.DataMFactuur" type="CLS"/>
@@ -38,9 +39,11 @@
     <ProjectItem name="Derde.Klant.Klant" type="CLS"/>
     <ProjectItem name="Stat.OmzetKlantProductMaand" type="CLS"/>
     <ProjectItem name="TECH.DateTime" type="CLS"/>
+    <ProjectItem name="TECH.Error.impl.ErrorHandler" type="CLS"/>
     <ProjectItem name="vhDeploy.Deploy201106081058" type="CLS"/>
     <ProjectItem name="vhDeploy.JBL.Deploy20110704x1341" type="CLS"/>
     <ProjectItem name="vhDeploy.JBL.Deploy20110830x1447" type="CLS"/>
+    <ProjectItem name="vhDeploy.JBL.Deploy20110902x1147" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.common.KlantKost.TestAfhalingKosten" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.common.KlantKost.TestBezoekKosten" type="CLS"/>
     <ProjectItem name="vhUnitTest.APPS.common.KlantKost.TestFactor" type="CLS"/>
Index: APPS/common/KlantKost/impl/data/MonsterKostItem.cls.xml
===================================================================
diff -u -r1600 -r1974
--- APPS/common/KlantKost/impl/data/MonsterKostItem.cls.xml	(.../MonsterKostItem.cls.xml)	(revision 1600)
+++ APPS/common/KlantKost/impl/data/MonsterKostItem.cls.xml	(.../MonsterKostItem.cls.xml)	(revision 1974)
@@ -18,12 +18,10 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..Datum = Datum
-	Set ..KlantNr = KlantNr
+	Do ##super(Datum,KlantNr,Kost)
 	Set ..KostType = ##class(APPS.common.KlantKost.enu.KostType).Monster()
-	Set ..Kost = Kost
-	Set ..ProformaNr = ProformaNr
-	Quit ##super()
+	Set ..ProformaNr = ProformaNr	
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
Index: APPS/common/KlantKost/impl/MonsterKostCalculator.cls.xml
===================================================================
diff -u -r1940 -r1974
--- APPS/common/KlantKost/impl/MonsterKostCalculator.cls.xml	(.../MonsterKostCalculator.cls.xml)	(revision 1940)
+++ APPS/common/KlantKost/impl/MonsterKostCalculator.cls.xml	(.../MonsterKostCalculator.cls.xml)	(revision 1974)
@@ -54,9 +54,7 @@
 				If ($SYSTEM.Status.IsError(Status)){
 					Set Bericht = "Failed to save "_KostItem.%ClassName(1)_": "	
 					Set Bericht = Bericht_KlantNr_$c(9)_$c(9)_ProformaNr_$c(9)_TotaalKost
-					Set Bericht = Bericht_$c(13,10)_$$ParseStatus^vhLib(Status)
-					w Bericht,!,!,!
-					Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).SaveFailed(),Bericht))
+					Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.SaveFailedException).%New(Bericht,Status))
 				}			
 			}
 		}