Index: APPS/TRANSP/Stapeling/dto/CollisOpPallet.cls.xml
===================================================================
diff -u -r35962 -r37590
--- APPS/TRANSP/Stapeling/dto/CollisOpPallet.cls.xml	(.../CollisOpPallet.cls.xml)	(revision 35962)
+++ APPS/TRANSP/Stapeling/dto/CollisOpPallet.cls.xml	(.../CollisOpPallet.cls.xml)	(revision 37590)
@@ -7,6 +7,14 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="VerpakkingType">
+<Type>APPS.VKP.Offerte.enu.VerpakkingType</Type>
+</Property>
+
+<Property name="LadeType">
+<Type>APPS.VKP.Offerte.enu.LadeType</Type>
+</Property>
+
 <Property name="Settings">
 <Type>APPS.TRANSP.Stapeling.dto.Settings</Type>
 </Property>
Index: WS/EC/Unishop/InternationaleZending/Service.cls.xml
===================================================================
diff -u -r37401 -r37590
--- WS/EC/Unishop/InternationaleZending/Service.cls.xml	(.../Service.cls.xml)	(revision 37401)
+++ WS/EC/Unishop/InternationaleZending/Service.cls.xml	(.../Service.cls.xml)	(revision 37590)
@@ -62,15 +62,13 @@
 <Implementation><![CDATA[
 	Do ..VerwijderBerekeningFouten(OfferteID)
 	#dim VerzendingMogelijkheden As WS.EC.ExterneVerkoop.dto.VerzendingMogelijkheden 
-	#dim BerekenInput As APPS.TRANSP.OfferteService.dto.BerekenInput
 	try {
 		#dim Verpakkingen As APPS.VKP.Offerte.dto.VerpakkingList = ..OfferteService.GeefProductVerpakkingDetails(OfferteID)
 		#dim LeverAdres As DOM.VKP.LeverAdres = ..OfferteService.GeefLeverAdres(OfferteID)
 		#dim VroegsteAfhaalDatum As %Date = ..GeefVroegsteAfhaalDatum(OfferteID)
-		
+		#dim BerekenInput As APPS.TRANSP.OfferteService.dto.BerekenInput
 		Set BerekenInput = ..NaarBerekenInputConverter.Convert(Verpakkingen, LeverAdres, OfferteID, VroegsteAfhaalDatum)
 		Set VerzendingMogelijkheden = ..ZendingDetails.GeefZendingDetails(BerekenInput, Taal, Sessie)
-		
 	} catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do ..BewaarBerekeningFouten(Exception.ToStream(), BerekenInput)
@@ -80,21 +78,68 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VoegSamen">
+<FormalSpec><![CDATA[&VerzendingMogelijkheden:WS.EC.ExterneVerkoop.dto.VerzendingMogelijkheden,ToeTeVoegen:WS.EC.ExterneVerkoop.dto.VerzendingMogelijkheden]]></FormalSpec>
+<Implementation><![CDATA[
+	Set VerzendingMogelijkheden.Titel = ToeTeVoegen.Titel
+	#dim ToeTeVoegenIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(ToeTeVoegen.VerzendingMogelijkheden)
+	While ToeTeVoegenIterator.HasNext() {
+		#dim ToeTeVoegenVerzendingMogelijkheid As WS.EC.ExterneVerkoop.dto.VerzendingMogelijkheid = ToeTeVoegenIterator.Next()
+		If ..GeefVerzendingMogelijkheid(VerzendingMogelijkheden, ToeTeVoegenVerzendingMogelijkheid.Code) = "" {
+			Do VerzendingMogelijkheden.VerzendingMogelijkheden.Insert(ToeTeVoegenVerzendingMogelijkheid)
+		} Else {
+			
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefVerzendingMogelijkheid">
+<FormalSpec>VerzendingMogelijkheden:WS.EC.ExterneVerkoop.dto.VerzendingMogelijkheden,Code:%String</FormalSpec>
+<ReturnType>WS.EC.ExterneVerkoop.dto.VerzendingMogelijkheid</ReturnType>
+<Implementation><![CDATA[
+	#dim VerzendingMogelijkheidResultaat As WS.EC.ExterneVerkoop.dto.VerzendingMogelijkheid = ""
+	#dim VerzendingMogelijkhedenIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(VerzendingMogelijkheden.VerzendingMogelijkheden)
+	While VerzendingMogelijkhedenIterator.HasNext() {
+		#dim VerzendingMogelijkheid As WS.EC.ExterneVerkoop.dto.VerzendingMogelijkheid = VerzendingMogelijkhedenIterator.Next()
+		If (VerzendingMogelijkheid.Code = Code) {
+			Set VerzendingMogelijkheidResultaat = VerzendingMogelijkheid
+			Quit
+		}
+	}
+	Quit VerzendingMogelijkheidResultaat
+]]></Implementation>
+</Method>
+
 <Method name="BerekenPalletGegevens">
 <FormalSpec>OfferteID:%String</FormalSpec>
 <Implementation><![CDATA[
 	#dim Verpakkingen As APPS.VKP.Offerte.dto.VerpakkingList = ..OfferteService.GeefProductVerpakkingDetails(OfferteID)
-	#dim CollisOpPallet As APPS.TRANSP.Stapeling.dto.CollisOpPallet = ..MaakCollisOpPallet(Verpakkingen, OfferteID)
-	Do ..StapelingBepaler.Bereken(CollisOpPallet)
+	
+	#dim LadeTypeIterator As TECH.ListIterator = ##class(APPS.VKP.Offerte.enu.LadeType).ValueListIterator()
+	While LadeTypeIterator.HasNext() {
+		#dim LadeType As APPS.VKP.Offerte.enu.LadeType = LadeTypeIterator.Next()
+		#dim VerpakkingTypeIterator As TECH.ListIterator = ##class(APPS.VKP.Offerte.enu.VerpakkingType).ValueListIterator()
+		While VerpakkingTypeIterator.HasNext(){
+			#dim VerpakkingType As APPS.VKP.Offerte.enu.VerpakkingType = VerpakkingTypeIterator.Next()
+			#dim CollisOpPallet As APPS.TRANSP.Stapeling.dto.CollisOpPallet 
+			If (VerpakkingType '= ##class(APPS.VKP.Offerte.enu.VerpakkingType).FlatpackV1()) || (LadeType '= ##class(APPS.VKP.Offerte.enu.LadeType).LegraboxPure()) {
+				Set CollisOpPallet = ..MaakCollisOpPallet(Verpakkingen.ZoekVerpakkingen(VerpakkingType, LadeType), OfferteID, VerpakkingType, LadeType)
+				Do ..StapelingBepaler.Bereken(CollisOpPallet)
+			}
+		}
+	}
 ]]></Implementation>
 </Method>
 
 <Method name="MaakCollisOpPallet">
-<FormalSpec>Verpakkingen:APPS.VKP.Offerte.dto.VerpakkingList,OfferteID:%String</FormalSpec>
+<FormalSpec>Verpakkingen:APPS.VKP.Offerte.dto.VerpakkingList,OfferteID:%String,VerpakkingType:APPS.VKP.Offerte.enu.VerpakkingType,LadeType:APPS.VKP.Offerte.enu.LadeType</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim CollisOpPallet As APPS.TRANSP.Stapeling.dto.CollisOpPallet = ##class(APPS.TRANSP.Stapeling.dto.CollisOpPallet).%New()
 	Set CollisOpPallet.Referentie = OfferteID
+	Set CollisOpPallet.LadeType = LadeType
+	Set CollisOpPallet.VerpakkingType = VerpakkingType
 	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())
Index: vhTest/Spy/APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml
===================================================================
diff -u -r36003 -r37590
--- vhTest/Spy/APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml	(.../StapelingBepaler.cls.xml)	(revision 36003)
+++ vhTest/Spy/APPS/TRANSP/Offerte/impl/DHL/StapelingBepaler.cls.xml	(.../StapelingBepaler.cls.xml)	(revision 37590)
@@ -3,13 +3,26 @@
 <Class name="vhTest.Spy.APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.TRANSP.Offerte.impl.DHL.StapelingBepaler,Tools.Mock.MockClassBase</Super>
-<Inheritance>right</Inheritance>
+<Inheritance>left</Inheritance>
 
-<Property name="CollisOpPallet">
+<Property name="CollisOpPalletList">
 <Type>APPS.TRANSP.Stapeling.dto.CollisOpPallet</Type>
+<Collection>list</Collection>
 <Private>1</Private>
 </Property>
 
+<Method name="%OnNew">
+<FormalSpec>StapelingRepository:APPS.TRANSP.Offerte.impl.DHL.StapelingRepository="",OptiboxRequestComposer:APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestComposer="",OptiboxRequestWriter:APPS.TRANSP.Stapeling.impl.ColliOpPalletStapelaar.Optibox.RequestWriter=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..CollisOpPalletList = ##class(%ListOfObjects).%New()
+	Quit ##super(StapelingRepository, OptiboxRequestComposer, OptiboxRequestWriter)
+]]></Implementation>
+</Method>
+
 <Method name="Bepaal">
 <FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
 <ReturnType>APPS.TRANSP.OfferteService.dto.Palletten</ReturnType>
@@ -20,14 +33,14 @@
 <Method name="Bereken">
 <FormalSpec>CollisOpPallet:APPS.TRANSP.Stapeling.dto.CollisOpPallet</FormalSpec>
 <Implementation><![CDATA[
-	Set ..CollisOpPallet = CollisOpPallet
+	Do ..CollisOpPalletList.Insert(CollisOpPallet)
 	do ..VerwerkMethodCall("Bereken",CollisOpPallet)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefCollisOpPallet">
-<ReturnType>APPS.TRANSP.Stapeling.dto.CollisOpPallet</ReturnType>
-<Implementation><![CDATA[	Quit ..CollisOpPallet
+<Method name="GeefCollisOpPalletList">
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[	Quit ..CollisOpPalletList
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Utils/APPS/VKP/Offerte/dto/VerpakkingList.cls.xml
===================================================================
diff -u -r37566 -r37590
--- vhTest/Utils/APPS/VKP/Offerte/dto/VerpakkingList.cls.xml	(.../VerpakkingList.cls.xml)	(revision 37566)
+++ vhTest/Utils/APPS/VKP/Offerte/dto/VerpakkingList.cls.xml	(.../VerpakkingList.cls.xml)	(revision 37590)
@@ -52,7 +52,6 @@
 	Set Verpakking.LadeType = ##class(APPS.VKP.Offerte.enu.LadeType).Taorbox()
 	Do VerpakkingsList.Insert(Verpakking)
 
-
 	Set Verpakking = ##class(APPS.VKP.Offerte.dto.Verpakking).%New()
 	Set Verpakking.VolumeAandeel = 0.65
 	Set Verpakking.Aantal = 5
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml
===================================================================
diff -u -r37549 -r37590
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 37549)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/Service/Test.cls.xml	(.../Test.cls.xml)	(revision 37590)
@@ -151,7 +151,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: BerekenPalletGegevens roept StapelingBepaler Bereken op met CollisOpPallet">
+<Method name="Test: BerekenPalletGegevens roept StapelingBepaler Bereken op met CollisOpPallet per combinatie verpakkingtype en ladetype">
 <Implementation><![CDATA[
 	#dim OfferteID As %String = 999
 	
@@ -168,15 +168,29 @@
 	
 	Do VerkoopOfferteServiceMock.Verifieer()
 	Do StapelingBepalerSpy.Verifieer()
-	Do $$$AssertIsObject(StapelingBepalerSpy.GeefCollisOpPallet())
+	
+	#dim CollisOpPalletList As %ListOfObjects = StapelingBepalerSpy.GeefCollisOpPalletList()
+	if $$$AssertEquals(CollisOpPalletList.Count(),5) {
+		Do $$$AssertEquals(CollisOpPalletList.GetAt(1).VerpakkingType, ##class(APPS.VKP.Offerte.enu.VerpakkingType).V1())
+		Do $$$AssertEquals(CollisOpPalletList.GetAt(1).LadeType, ##class(APPS.VKP.Offerte.enu.LadeType).Taorbox())
+		Do $$$AssertEquals(CollisOpPalletList.GetAt(2).VerpakkingType, ##class(APPS.VKP.Offerte.enu.VerpakkingType).Probox())
+		Do $$$AssertEquals(CollisOpPalletList.GetAt(2).LadeType, ##class(APPS.VKP.Offerte.enu.LadeType).Taorbox())
+		Do $$$AssertEquals(CollisOpPalletList.GetAt(3).VerpakkingType, ##class(APPS.VKP.Offerte.enu.VerpakkingType).FlatpackV1())
+		Do $$$AssertEquals(CollisOpPalletList.GetAt(3).LadeType, ##class(APPS.VKP.Offerte.enu.LadeType).Taorbox())
+		Do $$$AssertEquals(CollisOpPalletList.GetAt(4).VerpakkingType, ##class(APPS.VKP.Offerte.enu.VerpakkingType).V1())
+		Do $$$AssertEquals(CollisOpPalletList.GetAt(4).LadeType, ##class(APPS.VKP.Offerte.enu.LadeType).LegraboxPure())
+		Do $$$AssertEquals(CollisOpPalletList.GetAt(5).VerpakkingType, ##class(APPS.VKP.Offerte.enu.VerpakkingType).Probox())
+		Do $$$AssertEquals(CollisOpPalletList.GetAt(5).LadeType, ##class(APPS.VKP.Offerte.enu.LadeType).LegraboxPure())
+	}
 ]]></Implementation>
 </Method>
 
 <Method name="Test: BerekenPalletGegevens Converteert Verpakkingslist naar CollisOpPallet">
 <Implementation><![CDATA[
 	#dim OfferteID As %String = 999
 	
-	set DummyVerpakkingen = ##class(vhTest.Utils.APPS.VKP.Offerte.dto.VerpakkingList).GeefVerpakkingsList()
+	#dim DummyVerpakkingen As APPS.VKP.Offerte.dto.VerpakkingList
+	Set DummyVerpakkingen = ##class(vhTest.Utils.APPS.VKP.Offerte.dto.VerpakkingList).GeefVerpakkingsList()
 	
 	Set VerkoopOfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
 	Do VerkoopOfferteServiceMock.IndienMethodCall("GeefProductVerpakkingDetails",OfferteID).DanReturn(DummyVerpakkingen)
@@ -187,19 +201,21 @@
 	Set Service = ##class(WS.EC.Unishop.InternationaleZending.Service).%New(VerkoopOfferteServiceMock, , , , , StapelingBepalerSpy)
 	Do Service.BerekenPalletGegevens(OfferteID)
 	
-	#dim CollisOpPallet As APPS.TRANSP.Stapeling.dto.CollisOpPallet = StapelingBepalerSpy.GeefCollisOpPallet()
-	Do $$$AssertEquals(CollisOpPallet.Referentie, OfferteID)
-	Do $$$AssertEquals(CollisOpPallet.Settings.PalletFormaten.Count(), 2)
-	Do $$$AssertEquals(CollisOpPallet.Settings.PalletFormaten.GetAt(1), ##class(APPS.TRANSP.Stapeling.enu.PalletFormaat).EuroPallet())
-	Do $$$AssertEquals(CollisOpPallet.Settings.PalletFormaten.GetAt(2), ##class(APPS.TRANSP.Stapeling.enu.PalletFormaat).WegwerpPallet())
-	Do $$$AssertEquals(CollisOpPallet.Collis.Count(), 5)
-	#dim ColliOpPallet As APPS.TRANSP.Stapeling.dto.ColliOpPallet = CollisOpPallet.Collis.GetAt(1)
-	Do $$$AssertEquals(ColliOpPallet.Aantal, 2)
-	Do $$$AssertEquals(ColliOpPallet.GewichtInKg, .1)
-	Do $$$AssertEquals(ColliOpPallet.ProductID, 1)
-	Do $$$AssertEquals(ColliOpPallet.Afmeting.Hoogte, 90)
-	Do $$$AssertEquals(ColliOpPallet.Afmeting.Breedte, 80)
-	Do $$$AssertEquals(ColliOpPallet.Afmeting.Lengte, 70)
+	#dim CollisOpPalletList As %ListOfObjects = StapelingBepalerSpy.GeefCollisOpPalletList()
+	if $$$AssertEquals(CollisOpPalletList.Count(),5) {
+		#dim CollisOpPallet As APPS.TRANSP.Stapeling.dto.CollisOpPallet = CollisOpPalletList.GetAt(1)
+		Do $$$AssertEquals(CollisOpPallet.Referentie, OfferteID)
+		Do $$$AssertEquals(CollisOpPallet.Settings.PalletFormaten.Count(), 2)
+		Do $$$AssertEquals(CollisOpPallet.Settings.PalletFormaten.GetAt(1), ##class(APPS.TRANSP.Stapeling.enu.PalletFormaat).EuroPallet())
+		Do $$$AssertEquals(CollisOpPallet.Settings.PalletFormaten.GetAt(2), ##class(APPS.TRANSP.Stapeling.enu.PalletFormaat).WegwerpPallet())
+		#dim ColliOpPallet As APPS.TRANSP.Stapeling.dto.ColliOpPallet = CollisOpPallet.Collis.GetAt(1)
+		Do $$$AssertEquals(ColliOpPallet.Aantal, 1)
+		Do $$$AssertEquals(ColliOpPallet.GewichtInKg, .02)
+		Do $$$AssertEquals(ColliOpPallet.ProductID, 4)
+		Do $$$AssertEquals(ColliOpPallet.Afmeting.Hoogte, 20)
+		Do $$$AssertEquals(ColliOpPallet.Afmeting.Breedte, 30)
+		Do $$$AssertEquals(ColliOpPallet.Afmeting.Lengte, 50)
+	}
 ]]></Implementation>
 </Method>