Index: BL/Flow/Offerte/Convert2Order.cls.xml
===================================================================
diff -u -r31572 -r31573
--- BL/Flow/Offerte/Convert2Order.cls.xml	(.../Convert2Order.cls.xml)	(revision 31572)
+++ BL/Flow/Offerte/Convert2Order.cls.xml	(.../Convert2Order.cls.xml)	(revision 31573)
@@ -19,27 +19,26 @@
 	Do BUILDOBJ^FLOWORD(,,,,,,,,.Offerte)	
 	Do REFRESH^vhTERMINA()
 	Do ..ControleerOfferteData(.Offerte)
-	Do ..CorrigeerDocumentHoofding(.Offerte)
-	Do ..CorrigeerVerzendwijze(.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)
+		Do ..CorrigeerDocumentHoofding(Order, $P(Offerte("H","Default"),"\",57))
+		Do ..CorrigeerVerzendwijze(Order)
+	}
 	Quit
 ]]></Implementation>
 </Method>
 
 <Method name="CorrigeerDocumentHoofding">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Offerte:%String</FormalSpec>
+<FormalSpec>Order:DOM.VKP.Order,DocumentReferentiesID:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#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)
-		#dim OrderDocumentReferenties As DOM.VKP.DocumentReferenties = Order.GeefDocumentReferenties()
-	
-		#dim DocumentReferentiesID As %String = $P(Offerte("H","Default"),"\",57)
-		#dim OfferteDocumentReferenties As DOM.VKP.DocumentReferenties = ##class(DOM.VKP.DocumentReferenties).OpenId(DocumentReferentiesID)	
-		Set OrderDocumentReferenties.KlantOrderNummer = OfferteDocumentReferenties.KlantOrderNummer
-		Do OrderDocumentReferenties.Save()
-	}
+	#dim OrderDocumentReferenties As DOM.VKP.DocumentReferenties = Order.GeefDocumentReferenties()
+	#dim OfferteDocumentReferenties As DOM.VKP.DocumentReferenties = ##class(DOM.VKP.DocumentReferenties).OpenId(DocumentReferentiesID)	
+	Set OrderDocumentReferenties.KlantOrderNummer = OfferteDocumentReferenties.KlantOrderNummer
+	Do OrderDocumentReferenties.Save()
 ]]></Implementation>
 </Method>
 
@@ -56,13 +55,9 @@
 
 <Method name="CorrigeerVerzendwijze">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Offerte:%String</FormalSpec>
+<FormalSpec>Order:DOM.VKP.Order</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim OrderID As %String = $Get( Offerte("F") )
-	Quit:(##class(DOM.DomeinContext).Instance().GeefOrderAPI().BestaatOrder(OrderID))
-	
-	#dim Order As DOM.VKP.Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(OrderID)
 	#dim VerzendingWijze As %String = Order.GeefVerzendingWijze()
 	
 	#dim VerkoopAPI As DOM.VKP.VerkoopAPI = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()