Index: APPS/TRANSP/UPS/impl/Rate/BerekenInputConverteerder.cls.xml
===================================================================
diff -u -r32664 -r32665
--- APPS/TRANSP/UPS/impl/Rate/BerekenInputConverteerder.cls.xml	(.../BerekenInputConverteerder.cls.xml)	(revision 32664)
+++ APPS/TRANSP/UPS/impl/Rate/BerekenInputConverteerder.cls.xml	(.../BerekenInputConverteerder.cls.xml)	(revision 32665)
@@ -3,6 +3,11 @@
 <Class name="APPS.TRANSP.UPS.impl.Rate.BerekenInputConverteerder">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="GewichtBerekenaar">
+<Type>APPS.TRANSP.UPS.impl.BerekenGewicht</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="RateRequest">
 <Type>APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest</Type>
 <Private>1</Private>
@@ -13,6 +18,18 @@
 <Private>1</Private>
 </Property>
 
+<Method name="%OnNew">
+<FormalSpec>GewichtBerekenaar:APPS.TRANSP.UPS.impl.BerekenGewicht</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..GewichtBerekenaar = $$$Inject(GewichtBerekenaar,##class(APPS.TRANSP.UPS.impl.BerekenGewicht).%New())
+	quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Converteer">
 <FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
 <ReturnType>APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest</ReturnType>
@@ -67,28 +84,21 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 
-	For Item=1:1:..BerekenInput.TeverzendItems.Count() {
+	set Iterator = ##class(TECH.ListIterator).%New(..BerekenInput.TeverzendItems)
+	while Iterator.HasNext() {
 		#dim PackageItem As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.PackageType = ##class(APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.PackageType).%New()
-		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.BerekenInput = ..BerekenInput.TeverzendItems.GetAt(Item)
+		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.BerekenInput = Iterator.Next()
 		
 		for Aantal=1:1:TeverzendItem.Aantal { 
 			Set PackageItem.PackageWeight.UnitOfMeasurement.Code = "KGS"
-			Set PackageItem.PackageWeight.Weight = ..BerekenGewicht(TeverzendItem.Afmeting,TeverzendItem.Gewicht)
+			Set PackageItem.PackageWeight.Weight = ..GewichtBerekenaar.Bereken(TeverzendItem.Afmeting,TeverzendItem.Gewicht)
 			Set PackageItem.PackagingType.Code = "02"
 			Set PackageItem.PackagingType.Description = "Package/customer supplied"
 			Do ..RateRequest.Shipment.Package.Insert(PackageItem)
 		}
 	}
 ]]></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>
 </Class>