Index: vhUnitTest/APPS/EC/impl/ExterneVerkoopService/GeefOfferteSamenvattingenVoorKlant/Base.cls.xml
===================================================================
diff -u -r31105 -r32131
--- vhUnitTest/APPS/EC/impl/ExterneVerkoopService/GeefOfferteSamenvattingenVoorKlant/Base.cls.xml	(.../Base.cls.xml)	(revision 31105)
+++ vhUnitTest/APPS/EC/impl/ExterneVerkoopService/GeefOfferteSamenvattingenVoorKlant/Base.cls.xml	(.../Base.cls.xml)	(revision 32131)
@@ -84,7 +84,7 @@
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetTaal(..GeefPersonality().GeefTaal())
 
 	Set WinkelkarStub = ##class(vhTest.Fake.DOM.EC.Winkelkar.Winkelkar).%New($$$DummyString)
-	Set ..ExterneVerkoopService = ##class(APPS.EC.impl.ExterneVerkoopService).%New()
+	
 	Set SelectieCriteria = ##class(APPS.VKP.Offerte.dto.SelectieCriteria).%New()
 	Set SelectieCriteria.KlantID = ..#KlantID
 	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
@@ -95,6 +95,8 @@
 	Do OfferteServiceStub.IndienMethodCall("HeeftOfferteVanHandel", FakeOfferte).DanReturn(0)
 	Do OfferteServiceStub.IndienMethodCall("GeefOfferteVanHandel", FakeOfferte).DanReturn("")
 	
+	Set ..ExterneVerkoopService = ##class(APPS.EC.impl.ExterneVerkoopService).%New(OfferteServiceStub)
+	
 	#dim DOMECommerceAPIMock As vhTest.Mock.DOM.EC.ECommerceAPI = ##class(vhTest.Mock.DOM.EC.ECommerceAPI).MockInstance()
 	Set WinkelkarServiceStub = ##class(vhTest.Mock.DOM.EC.Winkelkar.WinkelkarService).%New()
 	Do WinkelkarServiceStub.IndienMethodCall("GeefWinkelkar", "DummyWinkelkarID").DanReturn(WinkelkarStub)
Index: vhTest/Mock/APPS/EC/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r29059 -r32131
--- vhTest/Mock/APPS/EC/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 29059)
+++ vhTest/Mock/APPS/EC/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 32131)
@@ -71,6 +71,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VoegToeMaatwerk">
+<FormalSpec>OfferteID:%String,IngegevenKenmerken:APPS.PM.Maatwerk.dto.IngegevenKenmerken,Aantal:%String,ProjectReferentie:%String=""</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("VoegToeMaatwerk",OfferteID,IngegevenKenmerken,Aantal,ProjectReferentie)
+]]></Implementation>
+</Method>
+
 <Method name="WisOfferte">
 <FormalSpec>OfferteID:%String</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("WisOfferte",OfferteID)
Index: APPS/EC/impl/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r31105 -r32131
--- APPS/EC/impl/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 31105)
+++ APPS/EC/impl/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 32131)
@@ -5,6 +5,35 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.RegisteredObject,APPS.EC.ExterneVerkoopService</Super>
 
+<Property name="OfferteService">
+<Type>APPS.VKP.OfferteService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="OfferteHerberekening">
+<Type>APPS.EC.impl.ExterneVerkoopService.OfferteHerberekening</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="GeldigheidVermeldingBepaler">
+<Type>APPS.EC.ExterneVerkoopService.GeldigheidVermeldingBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>OfferteService:APPS.VKP.OfferteService</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..OfferteService = $$$Implementation(OfferteService,##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService())
+	set ..OfferteHerberekening = ##class(APPS.EC.impl.ExterneVerkoopService.OfferteHerberekening).%New()
+	set ..GeldigheidVermeldingBepaler = ##class(APPS.EC.ExterneVerkoopService.GeldigheidVermeldingBepaler).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefOfferteEnHerberekenIndienNodig">
 <FormalSpec>OfferteID:%String</FormalSpec>
 <ReturnType>APPS.EC.dto.Offerte</ReturnType>
@@ -68,7 +97,7 @@
 <Method name="WisOfferte">
 <FormalSpec>OfferteID:%String</FormalSpec>
 <Implementation><![CDATA[
-	#dim Offerte As APPS.VKP.Offerte = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService().GeefOfferte(OfferteID)
+	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
 
 	If (Offerte.IsBesteld()) {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidUserInputException).%New("De offerte '"_OfferteID_"' is reeds besteld, en mag daarom niet gewist worden."))	
@@ -88,16 +117,14 @@
 	
 	#dim MagOfferteInSamenvattingenBepaler As APPS.EC.impl.MagOfferteInSamenvattingenBepaler = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefMagOfferteInSamenvattingenBepaler()
 	
-	#dim OfferteService As APPS.VKP.OfferteService = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService()
-	
 	#dim OfferteSelectieCriteriaBepaler As APPS.EC.OfferteSelectieCriteriaBepaler = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefOfferteSelectieCriteriaBepaler()
 	#dim SelectieCriteria As APPS.VKP.Offerte.dto.SelectieCriteria = OfferteSelectieCriteriaBepaler.BepaalSelectieCriteria(KlantID)
 	
-	#dim Offertes As %ListOfDataTypes = OfferteService.GeefOffertes(SelectieCriteria)
+	#dim Offertes As %ListOfDataTypes = ..OfferteService.GeefOffertes(SelectieCriteria)
 	
 	Set OfferteIterator = ##class(TECH.ListIterator).%New(Offertes)
 	While OfferteIterator.HasNext(){
-		#dim Offerte As APPS.VKP.Offerte = OfferteService.GeefOfferte(OfferteIterator.Next())
+		#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteIterator.Next())
 		#dim Winkelkar As DOM.EC.Winkelkar.Winkelkar = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().OpenWinkelkar(Offerte.GeefWinkelkarID())
 		If (Winkelkar.GeefLijnIterator().HasNext() && MagOfferteInSamenvattingenBepaler.MagOfferteInSamenvattingen( Offerte ))
 		{
@@ -125,10 +152,9 @@
 	
 	#dim KlantDataReferentie As %String = ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefKlantDataReferentieBepaler().GeefKlantDataReferentie(Offerte)
 	Set:$Length(KlantDataReferentie)>0 KlantDataReferentie = " ("_KlantDataReferentie_")"
-	#dim OfferteService As APPS.VKP.OfferteService = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService()
 	
-	If OfferteService.HeeftOfferteVanHandel(Offerte) {
-		#dim OfferteVanHandel As APPS.VKP.Offerte = OfferteService.GeefOfferteVanHandel(Offerte)
+	If ..OfferteService.HeeftOfferteVanHandel(Offerte) {
+		#dim OfferteVanHandel As APPS.VKP.Offerte = ..OfferteService.GeefOfferteVanHandel(Offerte)
 		Set OfferteSamenvatting.OrderReferentie = "EDInr: "_OfferteVanHandel.GeefID()_" - "
 	}
 	
@@ -172,7 +198,7 @@
 <Method name="ZetOfferteHoofding">
 <FormalSpec>OfferteID:%String,Hoofding:APPS.EC.dto.Hoofding</FormalSpec>
 <Implementation><![CDATA[
-	#Dim Offerte As APPS.VKP.Offerte = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService().GeefOfferte(OfferteID)
+	#Dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
 	#Dim LeverAdresConvertor As APPS.common.impl.LeverAdresConvertor = ##class(APPS.common.impl.LeverAdresConvertor).%New()
 	
 	If ($IsObject(Hoofding.LeveringDetail)) {
@@ -206,18 +232,25 @@
 <ReturnType>%ListOfDataTypes</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="%Date"</ReturnTypeParams>
 <Implementation><![CDATA[
-	#dim Offerte As APPS.VKP.Offerte = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService().GeefOfferte(OfferteID)
+	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
 	Quit ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWinkelkarService().GeefMogelijkeLeverdatums(Offerte.WinkelkarID)
 ]]></Implementation>
 </Method>
 
+<Method name="VoegToeMaatwerk">
+<FormalSpec>OfferteID:%String,IngegevenKenmerken:APPS.PM.Maatwerk.dto.IngegevenKenmerken,Aantal:%String,ProjectReferentie:%String=""</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..OfferteService.VoegToeMaakwerk(..OfferteService.GeefOfferte(),IngegevenKenmerken,Aantal,ProjectReferentie).%Id()
+]]></Implementation>
+</Method>
+
 <Method name="GeefMogelijkeLeverAdressen">
 <FormalSpec>OfferteID:%String</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="APPS.common.dto.Adres"</ReturnTypeParams>
 <Implementation><![CDATA[
 	#Dim MogelijkeLeverAdressen As %ListOfObjects = ##class(%ListOfObjects).%New()
-	#Dim Offerte As APPS.VKP.Offerte = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService().GeefOfferte(OfferteID)	
+	#Dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)	
 	#Dim Klant As DOM.VKP.Klant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(Offerte.GeefKlantID())
 	#Dim Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(Klant.GeefLeverAdressen())
 	#Dim AdresConvertor As APPS.common.impl.AdresConvertor =  ##class(APPS.common.impl.AdresConvertor).%New()
@@ -244,7 +277,7 @@
 <FormalSpec>OfferteID:%String,KlantID:DOM.VKP.VanHoeckeKlantID,PersonalityID:DOM.common.enu.Personality</FormalSpec>
 <ReturnType>APPS.EC.dto.Bestelling</ReturnType>
 <Implementation><![CDATA[
-	#dim Offerte As APPS.VKP.Offerte = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService().GeefOfferte(OfferteID)	
+	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)	
 	Do ..ControleerHeeftToegangTotOfferte(Offerte,KlantID,PersonalityID)
 	
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(PersonalityID)
@@ -272,9 +305,8 @@
 <FormalSpec>OfferteID:%String</FormalSpec>
 <ReturnType>APPS.EC.dto.OfferteIDEnWinkelkarID</ReturnType>
 <Implementation><![CDATA[
-	#dim OfferteService As APPS.VKP.OfferteService = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService()
-	#dim Offerte As APPS.VKP.Offerte = OfferteService.GeefOfferte(OfferteID)
-	#dim GekopieerdeOfferte As APPS.VKP.Offerte = OfferteService.KopieerOfferte(Offerte)
+	#dim Offerte As APPS.VKP.Offerte = ..OfferteService.GeefOfferte(OfferteID)
+	#dim GekopieerdeOfferte As APPS.VKP.Offerte = ..OfferteService.KopieerOfferte(Offerte)
 	//eventueel bestelstatus naar offerte zetten, datum?
 	Do GekopieerdeOfferte.ZetLeverDatum("")
 	Do GekopieerdeOfferte.ZetWensLeverDatum("")
@@ -289,34 +321,6 @@
 	Quit OfferteIDEnWinkelkarID
 ]]></Implementation>
 </Method>
-
-<Property name="OfferteHerberekening">
-<Type>APPS.EC.impl.ExterneVerkoopService.OfferteHerberekening</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="OfferteHerberekeningGet">
-<Private>1</Private>
-<ReturnType>APPS.EC.impl.ExterneVerkoopService.OfferteHerberekening</ReturnType>
-<Implementation><![CDATA[
-	set i%OfferteHerberekening = $$$LazyLoad(i%OfferteHerberekening,##class(APPS.EC.impl.ExterneVerkoopService.OfferteHerberekening).%New())
-	quit i%OfferteHerberekening
-]]></Implementation>
-</Method>
-
-<Property name="GeldigheidVermeldingBepaler">
-<Type>APPS.EC.ExterneVerkoopService.GeldigheidVermeldingBepaler</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="GeldigheidVermeldingBepalerGet">
-<Private>1</Private>
-<ReturnType>APPS.EC.ExterneVerkoopService.GeldigheidVermeldingBepaler</ReturnType>
-<Implementation><![CDATA[
-	set i%GeldigheidVermeldingBepaler = $$$LazyLoad(i%GeldigheidVermeldingBepaler,##class(APPS.EC.ExterneVerkoopService.GeldigheidVermeldingBepaler).%New())
-	quit i%GeldigheidVermeldingBepaler
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: APPS/EC/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r29059 -r32131
--- APPS/EC/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 29059)
+++ APPS/EC/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 32131)
@@ -30,12 +30,17 @@
 <FormalSpec>OfferteID:%String</FormalSpec>
 </Method>
 
+<Method name="VoegToeMaatwerk">
+<Abstract>1</Abstract>
+<FormalSpec>OfferteID:%String,IngegevenKenmerken:APPS.PM.Maatwerk.dto.IngegevenKenmerken,Aantal:%String,ProjectReferentie:%String=""</FormalSpec>
+<ReturnType>%String</ReturnType>
+</Method>
+
 <Method name="GeefOfferteSamenvattingenVoorKlant">
 <Abstract>1</Abstract>
 <FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <ReturnTypeParams>ELEMENTTYPE="APPS.EC.dto.OfferteSamenvatting"</ReturnTypeParams>
-<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="MagWinkelkarInHistoriek">