Index: vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenker/doBookingRequestSchenker.xml
===================================================================
diff -u -r71131 -r71139
--- vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenker/doBookingRequestSchenker.xml	(.../doBookingRequestSchenker.xml)	(revision 71131)
+++ vhTestFiles/UnitTests/APPS.TRANSP.Transsmart.impl.RequestDataBouwer/Test/TestdoBookingSchenker/doBookingRequestSchenker.xml	(.../doBookingRequestSchenker.xml)	(revision 71139)
@@ -27,20 +27,33 @@
     </additionalReferences>
     <pickupDate>2011-07-04</pickupDate>
     <serviceLevelTime>PREMIUM</serviceLevelTime>
-    <incoterms>CPT</incoterms>
+    <incoterms>DAP</incoterms>
     <inbound>0</inbound>
     <loadmeter>0</loadmeter>
-    <noOfPackages>1</noOfPackages>
+    <noOfPackages>2</noOfPackages>
     <shipmentLines>
       <shipmentLine>
         <lineNo>1</lineNo>
+        <packageType>Pallet80x60</packageType>
+        <quantity>1</quantity>
+        <measurements>
+          <length>80</length>
+          <width>60</width>
+          <height>120</height>
+          <weight>.25</weight>
+          <sizeUom>CM</sizeUom>
+          <weightUom>KG</weightUom>
+        </measurements>
+      </shipmentLine>
+      <shipmentLine>
+        <lineNo>2</lineNo>
         <packageType>Wwpallet</packageType>
         <quantity>1</quantity>
         <measurements>
-          <length>0</length>
-          <width>0</width>
-          <height>0</height>
-          <weight>.5</weight>
+          <length>80</length>
+          <width>120</width>
+          <height>120</height>
+          <weight>.25</weight>
           <sizeUom>CM</sizeUom>
           <weightUom>KG</weightUom>
         </measurements>
Index: vhTest/Utils/APPS/TRANSP/dto/LeveringInfo.cls.xml
===================================================================
diff -u -r69222 -r71139
--- vhTest/Utils/APPS/TRANSP/dto/LeveringInfo.cls.xml	(.../LeveringInfo.cls.xml)	(revision 69222)
+++ vhTest/Utils/APPS/TRANSP/dto/LeveringInfo.cls.xml	(.../LeveringInfo.cls.xml)	(revision 71139)
@@ -36,6 +36,28 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefLeveringInfoWWPalletEnHalve">
+<ClassMethod>1</ClassMethod>
+<ReturnType>APPS.TRANSP.dto.LeveringInfo</ReturnType>
+<Implementation><![CDATA[
+	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ..GeefLeveringInfo()
+	
+	Set VerpakkingEenheid = ##class(APPS.TRANSP.dto.VerpakkingEenheid.HalveEuropallet).%New()
+	Set VerpakkingEenheid.Aantal = 1
+	Set VerpakkingEenheid.Volgnummer = 1
+
+	Set VerpakkingEenheidWW = ##class(APPS.TRANSP.dto.VerpakkingEenheid.Wegwerppallet).%New()
+	Set VerpakkingEenheidWW.Aantal = 1
+	Set VerpakkingEenheidWW.Volgnummer = 1
+
+	Set LeveringInfo.VerpakkingEenheden = ##class(APPS.TRANSP.dto.VerpakkingEenheid.VerpakkingEenheidLijst).%New()
+	Do LeveringInfo.VerpakkingEenheden.Insert(VerpakkingEenheid)
+	Do LeveringInfo.VerpakkingEenheden.Insert(VerpakkingEenheidWW)
+	Set LeveringInfo.AantalVerpakkingEenhedenTotaal = 2
+	Quit LeveringInfo
+]]></Implementation>
+</Method>
+
 <Method name="GeefLeveringInfoEuroEnWWPallet">
 <ClassMethod>1</ClassMethod>
 <ReturnType>APPS.TRANSP.dto.LeveringInfo</ReturnType>
Index: vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r68311 -r71139
--- vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 68311)
+++ vhTest/Fake/APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 71139)
@@ -7,16 +7,16 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.TRANSP.Transsmart.impl.RequestDataBouwer</Super>
 
-<Method name="GeefShipmentInfoGetDocs">
-<FormalSpec>Reference:%String</FormalSpec>
-<ReturnType>WS.Transsmart.tns.GetDocsShipmentInfo</ReturnType>
+<Method name="GeefIncoterms">
+<FormalSpec>Rit:DOM.TRANSP.Rit,LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
 
-<Method name="GeefIncoterms">
-<FormalSpec>Rit:DOM.TRANSP.Rit</FormalSpec>
-<ReturnType>%String</ReturnType>
+<Method name="GeefShipmentInfoGetDocs">
+<FormalSpec>Reference:%String</FormalSpec>
+<ReturnType>WS.Transsmart.tns.GetDocsShipmentInfo</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
@@ -28,16 +28,16 @@
 ]]></Implementation>
 </Method>
 
-<Method name="MaakdoManifestRequest">
-<FormalSpec>Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date</FormalSpec>
-<ReturnType>WS.Transsmart.tns.doManifest</ReturnType>
+<Method name="MaakdoDeleteRequest">
+<FormalSpec>VerzendData:APPS.TRANSP.Transsmart.data.VerzendData</FormalSpec>
+<ReturnType>WS.Transsmart.tns.doDelete</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
 
-<Method name="MaakdoDeleteRequest">
-<FormalSpec>VerzendData:APPS.TRANSP.Transsmart.data.VerzendData</FormalSpec>
-<ReturnType>WS.Transsmart.tns.doDelete</ReturnType>
+<Method name="MaakdoManifestRequest">
+<FormalSpec>Carrier:%String,CostCenter:%String,PickupDateFrom:%Date,PickupDateTo:%Date</FormalSpec>
+<ReturnType>WS.Transsmart.tns.doManifest</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml
===================================================================
diff -u -r71131 -r71139
--- vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 71131)
+++ vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 71139)
@@ -55,7 +55,7 @@
 
 <Method name="Test doBooking Schenker">
 <Implementation><![CDATA[
-	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoEuroPallet()
+	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoWWPalletEnHalve()
 	Set LeveringInfo.GeleverdAanKlantNummer = 37598
 	#dim Datum as %Date = +(##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog())	
 	Set LeveringInfo.AfleverDatum = ##class(TECH.DateTime).BerekenWerkdag(Datum,1)
Index: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r71131 -r71139
--- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 71131)
+++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 71139)
@@ -231,9 +231,9 @@
 		}
 	}
 	If (Rit.GeefTransporteur() = Transporteur.Schenker) {
-		w !,LeveringInfo.GeleverdAanKlantNummer
+		
 		If (LeveringInfo.GeleverdAanKlantNummer = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(Klant.BlumPolen) ) {
-			Set Incoterms = "CPT"
+			Set Incoterms = "DAP"
 		}
 
 	} 
@@ -414,17 +414,42 @@
 	Set ShipmentLine.lineNo = Lijnnummmer
 	Set ShipmentLine.packageType = ..BepaalPackageType(VerpakkingEenheid.Type,Carrier)
 	Set ShipmentLine.quantity = VerpakkingEenheid.Aantal
-	Set ShipmentLine.measurements = ##class(WS.Transsmart.tns.DoBookingMeasurements).%New()
-	Set ShipmentLine.measurements.length = 0
-	Set ShipmentLine.measurements.width = 0
-	Set ShipmentLine.measurements.height = 0
-	Set ShipmentLine.measurements.sizeUom = "CM"
-	Set ShipmentLine.measurements.weightUom = "KG"
-	Set ShipmentLine.measurements.weight = Gewicht
+	Set ShipmentLine.measurements = ..GeefMeasurements(ShipmentLine.packageType,Gewicht,Carrier)
+	
+	
 	Quit ShipmentLine
 ]]></Implementation>
 </Method>
 
+<Method name="GeefMeasurements">
+<FormalSpec>PackageType:%String,Gewicht:%Numeric,Carrier:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>WS.Transsmart.tns.DoBookingMeasurements</ReturnType>
+<Implementation><![CDATA[
+	Set Measurements = ##class(WS.Transsmart.tns.DoBookingMeasurements).%New()
+	
+	Set Measurements.length = 0
+	Set Measurements.width = 0
+	Set Measurements.height = 0
+	Set Measurements.sizeUom = "CM"
+	Set Measurements.weightUom = "KG"
+	Set Measurements.weight = Gewicht
+	If (Carrier = "SNB") {
+		Set Measurements.height = 120
+		If (##class(TECH.StringUtils).Equals(PackageType,"EUROPALLET","Wwpallet","Pallet")){
+			Set Measurements.length = 80
+			Set Measurements.width = 120	
+		}
+		If (##class(TECH.StringUtils).Equals(PackageType,"Pallet80x60")){
+			Set Measurements.length = 80
+			Set Measurements.width = 60	
+		}
+		
+	} 	
+	Quit Measurements
+]]></Implementation>
+</Method>
+
 <Method name="BepaalCostCenter">
 <FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
 <Private>1</Private>