Index: APPS/VKP/OrderIngaveService.cls.xml
===================================================================
diff -u -r48732 -r51489
--- APPS/VKP/OrderIngaveService.cls.xml	(.../OrderIngaveService.cls.xml)	(revision 48732)
+++ APPS/VKP/OrderIngaveService.cls.xml	(.../OrderIngaveService.cls.xml)	(revision 51489)
@@ -193,7 +193,7 @@
 		Do Order.ZetAfleveradres(LeverAdres)
 		Do Order.ZetOorsprong(##class(BL.Flow.Offerte.enu.Oorsprong).UniShop())
 		Do Order.ZetOorsprongKetting($$$LCVT(..BepaalOorsprongKetting(Offerte)))
-		Do Order.ZetEDINummer(Offerte.GeefEDINummerVoorEindklant())
+		Do Order.ZetEDINummer(Offerte.GeefEDINummerBijVanHoecke())
 		
 		If ..GebruiktExternTransport(Offerte) {
 			Do Order.ZetLeveringVoorwaarde(##class(DOM.CRM.enu.LeveringVoorwaarde).KostInManueleLijn())
Index: APPS/VKP/impl/Offerte.cls.xml
===================================================================
diff -u -r50504 -r51489
--- APPS/VKP/impl/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 50504)
+++ APPS/VKP/impl/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 51489)
@@ -318,6 +318,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefEDINummerBijVanHoecke">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.VKP.Offerte.impl.KlantBestellingAanLeverancierOfferteKoppelaar).%New().GeefEDINummerBijVanHoecke($this)
+]]></Implementation>
+</Method>
+
 <Method name="GeefEDINummer">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit $$$If(..IsVhisie4(),..GeefExterneId(),..GeefID())
Index: vhTest/Mock/APPS/VKP/Offerte.cls.xml
===================================================================
diff -u -r49636 -r51489
--- vhTest/Mock/APPS/VKP/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 49636)
+++ vhTest/Mock/APPS/VKP/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 51489)
@@ -56,6 +56,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefEDINummerBijVanHoecke">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefEDINummerBijVanHoecke")
+]]></Implementation>
+</Method>
+
 <Method name="GeefEDINummerVoorEindklant">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefEDINummerVoorEindklant")
Index: APPS/VKP/Offerte/impl/KlantBestellingAanLeverancierOfferteKoppelaar.cls.xml
===================================================================
diff -u -r47444 -r51489
--- APPS/VKP/Offerte/impl/KlantBestellingAanLeverancierOfferteKoppelaar.cls.xml	(.../KlantBestellingAanLeverancierOfferteKoppelaar.cls.xml)	(revision 47444)
+++ APPS/VKP/Offerte/impl/KlantBestellingAanLeverancierOfferteKoppelaar.cls.xml	(.../KlantBestellingAanLeverancierOfferteKoppelaar.cls.xml)	(revision 51489)
@@ -25,10 +25,17 @@
 <Method name="GeefOfferteVanHandel">
 <FormalSpec>LeverancierOfferte:APPS.VKP.Offerte</FormalSpec>
 <ReturnType>APPS.VKP.Offerte</ReturnType>
-<Implementation><![CDATA[	Quit LeverancierOfferte.OfferteVanHandel
+<Implementation><![CDATA[	Quit ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService().GeefOfferte(LeverancierOfferte.LeverancierOfferteId)
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBestellingVanKlant">
+<FormalSpec>LeverancierOfferte:APPS.VKP.Offerte</FormalSpec>
+<ReturnType>APPS.VKP.Offerte</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService().GeefOfferte(LeverancierOfferte.KlantBestellingId)
+]]></Implementation>
+</Method>
+
 <Method name="GeefOfferteVanVH">
 <FormalSpec>KlantBestelling:APPS.VKP.Offerte</FormalSpec>
 <ReturnType>APPS.VKP.Offerte</ReturnType>
@@ -39,25 +46,53 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefEDINummerVoorEindklant">
+<Method name="GeefEDINummerBijVanHoecke">
 <FormalSpec>LeverancierOfferte:APPS.VKP.Offerte</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If ..IsGekoppeldAanOfferteVanHandel(LeverancierOfferte) {
-		Quit ..GeefEDINummerVoorEindklant(..GeefOfferteVanHandel(LeverancierOfferte))
+	If ..IsGekoppeldAanLeverancierOfferte(LeverancierOfferte) {
+		Quit ..GeefEDINummerBijVanHoecke(..GeefOfferteVanHandel(LeverancierOfferte))
 	} Else {
 		Quit LeverancierOfferte.GeefEDINummer()
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="GeefEDINummerVoorEindklant">
+<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	If (..IsGekoppeldAanKlantBestelling(Offerte)) {
+		Quit ..GeefEDINummerVoorEindklant(..GeefBestellingVanKlant(Offerte))
+	} Else {
+		Quit Offerte.GeefEDINummer()
+	}
+]]></Implementation>
+</Method>
+
 <Method name="IsGekoppeldAanOfferteVanHandel">
 <FormalSpec>LeverancierOfferte:APPS.VKP.Offerte</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit $IsObject(LeverancierOfferte.OfferteVanHandel)
 ]]></Implementation>
 </Method>
+
+<Method name="IsGekoppeldAanKlantBestelling">
+<FormalSpec>LeverancierOfferte:APPS.VKP.Offerte</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $$$HasLength(LeverancierOfferte.KlantBestellingId)
+]]></Implementation>
+</Method>
+
+<Method name="IsGekoppeldAanLeverancierOfferte">
+<FormalSpec>LeverancierOfferte:APPS.VKP.Offerte</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $$$HasLength(LeverancierOfferte.LeverancierOfferteId)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/VKP/Offerte.cls.xml
===================================================================
diff -u -r49636 -r51489
--- APPS/VKP/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 49636)
+++ APPS/VKP/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 51489)
@@ -81,6 +81,11 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="GeefEDINummerBijVanHoecke">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
 <Method name="GeefEDINummer">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>