Index: vhTest/Mock/APPS/VKP/OfferteService.cls.xml
===================================================================
diff -u -r29059 -r32078
--- vhTest/Mock/APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 29059)
+++ vhTest/Mock/APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 32078)
@@ -87,6 +87,12 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakNieuwOfferte",KlantID,PersonalityID)
 ]]></Implementation>
 </Method>
+
+<Method name="VerwijderOfferte">
+<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("VerwijderOfferte",Offerte)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/EDI/Resultaat.cls.xml
===================================================================
diff -u -r31833 -r32078
--- APPS/EDI/Resultaat.cls.xml	(.../Resultaat.cls.xml)	(revision 31833)
+++ APPS/EDI/Resultaat.cls.xml	(.../Resultaat.cls.xml)	(revision 32078)
@@ -3,6 +3,10 @@
 <Class name="APPS.EDI.Resultaat">
 <Abstract>1</Abstract>
 <Super>TECH.DataTransferObject</Super>
+
+<Property name="Exceptie">
+<Type>TECH.Exceptions.Exception</Type>
+</Property>
 </Class>
 
 
Index: APPS/VKP/impl/OfferteService.cls.xml
===================================================================
diff -u -r29059 -r32078
--- APPS/VKP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 29059)
+++ APPS/VKP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 32078)
@@ -28,6 +28,58 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VoegToeMaatwerk">
+<FormalSpec>Offerte:APPS.VKP.Offerte,Taal:DOM.enu.Taal,IngegevenKenmerken:APPS.PM.Maatwerk.dto.IngegevenKenmerken,Aantal:%String,ProjectReferentie:%String=""</FormalSpec>
+<ReturnType>DOM.EC.Winkelkar.MaatwerkLijn</ReturnType>
+<Implementation><![CDATA[
+	#dim GroepNaam As %String = ..GroepnaamBepaler.GeefGroepNaam(IngegevenKenmerken,Taal)
+	do ..WinkelkarService.VoegToeMaatwerk(Offerte.GeefWinkelkarID(),GroepNaam,IngegevenKenmerken,Aantal,ProjectReferentie)
+]]></Implementation>
+</Method>
+
+<Property name="GroepnaamBepaler">
+<Type>APPS.EC.Winkelkar.impl.GroepNaamVoorIngegevenKenmerkenBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="GroepnaamBepalerGet">
+<Private>1</Private>
+<ReturnType>APPS.EC.Winkelkar.impl.GroepNaamVoorIngegevenKenmerkenBepaler</ReturnType>
+<Implementation><![CDATA[
+	set r%GroepnaamBepaler = $$$LazyLoad(r%GroepnaamBepaler,##class(APPS.EC.Winkelkar.impl.GroepNaamVoorIngegevenKenmerkenBepaler).%New())
+	quit r%GroepnaamBepaler
+]]></Implementation>
+</Method>
+
+<Property name="WinkelkarService">
+<Type>APPS.EC.Winkelkar.WinkelkarService</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="WinkelkarServiceGet">
+<Private>1</Private>
+<ReturnType>APPS.EC.Winkelkar.WinkelkarService</ReturnType>
+<Implementation><![CDATA[
+	set r%WinkelkarService = $$$LazyLoad(r%WinkelkarService,##class(APPS.EC.Winkelkar.impl.WinkelkarService).%New())
+	quit r%WinkelkarService
+]]></Implementation>
+</Method>
+
+<Method name="VerwijderOfferte">
+<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
+<Implementation><![CDATA[
+	#dim OfferteID As %String = Offerte.GeefID()
+	if $$$HasLength(OfferteID) {
+		#dim Winkelkar As DOM.EC.Winkelkar.Winkelkar = ##class(DOM.EC.Winkelkar.Winkelkar).OpenId( Offerte.WinkelkarID )
+		#dim DocumentReferenties As DOM.VKP.DocumentReferenties = Offerte.DocumentReferenties
+	
+		Do Offerte.Delete()
+		Do DocumentReferenties.Delete()
+		Do Winkelkar.Delete()
+	}
+]]></Implementation>
+</Method>
+
 <Method name="KopieerOfferte">
 <FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
 <ReturnType>APPS.VKP.Offerte</ReturnType>
@@ -145,8 +197,8 @@
 <Private>1</Private>
 <ReturnType>APPS.VKP.impl.OfferteService.MagWijzigenBepaler</ReturnType>
 <Implementation><![CDATA[
-	set i%MagWijzigenBepaler = $$$LazyLoad(i%MagWijzigenBepaler,##class(APPS.VKP.impl.OfferteService.MagWijzigenBepaler).%New())
-	quit i%MagWijzigenBepaler
+	set r%MagWijzigenBepaler = $$$LazyLoad(r%MagWijzigenBepaler,##class(APPS.VKP.impl.OfferteService.MagWijzigenBepaler).%New())
+	quit r%MagWijzigenBepaler
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EDI/Offerte/dto/Resultaat.cls.xml
===================================================================
diff -u
--- APPS/EDI/Offerte/dto/Resultaat.cls.xml	(revision 0)
+++ APPS/EDI/Offerte/dto/Resultaat.cls.xml	(revision 32078)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EDI.Offerte.dto.Resultaat">
+<Super>APPS.EDI.Resultaat</Super>
+
+<Parameter name="XMLTYPE">
+<Default>APPS.EDI.Offerte.dto.Resultaat</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/EDI/Offerte/impl/OfferteService/MaakOfferte/FalendeOfferteService.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EDI/Offerte/impl/OfferteService/MaakOfferte/FalendeOfferteService.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EDI/Offerte/impl/OfferteService/MaakOfferte/FalendeOfferteService.cls.xml	(revision 32078)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EDI.Offerte.impl.OfferteService.MaakOfferte.FalendeOfferteService">
+<Super>APPS.EDI.Offerte.impl.OfferteService</Super>
+
+<Method name="VoegToeLijnen">
+<FormalSpec>Offerte:APPS.VKP.Offerte,Lijnen:%ListOfObjects</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.IllegalUsageException).%New("Altijd falende offerte service"))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EDI/Offerte/dto/Aanvraag.cls.xml
===================================================================
diff -u
--- APPS/EDI/Offerte/dto/Aanvraag.cls.xml	(revision 0)
+++ APPS/EDI/Offerte/dto/Aanvraag.cls.xml	(revision 32078)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EDI.Offerte.dto.Aanvraag">
+<Super>APPS.EDI.Aanvraag</Super>
+
+<Parameter name="XMLTYPE">
+<Default>APPS.EDI.Offerte.dto.Aanvraag</Default>
+</Parameter>
+
+<Property name="KlantID">
+<Type>%String</Type>
+</Property>
+
+<Property name="PersonalityID">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="Lijnen">
+<Type>APPS.EDI.common.dto.ProductLijn</Type>
+<Collection>list</Collection>
+</Property>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/APPS/EDI/Offerte/OfferteService.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/EDI/Offerte/OfferteService.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/EDI/Offerte/OfferteService.cls.xml	(revision 32078)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.EDI.Offerte.OfferteService">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.EDI.Offerte.OfferteService,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/APPS/VKP/Offerte.cls.xml
===================================================================
diff -u -r29059 -r32078
--- vhTest/Mock/APPS/VKP/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 29059)
+++ vhTest/Mock/APPS/VKP/Offerte.cls.xml	(.../Offerte.cls.xml)	(revision 32078)
@@ -158,6 +158,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VoegToeMaatwerk">
+<FormalSpec>GroepNaam:%String,IngegevenKenmerken:APPS.PM.Maatwerk.dto.IngegevenKenmerken,Aantal:%String,ProjectReferentie:%String=""</FormalSpec>
+<ReturnType>DOM.EC.Winkelkar.MaatwerkLijn</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("VoegToeMaatwerk",GroepNaam,IngegevenKenmerken,Aantal,ProjectReferentie)
+]]></Implementation>
+</Method>
+
 <Method name="ZetBestelOpmerking">
 <FormalSpec>BestelOpmerking:%String</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("ZetBestelOpmerking",BestelOpmerking)
Index: vhUnitTest/APPS/EDI/Offerte/impl/OfferteService/MaakOfferte/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/EDI/Offerte/impl/OfferteService/MaakOfferte/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/EDI/Offerte/impl/OfferteService/MaakOfferte/Test.cls.xml	(revision 32078)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.EDI.Offerte.impl.OfferteService.MaakOfferte.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Parameter name="KlantID">
+<Type>%String</Type>
+<Default>1000</Default>
+</Parameter>
+
+<Method name="Test: Maak offerte">
+<Implementation><![CDATA[
+	set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	do OfferteServiceMock.VerwachtMethodCall("MaakNieuwOfferte",..#KlantID,..#PersonalityID)
+	
+	set OfferteService = ##class(APPS.EDI.Offerte.impl.OfferteService).%New(OfferteServiceMock)
+	#dim Resultaat As APPS.EDI.Offerte.dto.Resultaat = OfferteService.MaakOfferte(..GeefAanvraag())
+	
+	do $$$AssertEquals(Resultaat.Exceptie,"")
+	
+	do OfferteServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Indien er een probleem is bij de verwerking wordt verwijder offerte opgeroepen en bevat het resultaat een exceptie">
+<Implementation><![CDATA[
+	set Offerte = ##class(vhTest.Dummy.APPS.VKP.Offerte).%New()
+	set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	do OfferteServiceMock.IndienMethodCall("MaakNieuwOfferte",..#KlantID,##class(DOM.common.enu.Personality).VanHoecke()).DanReturn(Offerte)
+	do OfferteServiceMock.VerwachtMethodCall("VerwijderOfferte",Offerte)
+	
+	set FalendeOfferteService = ##class(vhUnitTest.APPS.EDI.Offerte.impl.OfferteService.MaakOfferte.FalendeOfferteService).%New(OfferteServiceMock)
+	#dim Resultaat As APPS.EDI.Offerte.dto.Resultaat = FalendeOfferteService.MaakOfferte(..GeefAanvraag())
+	
+	do $$$AssertNotEquals(Resultaat.Exceptie,"")
+	
+	do OfferteServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="GeefAanvraag">
+<Private>1</Private>
+<ReturnType>APPS.EDI.Offerte.dto.Aanvraag</ReturnType>
+<Implementation><![CDATA[
+	set Aanvraag = ##class(APPS.EDI.Offerte.dto.Aanvraag).%New()
+	set Aanvraag.KlantID = ..#KlantID
+	set Aanvraag.PersonalityID = ..#PersonalityID
+	quit Aanvraag
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EDI/Offerte/OfferteService.cls.xml
===================================================================
diff -u
--- APPS/EDI/Offerte/OfferteService.cls.xml	(revision 0)
+++ APPS/EDI/Offerte/OfferteService.cls.xml	(revision 32078)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EDI.Offerte.OfferteService">
+<Abstract>1</Abstract>
+<Super>TECH.Interface</Super>
+</Class>
+
+
+</Export>
Index: APPS/VKP/OfferteService.cls.xml
===================================================================
diff -u -r29059 -r32078
--- APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 29059)
+++ APPS/VKP/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 32078)
@@ -82,6 +82,11 @@
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
+
+<Method name="VerwijderOfferte">
+<Abstract>1</Abstract>
+<FormalSpec>Offerte:APPS.VKP.Offerte</FormalSpec>
+</Method>
 </Class>
 
 
Index: vhTest/Dummy/APPS/VKP/Offerte.cls.xml
===================================================================
diff -u
--- vhTest/Dummy/APPS/VKP/Offerte.cls.xml	(revision 0)
+++ vhTest/Dummy/APPS/VKP/Offerte.cls.xml	(revision 32078)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Dummy.APPS.VKP.Offerte">
+<Super>TECH.RegisteredObject,APPS.VKP.Offerte</Super>
+</Class>
+
+
+</Export>
Index: APPS/EDI/common/dto/ProductLijn.cls.xml
===================================================================
diff -u
--- APPS/EDI/common/dto/ProductLijn.cls.xml	(revision 0)
+++ APPS/EDI/common/dto/ProductLijn.cls.xml	(revision 32078)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EDI.common.dto.ProductLijn">
+<Super>TECH.DataTransferObject</Super>
+
+<Property name="Aantal">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="Product">
+<Type>APPS.EDI.common.dto.Product</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: APPS/EDI/Offerte/impl/OfferteService.cls.xml
===================================================================
diff -u
--- APPS/EDI/Offerte/impl/OfferteService.cls.xml	(revision 0)
+++ APPS/EDI/Offerte/impl/OfferteService.cls.xml	(revision 32078)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.EDI.Offerte.impl.OfferteService">
+<Super>APPS.EDI.Offerte.OfferteService,TECH.RegisteredObject</Super>
+
+<Property name="OfferteService">
+<Type>APPS.VKP.OfferteService</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.VKP.impl.OfferteService).%New())
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="MaakOfferte">
+<FormalSpec>Aanvraag:APPS.EDI.Offerte.dto.Aanvraag</FormalSpec>
+<ReturnType>APPS.EDI.Offerte.dto.Resultaat</ReturnType>
+<Implementation><![CDATA[
+	set Resultaat = ##class(APPS.EDI.Offerte.dto.Resultaat).%New()
+	
+	#dim Offerte As APPS.VKP.Offerte= ..OfferteService.MaakNieuwOfferte(Aanvraag.KlantID,Aanvraag.PersonalityID)
+	try {
+		do ..VoegToeLijnen(Offerte,Aanvraag.Lijnen)
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		do ..OfferteService.VerwijderOfferte(Offerte)
+		set Resultaat.Exceptie = Exception
+	}
+	
+	quit Resultaat
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeLijnen">
+<FormalSpec>Offerte:APPS.VKP.Offerte,Lijnen:%ListOfObjects</FormalSpec>
+<Private>1</Private>
+</Method>
+</Class>
+
+
+</Export>