Index: APPS/VKP/impl/LeveringsTermijnFactory.cls.xml
===================================================================
diff -u -r53035 -r53070
--- APPS/VKP/impl/LeveringsTermijnFactory.cls.xml	(.../LeveringsTermijnFactory.cls.xml)	(revision 53035)
+++ APPS/VKP/impl/LeveringsTermijnFactory.cls.xml	(.../LeveringsTermijnFactory.cls.xml)	(revision 53070)
@@ -9,7 +9,7 @@
 <Implementation><![CDATA[
 	#dim LeveringsTermijn As APPS.VKP.LeveringsTermijn = ""
 	
-	If (KlantID = ##class(DOM.VKP.enu.Klant).SFS()) || (PersonalityID = ##class(DOM.common.enu.Personality).SFS()) {
+	If ..IsSFS(KlantID, PersonalityID) {
 		Set LeveringsTermijn =  ##class(APPS.VKP.LeveringsTermijnSFS).%New(RefDate,blVerzendWijze)
 	} Else {
 		Set LeveringsTermijn =  ##class(APPS.VKP.LeveringsTermijn).%New(RefDate,blVerzendWijze)
@@ -18,6 +18,16 @@
 	Quit LeveringsTermijn
 ]]></Implementation>
 </Method>
+
+<Method name="IsSFS">
+<FormalSpec>KlantID:DOM.common.PartijID="",PersonalityID:%String=""</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsSFS As %Boolean = (KlantID = ##class(DOM.VKP.enu.Klant).SFS()) || (PersonalityID = ##class(DOM.common.enu.Personality).SFS())
+	Quit IsSFS
+]]></Implementation>
+</Method>
 </Class>