Index: vhUnitTest/APPS/TRANSP/impl/TransportAPI/GeefCommunicatieService.cls.xml
===================================================================
diff -u -r61119 -r61263
--- vhUnitTest/APPS/TRANSP/impl/TransportAPI/GeefCommunicatieService.cls.xml	(.../GeefCommunicatieService.cls.xml)	(revision 61119)
+++ vhUnitTest/APPS/TRANSP/impl/TransportAPI/GeefCommunicatieService.cls.xml	(.../GeefCommunicatieService.cls.xml)	(revision 61263)
@@ -37,9 +37,11 @@
 	
 	Do $$$AssertClassName(TransportAPI.GeefCommunicatieService(..Transporteur.VRD),##class(APPS.TRANSP.impl.CommunicatieService).%ClassName(1))
 	Do $$$AssertClassName(TransportAPI.GeefCommunicatieService(..Transporteur.DHL),##class(APPS.TRANSP.impl.CommunicatieService).%ClassName(1))
+	Do $$$AssertClassName(TransportAPI.GeefCommunicatieService(..Transporteur.HamannHDE),##class(APPS.TRANSP.impl.CommunicatieService).%ClassName(1))
 	Do $$$AssertClassName(TransportAPI.GeefCommunicatieService(..Transporteur.Hamann),##class(APPS.TRANSP.impl.CommunicatieService).%ClassName(1))
 	Do $$$AssertClassName(TransportAPI.GeefCommunicatieService(..Transporteur.GLSBelgiumFreight),##class(APPS.TRANSP.GLS.impl.CommunicatieService).%ClassName(1))
 	Do $$$AssertClassName(TransportAPI.GeefCommunicatieService(..Transporteur.GLSBelgiumParcel),##class(APPS.TRANSP.GLS.impl.CommunicatieService).%ClassName(1))
+	
 	Do ..ProjectsettingAPI.Verifieer()
 ]]></Implementation>
 </Method>
@@ -52,7 +54,8 @@
 	
 	Do $$$AssertClassName(TransportAPI.GeefCommunicatieService(..Transporteur.VRD),##class(APPS.TRANSP.Transsmart.impl.CommunicatieService).%ClassName(1))
 	Do $$$AssertClassName(TransportAPI.GeefCommunicatieService(..Transporteur.DHL),##class(APPS.TRANSP.Transsmart.impl.CommunicatieService).%ClassName(1))
-	Do $$$AssertClassName(TransportAPI.GeefCommunicatieService(..Transporteur.Hamann),##class(APPS.TRANSP.Transsmart.impl.CommunicatieService).%ClassName(1))
+	Do $$$AssertClassName(TransportAPI.GeefCommunicatieService(..Transporteur.HamannHDE),##class(APPS.TRANSP.Transsmart.impl.CommunicatieService).%ClassName(1))
+	Do $$$AssertClassName(TransportAPI.GeefCommunicatieService(..Transporteur.Hamann),##class(APPS.TRANSP.impl.CommunicatieService).%ClassName(1))
 	Do $$$AssertClassName(TransportAPI.GeefCommunicatieService(..Transporteur.GLSBelgiumFreight),##class(APPS.TRANSP.impl.CommunicatieService).%ClassName(1))
 	Do $$$AssertClassName(TransportAPI.GeefCommunicatieService(..Transporteur.GLSBelgiumParcel),##class(APPS.TRANSP.impl.CommunicatieService).%ClassName(1))
 
Index: APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r61120 -r61263
--- APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 61120)
+++ APPS/TRANSP/Transsmart/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 61263)
@@ -348,7 +348,7 @@
 	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
 	Quit:(Rit.GeefTransporteur() = Transporteur.VRD) "VRD"
 	Quit:(Rit.GeefTransporteur() = Transporteur.DHL) "DHP"
-	Quit:(Rit.GeefTransporteur() = Transporteur.Hamann) "HAM"
+	Quit:(Rit.GeefTransporteur() = Transporteur.HamannHDE) "HAM"
 	Quit ""
 ]]></Implementation>
 </Method>
@@ -362,7 +362,7 @@
 
 	Quit:(Rit.GeefTransporteur() = Transporteur.VRD) "STANDARD"
 	Quit:(Rit.GeefTransporteur() = Transporteur.DHL) "EUROPLUS"
-	Quit:(Rit.GeefTransporteur() = Transporteur.Hamann) "STANDARD"
+	Quit:(Rit.GeefTransporteur() = Transporteur.HamannHDE) "STANDARD"
 	Quit ""
 ]]></Implementation>
 </Method>
Index: APPS/OV/impl/TrackAndTraceService.cls.xml
===================================================================
diff -u -r61122 -r61263
--- APPS/OV/impl/TrackAndTraceService.cls.xml	(.../TrackAndTraceService.cls.xml)	(revision 61122)
+++ APPS/OV/impl/TrackAndTraceService.cls.xml	(.../TrackAndTraceService.cls.xml)	(revision 61263)
@@ -110,8 +110,8 @@
 <Implementation><![CDATA[
 	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
 	#dim TransporteurID as %String = ..GeefTransporteurVoorBonId(BonID)
-	#dim IsTransportGLS As %Boolean = ##class(TECH.StringUtils).Equals(TransporteurID , Transporteur.VRD, Transporteur.DHL, Transporteur.Hamann)
-	Quit IsTransportGLS
+	#dim IsTransportTranssmart As %Boolean = ##class(TECH.StringUtils).Equals(TransporteurID , Transporteur.VRD, Transporteur.DHL)
+	Quit IsTransportTranssmart
 ]]></Implementation>
 </Method>
 
Index: APPS/TRANSP/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r61121 -r61263
--- APPS/TRANSP/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 61121)
+++ APPS/TRANSP/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 61263)
@@ -49,7 +49,7 @@
 <ReturnType>DOM.TRANSP.DistributeurDataVisitor</ReturnType>
 <Implementation><![CDATA[
 	Set Transporteur = ##class(DOM.TRANSP.enu.Transporteur.AutoComplete).%New()
-	If ##class(TECH.StringUtils).Equals(Rit.GeefTransporteur(),Transporteur.VRD,Transporteur.DHL,Transporteur.Hamann){
+	If ##class(TECH.StringUtils).Equals(Rit.GeefTransporteur(),Transporteur.VRD,Transporteur.DHL,Transporteur.HamannHDE){
 		Quit ##class(APPS.TRANSP.Transsmart.impl.StatusControleurDistributeurDataVisitor).%New()
 	} else {
 		Quit ##class(APPS.TRANSP.GLS.impl.StatusControleurDistributeurDataVisitor).%New()
Index: APPS/VKP/impl/VerkoopPrijsAPI.cls.xml
===================================================================
diff -u -r29059 -r61263
--- APPS/VKP/impl/VerkoopPrijsAPI.cls.xml	(.../VerkoopPrijsAPI.cls.xml)	(revision 29059)
+++ APPS/VKP/impl/VerkoopPrijsAPI.cls.xml	(.../VerkoopPrijsAPI.cls.xml)	(revision 61263)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.VKP.impl.VerkoopPrijsAPI">
-<Super>APPS.VKP.VerkoopPrijsAPI,%RegisteredObject</Super>
+<Super>APPS.VKP.VerkoopPrijsAPI,TECH.RegisteredObject</Super>
 
 <Property name="VerkoopPrijsService">
 <Type>APPS.VKP.VerkoopPrijsService</Type>
@@ -18,18 +18,22 @@
 <Method name="StelInKortingenVoorKlant">
 <FormalSpec>KortingConfiguratieLijst:APPS.VKP.dto.KortingConfiguratieLijst</FormalSpec>
 <Implementation><![CDATA[
+	#dim KortingService As DOM.VKP.KortingService = ##class(DOM.DomeinContext).Instance().GeefVerkoopPrijsAPI().GeefKortingService()
 	Set KortingConfiguratieIt = ##class(TECH.ListIterator).%New(KortingConfiguratieLijst)
 	While KortingConfiguratieIt.HasNext(){
-		Do ..StelInKortingVoorKlant(KortingConfiguratieIt.Next())
+		Do ..StelInKortingVoorKlant(KortingConfiguratieIt.Next(),KortingService)
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="StelInKortingVoorKlant">
-<FormalSpec>KortingConfiguratie:APPS.VKP.dto.KortingConfiguratie</FormalSpec>
-<Private>1</Private>
+<FormalSpec>KortingConfiguratie:APPS.VKP.dto.KortingConfiguratie,MyKortingService:APPS.VKP.Korting.KortingService=""</FormalSpec>
 <Implementation><![CDATA[
-	#dim KortingService As DOM.VKP.KortingService = ##class(DOM.DomeinContext).Instance().GeefVerkoopPrijsAPI().GeefKortingService()
+	if $$$Not($IsObject(MyKortingService)){
+		#dim KortingService As DOM.VKP.KortingService = ##class(DOM.DomeinContext).Instance().GeefVerkoopPrijsAPI().GeefKortingService()
+	} else {
+		Set KortingService = MyKortingService
+	}
 	
 	Set KortingSpecificatie = ##class(DOM.VKP.dto.KortingSpecificaties).%New()
 	Set KortingSpecificatie.PersonalityID = KortingConfiguratie.PersonalityID
Index: APPS/VKP/VerkoopPrijsAPI.cls.xml
===================================================================
diff -u -r29059 -r61263
--- APPS/VKP/VerkoopPrijsAPI.cls.xml	(.../VerkoopPrijsAPI.cls.xml)	(revision 29059)
+++ APPS/VKP/VerkoopPrijsAPI.cls.xml	(.../VerkoopPrijsAPI.cls.xml)	(revision 61263)
@@ -16,6 +16,10 @@
 <FormalSpec>KortingConfiguratieLijst:APPS.VKP.dto.KortingConfiguratieLijst</FormalSpec>
 </Method>
 
+<Method name="StelInKortingVoorKlant">
+<FormalSpec>KortingConfiguratie:APPS.VKP.dto.KortingConfiguratie,MyKortingService:APPS.VKP.Korting.KortingService=""</FormalSpec>
+</Method>
+
 <Method name="GeefVerkoopPrijsService">
 <Abstract>1</Abstract>
 <ReturnType>APPS.VKP.VerkoopPrijsService</ReturnType>
Index: vhUnitTest/APPS/OV/impl/TrackAndTraceService/TestGlsUrls.cls.xml
===================================================================
diff -u -r61125 -r61263
--- vhUnitTest/APPS/OV/impl/TrackAndTraceService/TestGlsUrls.cls.xml	(.../TestGlsUrls.cls.xml)	(revision 61125)
+++ vhUnitTest/APPS/OV/impl/TrackAndTraceService/TestGlsUrls.cls.xml	(.../TestGlsUrls.cls.xml)	(revision 61263)
@@ -109,28 +109,9 @@
 	Do ..TranssmartVrdVerzendData.Save()
 	Do Levering.VoegToeEnBewaarDistributeurDataID(..TranssmartVrdVerzendData.%Id())
 
-	Set VervoerRef = 7 // Hamann
-	Set BonID = 7
-	Set ^TRANSP("D",VervoerRef) = "7159\T\2804.8\\\\\58725,31224\1005\58725,31224\58725,31224\58725,31224\\5\\\\"
-	Set ^KUL(1000,"F",BonID,1)	= "\21.09.11\\\\1008\DI1 #Distributeur 1 - GLS\"_VervoerRef_";"_BonID_";5803\#\\\\10.91#1#26.0332\\\\\EUR\\\60\1\\###\\\\F\\\\\\1114#62354,37391\\\\TP7691\\\\OD1;62354;465883;80585\60719\\62353,50231\\\1071\62353,50237"
-	Set ^KU1(BonID,"F")="1000\"_BonID
-	Set Levering = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefLevering(VervoerRef,BonID)
-	Set ..TranssmartHamannVerzendData = ##class(APPS.TRANSP.Transsmart.data.VerzendData).%New()
-	Set IsNieuweVerzendData = ( ..TranssmartHamannVerzendData.%Id() = "" )
-	if IsNieuweVerzendData {
-		set ..TranssmartHamannVerzendData.Reference = "referenceHamann"
-		set ..TranssmartHamannVerzendData.Carrier = "carrierHamann"
-	}	
-	Set ..TranssmartHamannVerzendData.LaatsteRequestType = ##class(APPS.TRANSP.Transsmart.enu.RequestType).Registratie()
-	Set ..TranssmartHamannVerzendData.Status = ##class(APPS.TRANSP.Transsmart.enu.VerzendStatus).Started()
-	Set ..TranssmartHamannVerzendData.TrackAndTraceUrl = "https://Haman.com/User/Verzending/ToBeConfirmed"
-	Set ..TranssmartHamannVerzendData.TrackAndTraceID = "HAMTrackAndTraceID"
-	Set ..TranssmartHamannVerzendData.UnitID = "UTWillekeurig"
-	Set ..TranssmartHamannVerzendData.VerzendWijze = "Freight"
-	Do ..TranssmartHamannVerzendData.Save()
-	Do Levering.VoegToeEnBewaarDistributeurDataID(..TranssmartHamannVerzendData.%Id())
 
 
+
 		
 	Quit $$$OK
 ]]></Implementation>
Index: ULTOER2.mac.rou
===================================================================
diff -u -r61129 -r61263
--- ULTOER2.mac.rou	(.../ULTOER2.mac.rou)	(revision 61129)
+++ ULTOER2.mac.rou	(.../ULTOER2.mac.rou)	(revision 61263)
@@ -151,7 +151,7 @@
 		#dim LeveringID As %String = $$GeefLeveringID^ULTOER(ULNr)
 		If $Length(LeveringID){
 			#dim Transporteur as %String = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefRit(RitID).GeefTransporteur()
-			If ((Transporteur = ##class(DOM.TRANSP.enu.Transporteur).VRD()) || (Transporteur = ##class(DOM.TRANSP.enu.Transporteur).DHL())||(Transporteur = ##class(DOM.TRANSP.enu.Transporteur).Hamann()) ){
+			If ((Transporteur = ##class(DOM.TRANSP.enu.Transporteur).VRD()) || (Transporteur = ##class(DOM.TRANSP.enu.Transporteur).DHL())||(Transporteur = ##class(DOM.TRANSP.enu.Transporteur).HamannHDE()) ){
 				Set StatusControleur = ##class(APPS.TRANSP.Transsmart.impl.StatusControleurDistributeurDataVisitor).%New()
 				Set DienstBepaler = ##class(APPS.TRANSP.Transsmart.impl.DienstBepalerDistributeurDataVisitor).%New()
 			} else {
Index: vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml
===================================================================
diff -u -r61120 -r61263
--- vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 61120)
+++ vhUnitTest/APPS/TRANSP/Transsmart/impl/RequestDataBouwer/Test.cls.xml	(.../Test.cls.xml)	(revision 61263)
@@ -59,7 +59,7 @@
 	#dim Datum as %Date = +(DateTimeAPI.CurrentHorolog())	
 	Set LeveringInfo.AfleverDatum = ##class(TECH.DateTime).BerekenWerkdag(Datum,1)
 	Set RitMock = ##class(vhTest.Mock.DOM.TRANSP.Rit).%New()
-	Do RitMock.VerwachtMethodCall("GeefTransporteur").DanReturn(##class(DOM.TRANSP.enu.Transporteur).Hamann())
+	Do RitMock.VerwachtMethodCall("GeefTransporteur").DanReturn(##class(DOM.TRANSP.enu.Transporteur).HamannHDE())
 	Do RitMock.VerwachtMethodCall("GeefID").DanReturn(12345)
 	Do ..DataExporteerder.ExporteerDataTransferObject(..Bouwer.MaakdoBookingRequest(LeveringInfo,RitMock), "doBookingRequestHamann.xml", "")
 	Do RitMock.Verifieer()
Index: APPS/OV/impl/TranssmartTrackAndTrace.cls.xml
===================================================================
diff -u -r61123 -r61263
--- APPS/OV/impl/TranssmartTrackAndTrace.cls.xml	(.../TranssmartTrackAndTrace.cls.xml)	(revision 61123)
+++ APPS/OV/impl/TranssmartTrackAndTrace.cls.xml	(.../TranssmartTrackAndTrace.cls.xml)	(revision 61263)
@@ -76,8 +76,6 @@
 		set URL = ..GeefFreightTrackAndTraceURL(Levering,Taal)
 	} elseif  Transporteur = ##class(DOM.TRANSP.enu.Transporteur).DHL() {
 		set URL = ..GeefParcelTrackAndTraceURL(Levering,Taal)
-	} elseif  Transporteur = ##class(DOM.TRANSP.enu.Transporteur).Hamann() {
-		set URL = ..GeefHamannTrackAndTraceURL(Levering,Taal)
 	} else {
 		set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Voor transporteur '"_Transporteur_"' is Track And Trace niet mogelijk. Levering: "_Levering.GeefID())
 		do ##class(TECH.ExceptionHandler).Throw(Exception)
Index: DOM/TRANSP/impl/DataM/DataMTransportAPI.cls.xml
===================================================================
diff -u -r61112 -r61263
--- DOM/TRANSP/impl/DataM/DataMTransportAPI.cls.xml	(.../DataMTransportAPI.cls.xml)	(revision 61112)
+++ DOM/TRANSP/impl/DataM/DataMTransportAPI.cls.xml	(.../DataMTransportAPI.cls.xml)	(revision 61263)
@@ -99,7 +99,7 @@
 <Method name="IsTranssmart">
 <FormalSpec>TransporteurID:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (( TransporteurID = ##class(DOM.TRANSP.enu.Transporteur).VRD()) || (TransporteurID = ##class(DOM.TRANSP.enu.Transporteur).DHL() || (TransporteurID = ##class(DOM.TRANSP.enu.Transporteur).Hamann()) ))
+<Implementation><![CDATA[	Quit (( TransporteurID = ##class(DOM.TRANSP.enu.Transporteur).VRD()) || (TransporteurID = ##class(DOM.TRANSP.enu.Transporteur).DHL() || (TransporteurID = ##class(DOM.TRANSP.enu.Transporteur).HamannHDE()) ))
 ]]></Implementation>
 </Method>