Index: APPS/VKP/Offerte/impl/KlantBestellingAanLeverancierOfferteKoppelaar.cls.xml
===================================================================
diff -u -r53672 -r53675
--- APPS/VKP/Offerte/impl/KlantBestellingAanLeverancierOfferteKoppelaar.cls.xml	(.../KlantBestellingAanLeverancierOfferteKoppelaar.cls.xml)	(revision 53672)
+++ APPS/VKP/Offerte/impl/KlantBestellingAanLeverancierOfferteKoppelaar.cls.xml	(.../KlantBestellingAanLeverancierOfferteKoppelaar.cls.xml)	(revision 53675)
@@ -3,6 +3,22 @@
 <Class name="APPS.VKP.Offerte.impl.KlantBestellingAanLeverancierOfferteKoppelaar">
 <Super>TECH.RegisteredObject,APPS.VKP.Offerte.KlantBestellingAanLeverancierOfferteKoppelaar</Super>
 
+<Property name="PersonalityService">
+<Type>DOM.common.PersonalityService</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<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="KoppelAanOfferteVanHandel">
 <FormalSpec>LeverancierOfferte:APPS.VKP.Offerte,KlantBestelling:APPS.VKP.Offerte</FormalSpec>
 <Implementation><![CDATA[
@@ -21,7 +37,7 @@
 			Do LeverancierOfferte.ZetWensLeverDatum(KlantBestelling.GeefWensLeverDatum())
 			Do LeverancierOfferte.ZetVerzendingItem(KlantBestelling.GeefVerzendingItem())
 		
-			If ..IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(KlantBestelling) {
+			If ..PersonalityService.IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel(KlantBestelling.GeefPersonalityID()) {
 				Do LeverancierOfferte.ZetLeverAdres(KlantBestelling.GeefLeverAdres())
 			}
 		}
@@ -34,17 +50,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IsRechtstreekseLeveringDoorVanHoeckeAanKlantVanHandel">
-<FormalSpec>KlantBestelling:APPS.VKP.Offerte</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	Quit:(KlantBestelling.GeefPersonalityID() = ##class(DOM.common.enu.Personality).Hein()) $$$True
-	Quit:(KlantBestelling.GeefPersonalityID() = ##class(DOM.common.enu.Personality).Seefelder()) $$$True
-	Quit:(KlantBestelling.GeefPersonalityID() = ##class(DOM.common.enu.Personality).HaefeleNL()) $$$True
-	Quit $$$False
-]]></Implementation>
-</Method>
-
 <Method name="GeefOfferteVanHandel">
 <FormalSpec>LeverancierOfferte:APPS.VKP.Offerte</FormalSpec>
 <ReturnType>APPS.VKP.Offerte</ReturnType>