Index: vhUnitTest/APPS/common/KlantKost/TestTransportKosten.cls.xml
===================================================================
diff -u -r29059 -r40247
--- vhUnitTest/APPS/common/KlantKost/TestTransportKosten.cls.xml	(.../TestTransportKosten.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/common/KlantKost/TestTransportKosten.cls.xml	(.../TestTransportKosten.cls.xml)	(revision 40247)
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhUnitTest.APPS.common.KlantKost.TestTransportKosten">
-<Description>
-Do ##class(vhUnitTest.Manager).RunTest("","APPS.common.KlantKost.TestTransportKosten")</Description>
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.TestCase</Super>
 
-<Property name="Datum">
-<Type>%Date</Type>
-</Property>
-
 <Parameter name="Type">
 <Type>%String</Type>
 <Default>I</Default>
@@ -26,22 +20,27 @@
 <Default>10</Default>
 </Parameter>
 
+<Property name="Datum">
+<Type>%Date</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="VerkoopAPI">
 <Type>DOM.VKP.VerkoopAPI</Type>
+<Private>1</Private>
 </Property>
 
 <Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set Status = $$$OK
-
+	do ##super()
+	
 	Do ..OverrideVerkoopAPIOmTeBeperkenTotSpecifiekeKlanten()	
 
-	Set DatumHulp = "21.10.01"
+	#dim DatumHulp As %String = "21.10.01"
 	Set ..Datum = ##class(TECH.DateTime).TextToDate(DatumHulp)
 
 	// Testklant - DI1 - 2010.01
-	Set VervoerRef = 1
+	#dim VervoerRef As %Integer = 1
 	Set ^KFA("F",2,0,0)	= 	"1000\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,"U1",1)	= 	"\21.10.01\\\\1000\DI1 #Distributeur 1 - GLS\1;1;5036\#\\\\0.00##3.07714\\\21.10.01\\EUR\\\00\1\N\###\\\\F"
 	Set ^KFA("F",2,"U1",4)	= 	1	
@@ -56,7 +55,7 @@
 	
 	
 	// Testklant - OD2 - 2010.01
-	Set BonID = 2
+	#dim BonID As %String = 2
 	Set VervoerRef = 2
 	Set ^KFA("F",3,0,0) ="1000\F\21.10.01\1\EUR\21.10.01\14.00\13.72\2.88\0.00\0.00\16.88\.28\16.88\\\8#0.00\\\\\\\\\\"
 	Set ^KFA("F",3,"U"_BonID,1)	= 	"\21.10.01\\\\1000\OD2 #Door onze diensten 2\\#\\\\0.00##.0354\\\\\EUR\\\00\1\\###\\\\F"
@@ -73,11 +72,9 @@
 	Set ^TRANSP("D",VervoerRef,"D",BonID,"Q","E") = 5
 	Set ^TRANSP("D",VervoerRef,"D",BonID,"Q","C") = 3
 	
-	
-	
-	#dim BonID As %Integer = 4
+	Set BonID = 4
 	#dim FactuurID As %Integer = 4
-	#dim VervoerRef As %Integer = 4
+	Set VervoerRef = 4
 	
 	#dim TTC As DOM.TRANSP.enu.Transporteur = ##class(DOM.TRANSP.enu.Transporteur).TTC()	
 	#dim GLS As DOM.TRANSP.enu.Transporteur = ##class(DOM.TRANSP.enu.Transporteur).GLSBelgiumDistribution()
@@ -170,40 +167,12 @@
 	Set KlantKostService = ##class(vhUnitTest.APPS.common.KlantKost.impl.KlantKostService).%New()
 	Do KlantKostService.BerekenTransportKlantKosten(..#Jaar,..#Maand)
 	Do KlantKostService.BerekenTransportKlantKosten(2012,1)
-	
-	Quit Status
 ]]></Implementation>
 </Method>
 
-<Method name="OverrideVerkoopAPIOmTeBeperkenTotSpecifiekeKlanten">
-<Private>1</Private>
-<Implementation><![CDATA[
-	Do ##class(DOM.DomeinContext).Instance().PushVerkoopAPIClassName("vhUnitTest.APPS.common.KlantKost.DataMKlantAPI")
-	Set ..VerkoopAPI = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()
-]]></Implementation>
-</Method>
-
-<Method name="SetUpBasisFactuurEnTransport">
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,FactuurID:%String,BonID:%String,VervoerRef:%String,Transporteur:%String,Verzendwijze:DOM.VKP.enu.VerzendWijze</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set ^KFA("F",FactuurID,0,0) =KlantID_"\"
-	Set ^KFA("F",FactuurID,"U"_BonID,1)	= 	"\21.10.01\\\\"_KlantID_"\"_Verzendwijze_"#Distributeurs 2\"_VervoerRef_";"_BonID_"\#\\\\0.00##.0354\\\\\EUR\\\00\1\\###\\\\F"
-	Set ^TRANSP("D",VervoerRef) = 	Transporteur_"\T\2804.8\\\\\58725,31224\1005\58725,31224\58725,31224\58725,31224\\5\\\\"
-	Set ^TRANSP("D",VervoerRef,"D",BonID) = KlantID_"\"	
-	Set $P(^TRANSP("D",VervoerRef),"\",8) = ..Datum_",31224"
-	Set $P(^TRANSP("D",VervoerRef),"\",10) = ..Datum_",31224"
-	Set $P(^TRANSP("D",VervoerRef),"\",11) = ..Datum_",31224"
-	Set $P(^TRANSP("D",VervoerRef),"\",12) = ..Datum_",31224"
-	Set ^KFA1("F",KlantID,-..Datum,FactuurID)=""
-]]></Implementation>
-</Method>
-
 <Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set Status = $$$OK	
-	
+	#dim FactuurID As %Integer 	
 	For FactuurID = 1:1:100 {
 		Kill ^KFA("F",FactuurID)
 	}
@@ -213,7 +182,8 @@
 	#dim OptimaID As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(##class(DOM.VKP.enu.Klant).OptimaPack())
 	#dim NordInoxID As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(##class(DOM.VKP.enu.Klant).NordInox())
 	
-	For Teller=1:1:100{
+	#dim Teller As %Integer 
+	For Teller=1:1:100 {
 		Kill ^TRANSP("D",Teller)
 		Kill ^KUL(1000,"G",Teller)
 		Kill ^KUL(HaefeleID,"G",Teller)
@@ -234,10 +204,34 @@
 	
 	&SQL(Delete APPS_common_KlantKost_impl_data.GLSTransportKostItem where DatePart('yy',Datum) = 2001)
 	
-	Quit Status
+	do ##super()
 ]]></Implementation>
 </Method>
 
+<Method name="OverrideVerkoopAPIOmTeBeperkenTotSpecifiekeKlanten">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Do ##class(DOM.DomeinContext).Instance().PushVerkoopAPIClassName("vhUnitTest.APPS.common.KlantKost.DataMKlantAPI")
+	Set ..VerkoopAPI = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()
+]]></Implementation>
+</Method>
+
+<Method name="SetUpBasisFactuurEnTransport">
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,FactuurID:%String,BonID:%String,VervoerRef:%String,Transporteur:%String,Verzendwijze:DOM.VKP.enu.VerzendWijze</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ^KFA("F",FactuurID,0,0) =KlantID_"\"
+	Set ^KFA("F",FactuurID,"U"_BonID,1)	= 	"\21.10.01\\\\"_KlantID_"\"_Verzendwijze_"#Distributeurs 2\"_VervoerRef_";"_BonID_"\#\\\\0.00##.0354\\\\\EUR\\\00\1\\###\\\\F"
+	Set ^TRANSP("D",VervoerRef) = 	Transporteur_"\T\2804.8\\\\\58725,31224\1005\58725,31224\58725,31224\58725,31224\\5\\\\"
+	Set ^TRANSP("D",VervoerRef,"D",BonID) = KlantID_"\"	
+	Set $P(^TRANSP("D",VervoerRef),"\",8) = ..Datum_",31224"
+	Set $P(^TRANSP("D",VervoerRef),"\",10) = ..Datum_",31224"
+	Set $P(^TRANSP("D",VervoerRef),"\",11) = ..Datum_",31224"
+	Set $P(^TRANSP("D",VervoerRef),"\",12) = ..Datum_",31224"
+	Set ^KFA1("F",KlantID,-..Datum,FactuurID)=""
+]]></Implementation>
+</Method>
+
 <Method name="TestLosTransportKost">
 <Implementation><![CDATA[
 	Set Jaar = ..#Jaar