Index: APPS/CRM/impl/KlantIDValidator.cls.xml
===================================================================
diff -u -r45436 -r46621
--- APPS/CRM/impl/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 45436)
+++ APPS/CRM/impl/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 46621)
@@ -3,6 +3,11 @@
 <Class name="APPS.CRM.impl.KlantIDValidator">
 <Super>DOM.common.VanHoeckeOfAnderePersonalityVisitor,APPS.CRM.KlantIDValidator,APPS.common.impl.Validator</Super>
 
+<Property name="PersonalityService">
+<Type>DOM.common.PersonalityService</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="KlantID">
 <Type>%String</Type>
 <Private>1</Private>
@@ -18,19 +23,29 @@
 <Private>1</Private>
 </Property>
 
+<Method name="%OnNew">
+<FormalSpec>initvalue:%CacheString</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..PersonalityService = ##class(DOM.common.impl.PersonalityService).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="IsGeldig">
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Personality:DOM.common.Personality=""</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Set ..KlantID = KlantID
-	if '$IsObject(Personality) {
-		set Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(##class(TECH.Context.RuntimeContext).Instance().GeefPersonalityID())
-	}
+	Set:$$$Not($IsObject(Personality)) Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(##class(TECH.Context.RuntimeContext).Instance().GeefPersonalityID())
 	
-	set ..PersonalityID = Personality.GeefID()
+	Quit:$$$Not(..PersonalityService.IsGeldigKlantId(Personality, ..KlantID)) $$$False
 	
+	set ..PersonalityID = Personality.GeefID()
 	Do Personality.Accept($this)
-	
 	Quit ..IsGeldigKlantID
 ]]></Implementation>
 </Method>
@@ -55,14 +70,14 @@
 
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..IsGeldigKlantID = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().BestaatKlant(..KlantID)
+<Implementation><![CDATA[	Set ..IsGeldigKlantID = (##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().BestaatKlant(..KlantID))
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkAnderePersonality">
 <FormalSpec>Personality:DOM.common.Personality</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	Set ..IsGeldigKlantID = ##class(TECH.StringUtils).StartsWith(..KlantID,Personality.GeefPrefix())
+<Implementation><![CDATA[	; hier moeten we effectief controleren of de klant bestaat in de klantdata ;
 ]]></Implementation>
 </Method>
 </Class>