Index: APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml
===================================================================
diff -u -r36285 -r36304
--- APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml	(.../TariefRepository.cls.xml)	(revision 36285)
+++ APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml	(.../TariefRepository.cls.xml)	(revision 36304)
@@ -25,8 +25,8 @@
 <Implementation><![CDATA[
 	#Dim PostCodeSleutel As %String = ""
 	if LandCode = "IE" {
-		if ##class(TECH.StringUtils).ToUpper($Extract(PostCode,1,4)) = "IEBT" { 
-			Set PostCodeSleutel = "IEBT"
+		if ##class(TECH.StringUtils).ToUpper($Extract(PostCode,1,2)) = "BT" { 
+			Set PostCodeSleutel = "BT01"
 		} else {
 			Set PostCodeSleutel = ##class(TECH.StringUtils).ToUpper(PostCode)
 		}
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefRepository/PostCodeNaarSleutel.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefRepository/PostCodeNaarSleutel.cls.xml	(revision 0)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefRepository/PostCodeNaarSleutel.cls.xml	(revision 36304)
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepository.PostCodeNaarSleutel">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: postcode Bulgarije voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("BL","9951"),"99")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Denemarken voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("DN","8600"),"86")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Duitsland voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("DE","57072"),"57")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Estland voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("EE","10128"),"10")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Finland voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("FI","00250"),"00")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Frankrijk voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("FR","75001"),"75")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Griekenland voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("GR","10444"),"10")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Hongarije voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("HR","3350"),"03")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Ierland Limerick voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("IE","Limerick"),"LIMERICK")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Ierland BT44 voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("IE","BT44"),"BT01")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Italië voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("IT","20867"),"20")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Kroatië voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("HR","20000"),"20")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Letland voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("LV","5419"),"54")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Litouwen voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("LT","00100"),"00")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Oostenrijk voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("AT","4802"),"48")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Polen voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("PL","15-580"),"15")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Portugal voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("PT","4410-500"),"44")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Roemenië voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("RO","117701"),"11")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Slowakije voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("SK","96001"),"96")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Slovenië voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("SI","1311"),"13")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Spanje voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("ES","01213"),"01")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Tsjechië voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("CZ","10100"),"10")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode UK voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("GB","AB32"),"AB")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Zweden voor tarief">
+<Implementation><![CDATA[
+	Set tariefRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock).%New()
+	Do $$$AssertEquals(tariefRepository.PostCodeNaarSleutel("SE","10217"),"10")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefRepositoryMock.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefRepositoryMock.cls.xml	(revision 0)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TariefRepositoryMock.cls.xml	(revision 36304)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TariefRepositoryMock">
+<Super>APPS.TRANSP.Offerte.impl.DHL.TariefRepository</Super>
+
+<Method name="PostCodeNaarSleutel">
+<FormalSpec>LandCode:%String,PostCode:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##super(LandCode, PostCode)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/Offerte/impl/DHL/TransportduurRepository.cls.xml
===================================================================
diff -u -r36291 -r36304
--- APPS/TRANSP/Offerte/impl/DHL/TransportduurRepository.cls.xml	(.../TransportduurRepository.cls.xml)	(revision 36291)
+++ APPS/TRANSP/Offerte/impl/DHL/TransportduurRepository.cls.xml	(.../TransportduurRepository.cls.xml)	(revision 36304)
@@ -39,6 +39,7 @@
 
 <Method name="FormateerPostCode">
 <FormalSpec>LandCode:%String,PostCode:%String</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	if LandCode = "PL" {
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TransportduurRepositoryMock.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TransportduurRepositoryMock.cls.xml	(revision 0)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TransportduurRepositoryMock.cls.xml	(revision 36304)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock">
+<Super>APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository</Super>
+
+<Method name="FormateerPostCode">
+<FormalSpec>LandCode:%String,PostCode:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##super(LandCode, PostCode)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TransportduurRepository/FormateerPostCode.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TransportduurRepository/FormateerPostCode.cls.xml	(revision 0)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/TransportduurRepository/FormateerPostCode.cls.xml	(revision 36304)
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository.FormateerPostCode">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: postcode Bulgarije voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("BL","9951"),"9951")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Denemarken voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("DN","8600"),"8600")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Duitsland voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("DE","57072"),"57072")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Estland voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("EE","10128"),"10128")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Finland voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("FI","00250"),"00250")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Frankrijk voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("FR","75001"),"75001")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Griekenland voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("GR","10444"),"10444")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Hongarije voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("HR","3350"),"03350")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Ierland voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("IE","Limerick"),"LIMERICK")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Italië voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("IT","20867"),"20867")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Kroatië voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("HR","20000"),"20000")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Letland voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("LV","5419"),"5419")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Litouwen voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("LT","00100"),"00100")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Oostenrijk voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("AT","4802"),"4802")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Polen voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("PL","15-580"),"15580")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Portugal voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("PT","4410-500"),"4410")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Roemenië voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("RO","117701"),"117701")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Slowakije voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("SK","96001"),"96001")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Slovenië voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("SI","1311"),"1311")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Spanje voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("ES","01213"),"01213")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Tsjechië voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("CZ","10100"),"10100")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode UK voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("GB","AB32"),"AB32")
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode Zweden voor transportduur">
+<Implementation><![CDATA[
+	Set TransportDuurRepository = ##class(vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepositoryMock).%New()
+	Do $$$AssertEquals(TransportDuurRepository.FormateerPostCode("SE","10217"),"10217")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>