Index: vhDeploy/Deploy20160801StapelaarCubeIQInputFolder.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20160801StapelaarCubeIQInputFolder.cls.xml	(revision 0)
+++ vhDeploy/Deploy20160801StapelaarCubeIQInputFolder.cls.xml	(revision 35952)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20160801StapelaarCubeIQInputFolder">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>BLUM aankooporderresponse verwerking bestanden volgens nieuwe XML structuur.</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	#dim Sleutel As %String = "Cube_IQ_InputFolder"
+	#dim ProductiePath As %String = "\\OPTIBOXBIG"
+	#dim DevelopmentPath As %String = "E:\CacheExport\2010v2\ADMIN1\OptiboxBig"
+	
+	If ('(##class(TECH.Config.ConfigMgr).Instance().BestaatSleutel(Sleutel)))
+	{
+		If (##class(TECH.Config.ConfigMgr).Instance().GetOmgeving() = "PROD"){
+			Do ##class(TECH.Config.ConfigMgr).Instance().SetString(Sleutel,ProductiePath)
+		}Else{
+			Do ##class(TECH.Config.ConfigMgr).Instance().SetString(Sleutel,DevelopmentPath)
+		}
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/Stapeling/enu/PalletFormaat/AutoComplete.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/Stapeling/enu/PalletFormaat/AutoComplete.cls.xml	(revision 0)
+++ APPS/TRANSP/Stapeling/enu/PalletFormaat/AutoComplete.cls.xml	(revision 35952)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.Stapeling.enu.PalletFormaat.AutoComplete">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie Eigenschapn moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<ClassType>serial</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%SerialObject</Super>
+
+<Property name="EuroPallet">
+<Type>%String</Type>
+<InitialExpression>"EuroPallet"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
+<Property name="WegwerpPallet">
+<Type>%String</Type>
+<InitialExpression>"WegwerpPallet"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/Stapeling/enu/PalletFormaat/Verwerker.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/Stapeling/enu/PalletFormaat/Verwerker.cls.xml	(revision 0)
+++ APPS/TRANSP/Stapeling/enu/PalletFormaat/Verwerker.cls.xml	(revision 35952)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.Stapeling.enu.PalletFormaat.Verwerker">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de Enumeratie - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+De enumeratie methoden moeten als type de enumeratieklasse zelf terug geven. De enumeratieklasse moet afleiden van TECH.Enumeration</Description>
+<Abstract>1</Abstract>
+<ProcedureBlock>1</ProcedureBlock>
+
+<Method name="Verwerk">
+<Final>1</Final>
+<FormalSpec>PalletFormaat:APPS.TRANSP.Stapeling.enu.PalletFormaat</FormalSpec>
+<Implementation><![CDATA[
+	If PalletFormaat = "EuroPallet" {
+		Do ..VerwerkEuroPallet()
+	} ElseIf PalletFormaat = "WegwerpPallet" {
+		Do ..VerwerkWegwerpPallet()
+	} Else {
+		Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New(PalletFormaat,"APPS.TRANSP.Stapeling.enu.PalletFormaat",$classname())
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkEuroPallet">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkWegwerpPallet">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml
===================================================================
diff -u -r35949 -r35952
--- APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35949)
+++ APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35952)
@@ -28,12 +28,13 @@
 	
 	Set Requestcubeiq.settings = ..GeefCubeSetting()
 	Set Requestcubeiq.containersettings = ..GeefcontainerSettings()
-	Do Requestcubeiq.containers.Insert(..GeefEuroPallet())
-	Do Requestcubeiq.containers.Insert(..GeefWegwerpPallet())
+	
+	Set Requestcubeiq.containers = ..VoegToePalletFormaten(CollisOpPallet.Settings.PalletFormaten)
+	
 	Set Requestcubeiq.solutions = ..GeefSolution()
 	Set Requestcubeiq.containerstoload = ..GeefContainersToLoad()
 	
-	#dim CollisOpPalletIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CollisOpPallet)
+	#dim CollisOpPalletIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CollisOpPallet.Collis)
 	while CollisOpPalletIterator.HasNext()
 	{
 		#dim ColliOpPallet As APPS.TRANSP.Stapeling.dto.ColliOpPallet = CollisOpPalletIterator.Next()
@@ -47,14 +48,39 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VoegToePalletFormaten">
+<FormalSpec>PalletFormaten:%ListOfObjects</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[
+	#dim Result As %ListOfObjects = ##class(%ListOfObjects).%New()
+	
+	#dim PalletFormatenIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(PalletFormaten)
+	
+	While PalletFormatenIterator.HasNext()
+	{
+		#dim PalletFormat As APPS.TRANSP.Stapeling.enu.PalletFormaat = PalletFormatenIterator.Next()
+		If PalletFormat = ##class(APPS.TRANSP.Stapeling.enu.PalletFormaat).EuroPallet() 
+		{
+			Do Result.Insert(..GeefEuroPallet())
+		} 
+		If PalletFormat = ##class(APPS.TRANSP.Stapeling.enu.PalletFormaat).WegwerpPallet() 
+		{
+			Do Result.Insert(..GeefWegwerpPallet())
+		}
+	}
+	Quit Result
+]]></Implementation>
+</Method>
+
 <Method name="MaakPackage">
 <FormalSpec>ColliOpPallet:APPS.TRANSP.Stapeling.dto.ColliOpPallet</FormalSpec>
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.package</ReturnType>
 <Implementation><![CDATA[
 	#dim cubeiqPackage As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.package = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.package).%New()
-	Set cubeiqPackage.id = "DHL.package." _ColliOpPallet.ProductID
-	Set cubeiqPackage.packageid = "DHL.package." _ColliOpPallet.ProductID
+	Set cubeiqPackage.id = "Package." _ColliOpPallet.ProductID
+	Set cubeiqPackage.packageid = "Package." _ColliOpPallet.ProductID
 	Set cubeiqPackage.length = ColliOpPallet.Afmeting.Lengte
 	Set cubeiqPackage.width = ColliOpPallet.Afmeting.Breedte
 	Set cubeiqPackage.height = ColliOpPallet.Afmeting.Hoogte
@@ -78,10 +104,10 @@
 <ReturnType>APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.packagetoload</ReturnType>
 <Implementation><![CDATA[
 	#dim cubeiqPackageToLoad As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.packagetoload = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.packagetoload).%New()
-	Set cubeiqPackageToLoad.id = "DHL.packagetoload." _ColliOpPallet.ProductID
-	Set cubeiqPackageToLoad.solutionid = "DHL.stapelaar.Solution"
+	Set cubeiqPackageToLoad.id = "Packagetoload." _ColliOpPallet.ProductID
+	Set cubeiqPackageToLoad.solutionid = "Stapelaar.Solution"
 	Set cubeiqPackageToLoad.auto = "1"
-	Set cubeiqPackageToLoad.packageid = "DHL.package." _ColliOpPallet.ProductID
+	Set cubeiqPackageToLoad.packageid = "Package." _ColliOpPallet.ProductID
 	Set cubeiqPackageToLoad.quantity = ColliOpPallet.Aantal
 	Set cubeiqPackageToLoad.batch = "#0#100#0"
 	Quit cubeiqPackageToLoad
@@ -94,7 +120,7 @@
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
 	#dim Orientations As %ListOfObjects = ##class(%ListOfObjects).%New()
-	#dim packageid As %String = "DHL.package." _ColliOpPallet.ProductID
+	#dim packageid As %String = "Package." _ColliOpPallet.ProductID
 	Do Orientations.Insert(..MaakOrientation(packageid, "1", ColliOpPallet.Afmeting.Lengte, ColliOpPallet.Afmeting.Breedte, ColliOpPallet.Afmeting.Hoogte, "true"))
 	Do Orientations.Insert(..MaakOrientation(packageid, "2", ColliOpPallet.Afmeting.Breedte, ColliOpPallet.Afmeting.Lengte, ColliOpPallet.Afmeting.Hoogte, "true"))
 	Do Orientations.Insert(..MaakOrientation(packageid, "3", ColliOpPallet.Afmeting.Breedte, ColliOpPallet.Afmeting.Hoogte, ColliOpPallet.Afmeting.Lengte, "False"))
@@ -163,8 +189,8 @@
 	#dim Container As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container).%New()
 	Set Container.bottomtotoploading="True"
 	Set Container.partialloadonfloor="True" 
-	Set Container.id="DHL.stapelaar.EuroPallet"
-	Set Container.containerid="DHL.stapelaar.EuroPallet"
+	Set Container.id="Stapelaar.EuroPallet"
+	Set Container.containerid="Stapelaar.EuroPallet"
 	Set Container.containertype="Rectangular"
 	Set Container.depth="1200.00"
 	Set Container.width="800.00"
@@ -192,8 +218,8 @@
 	#dim Container As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.container).%New()
 	Set Container.bottomtotoploading="True"
 	Set Container.partialloadonfloor="True" 
-	Set Container.id="DHL.stapelaar.WegwerpPallet"
-	Set Container.containerid="DHL.stapelaar.WegwerpPallet"
+	Set Container.id="Stapelaar.WegwerpPallet"
+	Set Container.containerid="Stapelaar.WegwerpPallet"
 	Set Container.containertype="Rectangular"
 	Set Container.depth="1500.00"
 	Set Container.width="800.00"
@@ -219,8 +245,8 @@
 <ReturnType>APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.solution</ReturnType>
 <Implementation><![CDATA[
 	#dim solution As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.solution = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.solution).%New()
-	Set solution.id = "DHL.stapelaar.Solution"
-	Set solution.solutionid = "DHL.stapelaar.Solution"
+	Set solution.id = "Stapelaar.Solution"
+	Set solution.solutionid = "Stapelaar.Solution"
 	Set solution.date = ..GeefHuidigeDatum()
 	Set solution.stage = "1"
 	Quit solution
@@ -235,18 +261,18 @@
 	#dim ContainersToLoad As %ListOfObjects = ##class(%ListOfObjects).%New()
 	
 	#dim ContainerToLoad As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.containertoload = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.containertoload).%New()
-	Set ContainerToLoad.id = "DHL.stapelaar.EuroPallet"
-	Set ContainerToLoad.containerid = "DHL.stapelaar.EuroPallet"
-	Set ContainerToLoad.solutionid = "DHL.stapelaar.Solution"
+	Set ContainerToLoad.id = "Stapelaar.EuroPallet"
+	Set ContainerToLoad.containerid = "Stapelaar.EuroPallet"
+	Set ContainerToLoad.solutionid = "Stapelaar.Solution"
 	Set ContainerToLoad.auto = "0"
 	Set ContainerToLoad.containernum = "1"
 	Set ContainerToLoad.sequence = "1"
 	Do ContainersToLoad.Insert(ContainerToLoad)
 
 	Set ContainerToLoad = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.containertoload).%New()
-	Set ContainerToLoad.id = "DHL.stapelaar.WegwerpPallet"
-	Set ContainerToLoad.containerid = "DHL.stapelaar.WegwerpPallet"
-	Set ContainerToLoad.solutionid = "DHL.stapelaar.Solution"
+	Set ContainerToLoad.id = "Stapelaar.WegwerpPallet"
+	Set ContainerToLoad.containerid = "Stapelaar.WegwerpPallet"
+	Set ContainerToLoad.solutionid = "Stapelaar.Solution"
 	Set ContainerToLoad.auto = "0"
 	Set ContainerToLoad.containernum = "2"
 	Set ContainerToLoad.sequence = "2"
Index: APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter.cls.xml
===================================================================
diff -u -r35762 -r35952
--- APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter.cls.xml	(.../RequestWriter.cls.xml)	(revision 35762)
+++ APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter.cls.xml	(.../RequestWriter.cls.xml)	(revision 35952)
@@ -56,15 +56,15 @@
 <FormalSpec>UniekeSleutel:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.Files).AppendFile(..GeefLocatie(),"DHL_Stapelaar_" _UniekeSleutel _".xml")
+<Implementation><![CDATA[	Quit ##class(TECH.Files).AppendFile(..GeefLocatie(),"Stapelaar_" _UniekeSleutel _".xml")
 ]]></Implementation>
 </Method>
 
 <Method name="GeefLocatie">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim BestandLocatie As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("OptiBoxBigPath")
+	#dim BestandLocatie As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("Cube_IQ_InputFolder")
 	Quit ##class(TECH.Files).AppendSubPath(BestandLocatie,"\Cube_IQ_InputFolder\")
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml
===================================================================
diff -u -r35753 -r35952
--- vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml	(.../Test.cls.xml)	(revision 35753)
+++ vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestComposer/Compose/Test.cls.xml	(.../Test.cls.xml)	(revision 35952)
@@ -22,8 +22,8 @@
 	#dim cubeiqrequest As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.cubeiq = RequestComposer.Compose(CollisOpPallet)
 	
 	Do $$$AssertEquals(cubeiqrequest.packages.Count(),1)
-	Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).id,"DHL.package.1")
-	Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).packageid,"DHL.package.1")
+	Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).id,"Package.1")
+	Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).packageid,"Package.1")
 	Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).length,"700")
 	Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).width,"300")
 	Do $$$AssertEquals(cubeiqrequest.packages.GetAt(1).height,"163")
@@ -48,10 +48,10 @@
 	#dim cubeiqrequest As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.cubeiq = RequestComposer.Compose(CollisOpPallet)
 	
 	Do $$$AssertEquals(cubeiqrequest.packagestoload.Count(),1)
-	Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).id,"DHL.packagetoload.1")
-	Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).solutionid,"DHL.stapelaar.Solution")
+	Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).id,"Packagetoload.1")
+	Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).solutionid,"Stapelaar.Solution")
 	Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).auto,"1")
-	Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).packageid,"DHL.package.1")
+	Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).packageid,"Package.1")
 	Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).quantity,"2")
 	Do $$$AssertEquals(cubeiqrequest.packagestoload.GetAt(1).batch,"#0#100#0")
 ]]></Implementation>
@@ -65,47 +65,47 @@
 	#dim cubeiqrequest As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.cubeiq = RequestComposer.Compose(CollisOpPallet)
 	
 	Do $$$AssertEquals(cubeiqrequest.orientations.Count(),6)
-	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(1).packageid, "DHL.package.1") 
+	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(1).packageid, "Package.1") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(1).orientationnum, "1") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(1).length, "700.00") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(1).width, "300.00") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(1).height, "163.00")  
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(1).allowed, "true") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(1).bottomonly, "False") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(1).toponly, "False")
-	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(2).packageid, "DHL.package.1") 
+	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(2).packageid, "Package.1") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(2).orientationnum, "2") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(2).length, "300.00") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(2).width, "700.00") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(2).height, "163.00")  
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(2).allowed, "true") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(2).bottomonly, "False")
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(2).toponly, "False")
-	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(3).packageid, "DHL.package.1")
+	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(3).packageid, "Package.1")
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(3).orientationnum, "3") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(3).length, "300.00") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(3).width, "163.00") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(3).height, "700.00")  
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(3).allowed, "False") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(3).bottomonly, "False") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(3).toponly, "False")
-	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(4).packageid, "DHL.package.1") 
+	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(4).packageid, "Package.1") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(4).orientationnum, "4") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(4).length, "163.00") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(4).width, "300.00") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(4).height, "700.00")  
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(4).allowed, "False") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(4).bottomonly, "False") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(4).toponly, "False")
-	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(5).packageid, "DHL.package.1") 
+	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(5).packageid, "Package.1") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(5).orientationnum, "5") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(5).length, "163.00") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(5).width, "700.00") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(5).height, "300.00")  
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(5).allowed, "False") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(5).bottomonly, "False") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(5).toponly, "False")
-	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(6).packageid, "DHL.package.1") 
+	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(6).packageid, "Package.1") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(6).orientationnum, "6") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(6).length, "700.00") 
 	Do $$$AssertEquals(cubeiqrequest.orientations.GetAt(6).width, "163.00") 
@@ -159,8 +159,8 @@
 	
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).bottomtotoploading,"True") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).partialloadonfloor,"True") 
-	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).id,"DHL.stapelaar.EuroPallet") 
-	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).containerid,"DHL.stapelaar.EuroPallet") 
+	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).id,"Stapelaar.EuroPallet") 
+	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).containerid,"Stapelaar.EuroPallet") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).containertype,"Rectangular") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).depth,"1200.00") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(1).width,"800.00") 
@@ -188,8 +188,8 @@
 	
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).bottomtotoploading,"True") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).partialloadonfloor,"True") 
-	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).id,"DHL.stapelaar.WegwerpPallet") 
-	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).containerid,"DHL.stapelaar.WegwerpPallet") 
+	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).id,"Stapelaar.WegwerpPallet") 
+	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).containerid,"Stapelaar.WegwerpPallet") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).containertype,"Rectangular") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).depth,"1500.00") 
 	Do $$$AssertEquals(cubeiqrequest.containers.GetAt(2).width,"800.00") 
@@ -215,8 +215,8 @@
 	#dim RequestComposer As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestComposer = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestComposer).%New()
 	#dim cubeiqrequest As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.cubeiq = RequestComposer.Compose(CollisOpPallet)
 	
-	Do $$$AssertEquals(cubeiqrequest.solutions.id, "DHL.stapelaar.Solution")
-	Do $$$AssertEquals(cubeiqrequest.solutions.solutionid, "DHL.stapelaar.Solution")
+	Do $$$AssertEquals(cubeiqrequest.solutions.id, "Stapelaar.Solution")
+	Do $$$AssertEquals(cubeiqrequest.solutions.solutionid, "Stapelaar.Solution")
 	Do $$$AssertContains(cubeiqrequest.solutions.date, ..GeefHuidigeDatum())
 	Do $$$AssertEquals(cubeiqrequest.solutions.stage, "1")
 ]]></Implementation>
@@ -229,17 +229,17 @@
 	#dim RequestComposer As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestComposer = ##class(APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestComposer).%New()
 	#dim cubeiqrequest As APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.XML.Request.cubeiq = RequestComposer.Compose(CollisOpPallet)
 	
-	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).id, "DHL.stapelaar.EuroPallet")
-	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).solutionid, "DHL.stapelaar.Solution")
+	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).id, "Stapelaar.EuroPallet")
+	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).solutionid, "Stapelaar.Solution")
 	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).auto, "0")
-	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).containerid, "DHL.stapelaar.EuroPallet")
+	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).containerid, "Stapelaar.EuroPallet")
 	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).containernum, "1")
 	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(1).sequence, "1")
 
-	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).id, "DHL.stapelaar.WegwerpPallet")
-	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).solutionid, "DHL.stapelaar.Solution")
+	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).id, "Stapelaar.WegwerpPallet")
+	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).solutionid, "Stapelaar.Solution")
 	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).auto, "0")
-	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).containerid, "DHL.stapelaar.WegwerpPallet")
+	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).containerid, "Stapelaar.WegwerpPallet")
 	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).containernum, "2")
 	Do $$$AssertEquals(cubeiqrequest.containerstoload.GetAt(2).sequence, "2")
 ]]></Implementation>
Index: APPS/TRANSP/Stapeling/dto/Settings.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/Stapeling/dto/Settings.cls.xml	(revision 0)
+++ APPS/TRANSP/Stapeling/dto/Settings.cls.xml	(revision 35952)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.Stapeling.dto.Settings">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="PalletFormaten">
+<Type>APPS.TRANSP.Stapeling.enu.PalletFormaat</Type>
+<Collection>list</Collection>
+</Property>
+</Class>
+
+
+</Export>
Index: vhTest/Utils/APPS/TRANSP/Stapeling/dto/CollisOpPallet.cls.xml
===================================================================
diff -u -r35749 -r35952
--- vhTest/Utils/APPS/TRANSP/Stapeling/dto/CollisOpPallet.cls.xml	(.../CollisOpPallet.cls.xml)	(revision 35749)
+++ vhTest/Utils/APPS/TRANSP/Stapeling/dto/CollisOpPallet.cls.xml	(.../CollisOpPallet.cls.xml)	(revision 35952)
@@ -8,14 +8,18 @@
 <ReturnType>APPS.TRANSP.Stapeling.dto.CollisOpPallet</ReturnType>
 <Implementation><![CDATA[
 	#dim CollisOpPallet As APPS.TRANSP.Stapeling.dto.CollisOpPallet = ##class(APPS.TRANSP.Stapeling.dto.CollisOpPallet).%New()
-
+	
 	#dim ColliOpPallet As APPS.TRANSP.Stapeling.dto.ColliOpPallet = ##class(APPS.TRANSP.Stapeling.dto.ColliOpPallet).%New()
 	Set ColliOpPallet.Aantal = 2
 	Set ColliOpPallet.GewichtInKg = 15 // KG
 	Set ColliOpPallet.ProductID = 1
 	Set ColliOpPallet.Afmeting = ##class(APPS.TRANSP.Stapeling.dto.Afmeting).%New(163,300,700)
-	Do CollisOpPallet.Insert(ColliOpPallet)
+	Do CollisOpPallet.Collis.Insert(ColliOpPallet)
 	
+	Set CollisOpPallet.Settings = ##class(APPS.TRANSP.Stapeling.dto.Settings).%New()
+	Do CollisOpPallet.Settings.PalletFormaten.Insert(##class(APPS.TRANSP.Stapeling.enu.PalletFormaat).EuroPallet())
+	Do CollisOpPallet.Settings.PalletFormaten.Insert(##class(APPS.TRANSP.Stapeling.enu.PalletFormaat).WegwerpPallet())
+	
 	Quit CollisOpPallet
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/Stapeling/enu/PalletFormaat.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/Stapeling/enu/PalletFormaat.cls.xml	(revision 0)
+++ APPS/TRANSP/Stapeling/enu/PalletFormaat.cls.xml	(revision 35952)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.Stapeling.enu.PalletFormaat">
+<ClassType>datatype</ClassType>
+<Super>TECH.Enumeration</Super>
+
+<Method name="EuroPallet">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.Stapeling.enu.PalletFormaat</ReturnType>
+<Implementation><![CDATA[	Quit "EuroPallet"
+]]></Implementation>
+</Method>
+
+<Method name="WegwerpPallet">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.Stapeling.enu.PalletFormaat</ReturnType>
+<Implementation><![CDATA[	Quit "WegwerpPallet"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter/WriteRequest/Test.cls.xml
===================================================================
diff -u -r35949 -r35952
--- vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter/WriteRequest/Test.cls.xml	(.../Test.cls.xml)	(revision 35949)
+++ vhUnitTest/APPS/TRANSP/Stapeling/impl/ColliOpPalletStapelaar/Optibox/RequestWriter/WriteRequest/Test.cls.xml	(.../Test.cls.xml)	(revision 35952)
@@ -40,15 +40,15 @@
 <Method name="GeefBestandVolledigNaam">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.Files).AppendFile(..GeefLocatie(),"DHL_Stapelaar_UniekeSleutel.xml")
+<Implementation><![CDATA[	Quit ##class(TECH.Files).AppendFile(..GeefLocatie(),"Stapelaar_UniekeSleutel.xml")
 ]]></Implementation>
 </Method>
 
 <Method name="GeefLocatie">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim BestandLocatie As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("OptiBoxBigPath")
+	#dim BestandLocatie As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("Cube_IQ_InputFolder")
 	Quit ##class(TECH.Files).AppendSubPath(BestandLocatie,"\Cube_IQ_InputFolder\")
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/Stapeling/dto/CollisOpPallet.cls.xml
===================================================================
diff -u -r35735 -r35952
--- APPS/TRANSP/Stapeling/dto/CollisOpPallet.cls.xml	(.../CollisOpPallet.cls.xml)	(revision 35735)
+++ APPS/TRANSP/Stapeling/dto/CollisOpPallet.cls.xml	(.../CollisOpPallet.cls.xml)	(revision 35952)
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.TRANSP.Stapeling.dto.CollisOpPallet">
-<Super>%ListOfObjects</Super>
+<Super>TECH.RegisteredObject</Super>
 
-<Parameter name="ELEMENTTYPE">
-<Default>APPS.TRANSP.Stapeling.dto.ColliOpPallet</Default>
-</Parameter>
+<Property name="Settings">
+<Type>APPS.TRANSP.Stapeling.dto.Settings</Type>
+</Property>
 
+<Property name="Collis">
+<Type>APPS.TRANSP.Stapeling.dto.ColliOpPallet</Type>
+<Collection>list</Collection>
+</Property>
+
 <Storage name="Custom">
 <Type>%Library.CompleteCustomStorage</Type>
 </Storage>