Index: APPS/CRM/impl/KlantIDValidator.cls.xml
===================================================================
diff -u -r46722 -r46826
--- APPS/CRM/impl/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 46722)
+++ APPS/CRM/impl/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 46826)
@@ -8,6 +8,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="VerkoopApi">
+<Type>DOM.VKP.VerkoopAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="HandelKlantDataRepository">
 <Type>DOM.VKP.impl.HandelKlantDataRepository</Type>
 <Private>1</Private>
@@ -29,21 +34,21 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>initvalue:%CacheString</FormalSpec>
+<FormalSpec>VerkoopApi:DOM.VKP.VerkoopAPI,HandelKlantDataRepo:DOM.VKP.impl.HandelKlantDataRepository</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
+	Set ..VerkoopApi = $$$Inject(VerkoopApi,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
+	Set ..HandelKlantDataRepository = $$$Inject(HandelKlantDataRepo,##class(DOM.VKP.impl.HandelKlantDataRepository).%New())
 	Set ..PersonalityService = ##class(DOM.common.impl.PersonalityService).%New()
-	Set ..HandelKlantDataRepository = ##class(DOM.VKP.impl.HandelKlantDataRepository).%New() 
-	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="IsGeldig">
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Personality:DOM.common.Personality</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.KlantID,Personality:DOM.common.Personality</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Set ..KlantID = KlantID
@@ -57,7 +62,7 @@
 </Method>
 
 <Method name="Valideer">
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Personality:DOM.common.Personality</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.KlantID,Personality:DOM.common.Personality</FormalSpec>
 <Implementation><![CDATA[
 	If '..IsGeldig(KlantID , Personality ) { 
 		do ..ThrowError() 
@@ -76,7 +81,7 @@
 
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..IsGeldigKlantID = (##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().BestaatKlant(..KlantID))
+<Implementation><![CDATA[	Set ..IsGeldigKlantID = (..VerkoopApi.BestaatKlant(..KlantID))
 ]]></Implementation>
 </Method>