Index: APPS/TRANSP/VRD/TransportInschatting.cls.xml
===================================================================
diff -u -r60657 -r61934
--- APPS/TRANSP/VRD/TransportInschatting.cls.xml	(.../TransportInschatting.cls.xml)	(revision 60657)
+++ APPS/TRANSP/VRD/TransportInschatting.cls.xml	(.../TransportInschatting.cls.xml)	(revision 61934)
@@ -244,14 +244,37 @@
 <Implementation><![CDATA[
 	#dim AdresData as %String = $Get(^ORDW("D",CONSNr,"A"))
 	Set Detail.KlantNaam = $P(AdresData,"\",2)
-	Set Detail.Straat = $P(AdresData,"\",5)
+	Set Detail.Straat = ..FormatterStraat($P(AdresData,"\",5))
 	Set Detail.Gemeente =  $P(AdresData,"\",7)
-	Set Detail.PostCode =  $P(AdresData,"\",6)
-	Set Detail.LandCode = ..GeefLand($P(AdresData,"\",8))
+	#dim LandNr as %String = $P(AdresData,"\",8)
+	Set Detail.LandCode = ..GeefLand(LandNr)
+	Set Detail.PostCode =  ..FormatteerPostcode(LandNr,$P(AdresData,"\",6))
+	
 	Quit Detail
 ]]></Implementation>
 </Method>
 
+<Method name="FormatteerPostcode">
+<FormalSpec>LandNr:%String,LandCode:%String,Postcode:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Geformatteerdepostcode as %String = ##class(DOM.common.impl.AdresUtils).CorrigeerPostcode(Postcode,LandNr)
+	if (LandNr = "1147") {
+		Set Geformatteerdepostcode = ##class(TECH.StringUtils).Replace(Geformatteerdepostcode,"-"," ")
+	}
+	Quit Geformatteerdepostcode
+]]></Implementation>
+</Method>
+
+<Method name="FormatterStraat">
+<FormalSpec>Straat:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).Replace(Straat, "#" , " ")
+]]></Implementation>
+</Method>
+
 <Method name="GeefLand">
 <FormalSpec>LandId:%String</FormalSpec>
 <Private>1</Private>