Index: vhUnitTest/DOM/VKP/impl/DataM/DataMBonAbstract/IsRechtstreeksTeLeveren/Test.cls.xml
===================================================================
diff -u -r63265 -r63971
--- vhUnitTest/DOM/VKP/impl/DataM/DataMBonAbstract/IsRechtstreeksTeLeveren/Test.cls.xml	(.../Test.cls.xml)	(revision 63265)
+++ vhUnitTest/DOM/VKP/impl/DataM/DataMBonAbstract/IsRechtstreeksTeLeveren/Test.cls.xml	(.../Test.cls.xml)	(revision 63971)
@@ -113,6 +113,45 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: VanRaemdonck -&gt; rechtstreeks indien geen AxLocationId ingevuld (adhoc)">
+<Implementation><![CDATA[
+	#dim ProjectSettingsAPIMock as vhTest.Mock.DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
+	do ProjectSettingsAPIMock.VerwachtMethodCall("IsActiefVanRaemdonckNaarEindklant").DanReturn($$$True)
+
+	#dim KlantNummer As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(##class(DOM.VKP.enu.Klant).VanRaemdonck())
+	
+	Set $P(^KU1(..#Uitlevering,"F"),"\",1) = KlantNummer
+	
+	Set $P(^KUL(KlantNummer,"F",..#Uitlevering,3),"\",29) = ""
+	
+	Set DataMBonAbstract = ##class(DOM.VKP.impl.DataM.DataMBon).%New(..#Uitlevering)
+	
+	Do $$$AssertTrue(DataMBonAbstract.IsRechtstreeksTeLeveren())
+	Do ProjectSettingsAPIMock.Verifieer()
+	K ^KUL(KlantNummer,"F",..#Uitlevering,1)
+	K ^KU1(..#Uitlevering,"F")
+]]></Implementation>
+</Method>
+
+<Method name="Test: VanRaemdonck -&gt; niet rechtstreeks indien AxLocationId ingevuld (niet adhoc)">
+<Implementation><![CDATA[
+	#dim ProjectSettingsAPIMock as vhTest.Mock.DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
+	do ProjectSettingsAPIMock.IndienMethodCall("IsActiefVanRaemdonckNaarEindklant").DanReturn($$$True)
+	#dim KlantNummer As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(##class(DOM.VKP.enu.Klant).VanRaemdonck())
+	
+	Set $P(^KU1(..#Uitlevering,"F"),"\",1) = KlantNummer
+	
+	Set $P(^KUL(KlantNummer,"F",..#Uitlevering,3),"\",29) = "123456789"
+	
+	Set DataMBonAbstract = ##class(DOM.VKP.impl.DataM.DataMBon).%New(..#Uitlevering)
+	
+	Do $$$AssertFalse(DataMBonAbstract.IsRechtstreeksTeLeveren())
+
+	K ^KUL(KlantNummer,"F",..#Uitlevering,1)
+	K ^KU1(..#Uitlevering,"F")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Pavanello -&gt; altijd rechtstreeks">
 <Implementation><![CDATA[
 	#dim KlantNummer As %String = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(##class(DOM.VKP.enu.Klant).Pavanello())
Index: DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml
===================================================================
diff -u -r63265 -r63971
--- DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 63265)
+++ DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 63971)
@@ -458,10 +458,14 @@
 	If (..GeefKlantID() = ##class(DOM.VKP.enu.Klant).Ferexpert()) && ##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsActiefFerexpertNaarEindklant() {
 		Set Resultaat = $$$True
 	}
-
 	If ((..GeefKlantID() = ##class(DOM.VKP.enu.Klant).DuPont()) && ($Piece(..NodeAdres,"\",29)="")) {
 		Set Resultaat = $$$True
 	}
+	w !,..GeefKlantID() _ "#" _ $Piece(..NodeAdres,"\",29) _ "#"
+	If ((..GeefKlantID() = ##class(DOM.VKP.enu.Klant).VanRaemdonck()) && ($Piece(..NodeAdres,"\",29)="") && ##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsActiefVanRaemdonckNaarEindklant()) {
+		Set Resultaat = $$$True
+	}
+
 	
 	Quit Resultaat
 ]]></Implementation>