Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r43375 -r43376
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 43375)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 43376)
@@ -53,22 +53,10 @@
 	
 	#Dim Order As DOM.VKP.Order = ..OrderLevenCyclusService.MaakOrderMetKlantGegevens(KlantID)
 	
-	#dim OrderDocRef As DOM.VKP.DocumentReferenties = ..DocumentReferentiesRepository.Maak()
-	Set OrderDocRef.OrderReferentie = OrderHeader.CustomerRef
-	Do ..DocumentReferentiesRepository.Bewaar(OrderDocRef)
-	Do Order.ZetDocumentReferenties(OrderDocRef)	
+	Do Order.ZetDocumentReferenties(..MaakOrderReferentie(OrderHeader))	
+	Do Order.ZetAfleveradres(..MaakLeverAdres(OrderHeader))
+	Do Order.ZetCreatieDatum(..MaakCreatieDatum(OrderHeader))
 
-	Set LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
-	Do LeverAdres.ZetGemeente(OrderHeader.DlvAddrCity)
-	Do LeverAdres.ZetPostcode(OrderHeader.DlvAddrZipCode)
-	Do LeverAdres.ZetStraat(OrderHeader.DlvAddrStreet1)
-	Do LeverAdres.ZetLandNr(OrderHeader.DlvAddrCountry)
-	Do LeverAdres.ZetNaam(OrderHeader.DeliveryName)
-	
-	Do Order.ZetAfleveradres(LeverAdres)
-
-	Do Order.ZetCreatieDatum(##class(AXimpl.AxToAdminUtils).ConvertZuluTimeStampToDate(OrderHeader.CreatedDateTimeHeader.content))
-
 	// Enkel nog maar productLijn.
 	Set OrderLineIterator = ##class(TECH.ListIterator).%New(OrderHeader.OrderLine)
 	While OrderLineIterator.HasNext() {
@@ -83,6 +71,42 @@
 	Do ..OrderAPI.Bewaar(Order)
 ]]></Implementation>
 </Method>
+
+<Method name="MaakCreatieDatum">
+<FormalSpec>OrderHeader:AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[	Quit ##class(AXimpl.AxToAdminUtils).ConvertZuluTimeStampToDate(OrderHeader.CreatedDateTimeHeader.content)
+]]></Implementation>
+</Method>
+
+<Method name="MaakOrderReferentie">
+<FormalSpec>OrderHeader:AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.VKP.DocumentReferenties</ReturnType>
+<Implementation><![CDATA[
+	#dim OrderDocRef As DOM.VKP.DocumentReferenties = ..DocumentReferentiesRepository.Maak()
+	Set OrderDocRef.OrderReferentie = OrderHeader.CustomerRef
+	Do ..DocumentReferentiesRepository.Bewaar(OrderDocRef)
+	
+	Quit OrderDocRef
+]]></Implementation>
+</Method>
+
+<Method name="MaakLeverAdres">
+<FormalSpec>OrderHeader:AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.VKP.impl.LeverAdres</ReturnType>
+<Implementation><![CDATA[
+	Set LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	Do LeverAdres.ZetGemeente(OrderHeader.DlvAddrCity)
+	Do LeverAdres.ZetPostcode(OrderHeader.DlvAddrZipCode)
+	Do LeverAdres.ZetStraat(OrderHeader.DlvAddrStreet1)
+	Do LeverAdres.ZetLandNr(OrderHeader.DlvAddrCountry)
+	Do LeverAdres.ZetNaam(OrderHeader.DeliveryName)
+	
+	Quit LeverAdres
+]]></Implementation>
+</Method>
 </Class>