Index: APPS/TRANSP/OfferteService/dto/ServiceCode.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/OfferteService/dto/ServiceCode.cls.xml	(revision 0)
+++ APPS/TRANSP/OfferteService/dto/ServiceCode.cls.xml	(revision 32614)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.OfferteService.dto.ServiceCode">
+<Super>TECH.DataTransferObject</Super>
+
+<Property name="Code">
+<Type>TECH.Integer</Type>
+</Property>
+
+<Property name="Omschrijving">
+<Type>TECH.String</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/UPS/impl/MergeOfferte.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/UPS/impl/MergeOfferte.cls.xml	(revision 0)
+++ APPS/TRANSP/UPS/impl/MergeOfferte.cls.xml	(revision 32614)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.UPS.impl.MergeOfferte">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="VoegSamen">
+<FormalSpec>TransportFirma:TECH.String,RateOfferteData:APPS.TRANSP.OfferteService.dto.OfferteData,TimeInTransitOfferteData:APPS.TRANSP.OfferteService.dto.OfferteData</FormalSpec>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	
+	Set RateIterator = ##class(TECH.ListIterator).%New(RateOfferteData.OfferteItemList)
+	While RateIterator.HasNext() {
+		#dim RateItem As APPS.TRANSP.OfferteService.dto.OfferteItem = RateIterator.Next()
+		Set TimeInTransitIterator = ##class(TECH.ListIterator).%New(TimeInTransitOfferteData.OfferteItemList)
+		While TimeInTransitIterator.HasNext() {
+			#dim TimeInTransitItem As APPS.TRANSP.OfferteService.dto.OfferteItem = TimeInTransitIterator.Next()
+
+			#dim TransportService As APPS.TRANSP.OfferteService.dto.ServiceCode = ..GeefTransportServiceCode(TransportFirma, RateItem.Code,TimeInTransitItem.Code)
+			
+			If $IsObject(TransportService) {
+				#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+				Set OfferteItem.Code = TransportService.Code
+				Set OfferteItem.Omschrijving = TransportService.Omschrijving
+				Set OfferteItem.Duurtijd = TimeInTransitItem.Duurtijd
+				Set OfferteItem.Gegarandeerd = TimeInTransitItem.Gegarandeerd
+				Set OfferteItem.Kostprijs = RateItem.Kostprijs
+				Set OfferteItem.OphaalDatum = TimeInTransitItem.OphaalDatum
+				Set OfferteItem.Optie = TimeInTransitItem.Optie
+				Do OfferteData.OfferteItemList.Insert(OfferteItem)
+			}
+			
+		}
+	}
+	Quit OfferteData
+]]></Implementation>
+</Method>
+
+<Method name="GeefTransportServiceCode">
+<FormalSpec>TransportFirma:TECH.String,RateServiceCode:TECH.Integer,TimeIntTransitServiceCode:TECH.Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.ServiceCode</ReturnType>
+<Implementation><![CDATA[
+	#dim ServiceCode As APPS.TRANSP.OfferteService.dto.ServiceCode = ""
+	#dim Parameters As %List = $ListBuild(TransportFirma, RateServiceCode, TimeIntTransitServiceCode)
+	#dim Query As %String = "SELECT InterneCode, Omschrijving FROM APPS_TRANSP_OfferteService_data.ServiceCodeMapping WHERE TransportFirma = ? AND RateCode = ? AND TimeInTransitCode = ? "
+	#dim ResultSet As %ResultSet = $$ExecDynQuery^vhLib.Query(Query,Parameters)
+	If ResultSet.Next() {
+		Set ServiceCode = ##class(APPS.TRANSP.OfferteService.dto.ServiceCode).%New()
+		Set ServiceCode.Code = ResultSet.Data("InterneCode")
+		Set ServiceCode.Omschrijving = ResultSet.Data("Omschrijving")
+	}
+	If ResultSet.Next() {
+	///	Raise error
+		}
+		
+	Quit ServiceCode
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/APPS/TRANSP/UPS/Rate/OfferteBerekenaar.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/TRANSP/UPS/Rate/OfferteBerekenaar.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/TRANSP/UPS/Rate/OfferteBerekenaar.cls.xml	(revision 32614)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.TRANSP.UPS.Rate.OfferteBerekenaar">
+<Super>APPS.TRANSP.UPS.OfferteBerekenaar</Super>
+
+<Method name="Bereken">
+<FormalSpec>TeverzendenItemList:APPS.TRANSP.OfferteService.dto.TeverzendenItemList</FormalSpec>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	
+	For Item=1:1:TeverzendenItemList.TeverzendItems.Count() {
+		#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = TeverzendenItemList.TeverzendItems.GetAt(Item)
+		Set OfferteItem.Code = Item
+		Set OfferteItem.Omschrijving = "Omschrijving"_Item
+		Set OfferteItem.Gegarandeerd = ""
+		Set OfferteItem.Duurtijd = ""
+		Set OfferteItem.Kostprijs = Item * 10
+		Set OfferteItem.OphaalDatum = ""
+		Set OfferteItem.Optie = ""
+
+		Do OfferteData.OfferteItemList.SetAt(OfferteItem,Item)
+	}
+	quit OfferteData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/APPS/TRANSP/UPS/SoapClients/Rate/RatePort.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/TRANSP/UPS/SoapClients/Rate/RatePort.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/TRANSP/UPS/SoapClients/Rate/RatePort.cls.xml	(revision 32614)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.TRANSP.UPS.SoapClients.Rate.RatePort">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.RegisteredObject,APPS.TRANSP.UPS.SoapClients.Port</Super>
+
+<Method name="Process">
+<FormalSpec>Body:APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest</FormalSpec>
+<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse</ReturnType>
+<Implementation><![CDATA[
+	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse = ##class(APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse).%New()
+
+	Set Response.Response.ResponseStatus.Code = "1"
+	Set Response.Response.ResponseStatus.Description = "Success"
+	
+	///RequestOption.SetAt("Shop",1)
+	
+	Set Response.Response.TransactionReference.CustomerContext = Body.Request.TransactionReference.CustomerContext
+	Set Response.Response.TransactionReference.TransactionIdentifier = Body.Request.TransactionReference.TransactionIdentifier
+
+	For Item=1:1:Body.Shipment.Package.Count() {
+		#dim RatedShipment As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RatedShipmentType = ##class(APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RatedShipmentType).%New()
+		
+		Set RatedShipment.Service.Code = Item
+		Set RatedShipment.GuaranteedDelivery.BusinessDaysInTransit = "1"
+		Set RatedShipment.BillingWeight.UnitOfMeasurement = "KGS" 
+		Set RatedShipment.BillingWeight.Weight = 0 
+		Set RatedShipment.TotalCharges.CurrencyCode = "EUR"
+		Set RatedShipment.TotalCharges.MonetaryValue  = Item * 10
+		
+		Do Response.RatedShipment.SetAt(RatedShipment,Item)	
+	}
+
+	Quit Response
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/UPS/impl/SoapClients/Rate/RatePort.cls.xml
===================================================================
diff -u -r32556 -r32614
--- APPS/TRANSP/UPS/impl/SoapClients/Rate/RatePort.cls.xml	(.../RatePort.cls.xml)	(revision 32556)
+++ APPS/TRANSP/UPS/impl/SoapClients/Rate/RatePort.cls.xml	(.../RatePort.cls.xml)	(revision 32614)
@@ -1,22 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.TRANSP.UPS.impl.SoapClients.Rate.RatePort">
+<IncludeCode>vhLib.Macro</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%SOAP.WebClient</Super>
+<Super>%SOAP.WebClient,APPS.TRANSP.UPS.SoapClients.Port</Super>
 
-<Method name="ProcessRate">
-<Final>1</Final>
-<FormalSpec>Body:APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest(XMLNAME="RateRequest")</FormalSpec>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse</ReturnType>
-<WebMethod>1</WebMethod>
-<SoapBindingStyle>document</SoapBindingStyle>
-<SoapBodyUse>literal</SoapBodyUse>
-<ReturnTypeParams>XMLNAME="RateResponse"</ReturnTypeParams>
-<Implementation><![CDATA[ Quit ..WebMethod("ProcessRate").Invoke($this,"http://onlinetools.ups.com/webservices/RateBinding/v1.1",.Body)
-]]></Implementation>
-</Method>
-
 <Parameter name="ARGUMENTSTYLE">
 <Description>
 Use unwrapped message style for document binding style.</Description>
@@ -26,7 +14,7 @@
 <Parameter name="LOCATION">
 <Description>
 This is the URL used to access the web service.</Description>
-<Default>https://wwwcie.ups.com/webservices/Rate</Default>
+<Default>https://onlinetools.ups.com/webservices/Rate</Default>
 </Parameter>
 
 <Parameter name="NAMESPACE">
@@ -58,6 +46,53 @@
 This is the namespace used for types by the Service</Description>
 <Default>http://www.ups.com/XMLSchema/XOLTWS/Rate/v1.1</Default>
 </Parameter>
+
+<Method name="Process">
+<Final>1</Final>
+<FormalSpec>Body:APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest(XMLNAME="RateRequest")</FormalSpec>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse</ReturnType>
+<WebMethod>1</WebMethod>
+<SoapBindingStyle>document</SoapBindingStyle>
+<SoapBodyUse>literal</SoapBodyUse>
+<ReturnTypeParams>XMLNAME="RateResponse"</ReturnTypeParams>
+<Implementation><![CDATA[
+ 	Do ..HeadersOut.SetAt(..GeefHeader(),"v1")
+	Set ..SSLConfiguration = "UPS"
+
+	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse = ""
+	#dim Pogingen As %Integer = 0
+	For {
+		try {
+			Set Response = ..WebMethod("Process").Invoke($this,"http://onlinetools.ups.com/webservices/RateBinding/v1.1",.Body)
+		} catch {
+			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+			Set Response = ""
+		}
+		Set Pogingen = Pogingen + 1
+		Quit:(Pogingen = 3 || $IsObject(Response))
+	}
+	
+	If ($$$Not($IsObject(Response))){
+		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Kon geen gegevens ophalen van UPS Rate : " _Exception.ToString())
+	}
+	
+	Quit Response
+]]></Implementation>
+</Method>
+
+<Method name="GeefHeader">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.Rate.upss.UPSSecurity</ReturnType>
+<Implementation><![CDATA[
+	#dim Header As APPS.TRANSP.UPS.impl.SoapClients.Rate.upss.UPSSecurity = ##class(APPS.TRANSP.UPS.impl.SoapClients.Rate.upss.UPSSecurity).%New()
+	Set Header.ServiceAccessToken.AccessLicenseNumber = "BD0247306226EBF8"
+	Set Header.UsernameToken.Username = "VanHoeckeAPI" 
+	Set Header.UsernameToken.Password = "123ABC@@@"
+	Set Header.mustUnderstand = 1
+	quit Header
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/TRANSP/dto/InternationaalAdres.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/dto/InternationaalAdres.cls.xml	(revision 0)
+++ APPS/TRANSP/dto/InternationaalAdres.cls.xml	(revision 32614)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.dto.InternationaalAdres">
+<Super>APPS.common.dto.Adres</Super>
+
+<Property name="ProvincieCode">
+<Type>%String</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/OfferteService/dto/TeverzendenItem.cls.xml
===================================================================
diff -u -r32557 -r32614
--- APPS/TRANSP/OfferteService/dto/TeverzendenItem.cls.xml	(.../TeverzendenItem.cls.xml)	(revision 32557)
+++ APPS/TRANSP/OfferteService/dto/TeverzendenItem.cls.xml	(.../TeverzendenItem.cls.xml)	(revision 32614)
@@ -8,7 +8,7 @@
 </Property>
 
 <Property name="Afmeting">
-<Type>TECH.Decimal</Type>
+<Type>APPS.TRANSP.OfferteService.dto.Afmeting</Type>
 </Property>
 
 <Property name="Gewicht">
@@ -22,6 +22,10 @@
 <Property name="DatumBeschikbaar">
 <Type>%Date</Type>
 </Property>
+
+<Property name="Aantal">
+<Type>TECH.Integer</Type>
+</Property>
 </Class>
 
 
Index: vhTest/Fake/APPS/TRANSP/UPS/TimeInTransit/OfferteBerekenaar.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/TRANSP/UPS/TimeInTransit/OfferteBerekenaar.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/TRANSP/UPS/TimeInTransit/OfferteBerekenaar.cls.xml	(revision 32614)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.TRANSP.UPS.TimeInTransit.OfferteBerekenaar">
+<Super>APPS.TRANSP.UPS.OfferteBerekenaar</Super>
+
+<Method name="Bereken">
+<FormalSpec>TeverzendenItemList:APPS.TRANSP.OfferteService.dto.TeverzendenItemList</FormalSpec>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	
+	For Item=1:1:TeverzendenItemList.TeverzendItems.Count() {
+		#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = TeverzendenItemList.TeverzendItems.GetAt(Item)
+		Set OfferteItem.Code = Item
+		Set OfferteItem.Omschrijving = "Omschrijving"_Item
+		Set OfferteItem.Gegarandeerd = "1"
+		Set OfferteItem.Duurtijd = Item
+		Set OfferteItem.Kostprijs = ""
+		Set OfferteItem.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+		Set OfferteItem.Optie = ""
+
+		Do OfferteData.OfferteItemList.SetAt(OfferteItem,Item)
+	}
+	quit OfferteData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/UPS/impl/SoapClients/TimeInTransit/TimeInTransitPort.cls.xml
===================================================================
diff -u -r32557 -r32614
--- APPS/TRANSP/UPS/impl/SoapClients/TimeInTransit/TimeInTransitPort.cls.xml	(.../TimeInTransitPort.cls.xml)	(revision 32557)
+++ APPS/TRANSP/UPS/impl/SoapClients/TimeInTransit/TimeInTransitPort.cls.xml	(.../TimeInTransitPort.cls.xml)	(revision 32614)
@@ -3,7 +3,7 @@
 <Class name="APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.TimeInTransitPort">
 <IncludeCode>vhLib.Macro</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%SOAP.WebClient,APPS.TRANSP.UPS.SoapClients.TimeInTransit.TimeInTransitPort</Super>
+<Super>%SOAP.WebClient,APPS.TRANSP.UPS.SoapClients.Port</Super>
 
 <Parameter name="ARGUMENTSTYLE">
 <Description>
@@ -47,7 +47,7 @@
 <Default>http://www.ups.com/XMLSchema/XOLTWS/tnt/v1.0</Default>
 </Parameter>
 
-<Method name="ProcessTimeInTransit">
+<Method name="Process">
 <Final>1</Final>
 <FormalSpec>Body:APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest(XMLNAME="TimeInTransitRequest")</FormalSpec>
 <ProcedureBlock>1</ProcedureBlock>
@@ -64,7 +64,7 @@
 	#dim Pogingen As %Integer = 0
 	For {
 		try {
-			Set Response = ..WebMethod("ProcessTimeInTransit").Invoke($this,"http://onlinetools.ups.com/webservices/TimeInTransitBinding/v1.0",.Body)
+			Set Response = ..WebMethod("Process").Invoke($this,"http://onlinetools.ups.com/webservices/TimeInTransitBinding/v1.0",.Body)
 		} catch {
 			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 			Set Response = ""
Index: vhUnitTest/APPS/TRANSP/UPS/impl/SoapClients/Rate/RatePort/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/TRANSP/UPS/impl/SoapClients/Rate/RatePort/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/TRANSP/UPS/impl/SoapClients/Rate/RatePort/Test.cls.xml	(revision 32614)
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.TRANSP.UPS.impl.SoapClients.Rate.RatePort.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: UPS Communicatie met TransportSpy ">
+<Implementation><![CDATA[
+	#dim TransportSpy As vhTest.Spy.TECH.SoapClient.Transporter = ..GeefTransport()
+	
+	Do ..CommuniceerMetUPS(TransportSpy)
+	
+	do $$$AssertEquals(TransportSpy.Action,"http://onlinetools.ups.com/webservices/RateBinding/v1.1")
+	do $$$AssertEquals(TransportSpy.OneWay,$$$false)
+	
+	do ..DataExporteerder.ExporteerStream(..FormateerXmlStream(TransportSpy.RequestStream),"Response.xml")
+	
+	do $$$AssertReferentieBestanden(..GeefBestandLocatie())
+]]></Implementation>
+</Method>
+
+<Method name="No_Test: UPS Communicatie">
+<Implementation><![CDATA[
+	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse = ..CommuniceerMetUPS()
+	Do ..SchrijfXmlNaarBestand(Response, "Response.xml")
+	do $$$AssertReferentieBestanden(..GeefBestandLocatie())
+]]></Implementation>
+</Method>
+
+<Method name="CommuniceerMetUPS">
+<FormalSpec><![CDATA[&TransportSpy:vhTest.Spy.TECH.SoapClient.Transporter=""]]></FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse</ReturnType>
+<Implementation><![CDATA[
+	#dim Connection As APPS.TRANSP.UPS.impl.SoapClients.Rate.RatePort = ##class(APPS.TRANSP.UPS.impl.SoapClients.Rate.RatePort).%New()
+	
+	If ($IsObject(TransportSpy)) {
+		Set Connection.Transport = TransportSpy
+	}
+
+	try {
+		#dim Response As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse = Connection.Process(..GeefBody())
+	} catch {
+		do ..Fail(##class(TECH.ExceptionHandler).Catch().GeefOmschrijving())
+		do ..Fail(%objlasterror)
+	}
+	
+	Quit Response
+]]></Implementation>
+</Method>
+
+<Method name="SchrijfXmlNaarBestand">
+<FormalSpec>Document:%XML.Adaptor,BestandsNaam:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim FileWriter As TECH.File.FileWriter = ##class(TECH.Context).Instance().GeefFileAPI().GeefFileWriter()
+	do FileWriter.Open(..GeefBestandLocatie() _BestandsNaam)
+	do FileWriter.WriteXML(Document)
+	do FileWriter.Close()
+]]></Implementation>
+</Method>
+
+<Method name="FormateerXmlStream">
+<FormalSpec>BronStream:%Stream</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Stream</ReturnType>
+<Implementation><![CDATA[
+	Set reader=##class(%XML.Reader).%New()
+	Set writer=##class(%XML.Writer).%New()
+	Do reader.OpenStream(BronStream)
+	Set writer.Charset="UTF-8"
+	Set writer.Indent=1
+	Set Stream=##class(%GlobalCharacterStream).%New()
+	Do writer.OutputToStream(Stream)
+	Do writer.Document(reader.Document)
+	Quit Stream
+]]></Implementation>
+</Method>
+
+<Method name="GeefTransport">
+<Private>1</Private>
+<ReturnType>vhTest.Spy.TECH.SoapClient.Transporter</ReturnType>
+<Implementation><![CDATA[
+	#dim TransportSpy As vhTest.Spy.TECH.SoapClient.Transporter = ##class(vhTest.Spy.TECH.SoapClient.Transporter).%New("<soapenv:Envelope xmlns:soapenv=""http://schemas.xmlsoap.org/soap/envelope/""><soapenv:Header/><soapenv:Body><rate:RateResponse xmlns:rate=""http://www.ups.com/XMLSchema/XOLTWS/Rate/v1.1""></rate:RateResponse></soapenv:Body></soapenv:Envelope>")
+	quit TransportSpy
+]]></Implementation>
+</Method>
+
+<Method name="GeefBody">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest</ReturnType>
+<Implementation><![CDATA[
+	#dim Body As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest = ##class(APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest).%New()
+	
+	Set Body.Request.TransactionReference.CustomerContext = "jskqlfsdf"
+	Set Body.Request.TransactionReference.TransactionIdentifier = "?"
+
+	Do Body.Request.RequestOption.SetAt("Shop",1)
+	
+	Set Body.Shipment.Shipper.Name = "Van Hoecke"
+	Set Body.Shipment.Shipper.ShipperNumber = "A566R9"
+	Set Body.Shipment.Shipper.Address.AddressLine = "Europark-Noord 9"
+	Set Body.Shipment.Shipper.Address.City = "Sint-Niklaas"
+	Set Body.Shipment.Shipper.Address.PostalCode = "9100"
+	Set Body.Shipment.Shipper.Address.CountryCode = "BE"
+	
+	Set Body.Shipment.ShipTo.Name = "Test klant"
+	Set Body.Shipment.ShipTo.Address.AddressLine = "Kemzekestraat 6"
+	Set Body.Shipment.ShipTo.Address.City = "Sint-Gillis-Waas"
+	Set Body.Shipment.ShipTo.Address.PostalCode = "9170"
+	Set Body.Shipment.ShipTo.Address.CountryCode = "BE"
+	Set Body.Shipment.ShipTo.Address.StateProvinceCode = ""
+	
+	For Item=1:1:5 {
+		#dim Package As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.PackageType = ##class(APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.PackageType).%New()
+
+		Set Package.PackageWeight.UnitOfMeasurement.Code = "KGS"
+		Set Package.PackageWeight.Weight = 10 * Item
+		Set Package.PackagingType.Code = "02"
+		Set Package.PackagingType.Description = "Package/customer supplied"
+		
+		Do Body.Shipment.Package.SetAt(Package,Item)
+	}
+	
+	
+	Set Body.Shipment.ShipmentServiceOptions.UPScarbonneutralIndicator = ""
+	Set Body.Shipment.ShipmentRatingOptions.NegotiatedRatesIndicator = ""
+	
+	quit Body
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/UPS/impl/TimeInTransit/ResponseConverteerder.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/UPS/impl/TimeInTransit/ResponseConverteerder.cls.xml	(revision 0)
+++ APPS/TRANSP/UPS/impl/TimeInTransit/ResponseConverteerder.cls.xml	(revision 32614)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.UPS.impl.TimeInTransit.ResponseConverteerder">
+<Super>APPS.TRANSP.UPS.ResponseConverteerder</Super>
+
+<Method name="Converteer">
+<FormalSpec>Response:APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse</FormalSpec>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	For Item=1:1:Response.TransitResponse.ServiceSummary.Count() {
+		#dim ServiceSummary As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.ServiceSummaryType = Response.TransitResponse.ServiceSummary.GetAt(Item)
+		#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+
+		Set OfferteItem.Gegarandeerd = ServiceSummary.GuaranteedIndicator 
+		Set OfferteItem.Code = ServiceSummary.Service.Code  
+		Set OfferteItem.Omschrijving = ServiceSummary.Service.Description
+		Set OfferteItem.OphaalDatum = ServiceSummary.EstimatedArrival.Pickup.Date
+		Set OfferteItem.Duurtijd = ServiceSummary.EstimatedArrival.TotalTransitDays 
+		Set OfferteItem.Kostprijs = 0
+		Set OfferteItem.Optie = ""
+		
+		Do OfferteData.OfferteItemList.SetAt(OfferteItem,Item)
+	}
+
+	quit OfferteData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/UPS/impl/TimeInTransit/OfferteBerekenaar.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/UPS/impl/TimeInTransit/OfferteBerekenaar.cls.xml	(revision 0)
+++ APPS/TRANSP/UPS/impl/TimeInTransit/OfferteBerekenaar.cls.xml	(revision 32614)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.UPS.impl.TimeInTransit.OfferteBerekenaar">
+<Super>APPS.TRANSP.UPS.OfferteBerekenaar</Super>
+
+<Property name="UPSConnection">
+<Type>APPS.TRANSP.UPS.SoapClients.Port</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ResponseConverteerder">
+<Type>APPS.TRANSP.UPS.ResponseConverteerder</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TeverzendItemListConverteerder">
+<Type>APPS.TRANSP.UPS.TeverzendItemListConverteerder</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ResponseValideerder">
+<Type>APPS.TRANSP.UPS.ResponseValideerder</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TeverzendItemListValideerder">
+<Type>APPS.TRANSP.UPS.TeverzendItemListValideerder</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>UPSConnection:APPS.TRANSP.UPS.SoapClients.Port=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..UPSConnection = $$$Implementation(UPSConnection,##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.TimeInTransitPort).%New())
+	
+	Set ..ResponseConverteerder = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.ResponseConverteerder).%New()
+	Set ..TeverzendItemListConverteerder = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.TeverzendItemListConverteerder).%New()
+	Set ..ResponseValideerder = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValideerder).%New()
+	Set ..TeverzendItemListValideerder = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListValideerder).%New()
+	
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Bereken">
+<FormalSpec>TeverzendenItemList:APPS.TRANSP.OfferteService.dto.TeverzendenItemList</FormalSpec>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	
+	Do ..TeverzendItemListValideerder.Valideer(TeverzendenItemList)
+	
+	#dim Request As %SerialObject = ..TeverzendItemListConverteerder.Converteer(TeverzendenItemList)
+	#dim Response As %SerialObject = ..UPSConnection.Process(Request)
+
+	Do ..ResponseValideerder.Valideer(Response, Request) 
+
+	Quit ..ResponseConverteerder.Converteer(Response)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/TRANSP/UPS/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r32558 -r32614
--- vhUnitTest/APPS/TRANSP/UPS/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 32558)
+++ vhUnitTest/APPS/TRANSP/UPS/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 32614)
@@ -5,9 +5,10 @@
 
 <Method name="Test: Geef mogelijke leverdagen voor TeverzendItemList ">
 <Implementation><![CDATA[
-	#dim FakeWebClient As vhTest.Fake.APPS.TRANSP.UPS.SoapClients.TimeInTransit.TimeInTransitPort = ##class(vhTest.Fake.APPS.TRANSP.UPS.SoapClients.TimeInTransit.TimeInTransitPort).%New()
+	#dim RateBerekenaar As vhTest.Fake.APPS.TRANSP.UPS.Rate.OfferteBerekenaar = ##class(vhTest.Fake.APPS.TRANSP.UPS.Rate.OfferteBerekenaar).%New()
+	#dim TimeInTransitBerekenaar As vhTest.Fake.APPS.TRANSP.UPS.TimeInTransit.OfferteBerekenaar = ##class(vhTest.Fake.APPS.TRANSP.UPS.TimeInTransit.OfferteBerekenaar).%New()
 	
-	#dim OfferteBerekenaar As APPS.TRANSP.UPS.OfferteBerekenaar = ##class(APPS.TRANSP.UPS.OfferteBerekenaar).%New(FakeWebClient)
+	#dim OfferteBerekenaar As APPS.TRANSP.UPS.impl.OfferteBerekenaar = ##class(APPS.TRANSP.UPS.impl.OfferteBerekenaar).%New(RateBerekenaar, TimeInTransitBerekenaar)
 	
 	#dim TeverzendItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemList()
 	
@@ -23,188 +24,25 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: UPS Response converteerder">
-<Implementation><![CDATA[
-	#dim ResponseConverteerder As APPS.TRANSP.UPS.impl.ResponseConverteerder = ##class(APPS.TRANSP.UPS.impl.ResponseConverteerder).%New()
-	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ..GeefResponse()
-	#dim LeverDatums As APPS.TRANSP.OfferteService.dto.OfferteData = ResponseConverteerder.Converteer(Response)
-	#dim TestLeverDatums As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefLeverDatums()
-
-	Do $$$AssertEquals(LeverDatums.OfferteItemList.Count(), TestLeverDatums.OfferteItemList.Count())
-	
-	For Item=1:1:LeverDatums.OfferteItemList.Count() {
-		Do $$$AssertObject(LeverDatums.OfferteItemList.GetAt(Item), TestLeverDatums.OfferteItemList.GetAt(Item))
-		}
-]]></Implementation>
-</Method>
-
-<Method name="Test: UPS Response Valideerder - Response met alternatief adres">
-<Implementation><![CDATA[
-	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.ResponseValideerder = ##class(APPS.TRANSP.UPS.impl.ResponseValideerder).%New()
-	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ..GeefResponseMetAlternatiefAdres()
-	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest = ..GeefRequest()
-	
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("UPS stelt alternative adressen voor ref : 1")
-	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
-
-	Do ResponseValideerder.Valideer(Response, Request)
-]]></Implementation>
-</Method>
-
-<Method name="Test: UPS Response Valideerder">
-<Implementation><![CDATA[
-	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.ResponseValideerder = ##class(APPS.TRANSP.UPS.impl.ResponseValideerder).%New()
-	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ..GeefResponse()
-	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest = ..GeefRequest()
-	
-	Do ResponseValideerder.Valideer(Response, Request)
-	
-	Do $$$AssertTrue(1)
-]]></Implementation>
-</Method>
-
-<Method name="Test: UPS TeverzendItemList converteerder">
-<Implementation><![CDATA[
-	#dim TeverzendItemListConverteerder As APPS.TRANSP.UPS.impl.TeverzendItemListConverteerder  = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListConverteerder).%New()
-	#dim TeverzendenItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemList()
-	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest = TeverzendItemListConverteerder.Converteer(TeverzendenItemList)
-	#dim TestRequest As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest = ..GeefRequest()
-
-	Do $$$AssertObject(Request.Pickup, TestRequest.Pickup)
-	Do $$$AssertObject(Request.ShipFrom.Address , TestRequest.ShipFrom.Address)
-	Do $$$AssertObject(Request.Request.TransactionReference , TestRequest.Request.TransactionReference)
-	Do $$$AssertObject(Request.ShipTo.Address , TestRequest.ShipTo.Address)
-	Do $$$AssertObject(Request.ShipmentWeight.UnitOfMeasurement , TestRequest.ShipmentWeight.UnitOfMeasurement)
-	Do $$$AssertObject(Request.Request.TransactionReference , TestRequest.Request.TransactionReference)
-	Do $$$AssertObject(Request.InvoiceLineTotal , TestRequest.InvoiceLineTotal)
-	
-	Do $$$AssertEquals(Request.TotalPackagesInShipment , TestRequest.TotalPackagesInShipment)
-	Do $$$AssertEquals(Request.TotalPackagesInShipment , TestRequest.TotalPackagesInShipment)
-	Do $$$AssertEquals(Request.MaximumListSize,TestRequest.MaximumListSize)
-]]></Implementation>
-</Method>
-
-<Method name="Test: UPS TeverzendItemList Valideerder - TeverzendItemList zonder lijnen ">
-<Implementation><![CDATA[
-	#dim TeverzendItemListValideerder As APPS.TRANSP.UPS.impl.TeverzendItemListValideerder = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListValideerder).%New()
-	#dim TeverzendenItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemListZonderLijnen()
-	
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen Detaillijnen in TeverzendenItemList : 1")
-	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
-
-	Do TeverzendItemListValideerder.Valideer(TeverzendenItemList)
-]]></Implementation>
-</Method>
-
-<Method name="Test: UPS TeverzendItemList Valideerder">
-<Implementation><![CDATA[
-	#dim TeverzendItemListValideerder As APPS.TRANSP.UPS.impl.TeverzendItemListValideerder = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListValideerder).%New()
-	#dim TeverzendenItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemList()
-	
-	Do TeverzendItemListValideerder.Valideer(TeverzendenItemList)
-	
-	Do $$$AssertTrue(1)
-]]></Implementation>
-</Method>
-
-<Method name="GeefResponse">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse</ReturnType>
-<Implementation><![CDATA[
-	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse).%New()
-
-	Set Response.Response.ResponseStatus.Code = "1"
-	Set Response.Response.ResponseStatus.Description = "Success"
-	
-	Set Response.Response.TransactionReference.CustomerContext = "1"
-	Set Response.Response.TransactionReference.TransactionIdentifier = "1"
-
-	Set Response.TransitResponse.ShipmentWeight.UnitOfMeasurement = "KGS" 
-	Set Response.TransitResponse.ShipmentWeight.Weight = "200"
-	
-	Set Response.TransitResponse.ShipFrom.Address.City = "Sint-Niklaas"  
-	Set Response.TransitResponse.ShipFrom.Address.CountryCode = "BE"
-	Set Response.TransitResponse.ShipFrom.Address.PostalCode = "9100"
-
-	Set Response.TransitResponse.ShipTo.Address.City = "Sint-Niklaas"  
-	Set Response.TransitResponse.ShipTo.Address.CountryCode = "BE"
-	Set Response.TransitResponse.ShipTo.Address.PostalCode = "9100"
-	
-	Set Response.TransitResponse.PickupDate = ##class(TECH.DateTime).TextToDate("10/03/2016")
-	
-	for Item=1:1:5 {
-		#dim SummaryType As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.ServiceSummaryType = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.ServiceSummaryType).%New()
-		
-		Set SummaryType.Service.Code = Item
-		Set SummaryType.Service.Description = "Omschrijving"_Item
-		Set SummaryType.GuaranteedIndicator = "1"
-		Set SummaryType.EstimatedArrival.Pickup.Date = ##class(TECH.DateTime).TextToDate("10/03/2016")
-		Set SummaryType.EstimatedArrival.TotalTransitDays = Item
-			
-		Do Response.TransitResponse.ServiceSummary.SetAt(SummaryType,Item)
-	}
-	Quit Response
-]]></Implementation>
-</Method>
-
-<Method name="GeefResponseMetAlternatiefAdres">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse</ReturnType>
-<Implementation><![CDATA[
-	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse).%New()
-
-	Set Response.Response.ResponseStatus.Code = "1"
-	Set Response.Response.ResponseStatus.Description = "Success"
-
-	Set Response.Response.TransactionReference.CustomerContext = "1"
-	Set Response.Response.TransactionReference.TransactionIdentifier = "1"
-
-	Set Response.TransitResponse.ShipmentWeight.UnitOfMeasurement = "KGS" 
-	Set Response.TransitResponse.ShipmentWeight.Weight = "200"
-	
-	Set Response.TransitResponse.ShipFrom.Address.City = "Sint-Niklaas"  
-	Set Response.TransitResponse.ShipFrom.Address.CountryCode = "BE"
-	Set Response.TransitResponse.ShipFrom.Address.PostalCode = "9100"
-
-	Set Response.TransitResponse.ShipTo.Address.City = "Sint-Niklaas"  
-	Set Response.TransitResponse.ShipTo.Address.CountryCode = "BE"
-	Set Response.TransitResponse.ShipTo.Address.PostalCode = "9100"
-	
-	Set Response.TransitResponse.PickupDate = ##class(TECH.DateTime).TextToDate("10/03/2016")
-
-	Do Response.TransitResponse.ServiceSummary.Clear()
-	
-	#dim Candidate As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.CandidateType = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.CandidateType).%New()
-	
-	Set Candidate.Address.City = "Sint-Gillis-Waas"
-	Set Candidate.Address.CountryCode = "BE"
-	Set Candidate.Address.PostcodePrimaryHigh = "9170"
-	Set Candidate.Address.PostcodePrimaryLow = "9170"
-	
-	Do Response.CandidateResponse.ShipToList.SetAt(Candidate,1)
-
-	Quit Response
-]]></Implementation>
-</Method>
-
 <Method name="GeefTeverzendItemList">
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.OfferteService.dto.TeverzendenItemList</ReturnType>
 <Implementation><![CDATA[
 	#dim TeverzendItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItemList).%New()
 	Set TeverzendItemList.Referentie = "1"
 	Set TeverzendItemList.GewensteLeverDatum = ##class(TECH.DateTime).TextToDate("11/03/2016")
-	Set TeverzendItemList.LeverAdres = ##class(APPS.common.dto.Adres).%New()
+	Set TeverzendItemList.LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
+	Set TeverzendItemList.LeverAdres.ProvincieCode = ""
 	Set TeverzendItemList.LeverAdres.LandCode = "BE"
 	Set TeverzendItemList.LeverAdres.Postcode = "9100"
 	Set TeverzendItemList.LeverAdres.Woonplaats = "Sint-Niklaas"
 	
-	For Item=1:1:10 {
+	For Item=1:1:15 {
 		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItem).%New()
 		Set TeverzendItem.ProductID = Item
 		Set TeverzendItem.WaardeGoederen = Item * 10
 		Set TeverzendItem.Gewicht = Item * 5
-		Set TeverzendItem.Afmeting = Item * 15
+		Set TeverzendItem.Afmeting = Item * 500
 		Set TeverzendItem.DatumBeschikbaar = ##class(TECH.DateTime).TextToDate(Item_"/03/2016")
 		Do TeverzendItemList.TeverzendItems.SetAt(TeverzendItem,Item)
 	}
@@ -213,76 +51,42 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefTeverzendItemListZonderLijnen">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.OfferteService.dto.TeverzendenItemList</ReturnType>
-<Implementation><![CDATA[
-	#dim TeverzendItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItemList).%New()
-	Set TeverzendItemList.Referentie = "1"
-	Set TeverzendItemList.GewensteLeverDatum = ##class(TECH.DateTime).TextToDate("01/03/2016")
-	Set TeverzendItemList.LeverAdres = ##class(APPS.common.dto.Adres).%New()
-	Set TeverzendItemList.LeverAdres.LandCode = "BE"
-	Set TeverzendItemList.LeverAdres.Postcode = "9100"
-	Set TeverzendItemList.LeverAdres.Woonplaats = "Sint-Niklaas"
-	
-	Do TeverzendItemList.TeverzendItems.Clear()
-	
-	Quit TeverzendItemList
-]]></Implementation>
-</Method>
-
-<Method name="GeefRequest">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest</ReturnType>
-<Implementation><![CDATA[
-	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest  = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest).%New()
-	
-	Set Request.Request.TransactionReference.CustomerContext = "1"
-	Set Request.Request.TransactionReference.TransactionIdentifier = "1"
-
-	Set Request.ShipFrom.Address.City = "Sint-Niklaas" 
-	Set Request.ShipFrom.Address.CountryCode = "BE" 
-	Set Request.ShipFrom.Address.PostalCode = "9100" 
-	
-	Set Request.ShipTo.Address.City = "Sint-Niklaas" 
-	Set Request.ShipTo.Address.CountryCode = "BE" 
-	Set Request.ShipTo.Address.PostalCode = "9100" 
-	
-	Set Request.Pickup.Date = ##class(TECH.DateTime).TextToDate("10/03/2016")
-	Set Request.Pickup.Time = ""
-	
-	Set Request.ShipmentWeight.UnitOfMeasurement.Code = "KGS"
-	Set Request.ShipmentWeight.Weight = "275"
-
-	Set Request.TotalPackagesInShipment = "10"
-
-	Set Request.InvoiceLineTotal.CurrencyCode = "EUR"
-	Set Request.InvoiceLineTotal.MonetaryValue = "550"
-	
-	Set Request.MaximumListSize = "50"
-
-	Quit Request
-]]></Implementation>
-</Method>
-
 <Method name="GeefLeverDatums">
 <Private>1</Private>
 <ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
 <Implementation><![CDATA[
 	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
 	
-	For Item=1:1:5 {
-		#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
-		Set OfferteItem.Code = Item
-		Set OfferteItem.Omschrijving = "Omschrijving"_Item
-		Set OfferteItem.Gegarandeerd = "1"
-		Set OfferteItem.Duurtijd = Item
-		Set OfferteItem.Kostprijs = 0
-		Set OfferteItem.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
-		Set OfferteItem.Optie = ""
-		Do OfferteData.OfferteItemList.SetAt(OfferteItem,Item)
-	}
+	#dim OfferteItem1 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	Set OfferteItem1.Code = 2
+	Set OfferteItem1.Omschrijving = "UPS Express"
+	Set OfferteItem1.Gegarandeerd = "1"
+	Set OfferteItem1.Duurtijd = 1
+	Set OfferteItem1.Kostprijs = 70
+	Set OfferteItem1.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+	Set OfferteItem1.Optie = ""
+	Do OfferteData.OfferteItemList.SetAt(OfferteItem1,1)
 
+	#dim OfferteItem2 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	Set OfferteItem2.Code = 2
+	Set OfferteItem2.Omschrijving = "UPS Express"
+	Set OfferteItem2.Gegarandeerd = "1"
+	Set OfferteItem2.Duurtijd = 10
+	Set OfferteItem2.Kostprijs = 70
+	Set OfferteItem2.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+	Set OfferteItem2.Optie = ""
+	Do OfferteData.OfferteItemList.SetAt(OfferteItem2,2)
+
+	#dim OfferteItem3 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	Set OfferteItem3.Code = 4
+	Set OfferteItem3.Omschrijving = "UPS Standard"
+	Set OfferteItem3.Gegarandeerd = "1"
+	Set OfferteItem3.Duurtijd = 8
+	Set OfferteItem3.Kostprijs = 110
+	Set OfferteItem3.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+	Set OfferteItem3.Optie = ""
+	Do OfferteData.OfferteItemList.SetAt(OfferteItem3,3)
+
 	Quit OfferteData
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/UPS/impl/TimeInTransit/TeverzendItemListConverteerder.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/UPS/impl/TimeInTransit/TeverzendItemListConverteerder.cls.xml	(revision 0)
+++ APPS/TRANSP/UPS/impl/TimeInTransit/TeverzendItemListConverteerder.cls.xml	(revision 32614)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.UPS.impl.TimeInTransit.TeverzendItemListConverteerder">
+<Super>APPS.TRANSP.UPS.TeverzendItemListConverteerder</Super>
+
+<Property name="Body">
+<Type>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TeverzendenItemList">
+<Type>APPS.TRANSP.OfferteService.dto.TeverzendenItemList</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="Converteer">
+<FormalSpec>TeverzendenItemList:APPS.TRANSP.OfferteService.dto.TeverzendenItemList</FormalSpec>
+<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest</ReturnType>
+<Implementation><![CDATA[
+	Set ..Body = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest).%New()
+	Set ..TeverzendenItemList = TeverzendenItemList
+	
+	Do ..ZetReferentie()
+
+	Do ..ZetVerzendAdres()	
+	
+	Do ..ZetLeverAdres()
+
+	Do ..ZetAfhaalDatumEnTijd()	
+	
+	Do ..ZetVerzendDetails()
+		
+	Set ..Body.MaximumListSize = "50"
+	
+	quit ..Body
+]]></Implementation>
+</Method>
+
+<Method name="ZetVerzendDetails">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim TotaalPrijs As TECH.Decimal = 0
+	#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
+	}
+	
+	Set ..Body.ShipmentWeight.UnitOfMeasurement.Code = "KGS"
+	Set ..Body.ShipmentWeight.Weight = TotaalGewicht
+
+	Set ..Body.TotalPackagesInShipment = ..TeverzendenItemList.TeverzendItems.Count()
+
+	Set ..Body.InvoiceLineTotal.CurrencyCode = "EUR"
+	Set ..Body.InvoiceLineTotal.MonetaryValue = TotaalPrijs
+]]></Implementation>
+</Method>
+
+<Method name="ZetReferentie">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..Body.Request.TransactionReference.CustomerContext = ..TeverzendenItemList.Referentie
+	Set ..Body.Request.TransactionReference.TransactionIdentifier = ..TeverzendenItemList.Referentie
+]]></Implementation>
+</Method>
+
+<Method name="ZetLeverAdres">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..Body.ShipTo.Address.StateProvinceCode = ..TeverzendenItemList.LeverAdres.ProvincieCode
+	Set ..Body.ShipTo.Address.City = ..TeverzendenItemList.LeverAdres.Woonplaats
+	Set ..Body.ShipTo.Address.CountryCode = ..TeverzendenItemList.LeverAdres.LandCode
+	Set ..Body.ShipTo.Address.PostalCode = ..TeverzendenItemList.LeverAdres.Postcode
+]]></Implementation>
+</Method>
+
+<Method name="ZetVerzendAdres">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..Body.ShipFrom.Address.StateProvinceCode = ""
+	Set ..Body.ShipFrom.Address.City = "Sint-Niklaas" 
+	Set ..Body.ShipFrom.Address.CountryCode = "BE" 
+	Set ..Body.ShipFrom.Address.PostalCode = "9100"
+]]></Implementation>
+</Method>
+
+<Method name="ZetAfhaalDatumEnTijd">
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Context As TECH.Context = ##class(TECH.Context).Instance()
+	#dim AfhaalDatum As %Date = Context.GeefDateTimeAPI().CurrentDate()
+	
+	for Item=1:1:..TeverzendenItemList.TeverzendItems.Count() {
+			if (..TeverzendenItemList.TeverzendItems.GetAt(Item).DatumBeschikbaar > AfhaalDatum) {
+				Set AfhaalDatum = ..TeverzendenItemList.TeverzendItems.GetAt(Item).DatumBeschikbaar
+			}
+	}
+	
+	Set ..Body.Pickup.Date = AfhaalDatum 
+	Set ..Body.Pickup.Time = ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/UPS/impl/Rate/ResponseConverteerder.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/UPS/impl/Rate/ResponseConverteerder.cls.xml	(revision 0)
+++ APPS/TRANSP/UPS/impl/Rate/ResponseConverteerder.cls.xml	(revision 32614)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.UPS.impl.Rate.ResponseConverteerder">
+<Super>APPS.TRANSP.UPS.ResponseConverteerder</Super>
+
+<Method name="Converteer">
+<FormalSpec>Response:APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse</FormalSpec>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+
+	For Item=1:1:Response.RatedShipment.Count() {
+		#dim RatedShipment As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RatedShipmentType = Response.RatedShipment.GetAt(Item)
+
+		#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+
+		Set OfferteItem.Gegarandeerd = ""
+		Set OfferteItem.Code = RatedShipment.Service.Code  
+		Set OfferteItem.Omschrijving = RatedShipment.Service.Description
+		Set OfferteItem.OphaalDatum = ""
+		Set OfferteItem.Duurtijd = ""
+		Set OfferteItem.Kostprijs = RatedShipment.TotalCharges.MonetaryValue
+		Set OfferteItem.Optie = ""
+		
+		Do OfferteData.OfferteItemList.SetAt(OfferteItem,Item)
+	}
+
+	quit OfferteData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/UPS/impl/Rate/ResponseValideerder.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/UPS/impl/Rate/ResponseValideerder.cls.xml	(revision 0)
+++ APPS/TRANSP/UPS/impl/Rate/ResponseValideerder.cls.xml	(revision 32614)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.UPS.impl.Rate.ResponseValideerder">
+<Super>APPS.TRANSP.UPS.ResponseValideerder</Super>
+
+<Method name="Valideer">
+<FormalSpec>Response:APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse,Request:APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest</FormalSpec>
+<Implementation><![CDATA[
+	
+	if (Response.Response.TransactionReference.CustomerContext '= Request.Request.TransactionReference.CustomerContext) {
+		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Verkeerde referentie : " _Response.Response.TransactionReference.CustomerContext)
+	}
+
+	if ((Response.Response.ResponseStatus.Code '= "1") || (Response.Response.ResponseStatus.Description '= "Success")) {
+		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("UPS Response geeft ongeldige status voor ref : " _Response.Response.TransactionReference.CustomerContext)
+	}
+
+	Quit
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhDeploy/Deploy20160216TransportServiceCodes.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20160216TransportServiceCodes.cls.xml	(revision 0)
+++ vhDeploy/Deploy20160216TransportServiceCodes.cls.xml	(revision 32614)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20160216TransportServiceCodes">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhDeploy.Deploy</Super>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Do ##class(APPS.TRANSP.OfferteService.data.ServiceCodeMapping).%KillExtent()
+	
+	Do ..VoegServiceCodeToe("UPS",54,21,1,"UPS Express Plus")
+	Do ..VoegServiceCodeToe("UPS",07,10,2,"UPS Express")
+	Do ..VoegServiceCodeToe("UPS",07,01,2,"UPS Express")
+	Do ..VoegServiceCodeToe("UPS",65,28,3,"UPS Express Saver")
+	Do ..VoegServiceCodeToe("UPS",65,18,3,"UPS Express Saver")
+	Do ..VoegServiceCodeToe("UPS",11,08,4,"UPS Standard")
+	Do ..VoegServiceCodeToe("UPS",11,68,4,"UPS Standard")
+]]></Implementation>
+</Method>
+
+<Method name="VoegServiceCodeToe">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>TransportFirma:%String,RateCode:%Integer,TimeInTransitCode:%Integer,InterneCode:%Integer,Omschrijving:%String</FormalSpec>
+<Implementation><![CDATA[
+	
+	Set ServiceCodeMapping = ##class(APPS.TRANSP.OfferteService.data.ServiceCodeMapping).%New()
+	Set ServiceCodeMapping.InterneCode = InterneCode
+	Set ServiceCodeMapping.Omschrijving = Omschrijving
+	Set ServiceCodeMapping.RateCode = RateCode
+	Set ServiceCodeMapping.TimeInTransitCode = TimeInTransitCode
+	Set ServiceCodeMapping.TransportFirma = TransportFirma
+	Do ServiceCodeMapping.Save()
+	
+	Write "De servicecode """_InterneCode_""" is bewaard."
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/OfferteService/data/ServiceCodeMapping.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/OfferteService/data/ServiceCodeMapping.cls.xml	(revision 0)
+++ APPS/TRANSP/OfferteService/data/ServiceCodeMapping.cls.xml	(revision 32614)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.OfferteService.data.ServiceCodeMapping">
+<ClassType>persistent</ClassType>
+<Super>TECH.Persistent</Super>
+
+<Property name="InterneCode">
+<Type>TECH.Integer</Type>
+</Property>
+
+<Property name="Omschrijving">
+<Type>TECH.String</Type>
+</Property>
+
+<Property name="TransportFirma">
+<Type>TECH.String</Type>
+</Property>
+
+<Property name="RateCode">
+<Type>TECH.Integer</Type>
+</Property>
+
+<Property name="TimeInTransitCode">
+<Type>TECH.Integer</Type>
+</Property>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DataLocation>^APPS.TRANS2868.ServiceCodeM9AFD</DataLocation>
+<DefaultData>ServiceCodeMappingDefaultData</DefaultData>
+<IdLocation>^APPS.TRANS2868.ServiceCodeM9AFD</IdLocation>
+<IndexLocation>^APPS.TRANS2868.ServiceCodeM9AFI</IndexLocation>
+<StreamLocation>^APPS.TRANS2868.ServiceCodeM9AFS</StreamLocation>
+<Data name="ServiceCodeMappingDefaultData">
+<Structure>listnode</Structure>
+<Subscript/>
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+<Value name="2">
+<Value>InterneCode</Value>
+</Value>
+<Value name="3">
+<Value>Omschrijving</Value>
+</Value>
+<Value name="4">
+<Value>TransportFirma</Value>
+</Value>
+<Value name="5">
+<Value>RateCode</Value>
+</Value>
+<Value name="6">
+<Value>TimeInTransitCode</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/UPS/TeverzendItemListValideerder.cls.xml
===================================================================
diff -u -r32557 -r32614
--- APPS/TRANSP/UPS/TeverzendItemListValideerder.cls.xml	(.../TeverzendItemListValideerder.cls.xml)	(revision 32557)
+++ APPS/TRANSP/UPS/TeverzendItemListValideerder.cls.xml	(.../TeverzendItemListValideerder.cls.xml)	(revision 32614)
@@ -6,7 +6,7 @@
 
 <Method name="Valideer">
 <Abstract>1</Abstract>
-<FormalSpec>Offerte:APPS.TRANSP.OfferteService.dto.TeverzendenItemList</FormalSpec>
+<FormalSpec>Offerte:TECH.DataTransferObject</FormalSpec>
 </Method>
 </Class>
 
Index: vhUnitTest/APPS/TRANSP/UPS/Rate/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/TRANSP/UPS/Rate/OfferteBerekenaar/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/TRANSP/UPS/Rate/OfferteBerekenaar/Test.cls.xml	(revision 32614)
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.TRANSP.UPS.Rate.OfferteBerekenaar.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Geef mogelijke leverdagen voor TeverzendItemList ">
+<Implementation><![CDATA[
+	#dim FakeWebClient As vhTest.Fake.APPS.TRANSP.UPS.SoapClients.Rate.RatePort = ##class(vhTest.Fake.APPS.TRANSP.UPS.SoapClients.Rate.RatePort).%New()
+	
+	#dim OfferteBerekenaar As APPS.TRANSP.UPS.impl.Rate.OfferteBerekenaar = ##class(APPS.TRANSP.UPS.impl.Rate.OfferteBerekenaar).%New(FakeWebClient)
+	
+	#dim TeverzendItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemList()
+
+	#dim LeverDatums As APPS.TRANSP.OfferteService.dto.OfferteData = OfferteBerekenaar.Bereken(TeverzendItemList)
+	
+	#dim TestLeverDatums As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefLeverDatums()
+	
+	Do $$$AssertEquals(LeverDatums.OfferteItemList.Count(), TestLeverDatums.OfferteItemList.Count())
+	
+	For Item=1:1:LeverDatums.OfferteItemList.Count() {
+		Do $$$AssertObject(LeverDatums.OfferteItemList.GetAt(Item), TestLeverDatums.OfferteItemList.GetAt(Item))
+		}
+]]></Implementation>
+</Method>
+
+<Method name="Test: UPS Response converteerder">
+<Implementation><![CDATA[
+	#dim ResponseConverteerder As APPS.TRANSP.UPS.impl.Rate.ResponseConverteerder = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseConverteerder).%New()
+	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse = ..GeefResponse()
+	#dim LeverDatums As APPS.TRANSP.OfferteService.dto.OfferteData = ResponseConverteerder.Converteer(Response)
+	#dim TestLeverDatums As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefLeverDatums()
+	
+	#dim a As TECH.Integer
+	
+	Do $$$AssertEquals(LeverDatums.OfferteItemList.Count(), TestLeverDatums.OfferteItemList.Count())
+	
+	For Item=1:1:LeverDatums.OfferteItemList.Count() {
+		Do $$$AssertObject(LeverDatums.OfferteItemList.GetAt(Item), TestLeverDatums.OfferteItemList.GetAt(Item))
+		}
+]]></Implementation>
+</Method>
+
+<Method name="Test: UPS Response Valideerder">
+<Implementation><![CDATA[
+	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.Rate.ResponseValideerder = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValideerder).%New()
+	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse = ..GeefResponse()
+	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest = ..GeefRequest()
+	
+	Do ResponseValideerder.Valideer(Response, Request)
+	
+	Do $$$AssertTrue(1)
+]]></Implementation>
+</Method>
+
+<Method name="Test: UPS TeverzendItemList converteerder">
+<Implementation><![CDATA[
+	#dim TeverzendItemListConverteerder As APPS.TRANSP.UPS.impl.Rate.TeverzendItemListConverteerder  = ##class(APPS.TRANSP.UPS.impl.Rate.TeverzendItemListConverteerder).%New()
+	#dim TeverzendenItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemList()
+	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest = TeverzendItemListConverteerder.Converteer(TeverzendenItemList)
+	#dim TestRequest As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest = ..GeefRequest()
+
+	Do $$$AssertObject(Request.Shipment.Shipper.Address , TestRequest.Shipment.Shipper.Address)
+	Do $$$AssertObject(Request.Request.TransactionReference  , TestRequest.Request.TransactionReference)
+	Do $$$AssertObject(Request.Shipment.ShipTo.Address , TestRequest.Shipment.ShipTo.Address)
+	Do $$$AssertEquals(Request.Shipment.Package.Count(),TestRequest.Shipment.Package.Count())
+	
+	For Item=1:1:Request.Shipment.Package.Count() {
+		#dim Package As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.PackageType = Request.Shipment.Package.GetAt(Item)
+		#dim TestPackage As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.PackageType = TestRequest.Shipment.Package.GetAt(Item)
+
+		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)
+		
+		}
+]]></Implementation>
+</Method>
+
+<Method name="Test: UPS TeverzendItemList Valideerder - TeverzendItemList zonder lijnen ">
+<Implementation><![CDATA[
+	#dim TeverzendItemListValideerder As APPS.TRANSP.UPS.impl.TeverzendItemListValideerder = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListValideerder).%New()
+	#dim TeverzendenItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemListZonderLijnen()
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen Detaillijnen in TeverzendenItemList : 1")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
+
+	Do TeverzendItemListValideerder.Valideer(TeverzendenItemList)
+]]></Implementation>
+</Method>
+
+<Method name="Test: UPS TeverzendItemList Valideerder">
+<Implementation><![CDATA[
+	#dim TeverzendItemListValideerder As APPS.TRANSP.UPS.impl.TeverzendItemListValideerder = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListValideerder).%New()
+	#dim TeverzendenItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemList()
+	
+	Do TeverzendItemListValideerder.Valideer(TeverzendenItemList)
+	
+	Do $$$AssertTrue(1)
+]]></Implementation>
+</Method>
+
+<Method name="GeefResponse">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse</ReturnType>
+<Implementation><![CDATA[
+	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse = ##class(APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateResponse).%New()
+
+	Set Response.Response.ResponseStatus.Code = "1"
+	Set Response.Response.ResponseStatus.Description = "Success"
+	
+	Set Response.Response.TransactionReference.CustomerContext = "1"
+	Set Response.Response.TransactionReference.TransactionIdentifier = "1"
+
+	For Item=1:1:5 {
+		#dim RatedShipment As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RatedShipmentType = ##class(APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RatedShipmentType).%New()
+		
+		Set RatedShipment.Service.Code = Item
+		Set RatedShipment.GuaranteedDelivery.BusinessDaysInTransit = "1"
+		Set RatedShipment.BillingWeight.UnitOfMeasurement = "KGS" 
+		Set RatedShipment.BillingWeight.Weight = Item * 5 
+		Set RatedShipment.TotalCharges.CurrencyCode = "EUR"
+		Set RatedShipment.TotalCharges.MonetaryValue  = Item * 10
+		
+		Do Response.RatedShipment.SetAt(RatedShipment,Item)	
+	}
+
+	
+	Quit Response
+]]></Implementation>
+</Method>
+
+<Method name="GeefTeverzendItemList">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.TeverzendenItemList</ReturnType>
+<Implementation><![CDATA[
+	#dim TeverzendItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItemList).%New()
+	Set TeverzendItemList.Referentie = "1"
+	Set TeverzendItemList.GewensteLeverDatum = ##class(TECH.DateTime).TextToDate("11/03/2016")
+	Set TeverzendItemList.LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
+	Set TeverzendItemList.LeverAdres.ProvincieCode = ""
+	Set TeverzendItemList.LeverAdres.LandCode = "BE"
+	Set TeverzendItemList.LeverAdres.Postcode = "9100"
+	Set TeverzendItemList.LeverAdres.Woonplaats = "Sint-Niklaas"
+	
+	For Item=1:1:5 {
+		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItem).%New()
+		Set TeverzendItem.ProductID = Item
+		Set TeverzendItem.Aantal = 1
+		Set TeverzendItem.WaardeGoederen = Item * 10
+		Set TeverzendItem.Gewicht = Item * 120
+		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)
+	}
+	
+	Quit TeverzendItemList
+]]></Implementation>
+</Method>
+
+<Method name="GeefTeverzendItemListZonderLijnen">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.TeverzendenItemList</ReturnType>
+<Implementation><![CDATA[
+	#dim TeverzendItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItemList).%New()
+	Set TeverzendItemList.Referentie = "1"
+	Set TeverzendItemList.GewensteLeverDatum = ##class(TECH.DateTime).TextToDate("01/03/2016")
+	Set TeverzendItemList.LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
+	Set TeverzendItemList.LeverAdres.ProvincieCode = ""
+	Set TeverzendItemList.LeverAdres.LandCode = "BE"
+	Set TeverzendItemList.LeverAdres.Postcode = "9100"
+	Set TeverzendItemList.LeverAdres.Woonplaats = "Sint-Niklaas"
+	
+	Do TeverzendItemList.TeverzendItems.Clear()
+	
+	Quit TeverzendItemList
+]]></Implementation>
+</Method>
+
+<Method name="GeefRequest">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest</ReturnType>
+<Implementation><![CDATA[
+	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest  = ##class(APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest).%New()
+	
+	Do Request.Request.RequestOption.SetAt("Shop",1)
+	Set Request.Request.TransactionReference.CustomerContext = "1"
+	Set Request.Request.TransactionReference.TransactionIdentifier = "1"
+
+	Set Request.Shipment.Shipper.ShipperNumber = "A566R9"
+	Set Request.Shipment.Shipper.Address.StateProvinceCode = ""
+	Set Request.Shipment.Shipper.Address.City = "Sint-Niklaas" 
+	Set Request.Shipment.Shipper.Address.CountryCode = "BE" 
+	Set Request.Shipment.Shipper.Address.PostalCode = "9100" 
+	
+	Set Request.Shipment.ShipTo.Address.StateProvinceCode = ""
+	Set Request.Shipment.ShipTo.Address.City = "Sint-Niklaas" 
+	Set Request.Shipment.ShipTo.Address.CountryCode = "BE" 
+	Set Request.Shipment.ShipTo.Address.PostalCode = "9100" 
+	
+	For Item=1:1:5 {
+		#dim PackageItem As APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.PackageType = ##class(APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.PackageType).%New()
+		Set PackageItem.Dimensions.Height = Item * 500
+		Set PackageItem.Dimensions.Width = Item * 10
+		Set PackageItem.Dimensions.Length = Item * 100
+		Set PackageItem.PackageWeight.UnitOfMeasurement.Code = "KGS"
+		#dim Afmeting As APPS.TRANSP.OfferteService.dto.Afmeting
+		Set Afmeting = ##class(APPS.TRANSP.OfferteService.dto.Afmeting).%New(PackageItem.Dimensions.Height, PackageItem.Dimensions.Width, PackageItem.Dimensions.Length)
+		Set PackageItem.PackageWeight.Weight = ..BerekenGewicht(Afmeting ,(Item * 120))
+		Set PackageItem.PackagingType.Code = "02"
+		Set PackageItem.PackagingType.Description = "Package/customer supplied"
+		Do Request.Shipment.Package.SetAt(PackageItem,Item)
+	}
+	
+	Set Request.Shipment.ShipmentServiceOptions.UPScarbonneutralIndicator = ""
+	
+	Quit Request
+]]></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[
+	#dim BerekendGewicht As TECH.Decimal = (Afmeting.Breedte * Afmeting.Hoogte * Afmeting.Lengte) / 5000
+	If (BerekendGewicht > Gewicht)	{
+		Quit BerekendGewicht
+	} else {
+		Quit Gewicht
+	}
+]]></Implementation>
+</Method>
+
+<Method name="GeefLeverDatums">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	
+	For Item=1:1:5 {
+		#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+		Set OfferteItem.Code = Item
+		Set OfferteItem.Omschrijving = ""
+		Set OfferteItem.Gegarandeerd = ""
+		Set OfferteItem.Duurtijd = ""
+		Set OfferteItem.Kostprijs = Item * 10
+		Set OfferteItem.OphaalDatum = ""
+		Set OfferteItem.Optie = ""
+		Do OfferteData.OfferteItemList.SetAt(OfferteItem,Item)
+	}
+
+	Quit OfferteData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/OfferteService/dto/TeverzendenItemList.cls.xml
===================================================================
diff -u -r32557 -r32614
--- APPS/TRANSP/OfferteService/dto/TeverzendenItemList.cls.xml	(.../TeverzendenItemList.cls.xml)	(revision 32557)
+++ APPS/TRANSP/OfferteService/dto/TeverzendenItemList.cls.xml	(.../TeverzendenItemList.cls.xml)	(revision 32614)
@@ -8,7 +8,7 @@
 </Property>
 
 <Property name="LeverAdres">
-<Type>APPS.common.dto.Adres</Type>
+<Type>APPS.TRANSP.dto.InternationaalAdres</Type>
 </Property>
 
 <Property name="GewensteLeverDatum">
Index: APPS/TRANSP/UPS/OfferteBerekenaar.cls.xml
===================================================================
diff -u -r32558 -r32614
--- APPS/TRANSP/UPS/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 32558)
+++ APPS/TRANSP/UPS/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 32614)
@@ -1,108 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.TRANSP.UPS.OfferteBerekenaar">
+<Abstract>1</Abstract>
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="UPSConnection">
-<Type>%SOAP.WebClient</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="ResponseConverteerder">
-<Type>APPS.TRANSP.UPS.ResponseConverteerder</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="TeverzendItemListConverteerder">
-<Type>APPS.TRANSP.UPS.TeverzendItemListConverteerder</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="ResponseValideerder">
-<Type>APPS.TRANSP.UPS.ResponseValideerder</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="TeverzendItemListValideerder">
-<Type>APPS.TRANSP.UPS.TeverzendItemListValideerder</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<FormalSpec>UPSConnection:APPS.TRANSP.UPS.SoapClients.TimeInTransit.TimeInTransitPort=""</FormalSpec>
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[
-	Set ..UPSConnection = $$$Implementation(UPSConnection,##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.TimeInTransitPort).%New())
-	
-	Set ..ResponseConverteerder = ##class(APPS.TRANSP.UPS.impl.ResponseConverteerder).%New()
-	Set ..TeverzendItemListConverteerder = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListConverteerder).%New()
-	Set ..ResponseValideerder = ##class(APPS.TRANSP.UPS.impl.ResponseValideerder).%New()
-	Set ..TeverzendItemListValideerder = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListValideerder).%New()
-	
-	quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="Bereken">
+<Abstract>1</Abstract>
 <FormalSpec>TeverzendenItemList:APPS.TRANSP.OfferteService.dto.TeverzendenItemList</FormalSpec>
 <ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
-<Implementation><![CDATA[
-	
-	Do ..ValideerOfferte(TeverzendenItemList)
-	
-	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest = ..GeefRequest(TeverzendenItemList) 
-	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ..GeefResponse(Request) 
-
-	Do ..ValideerResponse(Response, Request)
-
-	Quit ..GeefLeverDatums(Response)
-]]></Implementation>
 </Method>
-
-<Method name="ValideerResponse">
-<FormalSpec>Response:APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse,Request:APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Do ..ResponseValideerder.Valideer(Response, Request) 
-	quit
-]]></Implementation>
-</Method>
-
-<Method name="ValideerOfferte">
-<FormalSpec>TeverzendenItemList:APPS.TRANSP.OfferteService.dto.TeverzendenItemList</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Do ..TeverzendItemListValideerder.Valideer(TeverzendenItemList)
-	quit
-]]></Implementation>
-</Method>
-
-<Method name="GeefLeverDatums">
-<FormalSpec>Response:APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse</FormalSpec>
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
-<Implementation><![CDATA[	quit ..ResponseConverteerder.Converteer(Response)
-]]></Implementation>
-</Method>
-
-<Method name="GeefRequest">
-<FormalSpec>TeverzendenItemList:APPS.TRANSP.OfferteService.dto.TeverzendenItemList</FormalSpec>
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest</ReturnType>
-<Implementation><![CDATA[	quit ..TeverzendItemListConverteerder.Converteer(TeverzendenItemList)
-]]></Implementation>
-</Method>
-
-<Method name="GeefResponse">
-<FormalSpec>Request:APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest</FormalSpec>
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse</ReturnType>
-<Implementation><![CDATA[	Quit ..UPSConnection.ProcessTimeInTransit(Request)
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: APPS/TRANSP/UPS/impl/TeverzendItemListValideerder.cls.xml
===================================================================
diff -u -r32558 -r32614
--- APPS/TRANSP/UPS/impl/TeverzendItemListValideerder.cls.xml	(.../TeverzendItemListValideerder.cls.xml)	(revision 32558)
+++ APPS/TRANSP/UPS/impl/TeverzendItemListValideerder.cls.xml	(.../TeverzendItemListValideerder.cls.xml)	(revision 32614)
@@ -9,12 +9,37 @@
 	If ($$$Not($IsObject(TeverzendenItemList.LeverAdres))) {
 		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Ongeldig leveradres in TeverzendenItemList : " _TeverzendenItemList.Referentie)
 	}
+	If ((TeverzendenItemList.LeverAdres.LandCode = "US" || TeverzendenItemList.LeverAdres.LandCode = "CA") && 
+		(TeverzendenItemList.LeverAdres.ProvincieCode = "" || $$$Not($IsObject(TeverzendenItemList.LeverAdres.ProvincieCode)))
+		) {
+		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("ProvincieCode ontbreekt in leveradres van TeverzendenItemList : " _TeverzendenItemList.Referentie)
+	}
 	If ($$$Not($IsObject(TeverzendenItemList.TeverzendItems)) || (TeverzendenItemList.TeverzendItems.Count() = 0)) {
 		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Geen Detaillijnen in TeverzendenItemList : " _TeverzendenItemList.Referentie)
 	}
+	
+
+	If (..BerekenAantalPakjes(TeverzendenItemList) > 50) {
+		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Het maximum aantal pakjes is overschreden : " _TeverzendenItemList.Referentie)
+	}
+	
 	quit
 ]]></Implementation>
 </Method>
+
+<Method name="BerekenAantalPakjes">
+<FormalSpec>TeverzendenItemList:APPS.TRANSP.OfferteService.dto.TeverzendenItemList</FormalSpec>
+<ReturnType>TECH.Integer</ReturnType>
+<Implementation><![CDATA[
+	#dim AantalPakjes As TECH.Integer = 0
+	Set TeverzendItemIterator = ##class(TECH.ListIterator).%New(TeverzendenItemList.TeverzendItems)
+	While TeverzendItemIterator.HasNext() {
+		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = TeverzendItemIterator.Next()
+		Set AantalPakjes = AantalPakjes + TeverzendItem.Aantal
+	}
+	Quit AantalPakjes
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: APPS/TRANSP/UPS/impl/Rate/OfferteBerekenaar.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/UPS/impl/Rate/OfferteBerekenaar.cls.xml	(revision 0)
+++ APPS/TRANSP/UPS/impl/Rate/OfferteBerekenaar.cls.xml	(revision 32614)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.UPS.impl.Rate.OfferteBerekenaar">
+<Super>APPS.TRANSP.UPS.OfferteBerekenaar</Super>
+
+<Property name="UPSConnection">
+<Type>APPS.TRANSP.UPS.SoapClients.Port</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ResponseConverteerder">
+<Type>APPS.TRANSP.UPS.ResponseConverteerder</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TeverzendItemListConverteerder">
+<Type>APPS.TRANSP.UPS.TeverzendItemListConverteerder</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ResponseValideerder">
+<Type>APPS.TRANSP.UPS.ResponseValideerder</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TeverzendItemListValideerder">
+<Type>APPS.TRANSP.UPS.TeverzendItemListValideerder</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>UPSConnection:APPS.TRANSP.UPS.SoapClients.Port=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..UPSConnection = $$$Implementation(UPSConnection,##class(APPS.TRANSP.UPS.impl.SoapClients.Rate.RatePort).%New())
+	
+	Set ..ResponseConverteerder = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseConverteerder).%New()
+	Set ..TeverzendItemListConverteerder = ##class(APPS.TRANSP.UPS.impl.Rate.TeverzendItemListConverteerder).%New()
+	Set ..ResponseValideerder = ##class(APPS.TRANSP.UPS.impl.Rate.ResponseValideerder).%New()
+	Set ..TeverzendItemListValideerder = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListValideerder).%New()
+	
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Bereken">
+<FormalSpec>TeverzendenItemList:APPS.TRANSP.OfferteService.dto.TeverzendenItemList</FormalSpec>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	Do ..TeverzendItemListValideerder.Valideer(TeverzendenItemList)
+	
+	#dim Request As %SerialObject = ..TeverzendItemListConverteerder.Converteer(TeverzendenItemList)
+
+	#dim Response As %SerialObject = ..UPSConnection.Process(Request)
+
+	Do ..ResponseValideerder.Valideer(Response, Request) 
+
+	Quit ..ResponseConverteerder.Converteer(Response)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/UPS/SoapClients/Port.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/UPS/SoapClients/Port.cls.xml	(revision 0)
+++ APPS/TRANSP/UPS/SoapClients/Port.cls.xml	(revision 32614)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.UPS.SoapClients.Port">
+<Abstract>1</Abstract>
+
+<Method name="Process">
+<Abstract>1</Abstract>
+<FormalSpec>Body:%SerialObject</FormalSpec>
+<ReturnType>%SerialObject</ReturnType>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/UPS/impl/TimeInTransit/ResponseValideerder.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/UPS/impl/TimeInTransit/ResponseValideerder.cls.xml	(revision 0)
+++ APPS/TRANSP/UPS/impl/TimeInTransit/ResponseValideerder.cls.xml	(revision 32614)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValideerder">
+<Super>APPS.TRANSP.UPS.ResponseValideerder</Super>
+
+<Method name="Valideer">
+<FormalSpec>Response:APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse,Request:APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest</FormalSpec>
+<Implementation><![CDATA[
+	
+	if (Response.Response.TransactionReference.CustomerContext '= Request.Request.TransactionReference.CustomerContext) {
+		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Verkeerde referentie : " _Response.Response.TransactionReference.CustomerContext)
+	}
+
+	if ((Response.Response.ResponseStatus.Code '= "1") || (Response.Response.ResponseStatus.Description '= "Success")) {
+		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("UPS Response geeft ongeldige status voor ref : " _Response.Response.TransactionReference.CustomerContext)
+	}
+	
+	if (Response.CandidateResponse.ShipToList.Count() > 0) {
+		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("UPS stelt alternative adressen voor ref : " _Response.Response.TransactionReference.CustomerContext)
+	}
+
+	Quit
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/UPS/impl/Rate/TeverzendItemListConverteerder.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/UPS/impl/Rate/TeverzendItemListConverteerder.cls.xml	(revision 0)
+++ APPS/TRANSP/UPS/impl/Rate/TeverzendItemListConverteerder.cls.xml	(revision 32614)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.UPS.impl.Rate.TeverzendItemListConverteerder">
+<Super>APPS.TRANSP.UPS.TeverzendItemListConverteerder</Super>
+
+<Property name="Body">
+<Type>APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TeverzendenItemList">
+<Type>APPS.TRANSP.OfferteService.dto.TeverzendenItemList</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="Converteer">
+<FormalSpec>TeverzendenItemList:APPS.TRANSP.OfferteService.dto.TeverzendenItemList</FormalSpec>
+<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest</ReturnType>
+<Implementation><![CDATA[
+	Set ..Body = ##class(APPS.TRANSP.UPS.impl.SoapClients.Rate.rate.RateRequest).%New()
+	Set ..TeverzendenItemList = TeverzendenItemList
+	
+	Do ..ZetReferentie()
+
+	Do ..ZetVerzendAdres()	
+	
+	Do ..ZetLeverAdres()
+
+	Do ..ZetVerzendDetails()
+		
+	quit ..Body
+]]></Implementation>
+</Method>
+
+<Method name="ZetReferentie">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..Body.Request.TransactionReference.CustomerContext = ..TeverzendenItemList.Referentie
+	Set ..Body.Request.TransactionReference.TransactionIdentifier = ..TeverzendenItemList.Referentie
+]]></Implementation>
+</Method>
+
+<Method name="ZetLeverAdres">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..Body.Shipment.ShipTo.Address.StateProvinceCode = ..TeverzendenItemList.LeverAdres.ProvincieCode
+	Set ..Body.Shipment.ShipTo.Address.City = ..TeverzendenItemList.LeverAdres.Woonplaats
+	Set ..Body.Shipment.ShipTo.Address.CountryCode = ..TeverzendenItemList.LeverAdres.LandCode
+	Set ..Body.Shipment.ShipTo.Address.PostalCode = ..TeverzendenItemList.LeverAdres.Postcode
+]]></Implementation>
+</Method>
+
+<Method name="ZetVerzendAdres">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..Body.Shipment.Shipper.Address.StateProvinceCode = ""
+	Set ..Body.Shipment.Shipper.Address.City = "Sint-Niklaas" 
+	Set ..Body.Shipment.Shipper.Address.CountryCode = "BE" 
+	Set ..Body.Shipment.Shipper.Address.PostalCode = "9100"
+]]></Implementation>
+</Method>
+
+<Method name="ZetVerzendDetails">
+<Private>1</Private>
+<Implementation><![CDATA[
+
+	For Item=1:1:..TeverzendenItemList.TeverzendItems.Count() {
+		#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.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"
+			Set PackageItem.PackagingType.Description = "Package/customer supplied"
+			Do ..Body.Shipment.Package.SetAt(PackageItem,Item)
+		}
+	}
+]]></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[
+	#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: APPS/TRANSP/UPS/impl/OfferteBerekenaar.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/UPS/impl/OfferteBerekenaar.cls.xml	(revision 0)
+++ APPS/TRANSP/UPS/impl/OfferteBerekenaar.cls.xml	(revision 32614)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.UPS.impl.OfferteBerekenaar">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="RateOfferteBerekenaar">
+<Type>APPS.TRANSP.UPS.OfferteBerekenaar</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TimeInTransitOfferteBerekenaar">
+<Type>APPS.TRANSP.UPS.OfferteBerekenaar</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>RateOfferteBerekenaar:APPS.TRANSP.UPS.OfferteBerekenaar="",TimeInTransitOfferteBerekenaar:APPS.TRANSP.UPS.OfferteBerekenaar=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..RateOfferteBerekenaar = $$$Implementation(RateOfferteBerekenaar,##class(APPS.TRANSP.UPS.impl.Rate.OfferteBerekenaar).%New())
+	Set ..TimeInTransitOfferteBerekenaar = $$$Implementation(TimeInTransitOfferteBerekenaar,##class(APPS.TRANSP.UPS.impl.TimeInTransit.OfferteBerekenaar).%New())
+	
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Bereken">
+<FormalSpec>TeverzendenItemList:APPS.TRANSP.OfferteService.dto.TeverzendenItemList</FormalSpec>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim RateOfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..RateOfferteBerekenaar.Bereken(TeverzendenItemList)
+	#dim TimeInTransitOfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..TimeInTransitOfferteBerekenaar.Bereken(TeverzendenItemList)
+	
+	Quit ..MergeOfferteData(RateOfferteData, TimeInTransitOfferteData)
+]]></Implementation>
+</Method>
+
+<Method name="MergeOfferteData">
+<FormalSpec>RateOfferteData:APPS.TRANSP.OfferteService.dto.OfferteData,TimeInTransitOfferteData:APPS.TRANSP.OfferteService.dto.OfferteData</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim MergeOfferte As APPS.TRANSP.UPS.impl.MergeOfferte = ##class(APPS.TRANSP.UPS.impl.MergeOfferte).%New()
+	
+	quit MergeOfferte.VoegSamen("UPS", RateOfferteData, TimeInTransitOfferteData)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/APPS/TRANSP/UPS/SoapClients/TimeInTransit/TimeInTransitPort.cls.xml
===================================================================
diff -u -r32558 -r32614
--- vhTest/Fake/APPS/TRANSP/UPS/SoapClients/TimeInTransit/TimeInTransitPort.cls.xml	(.../TimeInTransitPort.cls.xml)	(revision 32558)
+++ vhTest/Fake/APPS/TRANSP/UPS/SoapClients/TimeInTransit/TimeInTransitPort.cls.xml	(.../TimeInTransitPort.cls.xml)	(revision 32614)
@@ -2,9 +2,9 @@
 <Export generator="Cache" version="24">
 <Class name="vhTest.Fake.APPS.TRANSP.UPS.SoapClients.TimeInTransit.TimeInTransitPort">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>TECH.RegisteredObject,APPS.TRANSP.UPS.SoapClients.TimeInTransit.TimeInTransitPort</Super>
+<Super>TECH.RegisteredObject,APPS.TRANSP.UPS.SoapClients.Port</Super>
 
-<Method name="ProcessTimeInTransit">
+<Method name="Process">
 <FormalSpec>Body:APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest</FormalSpec>
 <ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse</ReturnType>
 <Implementation><![CDATA[
Index: APPS/TRANSP/OfferteService/dto/Afmeting.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/OfferteService/dto/Afmeting.cls.xml	(revision 0)
+++ APPS/TRANSP/OfferteService/dto/Afmeting.cls.xml	(revision 32614)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.OfferteService.dto.Afmeting">
+<Super>TECH.DataTransferObject</Super>
+
+<Property name="Hoogte">
+<Type>TECH.Decimal</Type>
+</Property>
+
+<Property name="Breedte">
+<Type>TECH.Decimal</Type>
+</Property>
+
+<Property name="Lengte">
+<Type>TECH.Decimal</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Hoogte:TECH.Decimal=0,Breedte:TECH.Decimal=0,Lengte:TECH.Decimal=0</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..Hoogte = Hoogte
+	Set ..Breedte = Breedte
+	Set ..Lengte = Lengte
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/TRANSP/UPS/impl/SoapClients/TimeInTransit/TimeInTransitPort/Test.cls.xml
===================================================================
diff -u -r32557 -r32614
--- vhUnitTest/APPS/TRANSP/UPS/impl/SoapClients/TimeInTransit/TimeInTransitPort/Test.cls.xml	(.../Test.cls.xml)	(revision 32557)
+++ vhUnitTest/APPS/TRANSP/UPS/impl/SoapClients/TimeInTransit/TimeInTransitPort/Test.cls.xml	(.../Test.cls.xml)	(revision 32614)
@@ -38,7 +38,7 @@
 	}
 
 	try {
-		#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = Connection.ProcessTimeInTransit(..GeefBody())
+		#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = Connection.Process(..GeefBody())
 	} catch {
 		do ..Fail(##class(TECH.ExceptionHandler).Catch().GeefOmschrijving())
 		do ..Fail(%objlasterror)
Index: vhUnitTest/APPS/TRANSP/UPS/TimeInTransit/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/TRANSP/UPS/TimeInTransit/OfferteBerekenaar/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/TRANSP/UPS/TimeInTransit/OfferteBerekenaar/Test.cls.xml	(revision 32614)
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.TRANSP.UPS.TimeInTransit.OfferteBerekenaar.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Geef mogelijke leverdagen voor TeverzendItemList ">
+<Implementation><![CDATA[
+	#dim FakeWebClient As vhTest.Fake.APPS.TRANSP.UPS.SoapClients.TimeInTransit.TimeInTransitPort = ##class(vhTest.Fake.APPS.TRANSP.UPS.SoapClients.TimeInTransit.TimeInTransitPort).%New()
+	
+	#dim OfferteBerekenaar As APPS.TRANSP.UPS.impl.TimeInTransit.OfferteBerekenaar = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.OfferteBerekenaar).%New(FakeWebClient)
+	
+	#dim TeverzendItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemList()
+	
+	#dim LeverDatums As APPS.TRANSP.OfferteService.dto.OfferteData = OfferteBerekenaar.Bereken(TeverzendItemList)
+	
+	#dim TestLeverDatums As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefLeverDatums()
+	
+	Do $$$AssertEquals(LeverDatums.OfferteItemList.Count(), TestLeverDatums.OfferteItemList.Count())
+	
+	For Item=1:1:LeverDatums.OfferteItemList.Count() {
+		Do $$$AssertObject(LeverDatums.OfferteItemList.GetAt(Item), TestLeverDatums.OfferteItemList.GetAt(Item))
+		}
+]]></Implementation>
+</Method>
+
+<Method name="Test: UPS Response converteerder">
+<Implementation><![CDATA[
+	#dim ResponseConverteerder As APPS.TRANSP.UPS.impl.TimeInTransit.ResponseConverteerder = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.ResponseConverteerder).%New()
+	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ..GeefResponse()
+	#dim LeverDatums As APPS.TRANSP.OfferteService.dto.OfferteData = ResponseConverteerder.Converteer(Response)
+	#dim TestLeverDatums As APPS.TRANSP.OfferteService.dto.OfferteData = ..GeefLeverDatums()
+
+	Do $$$AssertEquals(LeverDatums.OfferteItemList.Count(), TestLeverDatums.OfferteItemList.Count())
+	
+	For Item=1:1:LeverDatums.OfferteItemList.Count() {
+		Do $$$AssertObject(LeverDatums.OfferteItemList.GetAt(Item), TestLeverDatums.OfferteItemList.GetAt(Item))
+		}
+]]></Implementation>
+</Method>
+
+<Method name="Test: UPS Response Valideerder - Response met alternatief adres">
+<Implementation><![CDATA[
+	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValideerder = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValideerder).%New()
+	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ..GeefResponseMetAlternatiefAdres()
+	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest = ..GeefRequest()
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("UPS stelt alternative adressen voor ref : 1")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
+
+	Do ResponseValideerder.Valideer(Response, Request)
+]]></Implementation>
+</Method>
+
+<Method name="Test: UPS Response Valideerder">
+<Implementation><![CDATA[
+	#dim ResponseValideerder As APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValideerder = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.ResponseValideerder).%New()
+	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ..GeefResponse()
+	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest = ..GeefRequest()
+	
+	Do ResponseValideerder.Valideer(Response, Request)
+	
+	Do $$$AssertTrue(1)
+]]></Implementation>
+</Method>
+
+<Method name="Test: UPS TeverzendItemList converteerder">
+<Implementation><![CDATA[
+	#dim TeverzendItemListConverteerder As APPS.TRANSP.UPS.impl.TimeInTransit.TeverzendItemListConverteerder  = ##class(APPS.TRANSP.UPS.impl.TimeInTransit.TeverzendItemListConverteerder).%New()
+	#dim TeverzendenItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemList()
+	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest = TeverzendItemListConverteerder.Converteer(TeverzendenItemList)
+	#dim TestRequest As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest = ..GeefRequest()
+
+	Do $$$AssertObject(Request.Pickup, TestRequest.Pickup)
+	Do $$$AssertObject(Request.ShipFrom.Address , TestRequest.ShipFrom.Address)
+	Do $$$AssertObject(Request.Request.TransactionReference , TestRequest.Request.TransactionReference)
+	Do $$$AssertObject(Request.ShipTo.Address , TestRequest.ShipTo.Address)
+	Do $$$AssertObject(Request.ShipmentWeight.UnitOfMeasurement , TestRequest.ShipmentWeight.UnitOfMeasurement)
+	Do $$$AssertObject(Request.Request.TransactionReference , TestRequest.Request.TransactionReference)
+	Do $$$AssertObject(Request.InvoiceLineTotal , TestRequest.InvoiceLineTotal)
+	
+	Do $$$AssertEquals(Request.TotalPackagesInShipment , TestRequest.TotalPackagesInShipment)
+	Do $$$AssertEquals(Request.TotalPackagesInShipment , TestRequest.TotalPackagesInShipment)
+	Do $$$AssertEquals(Request.MaximumListSize,TestRequest.MaximumListSize)
+]]></Implementation>
+</Method>
+
+<Method name="Test: UPS TeverzendItemList Valideerder - TeverzendItemList zonder lijnen ">
+<Implementation><![CDATA[
+	#dim TeverzendItemListValideerder As APPS.TRANSP.UPS.impl.TeverzendItemListValideerder = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListValideerder).%New()
+	#dim TeverzendenItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemListZonderLijnen()
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen Detaillijnen in TeverzendenItemList : 1")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.GeneralErrorException",Substrings))
+
+	Do TeverzendItemListValideerder.Valideer(TeverzendenItemList)
+]]></Implementation>
+</Method>
+
+<Method name="Test: UPS TeverzendItemList Valideerder">
+<Implementation><![CDATA[
+	#dim TeverzendItemListValideerder As APPS.TRANSP.UPS.impl.TeverzendItemListValideerder = ##class(APPS.TRANSP.UPS.impl.TeverzendItemListValideerder).%New()
+	#dim TeverzendenItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ..GeefTeverzendItemList()
+	
+	Do TeverzendItemListValideerder.Valideer(TeverzendenItemList)
+	
+	Do $$$AssertTrue(1)
+]]></Implementation>
+</Method>
+
+<Method name="GeefResponse">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse</ReturnType>
+<Implementation><![CDATA[
+	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse).%New()
+
+	Set Response.Response.ResponseStatus.Code = "1"
+	Set Response.Response.ResponseStatus.Description = "Success"
+	
+	Set Response.Response.TransactionReference.CustomerContext = "1"
+	Set Response.Response.TransactionReference.TransactionIdentifier = "1"
+
+	Set Response.TransitResponse.ShipmentWeight.UnitOfMeasurement = "KGS" 
+	Set Response.TransitResponse.ShipmentWeight.Weight = "200"
+	
+	Set Response.TransitResponse.ShipFrom.Address.StateProvinceCode = ""
+	Set Response.TransitResponse.ShipFrom.Address.City = "Sint-Niklaas"  
+	Set Response.TransitResponse.ShipFrom.Address.CountryCode = "BE"
+	Set Response.TransitResponse.ShipFrom.Address.PostalCode = "9100"
+
+	Set Response.TransitResponse.ShipTo.Address.StateProvinceCode = ""
+	Set Response.TransitResponse.ShipTo.Address.City = "Sint-Niklaas"  
+	Set Response.TransitResponse.ShipTo.Address.CountryCode = "BE"
+	Set Response.TransitResponse.ShipTo.Address.PostalCode = "9100"
+	
+	Set Response.TransitResponse.PickupDate = ##class(TECH.DateTime).TextToDate("10/03/2016")
+	
+	for Item=1:1:5 {
+		#dim SummaryType As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.ServiceSummaryType = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.ServiceSummaryType).%New()
+		
+		Set SummaryType.Service.Code = Item
+		Set SummaryType.Service.Description = "Omschrijving"_Item
+		Set SummaryType.GuaranteedIndicator = "1"
+		Set SummaryType.EstimatedArrival.Pickup.Date = ##class(TECH.DateTime).TextToDate("10/03/2016")
+		Set SummaryType.EstimatedArrival.TotalTransitDays = Item
+			
+		Do Response.TransitResponse.ServiceSummary.SetAt(SummaryType,Item)
+	}
+	Quit Response
+]]></Implementation>
+</Method>
+
+<Method name="GeefResponseMetAlternatiefAdres">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse</ReturnType>
+<Implementation><![CDATA[
+	#dim Response As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitResponse).%New()
+
+	Set Response.Response.ResponseStatus.Code = "1"
+	Set Response.Response.ResponseStatus.Description = "Success"
+
+	Set Response.Response.TransactionReference.CustomerContext = "1"
+	Set Response.Response.TransactionReference.TransactionIdentifier = "1"
+
+	Set Response.TransitResponse.ShipmentWeight.UnitOfMeasurement = "KGS" 
+	Set Response.TransitResponse.ShipmentWeight.Weight = "200"
+	
+	Set Response.TransitResponse.ShipFrom.Address.StateProvinceCode = ""
+	Set Response.TransitResponse.ShipFrom.Address.City = "Sint-Niklaas"  
+	Set Response.TransitResponse.ShipFrom.Address.CountryCode = "BE"
+	Set Response.TransitResponse.ShipFrom.Address.PostalCode = "9100"
+
+	Set Response.TransitResponse.ShipTo.Address.StateProvinceCode = ""
+	Set Response.TransitResponse.ShipTo.Address.City = "Sint-Niklaas"  
+	Set Response.TransitResponse.ShipTo.Address.CountryCode = "BE"
+	Set Response.TransitResponse.ShipTo.Address.PostalCode = "9100"
+	
+	Set Response.TransitResponse.PickupDate = ##class(TECH.DateTime).TextToDate("10/03/2016")
+
+	Do Response.TransitResponse.ServiceSummary.Clear()
+	
+	#dim Candidate As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.CandidateType = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.CandidateType).%New()
+	
+	Set Candidate.Address.City = "Sint-Gillis-Waas"
+	Set Candidate.Address.StateProvinceCode = ""
+	Set Candidate.Address.CountryCode = "BE"
+	Set Candidate.Address.PostcodePrimaryHigh = "9170"
+	Set Candidate.Address.PostcodePrimaryLow = "9170"
+	
+	Do Response.CandidateResponse.ShipToList.SetAt(Candidate,1)
+
+	Quit Response
+]]></Implementation>
+</Method>
+
+<Method name="GeefTeverzendItemList">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.TeverzendenItemList</ReturnType>
+<Implementation><![CDATA[
+	#dim TeverzendItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItemList).%New()
+	Set TeverzendItemList.Referentie = "1"
+	Set TeverzendItemList.GewensteLeverDatum = ##class(TECH.DateTime).TextToDate("11/03/2016")
+	Set TeverzendItemList.LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
+	Set TeverzendItemList.LeverAdres.ProvincieCode = ""
+	Set TeverzendItemList.LeverAdres.LandCode = "BE"
+	Set TeverzendItemList.LeverAdres.Postcode = "9100"
+	Set TeverzendItemList.LeverAdres.Woonplaats = "Sint-Niklaas"
+	
+	For Item=1:1:10 {
+		#dim TeverzendItem As APPS.TRANSP.OfferteService.dto.TeverzendenItem = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItem).%New()
+		Set TeverzendItem.ProductID = Item
+		Set TeverzendItem.WaardeGoederen = Item * 10
+		Set TeverzendItem.Gewicht = Item * 5
+		Set TeverzendItem.Afmeting = Item * 500
+		Set TeverzendItem.DatumBeschikbaar = ##class(TECH.DateTime).TextToDate(Item_"/03/2016")
+		Do TeverzendItemList.TeverzendItems.SetAt(TeverzendItem,Item)
+	}
+	
+	Quit TeverzendItemList
+]]></Implementation>
+</Method>
+
+<Method name="GeefTeverzendItemListZonderLijnen">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.TeverzendenItemList</ReturnType>
+<Implementation><![CDATA[
+	#dim TeverzendItemList As APPS.TRANSP.OfferteService.dto.TeverzendenItemList = ##class(APPS.TRANSP.OfferteService.dto.TeverzendenItemList).%New()
+	Set TeverzendItemList.Referentie = "1"
+	Set TeverzendItemList.GewensteLeverDatum = ##class(TECH.DateTime).TextToDate("01/03/2016")
+	Set TeverzendItemList.LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
+	Set TeverzendItemList.LeverAdres.ProvincieCode = ""
+	Set TeverzendItemList.LeverAdres.LandCode = "BE"
+	Set TeverzendItemList.LeverAdres.Postcode = "9100"
+	Set TeverzendItemList.LeverAdres.Woonplaats = "Sint-Niklaas"
+	
+	Do TeverzendItemList.TeverzendItems.Clear()
+	
+	Quit TeverzendItemList
+]]></Implementation>
+</Method>
+
+<Method name="GeefRequest">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest</ReturnType>
+<Implementation><![CDATA[
+	#dim Request As APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest  = ##class(APPS.TRANSP.UPS.impl.SoapClients.TimeInTransit.tnt.TimeInTransitRequest).%New()
+	
+	Set Request.Request.TransactionReference.CustomerContext = "1"
+	Set Request.Request.TransactionReference.TransactionIdentifier = "1"
+
+	Set Request.ShipFrom.Address.City = "Sint-Niklaas" 
+	Set Request.ShipFrom.Address.StateProvinceCode = "" 
+	Set Request.ShipFrom.Address.CountryCode = "BE" 
+	Set Request.ShipFrom.Address.PostalCode = "9100" 
+	
+	Set Request.ShipTo.Address.City = "Sint-Niklaas" 
+	Set Request.ShipTo.Address.StateProvinceCode = "" 
+	Set Request.ShipTo.Address.CountryCode = "BE" 
+	Set Request.ShipTo.Address.PostalCode = "9100" 
+	
+	Set Request.Pickup.Date = ##class(TECH.DateTime).TextToDate("10/03/2016")
+	Set Request.Pickup.Time = ""
+	
+	Set Request.ShipmentWeight.UnitOfMeasurement.Code = "KGS"
+	Set Request.ShipmentWeight.Weight = "275"
+
+	Set Request.TotalPackagesInShipment = "10"
+
+	Set Request.InvoiceLineTotal.CurrencyCode = "EUR"
+	Set Request.InvoiceLineTotal.MonetaryValue = "550"
+	
+	Set Request.MaximumListSize = "50"
+
+	Quit Request
+]]></Implementation>
+</Method>
+
+<Method name="GeefLeverDatums">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	
+	For Item=1:1:5 {
+		#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+		Set OfferteItem.Code = Item
+		Set OfferteItem.Omschrijving = "Omschrijving"_Item
+		Set OfferteItem.Gegarandeerd = "1"
+		Set OfferteItem.Duurtijd = Item
+		Set OfferteItem.Kostprijs = 0
+		Set OfferteItem.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+		Set OfferteItem.Optie = ""
+		Do OfferteData.OfferteItemList.SetAt(OfferteItem,Item)
+	}
+
+	Quit OfferteData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>