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"