Index: APPS/VKP/LeveringsTermijnSFS.cls.xml
===================================================================
diff -u -r53065 -r53198
--- APPS/VKP/LeveringsTermijnSFS.cls.xml	(.../LeveringsTermijnSFS.cls.xml)	(revision 53065)
+++ APPS/VKP/LeveringsTermijnSFS.cls.xml	(.../LeveringsTermijnSFS.cls.xml)	(revision 53198)
@@ -18,11 +18,29 @@
 <Private>1</Private>
 </Property>
 
+<Property name="DateTimeApi">
+<Type>TECH.DateTime.DateTimeAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OrderDate">
+<Type>%Date</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>RefDate:%Date="",blVerzendWijze:APPS.VKP.VerzendWijze,SFSKalenderRepository:APPS.EC.impl.LeverdatumBepaler.Data.SFSKalenderRepository</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..SFSKalenderRepository = $$$Inject(SFSKalenderRepository, ##class(APPS.EC.impl.LeverdatumBepaler.Data.SFSKalenderRepository).%New())
+	Set ..DateTimeApi = ##class(TECH.Context).Instance().GeefDateTimeAPI()
+
+	If (RefDate = "") {
+		Set ..OrderDate =  ..DateTimeApi.CurrentDate()
+	} Else {
+		Set ..OrderDate =  ..DateTimeApi.HorologToDate(RefDate)
+	}
+	
 	Quit ##super(RefDate, blVerzendWijze)
 ]]></Implementation>
 </Method>
@@ -35,9 +53,9 @@
 	
 	#dim PickupDate As %Date = LeverDatum
 	#dim UntilPickupDate As %Date = ##class(TECH.DateTime).DatumBereken(LeverDatum, AantalWeken, ..#Weken)
+	#dim OrderDate As %Date = ##class(TECH.DateTime).%New().CurrentDate()
+	#dim SFSKalenderListIterator As TECH.Iterator = ..SFSKalenderRepository.ZoekViaPickupDateAndOrderDate(PickupDate, UntilPickupDate, ..OrderDate)
 	
-	#dim SFSKalenderListIterator As TECH.Iterator = ..SFSKalenderRepository.ZoekViaPickupDate(PickupDate, UntilPickupDate)
-	
 	While SFSKalenderListIterator.HasNext() {
 		#dim SFSKalender As APPS.EC.impl.LeverdatumBepaler.Data.SFSKalender = SFSKalenderListIterator.Next()
 		If $$$Not($LF(LeverDatums,SFSKalender.DeliveryDate)) {
Index: vhUnitTest/APPS/VKP/LeveringsTermijnSFS/GetLeverDatums/Test.cls.xml
===================================================================
diff -u -r53104 -r53198
--- vhUnitTest/APPS/VKP/LeveringsTermijnSFS/GetLeverDatums/Test.cls.xml	(.../Test.cls.xml)	(revision 53104)
+++ vhUnitTest/APPS/VKP/LeveringsTermijnSFS/GetLeverDatums/Test.cls.xml	(.../Test.cls.xml)	(revision 53198)
@@ -5,15 +5,17 @@
 
 <Method name="Test: SFS Leveringstermijn geeft geen leverdatums weer">
 <Implementation><![CDATA[
+	#dim OrderDate As %Date = ##class(TECH.DateTime).TextToDate("30/12/17")
+	
 	Set VerzendWijzeSFS = ##class(APPS.VKP.VerzendWijze).%New("12486","EX")
 	
 	Set SFSKalenderList = ##class(%ListOfObjects).%New()
 	Set SFSKalenderListIterator = ##class(TECH.ListIterator).%New(SFSKalenderList)
 	
 	Set SFSKalenderRepositoryMock = ##class(vhTest.Mock.APPS.EC.impl.LeverdatumBepaler.Data.SFSKalenderRepository).%New()
-	Do SFSKalenderRepositoryMock.VerwachtMethodCall("ZoekViaPickupDate","64649","64719").DanReturn(SFSKalenderListIterator)
+	Do SFSKalenderRepositoryMock.VerwachtMethodCall("ZoekViaPickupDateAndOrderDate","64649","64719", OrderDate).DanReturn(SFSKalenderListIterator)
 	
-	Set LeveringsTermijnSFS = ##class(APPS.VKP.LeveringsTermijnSFS).%New(,VerzendWijzeSFS, SFSKalenderRepositoryMock)
+	Set LeveringsTermijnSFS = ##class(APPS.VKP.LeveringsTermijnSFS).%New(OrderDate,VerzendWijzeSFS, SFSKalenderRepositoryMock)
 	
 	#dim LeverDatum As %Date = ##class(TECH.DateTime).TextToDate("01/01/2018")
 	
@@ -27,6 +29,8 @@
 
 <Method name="Test: SFS Leveringstermijn geeft één leverdatum weer">
 <Implementation><![CDATA[
+	#dim OrderDate As %Date = ##class(TECH.DateTime).TextToDate("30/12/17")
+	
 	Set VerzendWijzeSFS = ##class(APPS.VKP.VerzendWijze).%New("12486","EX")
 	
 	Set SFSKalender = ##class(APPS.EC.impl.LeverdatumBepaler.Data.SFSKalender).%New()
@@ -38,9 +42,9 @@
 	Set SFSKalenderListIterator = ##class(TECH.ListIterator).%New(SFSKalenderList)
 	
 	Set SFSKalenderRepositoryMock = ##class(vhTest.Mock.APPS.EC.impl.LeverdatumBepaler.Data.SFSKalenderRepository).%New()
-	Do SFSKalenderRepositoryMock.VerwachtMethodCall("ZoekViaPickupDate","64649","64719").DanReturn(SFSKalenderListIterator)
+	Do SFSKalenderRepositoryMock.VerwachtMethodCall("ZoekViaPickupDateAndOrderDate","64649","64719", OrderDate).DanReturn(SFSKalenderListIterator)
 	
-	Set LeveringsTermijnSFS = ##class(APPS.VKP.LeveringsTermijnSFS).%New(,VerzendWijzeSFS, SFSKalenderRepositoryMock)
+	Set LeveringsTermijnSFS = ##class(APPS.VKP.LeveringsTermijnSFS).%New(OrderDate,VerzendWijzeSFS, SFSKalenderRepositoryMock)
 	
 	#dim LeverDatum As %Date = ##class(TECH.DateTime).TextToDate("01/01/2018")
 	
@@ -55,6 +59,8 @@
 
 <Method name="Test: SFS Leveringstermijn geeft meerdere leverdatums weer">
 <Implementation><![CDATA[
+	#dim OrderDate As %Date = ##class(TECH.DateTime).TextToDate("30/12/17")
+	
 	Set VerzendWijzeSFS = ##class(APPS.VKP.VerzendWijze).%New("12486","EX")
 	
 	Set SFSKalenderList = ##class(%ListOfObjects).%New()
@@ -71,9 +77,9 @@
 	Set SFSKalenderListIterator = ##class(TECH.ListIterator).%New(SFSKalenderList)
 	
 	Set SFSKalenderRepositoryMock = ##class(vhTest.Mock.APPS.EC.impl.LeverdatumBepaler.Data.SFSKalenderRepository).%New()
-	Do SFSKalenderRepositoryMock.VerwachtMethodCall("ZoekViaPickupDate","64649","64719").DanReturn(SFSKalenderListIterator)
+	Do SFSKalenderRepositoryMock.VerwachtMethodCall("ZoekViaPickupDateAndOrderDate","64649","64719", OrderDate).DanReturn(SFSKalenderListIterator)
 	
-	Set LeveringsTermijnSFS = ##class(APPS.VKP.LeveringsTermijnSFS).%New(,VerzendWijzeSFS, SFSKalenderRepositoryMock)
+	Set LeveringsTermijnSFS = ##class(APPS.VKP.LeveringsTermijnSFS).%New(OrderDate,VerzendWijzeSFS, SFSKalenderRepositoryMock)
 	
 	#dim LeverDatum As %Date = ##class(TECH.DateTime).TextToDate("01/01/2018")