Index: vhUnitTest/DOM/AKP/impl/DataM/DataMToelevering/GeefEindPersonality/Test.cls.xml
===================================================================
diff -u -r51383 -r53193
--- vhUnitTest/DOM/AKP/impl/DataM/DataMToelevering/GeefEindPersonality/Test.cls.xml	(.../Test.cls.xml)	(revision 51383)
+++ vhUnitTest/DOM/AKP/impl/DataM/DataMToelevering/GeefEindPersonality/Test.cls.xml	(.../Test.cls.xml)	(revision 53193)
@@ -30,6 +30,51 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Geen OorsprongKetting aanwezig -&gt; EindPersonality is VanHoecke">
+<Implementation><![CDATA[
+	Set EindPersonalityBepalerMock = ##class(vhTest.Mock.DOM.VKP.impl.EindPersonalityBepaler).%New()
+	Do EindPersonalityBepalerMock.VerwachtMethodCall("GeefEindPersonality",$$$ElkeWaarde).ExactAantalKeer(0)
+	
+	Set $P(^KTO(..#LeverancierNummer,..#Toelevering,1),"\",27) = ""
+	
+	Set DataMToelevering = ##class(DOM.AKP.impl.DataM.DataMToelevering).%New(..#Toelevering, ##class(DOM.PARTIJ.impl.LegacyPartijAPI).%New().GeefLeverancierPartijID(..#LeverancierNummer))
+	Do DataMToelevering.ZetEindPersonalityBepaler(EindPersonalityBepalerMock)
+	#dim EindPersonality As DOM.common.Personality = DataMToelevering.GeefEindPersonality()
+	
+	K ^KTO(..#LeverancierNummer,..#Toelevering,1)
+	
+	Do EindPersonalityBepalerMock.Verifieer()
+	Do $$$AssertEquals(EindPersonality.GeefID(),##class(DOM.common.enu.Personality).VanHoecke())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geen OorsprongKetting aanwezig, maar klant is HFLNL: HFLNL als EindPersonality nemen">
+<Implementation><![CDATA[
+	Set EindPersonalityBepalerMock = ##class(vhTest.Mock.DOM.VKP.impl.EindPersonalityBepaler).%New()
+	Do EindPersonalityBepalerMock.VerwachtMethodCall("GeefEindPersonality",$$$ElkeWaarde).ExactAantalKeer(0)
+	
+	Set $P(^KTO(..#LeverancierNummer,..#Toelevering,1),"\",27) = ""
+	Set $P(^KTO(..#LeverancierNummer,..#Toelevering,1),"\",7) = $$$DummyInteger
+	
+	
+	#dim DummyOrder As DOM.VKP.Order = ##class(vhTest.Utils.DOM.VKP.Order).StandaardOrder()
+	Do DummyOrder.IndienMethodCall("GeefKlantID").DanReturn("K||2671")
+	Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New()
+	Do OrderApiStub.IndienMethodCall("BestaatOrder",$$$ElkeWaarde).DanReturn($$$True)
+	Do OrderApiStub.IndienMethodCall("GeefOrder",$$$ElkeWaarde).DanReturn(DummyOrder)
+	
+	Set DataMToelevering = ##class(DOM.AKP.impl.DataM.DataMToelevering).%New(..#Toelevering, ##class(DOM.PARTIJ.impl.LegacyPartijAPI).%New().GeefLeverancierPartijID(..#LeverancierNummer))
+	Do DataMToelevering.ZetEindPersonalityBepaler(EindPersonalityBepalerMock)
+	Do DataMToelevering.ZetOrderApi(OrderApiStub)
+	#dim EindPersonality As DOM.common.Personality = DataMToelevering.GeefEindPersonality()
+	
+	Do EindPersonalityBepalerMock.Verifieer()
+	K ^KTO(..#LeverancierNummer,..#Toelevering,1)
+	
+	Do $$$AssertEquals(EindPersonality.GeefID(),##class(DOM.common.enu.Personality).HaefeleNL())
+]]></Implementation>
+</Method>
+
 <Method name="Test: exceptie geraised in EindPersonalityBepaler -&gt; default">
 <Implementation><![CDATA[
 	Set EindPersonalityBepalerStub = ##class(vhTest.Mock.DOM.VKP.impl.EindPersonalityBepaler).%New()
Index: DOM/AKP/impl/DataM/DataMToelevering.cls.xml
===================================================================
diff -u -r51348 -r53193
--- DOM/AKP/impl/DataM/DataMToelevering.cls.xml	(.../DataMToelevering.cls.xml)	(revision 51348)
+++ DOM/AKP/impl/DataM/DataMToelevering.cls.xml	(.../DataMToelevering.cls.xml)	(revision 53193)
@@ -53,6 +53,11 @@
 <Transient>1</Transient>
 </Property>
 
+<Property name="OrderApi">
+<Type>DOM.VKP.OrderAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Index name="ToeleveringIDIndex">
 <IdKey>1</IdKey>
 <Properties>ToeleveringID</Properties>
@@ -68,6 +73,7 @@
 	Set ..ToeleveringID = ToeleveringID
 	Do ..ZetLeverancierNr(##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefLeverancierNummerVoorPartijID(LeverancierID))
 	Set ..EindPersonalityBepaler = ##class(DOM.VKP.impl.EindPersonalityBepaler).%New()
+	Set ..OrderApi = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -78,6 +84,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetOrderApi">
+<FormalSpec>OrderApi:DOM.VKP.OrderAPI</FormalSpec>
+<Implementation><![CDATA[	Set ..OrderApi = OrderApi
+]]></Implementation>
+</Method>
+
 <Method name="GeefKlantNummerBijLeverancier">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	quit ..HoofdingData.GeefPiece(9)
@@ -226,11 +238,11 @@
 	#dim KlantID As DOM.VKP.VanHoeckeKlantID = ""
 	#dim OrderID As %String = ..GeefOrderID()
 	if $length(OrderID) { 
-		If $$$Not(##class(DOM.DomeinContext).Instance().GeefOrderAPI().BestaatOrder(OrderID)) {
+		If $$$Not(..OrderApi.BestaatOrder(OrderID)) {
 			;#dim FixDataMsg As %String = $$$CRLF_"Fix data via "_$$$CRLF_"Do ##class(vhPowerTools.DOM.AKP.ToeleveringTools).VerwijderOrderVerwijzingIndienOrderNietBestaat("_..GeefID()_")"
 			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Foutieve orderverwijzing in Toelevering "_..GeefID()_": order "_OrderID_" bestaat niet!"))
 					}
-		set KlantID = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(OrderID).GeefKlantID()
+		set KlantID = ..OrderApi.GeefOrder(OrderID).GeefKlantID()
 	}
 	quit KlantID
 ]]></Implementation>
@@ -276,7 +288,15 @@
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality
 	Try {
-		Set Personality = ..EindPersonalityBepaler.GeefEindPersonality(..GeefOorsprongKetting())
+		If $$$HasLength(..GeefOorsprongKetting()) {
+			Set Personality = ..EindPersonalityBepaler.GeefEindPersonality(..GeefOorsprongKetting())
+		} Else {
+			If ..GeefKlantID() = ##class(DOM.VKP.enu.Klant).HaefeleNederland() {
+				Set Personality = ##class(DOM.common.impl.PersonalityRepository).%New().GeefViaID(##class(DOM.common.enu.Personality).HaefeleNL())
+			} Else {
+				Set Personality = ##class(DOM.common.impl.PersonalityRepository).%New().GeefViaID(##class(DOM.common.enu.Personality).VanHoecke())
+			}
+		}
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Set Personality = ##class(DOM.common.impl.PersonalityRepository).%New().GeefViaID(##class(DOM.common.enu.Personality).VanHoecke())
@@ -611,6 +631,9 @@
 <Value name="3">
 <Value>LeverancierNr</Value>
 </Value>
+<Value name="4">
+<Value>OrderApi</Value>
+</Value>
 </Data>
 </Storage>
 </Class>