Index: DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml
===================================================================
diff -u -r53904 -r53915
--- DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 53904)
+++ DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 53915)
@@ -21,13 +21,13 @@
 <Private>1</Private>
 </Property>
 
-<Property name="VerkoopApi">
-<Type>DOM.VKP.VerkoopAPI</Type>
+<Property name="LeverAdresRepository">
+<Type>DOM.VKP.impl.LeverAdresRepository</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="LeverAdresRepository">
-<Type>DOM.VKP.impl.LeverAdresRepository</Type>
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
 <Private>1</Private>
 </Property>
 
@@ -57,6 +57,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="KlantNr">
+<Type>%Integer</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="EindPersonalityBepaler">
 <Type>DOM.VKP.impl.EindPersonalityBepaler</Type>
 <Private>1</Private>
@@ -69,12 +74,13 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..BonNummer = BonNummer
+	Set ..KlantNr = $P(^KU1(BonNummer,"F"),"\")
 	Set ..TransportApi = ##class(DOM.DomeinContext).Instance().GeefTransportAPI()
 	Set ..OrderApi = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
 	Set ..PersonalityViaOorsprongBepaler = ##class(DOM.VKP.impl.DataM.DataMOrder.PersonalityViaOorsprongBepaler).%New()
-	Set ..VerkoopApi = ##class(DOM.VKP.impl.VerkoopAPI).%New()
 	Set ..LeverAdresRepository = ##class(DOM.VKP.impl.LeverAdresRepository).%New()
 	Set ..EindPersonalityBepaler = ##class(DOM.VKP.impl.EindPersonalityBepaler).%New()
+	Set ..Logger = ##class(vhLib.Logger).%New("DataMBonAbstract")
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -99,10 +105,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKlant">
+<ReturnType>DOM.VKP.VanHoeckeKlant</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(..GeefKlantID())
+]]></Implementation>
+</Method>
+
 <Method name="GeefKlantID">
-<Abstract>1</Abstract>
 <ReturnType>DOM.common.PartijID</ReturnType>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(..KlantNr)
+]]></Implementation>
 </Method>
 
 <Method name="GeefID">
@@ -159,8 +171,12 @@
 	} ElseIf (..LeverAdresRepository.BestaatViaAXLeverAdresIdEnKlantNummer(AxLocationId, ..GeefKlantID())) {
 		Set LeverAdres = ..LeverAdresRepository.GeefViaAXLeverAdresIdEnKlantNummer(AxLocationId, ..GeefKlantID())
 	} Else{
-		#dim Klant As DOM.VKP.VanHoeckeKlant = ..VerkoopApi.GeefKlant(..GeefKlantID())
+		#dim Klant As DOM.VKP.VanHoeckeKlant = ..GeefKlant()
 		Set LeverAdres = Klant.GeefStandaardLeverAdres()
+		If $$$Not(..GeefKlantID() = "K||7587") {
+			// K||7587 = Halux
+			Do ..Logger.Warning("Fallback LeveringsAdres gebruikt", "Voor Bon '"_..GeefID()_"' van Klant '"_..GeefKlantID()_"' stond er geen adres en geen AxLocationId op de 3-node (^KUL) en is de GeefStandaardLeverAdres op het Klant-object gebruikt.")
+		}
 	}
 	
 	Quit LeverAdres
Index: DOM/VKP/impl/DataM/DataMBon.cls.xml
===================================================================
diff -u -r49015 -r53915
--- DOM/VKP/impl/DataM/DataMBon.cls.xml	(.../DataMBon.cls.xml)	(revision 49015)
+++ DOM/VKP/impl/DataM/DataMBon.cls.xml	(.../DataMBon.cls.xml)	(revision 53915)
@@ -5,11 +5,6 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>DOM.VKP.impl.DataM.DataMBonAbstract</Super>
 
-<Property name="KlantNr">
-<Type>%Integer</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="FacturatieSoort">
 <Type>%String</Type>
 <Private>1</Private>
@@ -26,10 +21,10 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set ..KlantNr = $P(^KU1(BonNummer,"F"),"\")
+	Do ##super(BonNummer)
 	Set ..FacturatieSoort = FacturatieSoort
 	Set ..BonNr = BonNummer
-	Quit ##super(BonNummer)
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
@@ -66,18 +61,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefKlant">
-<ReturnType>DOM.VKP.VanHoeckeKlant</ReturnType>
-<Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(..GeefKlantID())
-]]></Implementation>
-</Method>
-
-<Method name="GeefKlantID">
-<ReturnType>DOM.common.PartijID</ReturnType>
-<Implementation><![CDATA[	Quit ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(..KlantNr)
-]]></Implementation>
-</Method>
-
 <Method name="GeefPrijsAffichering">
 <ReturnType>DOM.VKP.enu.PrijsAffichering</ReturnType>
 <Implementation><![CDATA[	Quit $piece(..NodeHoofding,"\",27)