Index: DOM/common/impl/PersonalityKlantBepaler.cls.xml
===================================================================
diff -u -r46113 -r46862
--- DOM/common/impl/PersonalityKlantBepaler.cls.xml	(.../PersonalityKlantBepaler.cls.xml)	(revision 46113)
+++ DOM/common/impl/PersonalityKlantBepaler.cls.xml	(.../PersonalityKlantBepaler.cls.xml)	(revision 46862)
@@ -3,36 +3,57 @@
 <Class name="DOM.common.impl.PersonalityKlantBepaler">
 <Super>DOM.common.PersonalityKlantBepaler,DOM.common.VanHoeckeOfAnderePersonalityVisitor,TECH.Mockable</Super>
 
-<Property name="KlantIDVanVHKlant">
+<Property name="PersonalityRepo">
+<Type>DOM.common.impl.PersonalityRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="VanHoeckeKlantId">
 <Type>DOM.common.PartijID</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="KlantIDVanEindklant">
+<Property name="KlantId">
 <Type>%String</Type>
 <Private>1</Private>
 </Property>
 
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..PersonalityRepo = ##class(DOM.common.impl.PersonalityRepository).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefKlantID">
-<FormalSpec>Personality:DOM.common.Personality,KlantIDVanEindklant:%String</FormalSpec>
+<FormalSpec>Personality:DOM.common.Personality,KlantId:%String</FormalSpec>
 <ReturnType>DOM.common.PartijID</ReturnType>
 <Implementation><![CDATA[
-	Set ..KlantIDVanEindklant=KlantIDVanEindklant
+	Set ..KlantId = KlantId
 	Do Personality.Accept($this)
-	Quit ..KlantIDVanVHKlant
+	Quit ..VanHoeckeKlantId
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkVanHoecke">
 <FormalSpec>VanHoeckePersonality:DOM.common.VanHoeckePersonality</FormalSpec>
-<Implementation><![CDATA[	Set ..KlantIDVanVHKlant = ..KlantIDVanEindklant
+<Implementation><![CDATA[	Set ..VanHoeckeKlantId = ..KlantId
 ]]></Implementation>
 </Method>
 
 <Method name="VerwerkAnderePersonality">
 <FormalSpec>Personality:DOM.common.Personality</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	Set ..KlantIDVanVHKlant = Personality.GeefKlantID()
+<Implementation><![CDATA[
+	while $$$Not(Personality.GeefLeverancierData().PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke()) {
+		set Personality = ..PersonalityRepo.GeefViaID(Personality.GeefLeverancierData().PersonalityId)
+	}
+	
+	Set ..VanHoeckeKlantId = Personality.GeefKlantID()
 ]]></Implementation>
 </Method>
 </Class>