Index: DOM/common/impl/AdresUtils.cls.xml =================================================================== diff -u -r50000 -r51820 --- DOM/common/impl/AdresUtils.cls.xml (.../AdresUtils.cls.xml) (revision 50000) +++ DOM/common/impl/AdresUtils.cls.xml (.../AdresUtils.cls.xml) (revision 51820) @@ -77,6 +77,17 @@ Quit PersistentAdres ]]> + + +1 +Postcode:%String +%String + + Index: vhUnitTest/DOM/common/impl/AdresUtils/MaakPostcodeGlsVriendelijk/Test.cls.xml =================================================================== diff -u --- vhUnitTest/DOM/common/impl/AdresUtils/MaakPostcodeGlsVriendelijk/Test.cls.xml (revision 0) +++ vhUnitTest/DOM/common/impl/AdresUtils/MaakPostcodeGlsVriendelijk/Test.cls.xml (revision 51820) @@ -0,0 +1,36 @@ + + + +vhUnitTest.TestCase + + + + + + + + + + + + + + + + + + + + Index: TRANSPEA.mac.rou =================================================================== diff -u -r51807 -r51820 --- TRANSPEA.mac.rou (.../TRANSPEA.mac.rou) (revision 51807) +++ TRANSPEA.mac.rou (.../TRANSPEA.mac.rou) (revision 51820) @@ -143,9 +143,8 @@ .Set LevAdr=$O(^KKL(^KK1(KLNr),"L")) Set:$E(LevAdr)="L" LevAdr=^KKL(^KK1(KLNr),LevAdr) .Set R=^KKL(^KK1(KLNr),0) .For I=2,5,6,7,8,13 Set:$P(LevAdr,"\",I)="" $P(LevAdr,"\",I)=$P(R,"\",I) - .Set Naam=$P(LevAdr,"\",2),Straat=$P(LevAdr,"\",5),PostCode=$P(LevAdr,"\",6),Gemeente=$P(LevAdr,"\",7),Land=$P(LevAdr,"\",8),Telefoon=$P(LevAdr,"\",13) + .Set Naam=$P(LevAdr,"\",2),Straat=$P(LevAdr,"\",5),PostCode=##class(DOM.common.impl.AdresUtils).MaakPostcodeGlsVriendelijk($P(LevAdr,"\",6)),Gemeente=$P(LevAdr,"\",7),Land=$P(LevAdr,"\",8),Telefoon=$P(LevAdr,"\",13) .Set Nummer=$P(Straat," ",$L(Straat," ")),Straat=$P(Straat," ",1,$L(Straat," ")-1),Land=$$LAND^vhRtn1(Land) - .Set:##class(TECH.StringUtils).StartsWith(PostCode,"NL-") PostCode = $P(PostCode,"-",2)_$P(PostCode,"-",3) Set:Afzender="" Afzender=$P(^TRANSP("T",TranspNr),"\",2) Set Bedrijf = ##class(Res.Bedrijf).%New() Set Naam=$G(Naam,Bedrijf.Naam)