Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Daro.cls.xml
===================================================================
diff -u -r62219 -r62891
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Daro.cls.xml	(.../Daro.cls.xml)	(revision 62219)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Daro.cls.xml	(.../Daro.cls.xml)	(revision 62891)
@@ -8,23 +8,15 @@
 <Private>1</Private>
 </Property>
 
-<Property name="ProductApi">
-<Type>DOM.PM.ProductAPI</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository="",UrlBepaler:APPS.EC.Webshop.impl.OfferteUrlBepaler="",TotaalEnPrijsBerekenaar:APPS.EC.Winkelkar.impl.TotaalEnPrijsBerekenaar="",KlantDataBepaler:DOM.VKP.KlantDataBepaler="",PersonalityService:DOM.common.PersonalityService="",DoorHandelMeeleverensMelder:APPS.VKP.Offerte.impl.DoorHandelMeeleverensMelder,ProductApi:DOM.PM.ProductAPI</FormalSpec>
+<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository="",UrlBepaler:APPS.EC.Webshop.impl.OfferteUrlBepaler="",TotaalEnPrijsBerekenaar:APPS.EC.Winkelkar.impl.TotaalEnPrijsBerekenaar="",KlantDataBepaler:DOM.VKP.KlantDataBepaler="",PersonalityService:DOM.common.PersonalityService="",ProductAPI:DOM.PM.ProductAPI="",DoorHandelMeeleverensMelder:APPS.VKP.Offerte.impl.DoorHandelMeeleverensMelder=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Do ##super(WinkelkarService,WinkelkarRepository,UrlBepaler,TotaalEnPrijsBerekenaar,KlantDataBepaler,PersonalityService)
-
+	Do ##super(WinkelkarService,WinkelkarRepository,UrlBepaler,TotaalEnPrijsBerekenaar,KlantDataBepaler,PersonalityService,ProductAPI)
 	Set ..DoorHandelMeeleverensMelder = $$$Inject(DoorHandelMeeleverensMelder, ##class(APPS.VKP.Offerte.impl.DoorHandelMeeleverensMelder).%New())
-	;Set ..ProductApi = $$$Inject(ProductApi,##class(DOM.DomeinContext).Instance().GeefProductAPI())
-	Set ..ProductApi = $$$Inject(ProductApi,##class(DOM.PM.impl.ProductAPI).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -35,7 +27,7 @@
 <ReturnType>APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.Offerte</ReturnType>
 <Implementation><![CDATA[
 	Do ##super(Offerte)
-	If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsDaroExcludeFromDeliveryEnabled() ) {
+	If ##class(DOM.DomeinContext).Instance().GeefProjectSettingsAPI().IsDaroExcludeFromDeliveryEnabled() {
 		Do ..VoegToeMeeleverensDoorHandel(Offerte)
 	}
 	
@@ -76,15 +68,15 @@
 <FormalSpec>PRNr:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..ProductApi.GeefProduct(PRNr).GeefKorttekst()
+<Implementation><![CDATA[	Quit ..ProductAPI.GeefProduct(PRNr).GeefKorttekst()
 ]]></Implementation>
 </Method>
 
 <Method name="GeefIdentNr">
 <FormalSpec>PRNr:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $$$Replace( ..ProductApi.GeefProduct(PRNr).GeefIdentNr(),".","")
+<Implementation><![CDATA[	Quit $$$Replace( ..ProductAPI.GeefProduct(PRNr).GeefIdentNr(),".","")
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml
===================================================================
diff -u -r62559 -r62891
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml	(.../OfferteGenerator.cls.xml)	(revision 62559)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml	(.../OfferteGenerator.cls.xml)	(revision 62891)
@@ -73,8 +73,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProductAPI">
+<Type>DOM.PM.impl.ProductAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository="",UrlBepaler:APPS.EC.Webshop.impl.OfferteUrlBepaler="",TotaalEnPrijsBerekenaar:APPS.EC.Winkelkar.impl.TotaalEnPrijsBerekenaar="",KlantDataBepaler:DOM.VKP.KlantDataBepaler="",PersonalityService:DOM.common.PersonalityService=""</FormalSpec>
+<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository="",UrlBepaler:APPS.EC.Webshop.impl.OfferteUrlBepaler="",TotaalEnPrijsBerekenaar:APPS.EC.Winkelkar.impl.TotaalEnPrijsBerekenaar="",KlantDataBepaler:DOM.VKP.KlantDataBepaler="",PersonalityService:DOM.common.PersonalityService="",ProductAPI:DOM.PM.ProductAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -88,6 +93,7 @@
 	Set ..FormatAPI = ##class(TECH.Context).Instance().GeefFormatAPI()
 	Set ..KlantDataBepaler = $$$Inject(KlantDataBepaler , ##class(DOM.VKP.impl.KlantDataBepaler).%New())
 	Set ..PersonalityService = $$$Inject(PersonalityService, ##class(DOM.common.impl.PersonalityService).%New())
+	Set ..ProductAPI = $$$Inject(ProductAPI, ##class(DOM.PM.impl.ProductAPI).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -325,6 +331,12 @@
 	If ..IsVersie002Compliant() {
 		Set OfferteLijn.DesignCode = "OL"
 		Do ..ZetProductOmschrijvingen(OfferteLijn,ProductLijn)
+		If ..Winkelkar.GeefPersonalityID() = ##class(DOM.common.enu.Personality).HaefeleDE() {
+			If ##class(TECH.Config.ConfigMgr).Instance().GeefBoolean("HaefeleDEReorderIDInHTTPPost", $$$False){
+				Set OfferteLijn.HerbestelId = "OL:"_ ..ProductAPI.GeefIdentNummerVoorProductId(ProductLijn.GeefProductId())
+			}
+		}
+
 	} 	
  	Quit OfferteLijn
 ]]></Implementation>
@@ -376,6 +388,10 @@
 
 	If ..IsVersie002Compliant() {
 		If ..Winkelkar.GeefPersonalityID() = ##class(DOM.common.enu.Personality).HaefeleDE() {
+			If ##class(TECH.Config.ConfigMgr).Instance().GeefBoolean("HaefeleDEReorderIDInHTTPPost", $$$False){
+				Set OfferteLijn.HerbestelId = "WEC:"_MaatwerkLijn.EconConfiguratieSleutel
+			}
+			
 			If MaatwerkLijn.GeefHerbestellingBijProbleem() = $$$True {
 				Set OfferteLijn.SchadeTijdensTransportOfVoormontage = MaatwerkLijn.GeefHerbestellingBijProbleem()
 			}
Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Test.cls.xml
===================================================================
diff -u -r62558 -r62891
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Test.cls.xml	(.../Test.cls.xml)	(revision 62558)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Test.cls.xml	(.../Test.cls.xml)	(revision 62891)
@@ -449,6 +449,7 @@
 	#dim KlantCode As %String = "KlantCode"
 	#dim EdiNummer As %String = "EdiNummer"
 	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("HaefeleLeveradresInHTTPPost",$$$True,..#Applicatie)
+	Do ##class(TECH.Config.ConfigMgr).Instance().SetBoolean("HaefeleDEReorderIDInHTTPPost",$$$True,..#Applicatie)
 
 	#dim LeverancierPersonality As DOM.common.Personality = ##class(DOM.common.VanHoeckePersonality).Instance()
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(KlantPersonalityId)
@@ -494,6 +495,7 @@
 	Set MaartwerkLijn = ##class(DOM.EC.Winkelkar.MaatwerkLijn).%New(,IngegevenKenmerkenAPIStub)
 	Do MaartwerkLijn.ZetEindklantEenheidPrijsNettoExclBTW(150)
 	Do MaartwerkLijn.ZetEenheidPrijsNettoExclBTW(100)
+	Set MaartwerkLijn.EconConfiguratieSleutel = "EconConfiguratieSleutel"
 	Do MaatwerkLijnen.Insert(MaartwerkLijn)	
 	
 	
@@ -526,12 +528,15 @@
 	#dim OfferteDto As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.Offerte002 = OfferteGenerator.GeefOfferteDto(OfferteStub)	
 
 	Do WinkelkarServiceMock.Verifieer()
-
+	
+	Do $$$AssertEquals(OfferteDto.Lijnen.GetAt(1).HerbestelId,"WEC:EconConfiguratieSleutel")
+	
 	Do $$$AssertEquals(OfferteDto.Lijnen.GetAt(2).ProductType,"OL")
 	Do $$$AssertEquals(OfferteDto.Lijnen.GetAt(2).ProductKleurOmschrijving,"Orange")
 	Do $$$AssertEquals(OfferteDto.Lijnen.GetAt(2).DesignCodeOmschrijving,"Orgalux")
 	Do $$$AssertEquals(OfferteDto.Lijnen.GetAt(2).LadeCode,"")
 	Do $$$AssertEquals(OfferteDto.Lijnen.GetAt(2).DesignCode,"OL")
+	Do $$$AssertEquals(OfferteDto.Lijnen.GetAt(2).HerbestelId,"OL:0.123.450.0")
 ]]></Implementation>
 </Method>
 
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Dupont.cls.xml
===================================================================
diff -u -r62219 -r62891
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Dupont.cls.xml	(.../Dupont.cls.xml)	(revision 62219)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Dupont.cls.xml	(.../Dupont.cls.xml)	(revision 62891)
@@ -8,22 +8,16 @@
 <Private>1</Private>
 </Property>
 
-<Property name="ProductApi">
-<Type>DOM.PM.ProductAPI</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository="",UrlBepaler:APPS.EC.Webshop.impl.OfferteUrlBepaler="",TotaalEnPrijsBerekenaar:APPS.EC.Winkelkar.impl.TotaalEnPrijsBerekenaar="",KlantDataBepaler:DOM.VKP.KlantDataBepaler="",PersonalityService:DOM.common.PersonalityService="",DoorHandelMeeleverensMelder:APPS.VKP.Offerte.impl.DoorHandelMeeleverensMelder,ProductApi:DOM.PM.ProductAPI</FormalSpec>
+<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository="",UrlBepaler:APPS.EC.Webshop.impl.OfferteUrlBepaler="",TotaalEnPrijsBerekenaar:APPS.EC.Winkelkar.impl.TotaalEnPrijsBerekenaar="",KlantDataBepaler:DOM.VKP.KlantDataBepaler="",PersonalityService:DOM.common.PersonalityService="",ProductAPI:DOM.PM.ProductAPI="",DoorHandelMeeleverensMelder:APPS.VKP.Offerte.impl.DoorHandelMeeleverensMelder</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Do ##super(WinkelkarService,WinkelkarRepository,UrlBepaler,TotaalEnPrijsBerekenaar,KlantDataBepaler,PersonalityService)
+	Do ##super(WinkelkarService,WinkelkarRepository,UrlBepaler,TotaalEnPrijsBerekenaar,KlantDataBepaler,PersonalityService,ProductAPI)
 
 	Set ..DoorHandelMeeleverensMelder = $$$Inject(DoorHandelMeeleverensMelder, ##class(APPS.VKP.Offerte.impl.DoorHandelMeeleverensMelder).%New())
-	Set ..ProductApi = $$$Inject(ProductApi,##class(DOM.DomeinContext).Instance().GeefProductAPI())
 	
 	Quit $$$OK
 ]]></Implementation>
Index: vhDeploy/D20201124xHaefeleDEReorderIDInHttpPost.cls.xml
===================================================================
diff -u
--- vhDeploy/D20201124xHaefeleDEReorderIDInHttpPost.cls.xml	(revision 0)
+++ vhDeploy/D20201124xHaefeleDEReorderIDInHttpPost.cls.xml	(revision 62891)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.D20201124xHaefeleDEReorderIDInHttpPost">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>ConfigItem Haefele DE om HerbestellingID/REORDER_ID in http post te zetten</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	if $$$Not(##class(TECH.Config.ConfigMgr).Instance().BestaatSleutel("HaefeleDEReorderIDInHTTPPost")){
+		Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("HaefeleDEReorderIDInHTTPPost",$$$False)
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/WelMeeleveren/Daro/Test.cls.xml
===================================================================
diff -u -r62186 -r62891
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/WelMeeleveren/Daro/Test.cls.xml	(.../Test.cls.xml)	(revision 62186)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/WelMeeleveren/Daro/Test.cls.xml	(.../Test.cls.xml)	(revision 62891)
@@ -25,6 +25,8 @@
 	#dim KlantCode As %String = "KlantCode"
 	#dim EdiNummer As %String = "EdiNummer"
 
+	#dim ProjectSettingsAPIMock as vhTest.Mock.DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
+	Do ProjectSettingsAPIMock.VerwachtMethodCall("IsDaroExcludeFromDeliveryEnabled").DanReturn($$$True)
 	#dim LeverancierPersonality As DOM.common.Personality = ##class(DOM.common.DaroPersonality).Instance()
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(KlantPersonalityId)
 	
@@ -90,12 +92,13 @@
 	Set PersonalityServiceMock = ##class(vhTest.Mock.DOM.common.PersonalityService).%New()
 	Do PersonalityServiceMock.IndienMethodCall("MagOrgaluxVerkopen",$$$ElkeWaarde).DanReturn($$$False)
 	
-	#dim OfferteGenerator = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator.Galimberti).%New(WinkelkarServiceStub, WinkelkarRepositoryStub, UrlBepalerStub, TotaalEnPrijsBerekenaarStub, KlantDataBepalerStub,PersonalityServiceMock,MeeleverensMelderMock,ProductApiMock)
+	#dim OfferteGenerator = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator.Daro).%New(WinkelkarServiceStub, WinkelkarRepositoryStub, UrlBepalerStub, TotaalEnPrijsBerekenaarStub, KlantDataBepalerStub,PersonalityServiceMock,ProductApiMock,MeeleverensMelderMock)
 	#dim OfferteDto As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.Offerte002 = OfferteGenerator.GeefOfferteDto(OfferteStub)
 	
 	Do $$$AssertEquals(OfferteDto.Meeleveren.Count(),0)
 	
 	Do MeeleverensMelderMock.Verifieer()
+	Do ProjectSettingsAPIMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -113,9 +116,13 @@
 	#dim KlantCode As %String = "KlantCode"
 	#dim EdiNummer As %String = "EdiNummer"
 
+	#dim ProjectSettingsAPIMock as vhTest.Mock.DOM.common.ProjectSettingsAPI = ##class(vhTest.Mock.DOM.common.ProjectSettingsAPI).MockInstance()
+	Do ProjectSettingsAPIMock.VerwachtMethodCall("IsDaroExcludeFromDeliveryEnabled").DanReturn($$$True)
+
 	#dim LeverancierPersonality As DOM.common.Personality = ##class(DOM.common.DaroPersonality).Instance()
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(KlantPersonalityId)
 	
+	
 	#dim KlantPersonalityStub As vhTest.Mock.DOM.common.Personality = ##class(vhTest.Mock.DOM.common.Personality).%New()
 	Do KlantPersonalityStub.IndienMethodCall("GeefTaal").DanReturn(##class(DOM.enu.Taal).Engels())
 	Do KlantPersonalityStub.IndienMethodCall("GeefID").DanReturn(KlantPersonalityId)
@@ -183,11 +190,11 @@
 	Do ProductMock.IndienMethodCall("GeefIdentNr").DanReturn("0.1.2.3")
 	Do ProductMock.IndienMethodCall("GeefKorttekst").DanReturn("Korttekst")
 	Do ProductApiMock.IndienMethodCall("GeefProduct",$$$ElkeWaarde).DanReturn(ProductMock)
+	;Do ProductApiMock.IndienMethodCall("GeefProduct",$$$ElkeWaarde).DanReturn(ProductMock)
 	
 	Set PersonalityServiceMock = ##class(vhTest.Mock.DOM.common.PersonalityService).%New()
 	Do PersonalityServiceMock.IndienMethodCall("MagOrgaluxVerkopen",$$$ElkeWaarde).DanReturn($$$False)
-
-	#dim OfferteGenerator = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator.Galimberti).%New(WinkelkarServiceStub, WinkelkarRepositoryStub, UrlBepalerStub, TotaalEnPrijsBerekenaarStub, KlantDataBepalerStub,PersonalityServiceMock, MeeleverensMelderMock,ProductApiMock)
+	#dim OfferteGenerator = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator.Daro).%New(WinkelkarServiceStub, WinkelkarRepositoryStub, UrlBepalerStub, TotaalEnPrijsBerekenaarStub, KlantDataBepalerStub,PersonalityServiceMock,ProductApiMock, MeeleverensMelderMock)
 	#dim OfferteDto As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.Offerte002 = OfferteGenerator.GeefOfferteDto(OfferteStub)
  
 	Do $$$AssertEquals(OfferteDto.Meeleveren.Count(),2)
@@ -196,6 +203,7 @@
 	Do $$$AssertEquals(OfferteDto.Meeleveren.GetAt(1).IdentNr,"0123")
 
 	Do MeeleverensMelderMock.Verifieer()
+	Do ProjectSettingsAPIMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Galimberti.cls.xml
===================================================================
diff -u -r62219 -r62891
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Galimberti.cls.xml	(.../Galimberti.cls.xml)	(revision 62219)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/Galimberti.cls.xml	(.../Galimberti.cls.xml)	(revision 62891)
@@ -8,22 +8,16 @@
 <Private>1</Private>
 </Property>
 
-<Property name="ProductApi">
-<Type>DOM.PM.ProductAPI</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository="",UrlBepaler:APPS.EC.Webshop.impl.OfferteUrlBepaler="",TotaalEnPrijsBerekenaar:APPS.EC.Winkelkar.impl.TotaalEnPrijsBerekenaar="",KlantDataBepaler:DOM.VKP.KlantDataBepaler="",PersonalityService:DOM.common.PersonalityService="",DoorHandelMeeleverensMelder:APPS.VKP.Offerte.impl.DoorHandelMeeleverensMelder,ProductApi:DOM.PM.ProductAPI</FormalSpec>
+<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository="",UrlBepaler:APPS.EC.Webshop.impl.OfferteUrlBepaler="",TotaalEnPrijsBerekenaar:APPS.EC.Winkelkar.impl.TotaalEnPrijsBerekenaar="",KlantDataBepaler:DOM.VKP.KlantDataBepaler="",PersonalityService:DOM.common.PersonalityService="",ProductAPI:DOM.PM.ProductAPI="",DoorHandelMeeleverensMelder:APPS.VKP.Offerte.impl.DoorHandelMeeleverensMelder=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Do ##super(WinkelkarService,WinkelkarRepository,UrlBepaler,TotaalEnPrijsBerekenaar,KlantDataBepaler,PersonalityService)
+	Do ##super(WinkelkarService,WinkelkarRepository,UrlBepaler,TotaalEnPrijsBerekenaar,KlantDataBepaler,PersonalityService,ProductAPI)
 
 	Set ..DoorHandelMeeleverensMelder = $$$Inject(DoorHandelMeeleverensMelder, ##class(APPS.VKP.Offerte.impl.DoorHandelMeeleverensMelder).%New())
-	Set ..ProductApi = $$$Inject(ProductApi,##class(DOM.DomeinContext).Instance().GeefProductAPI())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -74,15 +68,15 @@
 <FormalSpec>PRNr:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..ProductApi.GeefProduct(PRNr).GeefKorttekst()
+<Implementation><![CDATA[	Quit ..ProductAPI.GeefProduct(PRNr).GeefKorttekst()
 ]]></Implementation>
 </Method>
 
 <Method name="GeefIdentNr">
 <FormalSpec>PRNr:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $$$Replace( ..ProductApi.GeefProduct(PRNr).GeefIdentNr(),".","")
+<Implementation><![CDATA[	Quit $$$Replace( ..ProductAPI.GeefProduct(PRNr).GeefIdentNr(),".","")
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteLijn002.cls.xml
===================================================================
diff -u -r61100 -r62891
--- APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteLijn002.cls.xml	(.../OfferteLijn002.cls.xml)	(revision 61100)
+++ APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteLijn002.cls.xml	(.../OfferteLijn002.cls.xml)	(revision 62891)
@@ -33,6 +33,11 @@
 <Parameter name="XMLNAME" value="DAMAGE_BY_TRANSPORTATION_OR_ASSEMBLY"/>
 </Property>
 
+<Property name="HerbestelId">
+<Type>%String</Type>
+<Parameter name="XMLNAME" value="REORDER_ID"/>
+</Property>
+
 <Property name="EindklantEenheidPrijs">
 <Type>BL.FOP.Basis.pxAttribMunt</Type>
 <Parameter name="XMLNAME" value="SELLPRICE"/>
Index: vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/WelMeeleveren/Galimberti/Test.cls.xml
===================================================================
diff -u -r62186 -r62891
--- vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/WelMeeleveren/Galimberti/Test.cls.xml	(.../Test.cls.xml)	(revision 62186)
+++ vhUnitTest/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator/WelMeeleveren/Galimberti/Test.cls.xml	(.../Test.cls.xml)	(revision 62891)
@@ -90,7 +90,7 @@
 	Set PersonalityServiceMock = ##class(vhTest.Mock.DOM.common.PersonalityService).%New()
 	Do PersonalityServiceMock.IndienMethodCall("MagOrgaluxVerkopen",$$$ElkeWaarde).DanReturn($$$False)
 
-	#dim OfferteGenerator = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator.Galimberti).%New(WinkelkarServiceStub, WinkelkarRepositoryStub, UrlBepalerStub, TotaalEnPrijsBerekenaarStub, KlantDataBepalerStub,PersonalityServiceMock, MeeleverensMelderMock,ProductApiMock)
+	#dim OfferteGenerator = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator.Galimberti).%New(WinkelkarServiceStub, WinkelkarRepositoryStub, UrlBepalerStub, TotaalEnPrijsBerekenaarStub, KlantDataBepalerStub,PersonalityServiceMock,ProductApiMock, MeeleverensMelderMock)
 	#dim OfferteDto As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.Offerte002 = OfferteGenerator.GeefOfferteDto(OfferteStub)
 	
 	Do $$$AssertEquals(OfferteDto.Meeleveren.Count(),0)
@@ -187,7 +187,7 @@
 	Set PersonalityServiceMock = ##class(vhTest.Mock.DOM.common.PersonalityService).%New()
 	Do PersonalityServiceMock.IndienMethodCall("MagOrgaluxVerkopen",$$$ElkeWaarde).DanReturn($$$False)
 	
-	#dim OfferteGenerator = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator.Galimberti).%New(WinkelkarServiceStub, WinkelkarRepositoryStub, UrlBepalerStub, TotaalEnPrijsBerekenaarStub, KlantDataBepalerStub,PersonalityServiceMock, MeeleverensMelderMock,ProductApiMock)
+	#dim OfferteGenerator = ##class(APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.OfferteGenerator.Galimberti).%New(WinkelkarServiceStub, WinkelkarRepositoryStub, UrlBepalerStub, TotaalEnPrijsBerekenaarStub, KlantDataBepalerStub,PersonalityServiceMock,ProductApiMock, MeeleverensMelderMock)
 	#dim OfferteDto As APPS.VKP.Offerte.impl.BesteldeOfferteMelder.HttpVerzender.dto.Offerte002 = OfferteGenerator.GeefOfferteDto(OfferteStub)
  
 	Do $$$AssertEquals(OfferteDto.Meeleveren.Count(),2)
Index: vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml
===================================================================
diff -u -r62186 -r62891
--- vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml	(.../OfferteGenerator.cls.xml)	(revision 62186)
+++ vhTest/Mock/APPS/VKP/Offerte/impl/BesteldeOfferteMelder/HttpVerzender/dto/OfferteGenerator.cls.xml	(.../OfferteGenerator.cls.xml)	(revision 62891)
@@ -9,7 +9,7 @@
 <Inheritance>right</Inheritance>
 
 <Method name="%OnNew">
-<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository="",UrlBepaler:APPS.EC.Webshop.impl.OfferteUrlBepaler="",TotaalEnPrijsBerekenaar:APPS.EC.Winkelkar.impl.TotaalEnPrijsBerekenaar="",KlantDataBepaler:DOM.VKP.KlantDataBepaler="",PersonalityService:DOM.common.PersonalityService=""</FormalSpec>
+<FormalSpec>WinkelkarService:APPS.EC.Winkelkar.WinkelkarService="",WinkelkarRepository:DOM.EC.Winkelkar.impl.WinkelkarRepository="",UrlBepaler:APPS.EC.Webshop.impl.OfferteUrlBepaler="",TotaalEnPrijsBerekenaar:APPS.EC.Winkelkar.impl.TotaalEnPrijsBerekenaar="",KlantDataBepaler:DOM.VKP.KlantDataBepaler="",PersonalityService:DOM.common.PersonalityService="",ProductAPI:DOM.PM.ProductAPI=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit $$$OK
 ]]></Implementation>