Index: APPS/EC/impl/KlantDataReferentieBepaler.cls.xml
===================================================================
diff -u -r46621 -r46767
--- APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 46621)
+++ APPS/EC/impl/KlantDataReferentieBepaler.cls.xml	(.../KlantDataReferentieBepaler.cls.xml)	(revision 46767)
@@ -28,6 +28,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="PersonalityService">
+<Type>DOM.common.impl.PersonalityService</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>OfferteService:APPS.VKP.OfferteService,DataService:APPS.EC.DataService</FormalSpec>
 <Private>1</Private>
@@ -37,6 +42,7 @@
 <Implementation><![CDATA[
 	set ..OfferteService = $$$Inject(OfferteService,##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService())
 	set ..DataService = $$$Inject(DataService,##class(APPS.EC.Rapporteur.impl.IoCContainer).Instance().Resolve("DataService"))
+	set ..PersonalityService = ##class(DOM.common.impl.PersonalityService).%New()
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -163,7 +169,7 @@
 	#dim Naam As %String = KlantData.Naam
 	Do ..VoegToeIndienNodig(Naam)
 	
-	#dim Nummer As %String = KlantData.ID
+	#dim Nummer As %String = ..PersonalityService.GeefKlantCodeViaKlantId(Personality,KlantData.ID)
 	Do ..VoegToeIndienNodig(Nummer)
 	
 	#dim Email As %String = KlantData.EmailAdres
@@ -184,8 +190,10 @@
 		Do ..VoegToeIndienNodig(Gebruiker)
 	}
 	
-	#dim KlantID As DOM.VKP.VanHoeckeKlantID = ..GeefKlantIDVoorInfoVanOfferte(..Offerte)
+	#dim KlantID As DOM.VKP.KlantID = ..GeefKlantIDVoorInfoVanOfferte(..Offerte)
+	
 	#dim KlantData As DOM.VKP.impl.KlantData = ..DataService.GeefKlantData(Personality.GeefID(),KlantID)
+	
 	#dim Naam As %String = KlantData.Naam
 	Do ..VoegToeIndienNodig(Naam)
 	
@@ -214,7 +222,7 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim KlantID As DOM.VKP.VanHoeckeKlantID = Offerte.GeefKlantID()
+	#dim KlantID As DOM.VKP.KlantID = Offerte.GeefKlantID()
 	If ..OfferteService.HeeftOfferteVanHandel(Offerte) {
 		#dim OfferteVanHandel As APPS.VKP.Offerte = ..OfferteService.GeefOfferteVanHandel(Offerte)
 		Set KlantID = OfferteVanHandel.GeefKlantID()