Index: APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml
===================================================================
diff -u -r34414 -r34448
--- APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml	(.../TariefRepository.cls.xml)	(revision 34414)
+++ APPS/TRANSP/Offerte/impl/DHL/TariefRepository.cls.xml	(.../TariefRepository.cls.xml)	(revision 34448)
@@ -13,18 +13,31 @@
 <FormalSpec>LandCode:%String,PostCode:%String</FormalSpec>
 <ReturnType>TECH.Persistent</ReturnType>
 <Implementation><![CDATA[
-	#dim Sleutel As %String = LandCode _..PostCodeNaarSleutel(PostCode)
+	#dim Sleutel As %String = LandCode _..PostCodeNaarSleutel(LandCode, PostCode)
 	Quit ..GeefViaFilter("Sleutel = ?", $LB(Sleutel))
 ]]></Implementation>
 </Method>
 
 <Method name="PostCodeNaarSleutel">
-<FormalSpec>PostCode:%String</FormalSpec>
+<FormalSpec>LandCode:%String,PostCode:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set PostCode = ##class(TECH.StringUtils).AlignRight(PostCode,0,5) 
-	Quit $EXTRACT(PostCode,1,2)
+	#Dim PostCodeSleutel As %String = ""
+	if LandCode = "IE" {
+		Set PostCodeSleutel = PostCode
+	} Elseif LandCode = "GB" {
+		#dim KarakterPositie As %Integer = 1
+		While ('$isValidNum($Extract(PostCode,KarakterPositie,KarakterPositie))) && (KarakterPositie <= $Length(PostCode))
+		{
+			Set PostCodeSleutel = PostCodeSleutel _$Extract(PostCode,KarakterPositie,KarakterPositie)
+			Set KarakterPositie = KarakterPositie +1
+		}
+	} Else {
+		Set PostCodeSleutel = ##class(TECH.StringUtils).AlignRight(PostCode,0,5) 
+		Set PostCodeSleutel = $EXTRACT(PostCodeSleutel,1,2)
+	}
+	Quit PostCodeSleutel
 ]]></Implementation>
 </Method>