Index: AXdata/AifMessage/MessageRepository.cls.xml
===================================================================
diff -u -r35759 -r35766
--- AXdata/AifMessage/MessageRepository.cls.xml	(.../MessageRepository.cls.xml)	(revision 35759)
+++ AXdata/AifMessage/MessageRepository.cls.xml	(.../MessageRepository.cls.xml)	(revision 35766)
@@ -15,10 +15,17 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BestaatViaCommandAndSubjectId">
+<FormalSpec>Command:%String,SubjectId:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..BestaatViaFilter("SubjectId = ? AND Command = ?",$listbuild(SubjectId,Command))
+]]></Implementation>
+</Method>
+
 <Method name="GeefViaCommandAndSubjectId">
 <FormalSpec>Command:%String,SubjectId:%String</FormalSpec>
 <ReturnType>AXdata.AifMessage.Message</ReturnType>
-<Implementation><![CDATA[	quit ..GeefViaFilter("Command = ? AND SubjectId = ?",$listbuild(Command,SubjectId))
+<Implementation><![CDATA[	quit ..GeefViaFilter("SubjectId = ? AND Command = ?",$listbuild(SubjectId,Command))
 ]]></Implementation>
 </Method>
 </Class>
Index: vhConsistency/Checks/APPS/DynamicsAx/SalesInvoiceCreate.cls.xml
===================================================================
diff -u -r35759 -r35766
--- vhConsistency/Checks/APPS/DynamicsAx/SalesInvoiceCreate.cls.xml	(.../SalesInvoiceCreate.cls.xml)	(revision 35759)
+++ vhConsistency/Checks/APPS/DynamicsAx/SalesInvoiceCreate.cls.xml	(.../SalesInvoiceCreate.cls.xml)	(revision 35766)
@@ -8,22 +8,47 @@
 <Implementation><![CDATA[
 	set MessageRepo = ##class(AXdata.AifMessage.MessageRepository).%New()
 	
-	#dim From As %Integer = $piece(^KBA(2017,"VFNR"),"\",2)
-	#dim To As %Integer = $piece(^KBA(2017,"VFNR"),"\",1)-1
+	#dim From As %Integer = ..GeefLaatstGecontroleerdeFactuur()
+	#dim To As %Integer = ..GeefLaatsteFactuur(2017)
 	
 	#dim FactuurId 
 	for FactuurId = From:1:To {
-		try {
-			do MessageRepo.GeefViaCommandAndSubjectId("SalesInvoice/Create",FactuurId)	
-		} catch {
-			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch("TECH.Exceptions.DataNotFoundException")
-			do ..VoegMeldingToe("Factuur '"_FactuurId_"' niet verstuurd naar AX")
+		if $$$Not(MessageRepo.BestaatViaCommandAndSubjectId("SalesInvoice/Create",FactuurId)) {
+			do ..VoegToeFoutmelding("Factuur '"_FactuurId_"' niet verstuurd naar Dynamics AX")
 		}
 	}	
 	
-	quit $$$OK
+ 	do:..Status=$$$OK ..ZetLaatstGecontroleerdeFactuur(To)
+	
+	quit ..Status
 ]]></Implementation>
 </Method>
+
+<Method name="GeefLaatstGecontroleerdeFactuur">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit $get(^vhConsistency.Checks.APPS.DynamicsAx.SalesInvoiceCreate,..GeefEersteFactuur(2017))
+]]></Implementation>
+</Method>
+
+<Method name="GeefLaatsteFactuur">
+<FormalSpec>Boekjaar:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit $piece(^KBA(2017,"VFNR"),"\",1)-1
+]]></Implementation>
+</Method>
+
+<Method name="GeefEersteFactuur">
+<FormalSpec>Boekjaar:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit $piece(^KBA(2017,"VFNR"),"\",2)
+]]></Implementation>
+</Method>
+
+<Method name="ZetLaatstGecontroleerdeFactuur">
+<FormalSpec>FactuurId:%String</FormalSpec>
+<Implementation><![CDATA[	set ^vhConsistency.Checks.APPS.DynamicsAx.SalesInvoiceCreate = FactuurId
+]]></Implementation>
+</Method>
 </Class>