Index: vhDeploy/Deploy20160818xUPSKlassenaam.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20160818xUPSKlassenaam.cls.xml	(revision 0)
+++ vhDeploy/Deploy20160818xUPSKlassenaam.cls.xml	(revision 36118)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20160818xUPSKlassenaam">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>UPS OfferteBerekenaar dummy klasse voor development</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	#dim Sleutel As %String = "APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaar.Klassenaam"
+	#dim ProductieKlassenaam As %String = "APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaar"
+	#dim DevelopmentKlassenaam As %String = "APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaarDummy"
+	
+	If ('(##class(TECH.Config.ConfigMgr).Instance().BestaatSleutel(Sleutel)))
+	{
+		If (##class(TECH.Config.ConfigMgr).Instance().GetOmgeving() = "PROD"){
+			Do ##class(TECH.Config.ConfigMgr).Instance().SetString(Sleutel,ProductieKlassenaam)
+		}Else{
+			Do ##class(TECH.Config.ConfigMgr).Instance().SetString(Sleutel,DevelopmentKlassenaam)
+		}
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/Offerte/impl/UPS/OfferteBerekenaarDummy.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/Offerte/impl/UPS/OfferteBerekenaarDummy.cls.xml	(revision 0)
+++ APPS/TRANSP/Offerte/impl/UPS/OfferteBerekenaarDummy.cls.xml	(revision 36118)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaarDummy">
+<Super>APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaar</Super>
+
+<Method name="Bereken">
+<FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</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()
+	
+	#dim OfferteItem1 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	Set OfferteItem1.Code = 2
+	Set OfferteItem1.Omschrijving = "UPS (Worldwide) Express"
+	Set OfferteItem1.Gegarandeerd = "1"
+	Set OfferteItem1.Duurtijd = 1
+	Set OfferteItem1.Kostprijs = 70
+	Set OfferteItem1.CarbonNeutralPrijs = 7
+	Set OfferteItem1.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+
+	Do OfferteData.Items.Insert(OfferteItem1)
+
+	#dim OfferteItem2 As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	Set OfferteItem2.Code = 2
+	Set OfferteItem2.Omschrijving = "UPS (Worldwide) Express"
+	Set OfferteItem2.Gegarandeerd = "1"
+	Set OfferteItem2.Duurtijd = 10
+	Set OfferteItem2.Kostprijs = 70
+	Set OfferteItem2.CarbonNeutralPrijs = 7
+	Set OfferteItem2.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+
+	Do OfferteData.Items.Insert(OfferteItem2)
+
+	#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.CarbonNeutralPrijs = 11
+	Set OfferteItem3.OphaalDatum = ##class(TECH.DateTime).TextToDate("10/03/2016")
+
+	Do OfferteData.Items.Insert(OfferteItem3)
+
+	Quit OfferteData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/impl/OfferteService.cls.xml
===================================================================
diff -u -r34514 -r36118
--- APPS/TRANSP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 34514)
+++ APPS/TRANSP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 36118)
@@ -3,13 +3,32 @@
 <Class name="APPS.TRANSP.impl.OfferteService">
 <Super>TECH.RegisteredObject,APPS.TRANSP.OfferteService</Super>
 
+<Property name="ObjectAPI">
+<Type>TECH.Object.ObjectAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>initvalue:%CacheString</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ObjectAPI = ##class(TECH.Context).Instance().GeefObjectAPI()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="BerekenOfferte">
 <FormalSpec>TransportFirma:APPS.TRANSP.enu.TransportFirma,BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput=""</FormalSpec>
 <ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
 <Implementation><![CDATA[
 	If TransportFirma = ##class(APPS.TRANSP.enu.TransportFirma).UPS() {
 		if BerekenInput '= "" {
-			Quit ##class(APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaar).%New().Bereken(BerekenInput)
+			#dim KlasseNaam As TECH.String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaar.Klassenaam")
+ 			#dim UPSOfferteBerekenaar As APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaar = ..ObjectAPI.New(KlasseNaam)
+			Quit UPSOfferteBerekenaar.%New().Bereken(BerekenInput)
 		}
 	} ElseIf TransportFirma = ##class(APPS.TRANSP.enu.TransportFirma).DHL() {
 		if BerekenInput '= "" {