Index: vhUnitTest/APPS/common/KlantKost/TestPortKosten.cls.xml
===================================================================
diff -u -r29059 -r40214
--- vhUnitTest/APPS/common/KlantKost/TestPortKosten.cls.xml	(.../TestPortKosten.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/common/KlantKost/TestPortKosten.cls.xml	(.../TestPortKosten.cls.xml)	(revision 40214)
@@ -7,19 +7,20 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="Datum">
-<Type>%Date</Type>
-</Property>
-
 <Parameter name="Type">
 <Type>%String</Type>
 <Default>I</Default>
 </Parameter>
 
+<Property name="Datum">
+<Type>%Date</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeAllTests">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set Status = $$$OK
+	Do ##super()
 	
 	Do ##class(DOM.DomeinContext).Instance().PushVerkoopAPIClassName("vhUnitTest.APPS.common.KlantKost.DataMKlantAPI")
 	
@@ -32,11 +33,10 @@
 	Set ^KFAP("F",1,"U358178",102)="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",103)="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"
+	#dim DatumHulp As %String = "13.10.01"
 	Set ..Datum = ##class(TECH.DateTime).TextToDate(DatumHulp)
 	Set ^KFAP1("F",1000,-..Datum,1)=""
 	
-	
 	Set ^KFA("F",2,0,0)	= 	"15390\F\21.10.01\1\EUR\21.10.01\35.61\35.61\7.48\0.00\0.00\43.09\0\43.09\\1\8#0.00\\\\\\\\\\"
 	Set ^KFA("F",2,"U342756",1)	= 	"\21.10.01\\\\15390\TNC #TNT via DI3 Zaltbommel\\#\gamwelman@kpnmail.nl\\\0.00##1.29228\1\\18.05.11\\EUR\005004\\30\1\N\###\\\\F\\\\\\\\\\\\\\\43197\\58725,31224\\\1112\58725,31224"
 	Set ^KFA("F",2,"U342756",4)	= 	3
@@ -49,29 +49,27 @@
 	Set ^KFA("F",3,"U351024",101)	= 	"\\\1093#1158#58725,31224\167417 - 09.06.11 - 09.06.11 u/tel dsm/\\\\\\\\\\100\\KF5\\1093#58725,31224#167417\\\#\\\\"
 	Set ^KFA("F",3,"U351024",102)	= 	"703000 \284909\20\\\0.70\0#\8\14.00\14.00\703000 \L\\\200\14.00\KF6\\\\E1\EUR\\\58725\\\\58725\\\14\5.868\14\\\\\\\1\1\\\\0\\"
 	
+	#dim FactuurID As %Integer
 	For FactuurID = 2:1:3 {
 		Set DatumHulp = "21.10.01"
 		Set ..Datum = ##class(TECH.DateTime).TextToDate(DatumHulp)
 		Set ^KFA1("F",1000,-..Datum,FactuurID)=""
 	}
-	
-	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)
 	
+	#dim FactuurID As %Integer
 	For FactuurID = 2:1:3 {
 		Kill ^KFA("F",FactuurID)
 		Kill ^KFA1("F",1000,-..Datum,FactuurID)
 	}
-	Quit Status
+	
+	Do ##super()
 ]]></Implementation>
 </Method>
 
@@ -81,9 +79,9 @@
 <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).Post()
+	#dim Jaar As %Integer = 2001
+	#dim Maand As %Integer = 10
+	#dim KostType As APPS.common.KlantKost.enu.KostType = ##class(APPS.common.KlantKost.enu.KostType).Post()
 	
 	Do KlantKostService.BerekenTransportKlantKosten(Jaar,Maand)