Index: APPS/VKP/VerzendDatumExceptions.cls.xml
===================================================================
diff -u -r53578 -r53586
--- APPS/VKP/VerzendDatumExceptions.cls.xml	(.../VerzendDatumExceptions.cls.xml)	(revision 53578)
+++ APPS/VKP/VerzendDatumExceptions.cls.xml	(.../VerzendDatumExceptions.cls.xml)	(revision 53586)
@@ -59,9 +59,13 @@
 Do ##class(APPS.VKP.VerzendDatumExceptions).VerplaatsKerst()</Description>
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
+	#dim Dag As %Date
+	#dim DagNummerInWeek As %Integer
+
 	Set Dag=$$INTDATE^vhLib.DataTypes("03/01/2017")
+	Set DagNummerInWeek = ..GeefDagNummerInWeek(Dag)
 	Do ..DeleteDag(Dag)
-	Set sc=..AddSuppress(Dag,$LB("DI1","DI2"),2)
+	Set sc=..AddSuppress(Dag,$LB("DI1","DI2"),DagNummerInWeek)
 	If $$$ISERR(sc) Write "error in AddSuppress - Dag:",Dag," -> ",$$ParseStatus^vhLib(sc),!
  /*
 	Set Dag=$$INTDATE^vhLib.DataTypes("24/12/2012")
@@ -76,23 +80,37 @@
 
 <Method name="Verplaats1DagVroeger">
 <Description>
-Do ##class(APPS.VKP.VerzendDatumExceptions).Verplaats1DagVroeger("09/05/2013")
-PAS OP: DE DAG VAN DE WEEK IS HARDCODED, DUS NIET PER SE JUIST!!!</Description>
+Do ##class(APPS.VKP.VerzendDatumExceptions).Verplaats1DagVroeger("09/05/2013")</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Datum:%Date</FormalSpec>
+<FormalSpec>Datum:%String</FormalSpec>
 <Implementation><![CDATA[
+	#dim Dag As %Date
+	#dim DagNummerInWeek As %Integer
+	
 	Set Dag=$$INTDATE^vhLib.DataTypes(Datum)-1
+	Set DagNummerInWeek = ..GeefDagNummerInWeek(Dag)
 	Do ..DeleteDag(Dag)
-	Set sc=..AddSuppress(Dag,$LB("OD","OD1","OD2","OD3","OD4","OD5"),3)
+	Set sc=..AddSuppress(Dag,$LB("OD","OD1","OD2","OD3","OD4","OD5"),DagNummerInWeek)
 	If $$$ISERR(sc) Write "error in AddSuppress - Dag:",Dag," -> ",$$ParseStatus^vhLib(sc),!
 
 	Set Dag=$$INTDATE^vhLib.DataTypes(Datum)
+	Set DagNummerInWeek = ..GeefDagNummerInWeek(Dag)
 	Do ..DeleteDag(Dag)
-	Set sc=..AddMove(Dag,$LB("OD","OD1","OD2","OD3","OD4","OD5"),4,Dag-1,"OD")
+	Set sc=..AddMove(Dag,$LB("OD","OD1","OD2","OD3","OD4","OD5"),DagNummerInWeek,Dag-1,"OD")
 	If $$$ISERR(sc) Write "error in AddMove - Dag:",Dag," -> ",$$ParseStatus^vhLib(sc),!
 ]]></Implementation>
 </Method>
 
+<Method name="GeefDagNummerInWeek">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Datum:%Date</FormalSpec>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[
+	Set DateTimeApi = ##class(TECH.DateTime.impl.DateTimeAPI).%New()
+	Quit DateTimeApi.GeefDagNummerInWeek(Datum)
+]]></Implementation>
+</Method>
+
 <Method name="VerwisselODWoensdagMetDonderdag">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>WoensdagDate:%Date</FormalSpec>
@@ -121,11 +139,13 @@
 	#dim Dag1Nov As %String = "01/11/2018"
 	#dim Dag31okt As %String = "31/10/2018"
 	#dim Dag As %Date
+	#dim DagNummerInWeek As %Integer
 	
 	// "OD woensdag" (31 okt 2018) valt weg, en zal dus automatisch op de volgende OD komen, namelijk maandag. 
 	Set Dag=$$INTDATE^vhLib.DataTypes(Dag31okt)
+	Set DagNummerInWeek = ..GeefDagNummerInWeek(Dag)
 	Do ..DeleteDag(Dag)
-	#dim sc As %Status = ..AddSuppress(Dag,$LB("OD","OD1","OD2","OD3","OD4","OD5"),3)
+	#dim sc As %Status = ..AddSuppress(Dag,$LB("OD","OD1","OD2","OD3","OD4","OD5"),DagNummerInWeek)
 	If $$$ISERR(sc) Write "Dag:",Dag," -> ",$$ParseStatus^vhLib(sc),!
 	
 	// "OD donderdag" (1 nov 2018) komt op "OD woensdag"