Index: BL/Legacy/KLVERZW.cls.xml
===================================================================
diff -u -r49855 -r49856
--- BL/Legacy/KLVERZW.cls.xml	(.../KLVERZW.cls.xml)	(revision 49855)
+++ BL/Legacy/KLVERZW.cls.xml	(.../KLVERZW.cls.xml)	(revision 49856)
@@ -4,27 +4,38 @@
 <Super>TECH.RegisteredObject</Super>
 
 <Method name="PostCode">
-<FormalSpec>PostKode,KLNr</FormalSpec>
-<ProcedureBlock>0</ProcedureBlock>
+<FormalSpec>PostCode:%String,KlantNummer:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	New R,VerzW,KlantId
-	Set PostKode=$G(PostKode),KLNr=$G(KLNr),VerzW="OD"
-	Set:KLNr KlantId=^KK1(KLNr),R=^KKL(KlantId,0),PostKode=$P(R,D,6)
-	Do:$L(PostKode)
-	.Set:PostKode'?.N VerzW="EX"
-	.Set:PostKode?.N PostKode="BE-"_PostKode Set PostKode=$P(PostKode,"-",1,2)
-	.Set:$L(PostKode,"-")=1 PostKode=PostKode_"-*"
-	.Set R=$G(^RES("KLANT","PI","POSTKODE","D",PostKode))
-	.If R="" For  Do  Quit:$L(R)  Quit:PostKode=""
-	..Set R=$G(^RES("KLANT","PI","POSTKODE","D",PostKode_"*"))
-	..Quit:$L(R)
-	..Set PostKode=$E(PostKode,1,$L(PostKode)-1)
-	.If $L(R) Do
-	..Set R=$P(R,"`",3,6)
-	..For  Quit:R=""  Quit:$L($P(R,"`",$L(R,"`")))  Set R=$P(R,"`",1,$L(R,"`")-1)
-	..Set:$L(R) VerzW=R
-	Quit VerzW
+ 	#dim VerzendWijze As %String = "OD"	
+ 	
+ 	If (KlantNummer) {
+	 	#dim KlantId As %String = ^KK1(KlantNummer)
+	 	#dim KlantData As %String = ^KKL(KlantId, 0)
+	 	
+	 	Set PostCode = $Piece(KlantData, "\", 6)
+ 	}
+ 	
+ 	If $Length(PostCode) {
+		Set:$$$Not(PostCode?.N) VerzendWijze = "EX"
+		Set:(PostCode?.N) PostCode = "BE-" _ PostCode Set PostCode = $Piece(PostCode, "-", 1, 2)
+		Set:($Length(PostCode, "-") = 1) PostCode = PostCode _ "-*"
+		
+		#dim ResKlantData As %String = $Get(^RES("KLANT", "PI", "POSTKODE", "D", PostCode))
+		
+		If (ResKlantData = "") For  Do  Quit:$Length(ResKlantData)  Quit:(PostCode = "")
+			.Set ResKlantData = $Get(^RES("KLANT", "PI", "POSTKODE", "D", PostCode _ "*"))
+			.Quit:$Length(ResKlantData)
+			.Set PostCode = $Extract(PostCode, 1, $Length(PostCode) - 1)
+		
+		If $Length(ResKlantData) {
+			Set ResKlantData = $Piece(ResKlantData, "`", 3, 6)
+			For  Quit:(ResKlantData="")  Quit:$Length($Piece(ResKlantData, "`", $Length(ResKlantData, "`")))  Set ResKlantData = $Piece(ResKlantData, "`", 1, $Length(ResKlantData, "`") - 1)
+			Set:$Length(ResKlantData) VerzendWijze = ResKlantData
+		}
+ 	}
+ 	
+ 	Quit VerzendWijze
 ]]></Implementation>
 </Method>
 </Class>