Index: vhUnitTest/DOM/VKP/Factuur/Test.cls.xml
===================================================================
diff -u -r35795 -r40296
--- vhUnitTest/DOM/VKP/Factuur/Test.cls.xml	(.../Test.cls.xml)	(revision 35795)
+++ vhUnitTest/DOM/VKP/Factuur/Test.cls.xml	(.../Test.cls.xml)	(revision 40296)
@@ -15,6 +15,89 @@
 <Private>1</Private>
 </Property>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	#define Creditnota "C"
+	
+	set ..Consument = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeConsument()
+		
+	set ^KFA("F",320000,0,0)=..GeefConsumentNr()_"\"_$$$Creditnota_"\06.03.03\1\EUR\06.03.03\105.14\103.04\0.00\0.00\0.00\105.14\2.1\105.14\\1\0#0.00\\\\\\\\\\"
+    set ^KFA("F",320000,0,1)="0#105.14#\0#103.04#\\\\\\\\\\\\\\\\\\\\\\\\\"
+    set ^KFA("F",320000,0,2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+    set ^KFA("F",320000,0,3)="\\\\\\\\\\\\\\\\\\\\##\8.412\\08#105.14\\\\\\\"
+	set ^KFA("F",320000,"U323296",0)="\"
+    set ^KFA("F",320000,"U323296",1)="\05.03.03\\\\"_..GeefConsumentNr()_"\OD2 #Door onze diensten 2\\\\\\0.00##8.412\1\\\\EUR\\\30\1\\###\\\\F\\\\\\\\\\\\\\\\\\\\\\\\\\\1000\20"
+    set ^KFA("F",320000,"U323296",2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+    set ^KFA("F",320000,"U323296",3)="1\BRUYNZEEL\KEUKENS EN KASTENFABRIEK\B.V.\DREBBELSTRAAT 7\NL-4622-RC\BERGEN OP ZOOM\1147\N\\\\\\\\\\.\\\\\\\\\\\\\\\\\"
+    set ^KFA("F",320000,"U323296",4)=4
+    set ^KFA("F",320000,"U323296",101)="\\\1009#1037#59219,53454\156719 - 19.02.03 - 1020469 403001925\\\\\\\\\\100\\KF5\\\\\\\\\"
+    set ^KFA("F",320000,"U323296",102)="703100 \74183\1\\\51.87\21#0\0\51.87\51.87\703100 \L\25.10.02 RAAMORDER\\200\51.87\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\65.7\41.361357\51.87\\"
+	set ^KFA("F",320000,"U323296",103)="703100 \74250\1\\\53.27\21#0\0\53.27\53.27\703100 \L\12.12.02 RAAMORDER\\300\53.27\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\67.45\42.479295\53.27\\"
+	set ^KFA("F",320000,"U323296",104)="\\\1009#1037#59219,53454\156720 - 19.02.03 - 1020470 403001926\\\\\\\\\\100\\KF5\\\\\\\\\"
+    set ^KFA("F",320000,"U323296",105)="703100 \74100\1\\\51.87\21#0\0\51.87\51.87\703100 \L\25.10.02 RAAMORDER\\200\51.87\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\65.7\41.361357\51.87\\"
+	set ^KFA("F",320000,"U323296",106)="703100 \74200\1\\\53.27\21#0\0\53.27\53.27\703100 \L\12.12.02 RAAMORDER\\300\53.27\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\67.45\42.479295\53.27\\"
+	
+	set ^KKL(..Consument.GeefKlantIndexKKL(),320000)="F\06.03.03\06.03.03\105.14\105.14\4.46\\\\105.14"
+	set ^KFA.Index.FactuurPeriode(320000)=2003.03
+	set ^KVE(2003.03,320000)=""
+
+	set ^KFA("F",320001,0,0)=..GeefConsumentNr()_"\F\06.03.03\1\EUR\06.03.03\105.14\103.04\0.00\0.00\0.00\105.14\2.1\105.14\\\0#0.00\\\\\\\\\\"
+    set ^KFA("F",320001,0,1)="0#105.14#\0#103.04#\\\\\\\\\\\\\\\\\\\\\\\\\"
+    set ^KFA("F",320001,0,2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+    set ^KFA("F",320001,0,3)="\\\\\\\\\\\\\\\\\\\\##\8.412\\08#105.14\\\\\\\"
+    set $piece(^KFA("F",320001,0,3),"\",27)=1 ; Bruto Prijzen
+	set ^KFA("F",320001,"U323296",0)="\"
+    set ^KFA("F",320001,"U323296",1)="\05.03.03\\\\"_..GeefConsumentNr()_"\OD2 #Door onze diensten 2\\\\\\0.00##8.412\1\\\\EUR\\\30\1\\###\\\\F\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+    set ^KFA("F",320001,"U323296",2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+    set ^KFA("F",320001,"U323296",3)="1\BRUYNZEEL\KEUKENS EN KASTENFABRIEK\B.V.\DREBBELSTRAAT 7\NL-4622-RC\BERGEN OP ZOOM\1147\N\\\\\\\\\\.\\\\\\\\\\\\\\\\\"
+    set ^KFA("F",320001,"U323296",4)=4
+    set ^KFA("F",320001,"U323296",101)="\\\1009#1037#59219,53454\156719 - 19.02.03 - 1020469 403001925\\\\\\\\\\100\\KF5\\\\\\\\\"
+    set ^KFA("F",320001,"U323296",102)="703100 \74183\1\\\51.87\21#0\0\51.87\51.87\703100 \L\25.10.02 RAAMORDER\\200\51.87\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\65.7\41.361357\51.87\\"
+	set ^KFA("F",320001,"U323296",103)="703100 \74250\1\\\53.27\21#0\0\53.27\53.27\703100 \L\12.12.02 RAAMORDER\\300\53.27\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\67.45\42.479295\53.27\\"
+	set ^KFA("F",320001,"U323296",104)="\\\1009#1037#59219,53454\156720 - 19.02.03 - 1020470 403001926\\\\\\\\\\100\\KF5\\\\\\\\\"
+    set ^KFA("F",320001,"U323296",105)="703100 \74100\1\\\51.87\21#0\0\51.87\51.87\703100 \L\25.10.02 RAAMORDER\\200\51.87\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\65.7\41.361357\51.87\\"
+	set ^KFA("F",320001,"U323296",106)="703100 \74200\1\\\53.27\21#0\0\53.27\53.27\703100 \L\12.12.02 RAAMORDER\\300\53.27\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\67.45\42.479295\53.27\\"
+
+	set ^KKL(..Consument.GeefKlantIndexKKL(),320001)="F\06.03.03\06.03.03\105.14\105.14\4.46"
+	set ^KFA.Index.FactuurPeriode(320001)=2003.03
+	set ^KVE(2003.03,320001)=""
+
+	Set ..DocumentReferenties = ##class(DOM.VKP.DocumentReferenties).%New()
+	Set ..DocumentReferenties.OrderReferentie = "UTOrderReferentie"
+	Set ..DocumentReferenties.KlantOrderNummer = "UTKlantOrderNummer"
+	Set ..DocumentReferenties.CommissieReferentie = "UTCommissieReferentie"
+	Do ..DocumentReferenties.Save()
+	
+	set ^KFA("F",320002,0,0)=..GeefConsumentNr()_"\F\06.03.03\1\EUR\06.03.03\105.14\103.04\0.00\0.00\0.00\105.14\2.1\105.14\\1\0#0.00\\\\\\\\\\"
+    set ^KFA("F",320002,0,1)="0#105.14#\0#103.04#\\\\\\\\\\\\\\\\\\\\\\\\\"
+    set ^KFA("F",320002,0,2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+    set ^KFA("F",320002,0,3)="\\\\\\\\\\\\\\\\\\\\##\8.412\\08#105.14\\\\\\\"
+	set ^KFA("F",320002,"U323296",0)="\"
+    set ^KFA("F",320002,"U323296",1)="\05.03.03\\\\"_..GeefConsumentNr()_"\OD2 #Door onze diensten 2\\\\\\0.00##8.412\1\\\\EUR\\\30\1\\###\\\\F\\\\\\\\\\\\\\\\\\\\\\\\\\\1000`1001\7.5`12.5\"_..DocumentReferenties.GeefID()
+    set ^KFA("F",320002,"U323296",2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
+    set ^KFA("F",320002,"U323296",3)="1\BRUYNZEEL\KEUKENS EN KASTENFABRIEK\B.V.\DREBBELSTRAAT 7\NL-4622-RC\BERGEN OP ZOOM\1147\N\\\\\\\\\\.\\\\\\\\\\\\\\\\\"
+    set ^KFA("F",320002,"U323296",4)=4
+    set ^KFA("F",320002,"U323296",101)="\\\1009#1037#59219,53454\156719 - 19.02.03 - 1020469 403001925\\\\\\\\\\100\\KF5\\\\\\\\\"
+    set ^KFA("F",320002,"U323296",102)="703100 \74183\1\\\51.87\21#0\0\51.87\51.87\703100 \L\25.10.02 RAAMORDER\\200\51.87\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\65.7\41.361357\51.87\\"
+	set ^KFA("F",320002,"U323296",103)="703100 \74250\1\\\53.27\21#0\0\53.27\53.27\703100 \L\12.12.02 RAAMORDER\\300\53.27\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\67.45\42.479295\53.27\\"
+	set ^KFA("F",320002,"U323296",104)="\\\1009#1037#59219,53454\156720 - 19.02.03 - 1020470 403001926\\\\\\\\\\100\\KF5\\\\\\\\\"
+    set ^KFA("F",320002,"U323296",105)="703100 \74100\1\\\51.87\21#0\0\51.87\51.87\703100 \L\25.10.02 RAAMORDER\\200\51.87\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\65.7\41.361357\51.87\\"
+	set ^KFA("F",320002,"U323296",106)="703100 \74200\1\\\53.27\21#0\0\53.27\53.27\703100 \L\12.12.02 RAAMORDER\\300\53.27\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\67.45\42.479295\53.27\\"
+
+	set ^KKL(..Consument.GeefKlantIndexKKL(),320002)="F\06.03.03\06.03.03\105.14\105.14\4.46"
+	set ^KFA.Index.FactuurPeriode(320002)=2003.03
+	set ^KVE(2003.03,320002)=""
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	 do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(..Consument.GeefID())
+	 Do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestFactuurBTWRegime">
 <Implementation><![CDATA[
 	#dim OrderAPI As DOM.VKP.OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
@@ -193,92 +276,6 @@
 <Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(..Consument.GeefID())
 ]]></Implementation>
 </Method>
-
-<Method name="OnBeforeAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	#define Creditnota "C"
-	
-	set ..Consument = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeConsument()
-		
-	set ^KFA("F",320000,0,0)=..GeefConsumentNr()_"\"_$$$Creditnota_"\06.03.03\1\EUR\06.03.03\105.14\103.04\0.00\0.00\0.00\105.14\2.1\105.14\\1\0#0.00\\\\\\\\\\"
-    set ^KFA("F",320000,0,1)="0#105.14#\0#103.04#\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set ^KFA("F",320000,0,2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set ^KFA("F",320000,0,3)="\\\\\\\\\\\\\\\\\\\\##\8.412\\08#105.14\\\\\\\"
-	set ^KFA("F",320000,"U323296",0)="\"
-    set ^KFA("F",320000,"U323296",1)="\05.03.03\\\\"_..GeefConsumentNr()_"\OD2 #Door onze diensten 2\\\\\\0.00##8.412\1\\\\EUR\\\30\1\\###\\\\F\\\\\\\\\\\\\\\\\\\\\\\\\\\1000\20"
-    set ^KFA("F",320000,"U323296",2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set ^KFA("F",320000,"U323296",3)="1\BRUYNZEEL\KEUKENS EN KASTENFABRIEK\B.V.\DREBBELSTRAAT 7\NL-4622-RC\BERGEN OP ZOOM\1147\N\\\\\\\\\\.\\\\\\\\\\\\\\\\\"
-    set ^KFA("F",320000,"U323296",4)=4
-    set ^KFA("F",320000,"U323296",101)="\\\1009#1037#59219,53454\156719 - 19.02.03 - 1020469 403001925\\\\\\\\\\100\\KF5\\\\\\\\\"
-    set ^KFA("F",320000,"U323296",102)="703100 \74183\1\\\51.87\21#0\0\51.87\51.87\703100 \L\25.10.02 RAAMORDER\\200\51.87\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\65.7\41.361357\51.87\\"
-	set ^KFA("F",320000,"U323296",103)="703100 \74250\1\\\53.27\21#0\0\53.27\53.27\703100 \L\12.12.02 RAAMORDER\\300\53.27\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\67.45\42.479295\53.27\\"
-	set ^KFA("F",320000,"U323296",104)="\\\1009#1037#59219,53454\156720 - 19.02.03 - 1020470 403001926\\\\\\\\\\100\\KF5\\\\\\\\\"
-    set ^KFA("F",320000,"U323296",105)="703100 \74100\1\\\51.87\21#0\0\51.87\51.87\703100 \L\25.10.02 RAAMORDER\\200\51.87\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\65.7\41.361357\51.87\\"
-	set ^KFA("F",320000,"U323296",106)="703100 \74200\1\\\53.27\21#0\0\53.27\53.27\703100 \L\12.12.02 RAAMORDER\\300\53.27\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\67.45\42.479295\53.27\\"
-	
-	set ^KKL(..Consument.GeefKlantIndexKKL(),320000)="F\06.03.03\06.03.03\105.14\105.14\4.46\\\\105.14"
-	set ^KFA.Index.FactuurPeriode(320000)=2003.03
-	set ^KVE(2003.03,320000)=""
-
-	set ^KFA("F",320001,0,0)=..GeefConsumentNr()_"\F\06.03.03\1\EUR\06.03.03\105.14\103.04\0.00\0.00\0.00\105.14\2.1\105.14\\\0#0.00\\\\\\\\\\"
-    set ^KFA("F",320001,0,1)="0#105.14#\0#103.04#\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set ^KFA("F",320001,0,2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set ^KFA("F",320001,0,3)="\\\\\\\\\\\\\\\\\\\\##\8.412\\08#105.14\\\\\\\"
-    set $piece(^KFA("F",320001,0,3),"\",27)=1 ; Bruto Prijzen
-	set ^KFA("F",320001,"U323296",0)="\"
-    set ^KFA("F",320001,"U323296",1)="\05.03.03\\\\"_..GeefConsumentNr()_"\OD2 #Door onze diensten 2\\\\\\0.00##8.412\1\\\\EUR\\\30\1\\###\\\\F\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set ^KFA("F",320001,"U323296",2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set ^KFA("F",320001,"U323296",3)="1\BRUYNZEEL\KEUKENS EN KASTENFABRIEK\B.V.\DREBBELSTRAAT 7\NL-4622-RC\BERGEN OP ZOOM\1147\N\\\\\\\\\\.\\\\\\\\\\\\\\\\\"
-    set ^KFA("F",320001,"U323296",4)=4
-    set ^KFA("F",320001,"U323296",101)="\\\1009#1037#59219,53454\156719 - 19.02.03 - 1020469 403001925\\\\\\\\\\100\\KF5\\\\\\\\\"
-    set ^KFA("F",320001,"U323296",102)="703100 \74183\1\\\51.87\21#0\0\51.87\51.87\703100 \L\25.10.02 RAAMORDER\\200\51.87\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\65.7\41.361357\51.87\\"
-	set ^KFA("F",320001,"U323296",103)="703100 \74250\1\\\53.27\21#0\0\53.27\53.27\703100 \L\12.12.02 RAAMORDER\\300\53.27\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\67.45\42.479295\53.27\\"
-	set ^KFA("F",320001,"U323296",104)="\\\1009#1037#59219,53454\156720 - 19.02.03 - 1020470 403001926\\\\\\\\\\100\\KF5\\\\\\\\\"
-    set ^KFA("F",320001,"U323296",105)="703100 \74100\1\\\51.87\21#0\0\51.87\51.87\703100 \L\25.10.02 RAAMORDER\\200\51.87\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\65.7\41.361357\51.87\\"
-	set ^KFA("F",320001,"U323296",106)="703100 \74200\1\\\53.27\21#0\0\53.27\53.27\703100 \L\12.12.02 RAAMORDER\\300\53.27\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\67.45\42.479295\53.27\\"
-
-	set ^KKL(..Consument.GeefKlantIndexKKL(),320001)="F\06.03.03\06.03.03\105.14\105.14\4.46"
-	set ^KFA.Index.FactuurPeriode(320001)=2003.03
-	set ^KVE(2003.03,320001)=""
-
-	Set ..DocumentReferenties = ##class(DOM.VKP.DocumentReferenties).%New()
-	Set ..DocumentReferenties.OrderReferentie = "UTOrderReferentie"
-	Set ..DocumentReferenties.KlantOrderNummer = "UTKlantOrderNummer"
-	Set ..DocumentReferenties.CommissieReferentie = "UTCommissieReferentie"
-	Do ..DocumentReferenties.Save()
-	
-	set ^KFA("F",320002,0,0)=..GeefConsumentNr()_"\F\06.03.03\1\EUR\06.03.03\105.14\103.04\0.00\0.00\0.00\105.14\2.1\105.14\\1\0#0.00\\\\\\\\\\"
-    set ^KFA("F",320002,0,1)="0#105.14#\0#103.04#\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set ^KFA("F",320002,0,2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set ^KFA("F",320002,0,3)="\\\\\\\\\\\\\\\\\\\\##\8.412\\08#105.14\\\\\\\"
-	set ^KFA("F",320002,"U323296",0)="\"
-    set ^KFA("F",320002,"U323296",1)="\05.03.03\\\\"_..GeefConsumentNr()_"\OD2 #Door onze diensten 2\\\\\\0.00##8.412\1\\\\EUR\\\30\1\\###\\\\F\\\\\\\\\\\\\\\\\\\\\\\\\\\1000`1001\7.5`12.5\"_..DocumentReferenties.GeefID()
-    set ^KFA("F",320002,"U323296",2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
-    set ^KFA("F",320002,"U323296",3)="1\BRUYNZEEL\KEUKENS EN KASTENFABRIEK\B.V.\DREBBELSTRAAT 7\NL-4622-RC\BERGEN OP ZOOM\1147\N\\\\\\\\\\.\\\\\\\\\\\\\\\\\"
-    set ^KFA("F",320002,"U323296",4)=4
-    set ^KFA("F",320002,"U323296",101)="\\\1009#1037#59219,53454\156719 - 19.02.03 - 1020469 403001925\\\\\\\\\\100\\KF5\\\\\\\\\"
-    set ^KFA("F",320002,"U323296",102)="703100 \74183\1\\\51.87\21#0\0\51.87\51.87\703100 \L\25.10.02 RAAMORDER\\200\51.87\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\65.7\41.361357\51.87\\"
-	set ^KFA("F",320002,"U323296",103)="703100 \74250\1\\\53.27\21#0\0\53.27\53.27\703100 \L\12.12.02 RAAMORDER\\300\53.27\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\67.45\42.479295\53.27\\"
-	set ^KFA("F",320002,"U323296",104)="\\\1009#1037#59219,53454\156720 - 19.02.03 - 1020470 403001926\\\\\\\\\\100\\KF5\\\\\\\\\"
-    set ^KFA("F",320002,"U323296",105)="703100 \74100\1\\\51.87\21#0\0\51.87\51.87\703100 \L\25.10.02 RAAMORDER\\200\51.87\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\65.7\41.361357\51.87\\"
-	set ^KFA("F",320002,"U323296",106)="703100 \74200\1\\\53.27\21#0\0\53.27\53.27\703100 \L\12.12.02 RAAMORDER\\300\53.27\KF6\\\\E1\EUR\\\03/10\=\\KOM\\\\67.45\42.479295\53.27\\"
-
-	set ^KKL(..Consument.GeefKlantIndexKKL(),320002)="F\06.03.03\06.03.03\105.14\105.14\4.46"
-	set ^KFA.Index.FactuurPeriode(320002)=2003.03
-	set ^KVE(2003.03,320002)=""
-	
-    Quit $$$OK
-]]></Implementation>
-</Method>
-
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	 do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(..Consument.GeefID())
-	 Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>