Index: APPS/VKP/OrderIngaveService/LeverDatumBepaler.cls.xml
===================================================================
diff -u -r53032 -r53033
--- APPS/VKP/OrderIngaveService/LeverDatumBepaler.cls.xml	(.../LeverDatumBepaler.cls.xml)	(revision 53032)
+++ APPS/VKP/OrderIngaveService/LeverDatumBepaler.cls.xml	(.../LeverDatumBepaler.cls.xml)	(revision 53033)
@@ -3,16 +3,43 @@
 <Class name="APPS.VKP.OrderIngaveService.LeverDatumBepaler">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="SFSKalenderRepository">
+<Type>APPS.EC.impl.LeverdatumBepaler.Data.SFSKalenderRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>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())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Bepaal">
 <FormalSpec>Offerte:APPS.VKP.impl.Offerte</FormalSpec>
 <ReturnType>%Date</ReturnType>
 <Implementation><![CDATA[
 	#dim LeverDatum As %Date = ""
 	
 	If (Offerte.GeefKlantID() = ##class(DOM.VKP.enu.Klant).SFS()) {
-		Set LeverDatum = Offerte.LeverDatum
+		
+		If ..SFSKalenderRepository.BestaatViaDeliveryDate(LeverDatum) {
+			#dim SFSKalender As APPS.EC.impl.LeverdatumBepaler.Data.SFSKalender = ""
+			Set SFSKalender = ..SFSKalenderRepository.ZoekViaDeliveryDate(LeverDatum).Next()
+			Set LeverDatum = SFSKalender.PickupDate 
+		} Else {
+			Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New(LeverDatum_" is een ongeldige leverdatum voor SFS! Offerte " _Offerte.GeefID()_" wordt niet verwerkt.")
+			Do ##class(TECH.ExceptionHandler).Throw(Exception)
+		}
+		
 	} Else {
+		
 		Set LeverDatum = Offerte.LeverDatum
+		
 	}
 	
 	Quit LeverDatum