Index: APPS/TRANSP/UPS/impl/BerekenGewicht.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/UPS/impl/BerekenGewicht.cls.xml	(revision 0)
+++ APPS/TRANSP/UPS/impl/BerekenGewicht.cls.xml	(revision 32617)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.UPS.impl.BerekenGewicht">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="Bereken">
+<FormalSpec>Afmeting:APPS.TRANSP.OfferteService.dto.Afmeting,Gewicht:TECH.Decimal</FormalSpec>
+<ReturnType>TECH.Decimal</ReturnType>
+<Implementation><![CDATA[
+	#dim BerekendGewicht As TECH.Decimal = (Afmeting.Breedte * Afmeting.Hoogte * Afmeting.Lengte) / 5000
+	If (BerekendGewicht > Gewicht)	{
+		Quit BerekendGewicht
+	} else {
+		Quit Gewicht
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/TRANSP/UPS/Rate/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r32614 -r32617
--- vhUnitTest/APPS/TRANSP/UPS/Rate/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 32614)
+++ vhUnitTest/APPS/TRANSP/UPS/Rate/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 32617)
@@ -70,9 +70,6 @@
 
 		Do $$$AssertObject(Package.PackagingType , TestPackage.PackagingType  )
 
-		Do $$$AssertEquals(Package.Dimensions.Height , TestPackage.Dimensions.Height )
-		Do $$$AssertEquals(Package.Dimensions.Width , TestPackage.Dimensions.Width )
-		Do $$$AssertEquals(Package.Dimensions.Length , TestPackage.Dimensions.Length )
 		Do $$$AssertEquals(Package.PackageWeight.Weight , TestPackage.PackageWeight.Weight)
 		Do $$$AssertEquals(Package.PackageWeight.UnitOfMeasurement.Code , TestPackage.PackageWeight.UnitOfMeasurement.Code)
 		
Index: APPS/TRANSP/UPS/impl/Rate/TeverzendItemListConverteerder.cls.xml
===================================================================
diff -u -r32614 -r32617
--- APPS/TRANSP/UPS/impl/Rate/TeverzendItemListConverteerder.cls.xml	(.../TeverzendItemListConverteerder.cls.xml)	(revision 32614)
+++ APPS/TRANSP/UPS/impl/Rate/TeverzendItemListConverteerder.cls.xml	(.../TeverzendItemListConverteerder.cls.xml)	(revision 32617)
@@ -69,10 +69,6 @@
 		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = ..TeverzendenItemList.TeverzendItems.GetAt(Item)
 		
 		for Aantal=1:1:TeverzendItem.Aantal { 
-			Set PackageItem.Dimensions.Height = TeverzendItem.Afmeting.Hoogte
-			Set PackageItem.Dimensions.Length = TeverzendItem.Afmeting.Lengte
-			Set PackageItem.Dimensions.Width = TeverzendItem.Afmeting.Breedte
-			
 			Set PackageItem.PackageWeight.UnitOfMeasurement.Code = "KGS"
 			Set PackageItem.PackageWeight.Weight = ..BerekenGewicht(TeverzendItem.Afmeting,TeverzendItem.Gewicht)
 			Set PackageItem.PackagingType.Code = "02"
@@ -87,13 +83,7 @@
 <FormalSpec>Afmeting:APPS.TRANSP.OfferteService.dto.Afmeting,Gewicht:TECH.Decimal</FormalSpec>
 <Private>1</Private>
 <ReturnType>TECH.Decimal</ReturnType>
-<Implementation><![CDATA[
-	#dim BerekendGewicht As TECH.Decimal = (Afmeting.Breedte * Afmeting.Hoogte * Afmeting.Lengte) / 5000
-	If (BerekendGewicht > Gewicht)	{
-		Quit BerekendGewicht
-	} else {
-		Quit Gewicht
-	}
+<Implementation><![CDATA[	Quit ##class(APPS.TRANSP.UPS.impl.BerekenGewicht).%New().Bereken(Afmeting, Gewicht)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/TRANSP/UPS/TimeInTransit/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r32614 -r32617
--- vhUnitTest/APPS/TRANSP/UPS/TimeInTransit/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 32614)
+++ vhUnitTest/APPS/TRANSP/UPS/TimeInTransit/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 32617)
@@ -210,7 +210,8 @@
 		Set TeverzendItem.ProductID = Item
 		Set TeverzendItem.WaardeGoederen = Item * 10
 		Set TeverzendItem.Gewicht = Item * 5
-		Set TeverzendItem.Afmeting = Item * 500
+		Set TeverzendItem.Aantal = 1
+		Set TeverzendItem.Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(Item * 500, Item * 10, Item * 100 )
 		Set TeverzendItem.DatumBeschikbaar = ##class(TECH.DateTime).TextToDate(Item_"/03/2016")
 		Do TeverzendItemList.TeverzendItems.SetAt(TeverzendItem,Item)
 	}
Index: APPS/TRANSP/UPS/impl/TimeInTransit/TeverzendItemListConverteerder.cls.xml
===================================================================
diff -u -r32614 -r32617
--- APPS/TRANSP/UPS/impl/TimeInTransit/TeverzendItemListConverteerder.cls.xml	(.../TeverzendItemListConverteerder.cls.xml)	(revision 32614)
+++ APPS/TRANSP/UPS/impl/TimeInTransit/TeverzendItemListConverteerder.cls.xml	(.../TeverzendItemListConverteerder.cls.xml)	(revision 32617)
@@ -43,8 +43,9 @@
 	#dim TotaalGewicht As TECH.Decimal = 0
 	
 	for Item=1:1:..TeverzendenItemList.TeverzendItems.Count() {
-		Set TotaalPrijs = TotaalPrijs + ..TeverzendenItemList.TeverzendItems.GetAt(Item).WaardeGoederen
-		Set TotaalGewicht = TotaalGewicht + ..TeverzendenItemList.TeverzendItems.GetAt(Item).Gewicht
+		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = ..TeverzendenItemList.TeverzendItems.GetAt(Item)
+		Set TotaalPrijs = TotaalPrijs + (TeverzendItem.WaardeGoederen * TeverzendItem.Aantal)
+		Set TotaalGewicht = TotaalGewicht + (..BerekenGewicht(TeverzendItem.Afmeting, TeverzendItem.Gewicht) * TeverzendItem.Aantal)
 	}
 	
 	Set ..Body.ShipmentWeight.UnitOfMeasurement.Code = "KGS"
@@ -57,6 +58,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BerekenGewicht">
+<FormalSpec>Afmeting:APPS.TRANSP.OfferteService.dto.Afmeting,Gewicht:TECH.Decimal</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.Decimal</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.TRANSP.UPS.impl.BerekenGewicht).%New().Bereken(Afmeting, Gewicht)
+]]></Implementation>
+</Method>
+
 <Method name="ZetReferentie">
 <Private>1</Private>
 <Implementation><![CDATA[