Index: EXT/Unishop/PurchaseOrder001/XmlImporter.cls.xml
===================================================================
diff -u
--- EXT/Unishop/PurchaseOrder001/XmlImporter.cls.xml	(revision 0)
+++ EXT/Unishop/PurchaseOrder001/XmlImporter.cls.xml	(revision 32520)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="EXT.Unishop.PurchaseOrder001.XmlImporter">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="XmlCorrelater">
+<Type>TECH.XMLCorrelater</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..XmlCorrelater = ##class(TECH.XMLCorrelater).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Import">
+<FormalSpec>Bestand:%String</FormalSpec>
+<ReturnType>EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders</ReturnType>
+<Implementation><![CDATA[
+	#dim ClassName As %String = ##class(EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders).%ClassName(1)
+	#dim Orders As EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders = ..XmlCorrelater.GeefObjectVanBestand(Bestand,ClassName,"PurchaseOrders")
+	quit Orders
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandVerwerker/VerwerkBestand/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandVerwerker/VerwerkBestand/Test.cls.xml	(revision 0)
+++ vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandVerwerker/VerwerkBestand/Test.cls.xml	(revision 32520)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.EXT.Unishop.PurchaseOrder001.BestandVerwerker.VerwerkBestand.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Verwerker doet een goede order correlatie">
+<Implementation><![CDATA[
+	set XmlImporter = ##class(vhTest.Spy.EXT.Unishop.PurchaseOrder001.XmlImporter).%New()
+	set Verwerker = ##class(EXT.Unishop.PurchaseOrder001.BestandVerwerker).%New(XmlImporter)
+	
+	#dim BestandVolledigeNaam As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(""),"Alpnach.xml")
+	do Verwerker.VerwerkBestand(BestandVolledigeNaam)
+	
+	#dim Orders As EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders = XmlImporter.GeefOrders()
+	do $$$AssertTrue($IsObject(Orders))
+	do $$$AssertTrue(Orders.Orders.Count()>0)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: EXT/Unishop/PurchaseOrderService001/CreateOrder/LadeEigenschappenTAX.cls.xml
===================================================================
diff -u -r32274 -r32520
--- EXT/Unishop/PurchaseOrderService001/CreateOrder/LadeEigenschappenTAX.cls.xml	(.../LadeEigenschappenTAX.cls.xml)	(revision 32274)
+++ EXT/Unishop/PurchaseOrderService001/CreateOrder/LadeEigenschappenTAX.cls.xml	(.../LadeEigenschappenTAX.cls.xml)	(revision 32520)
@@ -4,11 +4,11 @@
 <Super>EXT.Unishop.PurchaseOrderService001.CreateOrder.ProductEigenschappen,EXT.Unishop.PurchaseOrderService001.CreateOrder.LadeEigenschappen</Super>
 
 <Parameter name="XMLNAME">
-<Default>ProductFeatures_TAX</Default>
+<Default>TAX</Default>
 </Parameter>
 
 <Parameter name="XMLTYPE">
-<Default>ProductFeatures_TAX</Default>
+<Default>TAX</Default>
 </Parameter>
 
 <Property name="LadeBinnenKleur">
Index: vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandVerwerker.VerwerkBestand/Test/Alpnach.xml
===================================================================
diff -u
--- vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandVerwerker.VerwerkBestand/Test/Alpnach.xml	(revision 0)
+++ vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandVerwerker.VerwerkBestand/Test/Alpnach.xml	(revision 32520)
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PurchaseOrders xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<PurchaseOrder>
+		<PurchaseOrderNumber>0000015042</PurchaseOrderNumber>
+		<PurchaseOrderReference>PIUS.AMSTAD</PurchaseOrderReference>
+		<RequestedDeliveryDate></RequestedDeliveryDate>
+		<PurchaseOrderLines>
+			<PurchaseOrderLine>
+				<PurchaseOrderLineNumber></PurchaseOrderLineNumber>
+				<PurchaseOrderLineReference>99-03-0001-003 Pos.901 LT25.01.16</PurchaseOrderLineReference>
+				<Quantity>4</Quantity>
+				<ProductFeatures xsi:type="TAX">
+					<Application>L</Application>
+					<BoxSystemColour>E1</BoxSystemColour>
+					<InteriorColour>E1</InteriorColour>
+					<BaseColour>E1</BaseColour>
+					<CoverColour>AL</CoverColour>
+					<BuildInHeight>K</BuildInHeight>
+					<BoxSystemDepth>500</BoxSystemDepth>
+					<IsInsideBoxSystem>false</IsInsideBoxSystem>
+					<FrontAttachment>E</FrontAttachment>
+					<CabinetWidth>765</CabinetWidth>
+					<IsInteriorCabinetWidth>true</IsInteriorCabinetWidth>
+					<HasSupportPanelLeft>false</HasSupportPanelLeft>
+					<HasSupportPanelRight>false</HasSupportPanelRight>
+					<SupportPanelColour/>
+					<LoadBearingCapacity>40</LoadBearingCapacity>
+					<RunnerSystem>B</RunnerSystem>
+					<RunnerType>Movento</RunnerType>
+					<DepthAdjustment>false</DepthAdjustment>
+					<HasSideStabiliser>false</HasSideStabiliser>
+					<TypeLockingDevice>D</TypeLockingDevice>
+					<HasCustomMat>true</HasCustomMat>
+					<MatMaterial>CV</MatMaterial>
+					<MatColour>BLW</MatColour>
+					<NotRequiredForDelivery>
+						<FrontAttachment>false</FrontAttachment>
+						<RunnerType>true</RunnerType>
+					</NotRequiredForDelivery>
+				</ProductFeatures>
+			</PurchaseOrderLine>
+			<PurchaseOrderLine>
+				<PurchaseOrderLineNumber></PurchaseOrderLineNumber>
+				<PurchaseOrderLineReference>99-03-0001-003 Pos.900 LT25.01.16</PurchaseOrderLineReference>
+				<Quantity>4</Quantity>
+				<ProductFeatures xsi:type="TAX">
+					<Application>L</Application>
+					<BoxSystemColour>W</BoxSystemColour>
+					<InteriorColour>W</InteriorColour>
+					<BaseColour>W</BaseColour>
+					<CoverColour>AL</CoverColour>
+					<BuildInHeight>K</BuildInHeight>
+					<BoxSystemDepth>500</BoxSystemDepth>
+					<IsInsideBoxSystem>false</IsInsideBoxSystem>
+					<FrontAttachment>E</FrontAttachment>
+					<CabinetWidth>765</CabinetWidth>
+					<IsInteriorCabinetWidth>true</IsInteriorCabinetWidth>
+					<HasSupportPanelLeft>false</HasSupportPanelLeft>
+					<HasSupportPanelRight>false</HasSupportPanelRight>
+					<SupportPanelColour/>
+					<LoadBearingCapacity>40</LoadBearingCapacity>
+					<RunnerSystem>B</RunnerSystem>
+					<RunnerType>Movento</RunnerType>
+					<DepthAdjustment>false</DepthAdjustment>
+					<HasSideStabiliser>false</HasSideStabiliser>
+					<TypeLockingDevice>D</TypeLockingDevice>
+					<HasCustomMat>false</HasCustomMat>
+					<MatMaterial></MatMaterial>
+					<MatColour></MatColour>
+					<NotRequiredForDelivery>
+						<FrontAttachment>false</FrontAttachment>
+						<RunnerType>true</RunnerType>
+					</NotRequiredForDelivery>
+				</ProductFeatures>
+			</PurchaseOrderLine>
+			<PurchaseOrderLine>
+				<PurchaseOrderLineNumber></PurchaseOrderLineNumber>
+				<PurchaseOrderLineReference>LAGER</PurchaseOrderLineReference>
+				<Quantity>3</Quantity>
+				<ProductFeatures xsi:type="TAX">
+					<Application>L</Application>
+					<BoxSystemColour>W</BoxSystemColour>
+					<InteriorColour>W</InteriorColour>
+					<BaseColour>W</BaseColour>
+					<CoverColour>AL</CoverColour>
+					<BuildInHeight>K</BuildInHeight>
+					<BoxSystemDepth>500</BoxSystemDepth>
+					<IsInsideBoxSystem>false</IsInsideBoxSystem>
+					<FrontAttachment>E</FrontAttachment>
+					<CabinetWidth>423</CabinetWidth>
+					<IsInteriorCabinetWidth>true</IsInteriorCabinetWidth>
+					<HasSupportPanelLeft>false</HasSupportPanelLeft>
+					<HasSupportPanelRight>false</HasSupportPanelRight>
+					<SupportPanelColour/>
+					<LoadBearingCapacity>40</LoadBearingCapacity>
+					<RunnerSystem>B</RunnerSystem>
+					<RunnerType>Movento</RunnerType>
+					<DepthAdjustment>false</DepthAdjustment>
+					<HasSideStabiliser>false</HasSideStabiliser>
+					<TypeLockingDevice>D</TypeLockingDevice>
+					<HasCustomMat>false</HasCustomMat>
+					<MatMaterial></MatMaterial>
+					<MatColour></MatColour>
+					<NotRequiredForDelivery>
+						<FrontAttachment>false</FrontAttachment>
+						<RunnerType>true</RunnerType>
+					</NotRequiredForDelivery>
+				</ProductFeatures>
+			</PurchaseOrderLine>
+			<PurchaseOrderLine>
+				<PurchaseOrderLineNumber></PurchaseOrderLineNumber>
+				<PurchaseOrderLineReference>99-03-0001-003 Pos.901 LT25.01.16</PurchaseOrderLineReference>
+				<Quantity>4</Quantity>
+				<ProductFeatures xsi:type="TAX">
+					<Application>L</Application>
+					<BoxSystemColour>E1</BoxSystemColour>
+					<InteriorColour>E1</InteriorColour>
+					<BaseColour>E1</BaseColour>
+					<CoverColour>AL</CoverColour>
+					<BuildInHeight>K</BuildInHeight>
+					<BoxSystemDepth>500</BoxSystemDepth>
+					<IsInsideBoxSystem>false</IsInsideBoxSystem>
+					<FrontAttachment>E</FrontAttachment>
+					<CabinetWidth>503</CabinetWidth>
+					<IsInteriorCabinetWidth>true</IsInteriorCabinetWidth>
+					<HasSupportPanelLeft>false</HasSupportPanelLeft>
+					<HasSupportPanelRight>false</HasSupportPanelRight>
+					<SupportPanelColour/>
+					<LoadBearingCapacity>40</LoadBearingCapacity>
+					<RunnerSystem>TOB</RunnerSystem>
+					<RunnerType>Movento</RunnerType>
+					<DepthAdjustment>false</DepthAdjustment>
+					<HasSideStabiliser>false</HasSideStabiliser>
+					<TypeLockingDevice>D</TypeLockingDevice>
+					<HasCustomMat>true</HasCustomMat>
+					<MatMaterial>CV</MatMaterial>
+					<MatColour>BLW</MatColour>
+					<NotRequiredForDelivery>
+						<FrontAttachment>false</FrontAttachment>
+						<RunnerType>false</RunnerType>
+					</NotRequiredForDelivery>
+				</ProductFeatures>
+			</PurchaseOrderLine>
+			<PurchaseOrderLine>
+				<PurchaseOrderLineNumber></PurchaseOrderLineNumber>
+				<PurchaseOrderLineReference>99-03-0001-003 Pos.900 LT25.01.16</PurchaseOrderLineReference>
+				<Quantity>4</Quantity>
+				<ProductFeatures xsi:type="TAX">
+					<Application>L</Application>
+					<BoxSystemColour>W</BoxSystemColour>
+					<InteriorColour>W</InteriorColour>
+					<BaseColour>W</BaseColour>
+					<CoverColour>AL</CoverColour>
+					<BuildInHeight>K</BuildInHeight>
+					<BoxSystemDepth>500</BoxSystemDepth>
+					<IsInsideBoxSystem>false</IsInsideBoxSystem>
+					<FrontAttachment>E</FrontAttachment>
+					<CabinetWidth>503</CabinetWidth>
+					<IsInteriorCabinetWidth>true</IsInteriorCabinetWidth>
+					<HasSupportPanelLeft>false</HasSupportPanelLeft>
+					<HasSupportPanelRight>false</HasSupportPanelRight>
+					<SupportPanelColour/>
+					<LoadBearingCapacity>40</LoadBearingCapacity>
+					<RunnerSystem>TOB</RunnerSystem>
+					<RunnerType>Movento</RunnerType>
+					<DepthAdjustment>false</DepthAdjustment>
+					<HasSideStabiliser>false</HasSideStabiliser>
+					<TypeLockingDevice>D</TypeLockingDevice>
+					<HasCustomMat>false</HasCustomMat>
+					<MatMaterial></MatMaterial>
+					<MatColour></MatColour>
+					<NotRequiredForDelivery>
+						<FrontAttachment>false</FrontAttachment>
+						<RunnerType>false</RunnerType>
+					</NotRequiredForDelivery>
+				</ProductFeatures>
+			</PurchaseOrderLine>
+			<PurchaseOrderLine>
+				<PurchaseOrderLineNumber></PurchaseOrderLineNumber>
+				<PurchaseOrderLineReference>99-03-0001-003 Pos.901 LT25.01.16</PurchaseOrderLineReference>
+				<Quantity>4</Quantity>
+				<ProductFeatures xsi:type="TAX">
+					<Application>L</Application>
+					<BoxSystemColour>E1</BoxSystemColour>
+					<InteriorColour>E1</InteriorColour>
+					<BaseColour>E1</BaseColour>
+					<CoverColour>AL</CoverColour>
+					<BuildInHeight>M</BuildInHeight>
+					<BoxSystemDepth>500</BoxSystemDepth>
+					<IsInsideBoxSystem>false</IsInsideBoxSystem>
+					<FrontAttachment>E</FrontAttachment>
+					<CabinetWidth>765</CabinetWidth>
+					<IsInteriorCabinetWidth>true</IsInteriorCabinetWidth>
+					<HasSupportPanelLeft>false</HasSupportPanelLeft>
+					<HasSupportPanelRight>false</HasSupportPanelRight>
+					<SupportPanelColour/>
+					<LoadBearingCapacity>40</LoadBearingCapacity>
+					<RunnerSystem>B</RunnerSystem>
+					<RunnerType>Movento</RunnerType>
+					<DepthAdjustment>false</DepthAdjustment>
+					<HasSideStabiliser>false</HasSideStabiliser>
+					<TypeLockingDevice>D</TypeLockingDevice>
+					<HasCustomMat>true</HasCustomMat>
+					<MatMaterial>CV</MatMaterial>
+					<MatColour>BLW</MatColour>
+					<NotRequiredForDelivery>
+						<FrontAttachment>false</FrontAttachment>
+						<RunnerType>true</RunnerType>
+					</NotRequiredForDelivery>
+				</ProductFeatures>
+			</PurchaseOrderLine>
+			<PurchaseOrderLine>
+				<PurchaseOrderLineNumber></PurchaseOrderLineNumber>
+				<PurchaseOrderLineReference>99-03-0001-003 Pos.900 LT25.01.16</PurchaseOrderLineReference>
+				<Quantity>4</Quantity>
+				<ProductFeatures xsi:type="TAX">
+					<Application>L</Application>
+					<BoxSystemColour>W</BoxSystemColour>
+					<InteriorColour>W</InteriorColour>
+					<BaseColour>W</BaseColour>
+					<CoverColour>AL</CoverColour>
+					<BuildInHeight>M</BuildInHeight>
+					<BoxSystemDepth>500</BoxSystemDepth>
+					<IsInsideBoxSystem>false</IsInsideBoxSystem>
+					<FrontAttachment>E</FrontAttachment>
+					<CabinetWidth>765</CabinetWidth>
+					<IsInteriorCabinetWidth>true</IsInteriorCabinetWidth>
+					<HasSupportPanelLeft>false</HasSupportPanelLeft>
+					<HasSupportPanelRight>false</HasSupportPanelRight>
+					<SupportPanelColour/>
+					<LoadBearingCapacity>40</LoadBearingCapacity>
+					<RunnerSystem>B</RunnerSystem>
+					<RunnerType>Movento</RunnerType>
+					<DepthAdjustment>false</DepthAdjustment>
+					<HasSideStabiliser>false</HasSideStabiliser>
+					<TypeLockingDevice>D</TypeLockingDevice>
+					<HasCustomMat>false</HasCustomMat>
+					<MatMaterial></MatMaterial>
+					<MatColour></MatColour>
+					<NotRequiredForDelivery>
+						<FrontAttachment>false</FrontAttachment>
+						<RunnerType>true</RunnerType>
+					</NotRequiredForDelivery>
+				</ProductFeatures>
+			</PurchaseOrderLine>
+		</PurchaseOrderLines>
+	</PurchaseOrder>
+</PurchaseOrders>
\ No newline at end of file
Index: EXT/Unishop/PurchaseOrderService001/CreateOrder/Orders.cls.xml
===================================================================
diff -u -r32161 -r32520
--- EXT/Unishop/PurchaseOrderService001/CreateOrder/Orders.cls.xml	(.../Orders.cls.xml)	(revision 32161)
+++ EXT/Unishop/PurchaseOrderService001/CreateOrder/Orders.cls.xml	(.../Orders.cls.xml)	(revision 32520)
@@ -9,7 +9,7 @@
 <Default>PurchaseOrders</Default>
 </Parameter>
 
-<Property name="EdiOrders">
+<Property name="Orders">
 <Type>EXT.Unishop.PurchaseOrderService001.CreateOrder.Order</Type>
 <Collection>list</Collection>
 <Required>1</Required>
Index: vhTest/Spy/EXT/Unishop/PurchaseOrder001/XmlImporter.cls.xml
===================================================================
diff -u
--- vhTest/Spy/EXT/Unishop/PurchaseOrder001/XmlImporter.cls.xml	(revision 0)
+++ vhTest/Spy/EXT/Unishop/PurchaseOrder001/XmlImporter.cls.xml	(revision 32520)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Spy.EXT.Unishop.PurchaseOrder001.XmlImporter">
+<Super>EXT.Unishop.PurchaseOrder001.XmlImporter</Super>
+
+<Property name="Orders">
+<Type>EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="Import">
+<FormalSpec>Bestand:%String</FormalSpec>
+<ReturnType>EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders</ReturnType>
+<Implementation><![CDATA[
+	#dim Orders As EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders = ##super(Bestand)
+	set ..Orders = Orders
+	quit Orders
+]]></Implementation>
+</Method>
+
+<Method name="GeefOrders">
+<ReturnType>EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders</ReturnType>
+<Implementation><![CDATA[	quit ..Orders
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: EXT/Unishop/PurchaseOrder001/BestandVerwerker.cls.xml
===================================================================
diff -u
--- EXT/Unishop/PurchaseOrder001/BestandVerwerker.cls.xml	(revision 0)
+++ EXT/Unishop/PurchaseOrder001/BestandVerwerker.cls.xml	(revision 32520)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="EXT.Unishop.PurchaseOrder001.BestandVerwerker">
+<Super>TECH.RegisteredObject,APPS.common.EDI.EDIVerwerker</Super>
+
+<Property name="XmlImporter">
+<Type>EXT.Unishop.PurchaseOrder001.XmlImporter</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>XmlImporter:EXT.Unishop.PurchaseOrder001.XmlImporter</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..XmlImporter = $$$Implementation(XmlImporter,##class(EXT.Unishop.PurchaseOrder001.XmlImporter).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkBestand">
+<FormalSpec>BestandNaam:%String</FormalSpec>
+<Implementation><![CDATA[	#dim Order As EXT.Unishop.PurchaseOrderService001.CreateOrder.Order = ..XmlImporter.Import(BestandNaam)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>