Index: BL/Flow/Offerte/Convert2Order.cls.xml
===================================================================
diff -u -r31573 -r31574
--- BL/Flow/Offerte/Convert2Order.cls.xml	(.../Convert2Order.cls.xml)	(revision 31573)
+++ BL/Flow/Offerte/Convert2Order.cls.xml	(.../Convert2Order.cls.xml)	(revision 31574)
@@ -9,10 +9,25 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="OrderAPI">
+<Type>DOM.VKP.OrderAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI() 
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="CreateOrder">
 <Description>
 Offerte is een multidimensional uit de CHUI.</Description>
-<ClassMethod>1</ClassMethod>
 <FormalSpec>Offerte:%String</FormalSpec>
 <Implementation><![CDATA[
 	Do STORE^vhTERMINA()
@@ -21,8 +36,8 @@
 	Do ..ControleerOfferteData(.Offerte)
 	
 	#dim OrderID As %String = $Get( Offerte("F") )
-	If (##class(DOM.DomeinContext).Instance().GeefOrderAPI().BestaatOrder(OrderID)) {
-		#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(OrderID)
+	If (..OrderAPI.BestaatOrder(OrderID)) {
+		#dim Order As DOM.VKP.Order = ..OrderAPI.GeefOrder(OrderID)
 		Do ..CorrigeerDocumentHoofding(Order, $P(Offerte("H","Default"),"\",57))
 		Do ..CorrigeerVerzendwijze(Order)
 	}
@@ -31,7 +46,6 @@
 </Method>
 
 <Method name="CorrigeerDocumentHoofding">
-<ClassMethod>1</ClassMethod>
 <FormalSpec>Order:DOM.VKP.Order,DocumentReferentiesID:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
@@ -43,7 +57,6 @@
 </Method>
 
 <Method name="ControleerOfferteData">
-<ClassMethod>1</ClassMethod>
 <FormalSpec>Offerte:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
@@ -54,7 +67,6 @@
 </Method>
 
 <Method name="CorrigeerVerzendwijze">
-<ClassMethod>1</ClassMethod>
 <FormalSpec>Order:DOM.VKP.Order</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[