Index: APPS/TBXWeb/impl/OrderVerwerker.cls.xml
===================================================================
diff -u -r40353 -r40658
--- APPS/TBXWeb/impl/OrderVerwerker.cls.xml	(.../OrderVerwerker.cls.xml)	(revision 40353)
+++ APPS/TBXWeb/impl/OrderVerwerker.cls.xml	(.../OrderVerwerker.cls.xml)	(revision 40658)
@@ -40,19 +40,19 @@
 </Property>
 
 <Method name="ConverteerWebOrderNaarOfferte">
-<FormalSpec>WebOrder:WS.TBX.Order</FormalSpec>
+<FormalSpec>WebOrder:WS.TBX.Order,OfferteId:%Integer=""</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim OfferteID As %String = ""
+	Set OfferteId = $$$If($$$HasLength(OfferteId),OfferteId,..CreateOfferte())
 	;#dim OperatieScope As TECH.OperatieScope = ##class(TECH.OperatieScope).StartMetTx()
+
 	try {
 		set ..WebOrder = WebOrder
 		set ..OrderReferentie = WebOrder.Commissie
 		set ..CommissieReferentie = WebOrder.CommissieReferentie
-		do ..ConverteerWebOrderHoofding()
+		do ..ConverteerWebOrderHoofding(OfferteId)
 		do ..ConverteerWebOrderLijnen(0)
 		do ..ConversieAfhandeling()
-		set OfferteID = ..Offerte.%Id()
 		
 		;do OperatieScope.Gelukt()
 	} 
@@ -62,15 +62,15 @@
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		do ##class(TECH.ExceptionHandler).Rethrow(Exception)
 	}
-	quit OfferteID
+	quit OfferteId
 ]]></Implementation>
 </Method>
 
 <Method name="ConverteerWebGroepOrderNaarOfferte">
-<FormalSpec>GroepWebOrder:WS.TBX.GroepOrder</FormalSpec>
+<FormalSpec>GroepWebOrder:WS.TBX.GroepOrder,OfferteId:%Integer=""</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim OfferteID As %String = ""
+	Set OfferteId = $$$If($$$HasLength(OfferteId),OfferteId,..CreateOfferte())
 	;#dim OperatieScope As TECH.OperatieScope = ##class(TECH.OperatieScope).StartMetTx()
 	
 	try {
@@ -82,15 +82,14 @@
 			set ctrWebOrders = ctrWebOrders + 1
 			set ..WebOrder = itWebOrders.Next()			
 			if ctrWebOrders = 1 {
-				do ..ConverteerWebOrderHoofding()
+				do ..ConverteerWebOrderHoofding(OfferteId)
 			} else {
 				do ..VoegToeWebOrderOorsprongDetail()
 			}
 			do ..VoegToeWebOrderReferentieLijn()
 			do ..ConverteerWebOrderLijnen(1)
 		}	
 		do ..ConversieAfhandeling()
-		set OfferteID = ..Offerte.%Id()
 		
 		;do OperatieScope.Gelukt()
 	} 
@@ -100,10 +99,21 @@
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		do ##class(TECH.ExceptionHandler).Rethrow(Exception)
 	}
-	quit OfferteID
+	quit OfferteId
 ]]></Implementation>
 </Method>
 
+<Method name="CreateOfferte">
+<Private>1</Private>
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[
+	set Offerte = ##class(Flow.Offerte.Hoofding).%New()
+	set Offerte.ID = ##class(Flow.Offerte.Hoofding).NewID()
+	do Offerte.Save()
+	quit Offerte.ID
+]]></Implementation>
+</Method>
+
 <Method name="VoegToeWebOrderOorsprongDetail">
 <Private>1</Private>
 <Implementation><![CDATA[	set ..Offerte.OorsprongDetail = ..Offerte.OorsprongDetail _ ";"_..WebOrder.OrderNr
@@ -122,12 +132,13 @@
 </Method>
 
 <Method name="ConverteerWebOrderHoofding">
+<FormalSpec>OfferteId:%Integer</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	do ..BepaalTBXHandel()
 	do ..BepaalblFlowOfferte()
 	
-	set ..Offerte = ..blFlowOfferte.Create()
+	set ..Offerte = ..blFlowOfferte.Open(OfferteId)
 	set ..Offerte.Oorsprong = ##class(BL.Flow.Offerte.enu.Oorsprong).TandemboxWebsite()
 	set ..Offerte.OorsprongDetail = ..WebOrder.OrderNr
 	set ..Offerte.CreatieTijdStip = ..GeefCreatieTijdstip()
Index: APPS/TBXWeb/OrderVerwerker.cls.xml
===================================================================
diff -u -r35697 -r40658
--- APPS/TBXWeb/OrderVerwerker.cls.xml	(.../OrderVerwerker.cls.xml)	(revision 35697)
+++ APPS/TBXWeb/OrderVerwerker.cls.xml	(.../OrderVerwerker.cls.xml)	(revision 40658)
@@ -5,13 +5,13 @@
 
 <Method name="ConverteerWebOrderNaarOfferte">
 <Abstract>1</Abstract>
-<FormalSpec>WebOrder:WS.TBX.Order</FormalSpec>
+<FormalSpec>WebOrder:WS.TBX.Order,OfferteId:%Integer=""</FormalSpec>
 <ReturnType>%String</ReturnType>
 </Method>
 
 <Method name="ConverteerWebGroepOrderNaarOfferte">
 <Abstract>1</Abstract>
-<FormalSpec>GroepWebOrder:WS.TBX.GroepOrder</FormalSpec>
+<FormalSpec>GroepWebOrder:WS.TBX.GroepOrder,OfferteId:%Integer=""</FormalSpec>
 <ReturnType>%String</ReturnType>
 </Method>
 </Class>
Index: Flow/Offerte/OfferteRepository.cls.xml
===================================================================
diff -u
--- Flow/Offerte/OfferteRepository.cls.xml	(revision 0)
+++ Flow/Offerte/OfferteRepository.cls.xml	(revision 40658)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Flow.Offerte.OfferteRepository">
+<Super>TECH.Persistentie.impl.Repository</Super>
+
+<Parameter name="DataClassName">
+<Type>%String</Type>
+<Default>Flow.Offerte.Hoofding</Default>
+</Parameter>
+</Class>
+
+
+</Export>
Index: WS/TBX/Calc.cls.xml
===================================================================
diff -u -r40656 -r40658
--- WS/TBX/Calc.cls.xml	(.../Calc.cls.xml)	(revision 40656)
+++ WS/TBX/Calc.cls.xml	(.../Calc.cls.xml)	(revision 40658)
@@ -24,19 +24,24 @@
 <Default>http://tempuri.org</Default>
 </Parameter>
 
+<Property name="OfferteRepository">
+<Type>Flow.Offerte.OfferteRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="BackgroundProcessStarter">
 <Type>TECH.impl.BackgroundProcessStarter</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>initvalue:%CacheString</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..BackgroundProcessStarter = ##class(TECH.Context).Instance().GeefBackgroundJobAPI().GeefBackgroundProcessStarter()
+	set ..OfferteRepository = ##class(Flow.Offerte.OfferteRepository).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -59,17 +64,15 @@
 <ReturnType>%String</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	If $$$Not(WebOrder.KLNummer = 2265) {
-		set Verwerker = ##class(APPS.TBXWeb.impl.OrderVerwerker).%New()
-		quit Verwerker.ConverteerWebOrderNaarOfferte(WebOrder)
-	} else {
-		set DataBuilder = ##class(TECH.BackgroundProcess.impl.DataBuilder).%New()
-		do DataBuilder.SetClassName(##class(APPS.TBXWeb.impl.OrderVerwerker).%ClassName(1))
-		do DataBuilder.SetMethodName("ConverteerWebOrderNaarOfferte")
-		do DataBuilder.VoegToeDataTranferObject(WebOrder)
-		do ..BackgroundProcessStarter.StartProcess(DataBuilder.GetData())
-		quit 999999
-	}
+	#dim OfferteId As %String = ..MaakOfferte()
+	
+	set DataBuilder = ##class(TECH.BackgroundProcess.impl.DataBuilder).%New()
+	do DataBuilder.SetClassName(##class(APPS.TBXWeb.impl.OrderVerwerker).%ClassName(1))
+	do DataBuilder.SetMethodName("ConverteerWebOrderNaarOfferte")
+	do DataBuilder.VoegToeDataTranferObject(WebOrder)
+	do DataBuilder.VoegToeDataType(OfferteId)
+	do ..BackgroundProcessStarter.StartProcess(DataBuilder.GetData())
+	quit OfferteId
 ]]></Implementation>
 </Method>
 
@@ -78,8 +81,15 @@
 <ReturnType>%String</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	set Verwerker = ##class(APPS.TBXWeb.impl.OrderVerwerker).%New()
-	quit Verwerker.ConverteerWebGroepOrderNaarOfferte(WebGroepOrder)
+	#dim OfferteId As %String = ..MaakOfferte()
+	
+	set DataBuilder = ##class(TECH.BackgroundProcess.impl.DataBuilder).%New()
+	do DataBuilder.SetClassName(##class(APPS.TBXWeb.impl.OrderVerwerker).%ClassName(1))
+	do DataBuilder.SetMethodName("ConverteerWebGroepOrderNaarOfferte")
+	do DataBuilder.VoegToeDataTranferObject(WebGroepOrder)
+	do DataBuilder.VoegToeDataType(OfferteId)
+	do ..BackgroundProcessStarter.StartProcess(DataBuilder.GetData())
+	quit OfferteId
 ]]></Implementation>
 </Method>
 
@@ -91,6 +101,17 @@
 <Implementation><![CDATA[	Quit "1"
 ]]></Implementation>
 </Method>
+
+<Method name="MaakOfferte">
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Offerte As Flow.Offerte.Hoofding = ..OfferteRepository.Maak()
+	Set Offerte.ID = ##class(Flow.Offerte.Hoofding).NewID()
+	Do ..OfferteRepository.Bewaar(Offerte)
+	Quit Offerte.ID
+]]></Implementation>
+</Method>
 </Class>