Index: EXT/Unishop/PurchaseOrderService001/OrderConverter.cls.xml
===================================================================
diff -u -r32480 -r32529
--- EXT/Unishop/PurchaseOrderService001/OrderConverter.cls.xml	(.../OrderConverter.cls.xml)	(revision 32480)
+++ EXT/Unishop/PurchaseOrderService001/OrderConverter.cls.xml	(.../OrderConverter.cls.xml)	(revision 32529)
@@ -21,7 +21,7 @@
 </Method>
 
 <Method name="Converteer">
-<FormalSpec>Request:EXT.Unishop.PurchaseOrderService001.CreateOrder.Request</FormalSpec>
+<FormalSpec>ExtOrder:EXT.Unishop.PurchaseOrderService001.CreateOrder.Order</FormalSpec>
 <ReturnType>APPS.EDI.Bestel.BestelService.PlaatsBestelling.Aanvraag</ReturnType>
 <Implementation><![CDATA[
 	set PlaatsBestellingAanvraag = ##class(APPS.EDI.Bestel.BestelService.PlaatsBestelling.Aanvraag).%New()
@@ -30,16 +30,16 @@
 	set PlaatsBestellingAanvraag.KlantID = "SFS_83723"
 	set PlaatsBestellingAanvraag.PersonalityID = ##class(DOM.common.enu.Personality).SFS()
 		
-	set Order = ##class(APPS.EDI.Bestel.BestelService.PlaatsBestelling.Order).%New()
+	set AppsOrder = ##class(APPS.EDI.Bestel.BestelService.PlaatsBestelling.Order).%New()
 	
-	do ..Converter.Convert(Request.Order,Order,..OrderConverteerOpties)
+	do ..Converter.Convert(ExtOrder,AppsOrder,..OrderConverteerOpties)
 		
-	set LijnenIterator = ##class(TECH.ListIterator).%New(Request.Order.Lijnen)
+	set LijnenIterator = ##class(TECH.ListIterator).%New(ExtOrder.Lijnen)
 	while LijnenIterator.HasNext() {
-		do Order.Lijnen.Insert(..ConverteerLijn(LijnenIterator.Next()))
+		do AppsOrder.Lijnen.Insert(..ConverteerLijn(LijnenIterator.Next()))
 	}
 	
-	set PlaatsBestellingAanvraag.Order = Order
+	set PlaatsBestellingAanvraag.Order = AppsOrder
 	quit PlaatsBestellingAanvraag
 ]]></Implementation>
 </Method>
Index: EXT/Unishop/PurchaseOrder001/BestandVerwerker.cls.xml
===================================================================
diff -u -r32527 -r32529
--- EXT/Unishop/PurchaseOrder001/BestandVerwerker.cls.xml	(.../BestandVerwerker.cls.xml)	(revision 32527)
+++ EXT/Unishop/PurchaseOrder001/BestandVerwerker.cls.xml	(.../BestandVerwerker.cls.xml)	(revision 32529)
@@ -13,6 +13,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="OrderConverter">
+<Type>EXT.Unishop.PurchaseOrderService001.OrderConverter</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>XmlCorrelater:TECH.XMLCorrelater,BestelService:APPS.EDI.Bestel.BestelService</FormalSpec>
 <Private>1</Private>
@@ -22,6 +27,7 @@
 <Implementation><![CDATA[
 	set ..XmlCorrelater = $$$Inject(XmlCorrelater,##class(TECH.XMLCorrelater).%New())
 	set ..BestelService = $$$Inject(BestelService,##class(APPS.EDI.Bestel.impl.BestelService).%New())
+	set ..OrderConverter = ##class(EXT.Unishop.PurchaseOrderService001.OrderConverter).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -31,9 +37,9 @@
 <Implementation><![CDATA[
 	#dim ClassName As %String = ##class(EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders).%ClassName(1)
 	#dim Orders As EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders = ..XmlCorrelater.GeefObjectVanBestand(BestandVolledigeNaam,ClassName,"PurchaseOrders")
+	#dim Order As EXT.Unishop.PurchaseOrderService001.CreateOrder.Order = Orders.Orders.GetAt(1)
 	
-	set Aanvraag = ##class(APPS.EDI.Bestel.BestelService.PlaatsBestelling.Aanvraag).%New()
-	do ..BestelService.PlaatsBestelling(Aanvraag)
+	do:$IsObject(Order) ..BestelService.PlaatsBestelling(..OrderConverter.Converteer(Order))
 ]]></Implementation>
 </Method>
 </Class>
Index: EXT/Unishop/PurchaseOrderService001/Service.cls.xml
===================================================================
diff -u -r32274 -r32529
--- EXT/Unishop/PurchaseOrderService001/Service.cls.xml	(.../Service.cls.xml)	(revision 32274)
+++ EXT/Unishop/PurchaseOrderService001/Service.cls.xml	(.../Service.cls.xml)	(revision 32529)
@@ -16,7 +16,7 @@
 <Private>1</Private>
 </Property>
 
-<Property name="RequestConverter">
+<Property name="OrderConverter">
 <Type>EXT.Unishop.PurchaseOrderService001.OrderConverter</Type>
 <Private>1</Private>
 </Property>
@@ -28,7 +28,7 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..BestelService = ##class(APPS.EDI.Bestel.impl.BestelService).%New()
-	set ..RequestConverter = ##class(EXT.Unishop.PurchaseOrderService001.OrderConverter).%New()
+	set ..OrderConverter = ##class(EXT.Unishop.PurchaseOrderService001.OrderConverter).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -41,7 +41,7 @@
 	do:CreateOrderRequest.Merkteken'="3}Z7Mb-(8aP*P/[]" ##class(TECH.Exceptions.InvalidInputException).Throw("Token not valid for this system")
 	
 	#dim Response As EXT.Unishop.PurchaseOrderService001.CreateOrder.Response
-	set Response = ..CreateResponse(..BestelService.PlaatsBestelling(..RequestConverter.Converteer(CreateOrderRequest)))
+	set Response = ..CreateResponse(..BestelService.PlaatsBestelling(..OrderConverter.Converteer(CreateOrderRequest.Order)))
 	quit Response
 ]]></Implementation>
 </Method>
Index: vhTest/Utils/EXT/Unishop/PurchaseOrderService001/CreateOrder/Order.cls.xml
===================================================================
diff -u
--- vhTest/Utils/EXT/Unishop/PurchaseOrderService001/CreateOrder/Order.cls.xml	(revision 0)
+++ vhTest/Utils/EXT/Unishop/PurchaseOrderService001/CreateOrder/Order.cls.xml	(revision 32529)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Utils.EXT.Unishop.PurchaseOrderService001.CreateOrder.Order">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="TaorboxOrder">
+<ClassMethod>1</ClassMethod>
+<ReturnType>EXT.Unishop.PurchaseOrderService001.CreateOrder.Order</ReturnType>
+<Implementation><![CDATA[
+	set Order = ##class(EXT.Unishop.PurchaseOrderService001.CreateOrder.Order).%New()
+	set Order.OrderReferentie = "TaorboxOrderReferentie"
+	
+	set Lijn = ##class(EXT.Unishop.PurchaseOrderService001.CreateOrder.OrderLijn).%New()
+	set Lijn.Product = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrderService001.CreateOrder.LadeEigenschappenTAX).StandaardLade()
+	set Lijn.Aantal = 1
+	set Lijn.Referentie = "TaorboxLijnReferentie"
+	do Order.Lijnen.Insert(Lijn)
+
+	quit Order
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandVerwerker/VerwerkBestand/Test.cls.xml
===================================================================
diff -u -r32527 -r32529
--- vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandVerwerker/VerwerkBestand/Test.cls.xml	(.../Test.cls.xml)	(revision 32527)
+++ vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandVerwerker/VerwerkBestand/Test.cls.xml	(.../Test.cls.xml)	(revision 32529)
@@ -49,6 +49,8 @@
 <Method name="Test : Na een goede correlate wordt de bestel service opgeroepen met de juiste parameters">
 <Implementation><![CDATA[
 	set DummyOrders = ##class(EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders).%New()
+	do DummyOrders.Orders.Insert(##class(vhTest.Utils.EXT.Unishop.PurchaseOrderService001.CreateOrder.Order).TaorboxOrder())
+	
 	set StubCorrelator = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	do StubCorrelator.IndienMethodCall("GeefObjectVanBestand",..BestandVolledigeNaam,"EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders","PurchaseOrders").DanReturn(DummyOrders)
 	
@@ -58,7 +60,14 @@
 	do Verwerker.VerwerkBestand(..BestandVolledigeNaam)
 	
 	#dim Aanvraag As APPS.EDI.Bestel.BestelService.PlaatsBestelling.Aanvraag = EdiBestelServiceSpy.GeefAanvraag()
+	
 	if $$$AssertIsObject(Aanvraag) {
+		do $$$AssertEquals(Aanvraag.PersonalityID,##class(DOM.common.enu.Personality).SFS())
+		do $$$AssertEquals(Aanvraag.KlantID,"SFS_83723")
+		if $$$AssertEquals(Aanvraag.Order.Lijnen.Count(),1) {
+			do $$$AssertEquals(Aanvraag.Order.Lijnen.GetAt(1).Aantal,1)	
+		}
+		
 	}
 ]]></Implementation>
 </Method>