Index: vhUnitTest/APPS/VKP/Commissie/impl/CommissieService/Test.cls.xml
===================================================================
diff -u -r35755 -r35777
--- vhUnitTest/APPS/VKP/Commissie/impl/CommissieService/Test.cls.xml	(.../Test.cls.xml)	(revision 35755)
+++ vhUnitTest/APPS/VKP/Commissie/impl/CommissieService/Test.cls.xml	(.../Test.cls.xml)	(revision 35777)
@@ -34,41 +34,31 @@
 <Type>APPS.VKP.Commissie.impl.CommissieService</Type>
 </Property>
 
-<Method name="TestGeefStatus">
+<Method name="%OnNew">
+<FormalSpec>AManager:Tools.Test.Manager</FormalSpec>
+<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	do ..VerwijderCommissieData()
+	 set ..implConsumentCommissie = ##class(vhUnitTest.APPS.VKP.impl.CommissieServiceMock).%New()
 	
-	#dim AanbrengerID As %String = ..GeefAanbrengerID()
-	#dim ConsumentNr As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(..Consument.GeefID())
-	
-	do ..implConsumentCommissie.RegistreerVerkoopfactuur(..#CommissieID1,AanbrengerID)
-	
-	Set Commissie = ##class(DOM.VKP.impl.Commissie).%New()
-	Set Commissie.Verkoopfactuur = ..#CommissieID1
-	
-	Set $piece(^KKL(..Consument.GeefKlantIndexKKL(),Commissie.Verkoopfactuur),"\",10) = 100 // Openstaand bedrag op 100 zetten
-	
-	Do $$$AssertEquals(..implConsumentCommissie.GeefStatus(Commissie),##class(DOM.VKP.Commissie.enu.CommissieStatus).WachtOpBetalingVerkoopfactuur())
-	
-	do ..implConsumentCommissie.RegistreerAankoopfactuur(..#CommissieID1_"||"_AanbrengerID,355388)
-	Kill ^KKL(..Consument.GeefKlantIndexKKL(),Commissie.Verkoopfactuur)
-	
-	Do $$$AssertEquals(..implConsumentCommissie.GeefStatus(Commissie),##class(DOM.VKP.Commissie.enu.CommissieStatus).WachtOpGoedkeuring())
-	
-	#dim VFV As DOM.BKH.impl.VerkoopFactuurVoldaan = ##class(DOM.BKH.impl.VerkoopFactuurVoldaan).OpenId(..#CommissieID1)
-	#dim OrigineleDatum = VFV.Datum
-	Set VFV.Datum = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDate() - 1
-	Do VFV.Save()
-	
-	Do $$$AssertEquals(..implConsumentCommissie.GeefStatus(Commissie),##class(DOM.VKP.Commissie.enu.CommissieStatus).WachtOpEindeBedenktermijn())
-	
-	Set VFV.Datum = OrigineleDatum
-	Do VFV.Save()
-	
-	do ..VerwijderCommissieData()
+	 quit ##super(AManager)
 ]]></Implementation>
 </Method>
 
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	do ##super()
+	do ..VerwijderData()
+	do ..MaakData()
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	do ..VerwijderData() 
+	do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="TestKeurGoedCommissiesEnGeefNieuweDetails">
 <Implementation><![CDATA[
 	do ..VerwijderCommissieData()
@@ -271,14 +261,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="OnBeforeAllTests">
-<Implementation><![CDATA[
-	do ##super()
-	do ..VerwijderData()
-	do ..MaakData()
-]]></Implementation>
-</Method>
-
 <Method name="MaakData">
 <Implementation><![CDATA[
 	set ..Consument = ##class(vhTest.Data.DOM.VKP.VanHoeckeKlant).MaakBelgischeConsument()
@@ -306,9 +288,11 @@
 	set ^KFA("F",..#CommissieID1,"U323296",104)="\\\1009#1037#59219,53454\156720 - 19.02.03 - 1020470 403001926\\\\\\\\\\100\\KF5\\\\\\\\\"
     set ^KFA("F",..#CommissieID1,"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",..#CommissieID1,"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\\"
-	
-	do ..ZetVoldaan(..#CommissieID1,$$INTDATE^vhLib.DataTypes("06.04.03"))
 
+	set ^KFA.Index.FactuurPeriode(..#CommissieID1)="2016.07"
+
+	do ..ZetVoldaan(..#CommissieID1,$$INTDATE^vhLib.DataTypes("01.01.16"))
+
 	set ^KFA("F",..#CommissieID2,0,0)=ConsumentNr_"\C\06.04.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",..#CommissieID2,0,1)="0#105.14#\0#103.04#\\\\\\\\\\\\\\\\\\\\\\\\\"
     set ^KFA("F",..#CommissieID2,0,2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
@@ -325,8 +309,10 @@
     set ^KFA("F",..#CommissieID2,"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",..#CommissieID2,"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\\"
 	
-	do ..ZetVoldaan(..#CommissieID2,$$INTDATE^vhLib.DataTypes("06.04.03"))
+	set ^KFA.Index.FactuurPeriode(..#CommissieID2)="2016.07"
 	
+	do ..ZetVoldaan(..#CommissieID2,$$INTDATE^vhLib.DataTypes("01.01.16"))
+	
 	set ^KFA("F",..#ReedsVerstuurdeCommissieID,0,0)=ConsumentNr_"\C\06.04.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",..#ReedsVerstuurdeCommissieID,0,1)="0#105.14#\0#103.04#\\\\\\\\\\\\\\\\\\\\\\\\\"
     set ^KFA("F",..#ReedsVerstuurdeCommissieID,0,2)="\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"
@@ -343,27 +329,26 @@
     set ^KFA("F",..#ReedsVerstuurdeCommissieID,"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",..#ReedsVerstuurdeCommissieID,"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\\"
 	
-	do ..ZetVoldaan(..#ReedsVerstuurdeCommissieID,$$INTDATE^vhLib.DataTypes("06.04.03"))
+	set ^KFA.Index.FactuurPeriode(..#ReedsVerstuurdeCommissieID)="2016.07"
+	
+	do ..ZetVoldaan(..#ReedsVerstuurdeCommissieID,$$INTDATE^vhLib.DataTypes("01.01.16"))
 ]]></Implementation>
 </Method>
 
-<Method name="OnAfterAllTests">
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	do ..VerwijderData() 
-	quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="VerwijderData">
 <Private>1</Private>
 <Implementation><![CDATA[
 	if $isObject(..Consument) do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(..Consument.GeefID())
 	if $isObject(..Aanbrenger) do ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().VerwijderKlant(..Aanbrenger.GeefID())
 	 
 	kill ^KFA("F",..#CommissieID1)
+	kill ^KFA.Index.FactuurPeriode(..#CommissieID1)
+	
 	kill ^KFA("F",..#CommissieID2)	 
+	kill ^KFA.Index.FactuurPeriode(..#CommissieID2)
+	
 	kill ^KFA("F",..#ReedsVerstuurdeCommissieID)	 
+	kill ^KFA.Index.FactuurPeriode(..#ReedsVerstuurdeCommissieID)
 	
 	do ##class(DOM.BKH.impl.VerkoopFactuurVoldaan).%DeleteId(..#CommissieID2)
 	do ##class(DOM.BKH.impl.VerkoopFactuurVoldaan).%DeleteId(..#CommissieID1)
@@ -393,16 +378,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="%OnNew">
-<FormalSpec>AManager:Tools.Test.Manager</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	 set ..implConsumentCommissie = ##class(vhUnitTest.APPS.VKP.impl.CommissieServiceMock).%New()
-	
-	 quit ##super(AManager)
-]]></Implementation>
-</Method>
-
 <Method name="GeefAanbrengerID">
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[	quit ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(..Aanbrenger.GeefID())