Index: AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml
===================================================================
diff -u -r38310 -r38317
--- AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38310)
+++ AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38317)
@@ -23,6 +23,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Formatter">
+<Type>AX.common.impl.Formatter</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>VerkoopAPI:DOM.VKP.VerkoopAPI,LeveradresRepository:AXimpl.BizTalkMessage.Converter.AddressUpsertConverter.LeveradresRepository</FormalSpec>
 <Private>1</Private>
@@ -32,6 +37,7 @@
 <Implementation><![CDATA[
 	Set ..VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
 	Set ..LeveradresRepository = $$$Inject(LeveradresRepository,##class(AXimpl.BizTalkMessage.Converter.AddressUpsertConverter.LeveradresRepository).%New())
+	Set ..Formatter = ##class(AX.common.impl.Formatter).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -44,13 +50,13 @@
 	
 	Set ..Address.Straat1 = Adres.GeefStraat()
 	Set ..Address.Klantnummer = ##class(AX.common.impl.ConvertAdminToAX).ConvertCustomerID(Adres.GeefKlantId())
-	Set ..Address.Postcode = Adres.GeefPostcode()
-	Set ..Address.Plaats = Adres.GeefGemeente()
 	If Adres.GeefLandNr()="" {
 		Set ..Address.LandCodeISO3 = ..VerkoopAPI.GeefKlant(Adres.GeefKlantId()).GeefAdres().GeefLand().GeefIso3()
 	} Else {
 		Set ..Address.LandCodeISO3 = Adres.GeefLand().GeefIso3()
 	}
+	Set ..Address.Postcode = ..Formatter.FormatPostcode(Adres.GeefPostcode(),..Address.LandCodeISO3)
+	Set ..Address.Plaats = Adres.GeefGemeente()
 	Set ..Address.Telefoon = Adres.GeefTelefoon()
 	Set ..Address.Verzendwijze = $$SHOW^KLVERZW(,,,Adres.GeefVerzendingWijze())
 	Set ..Address.BezoekAdres = $$$False
Index: AX/common/impl/Formatter.cls.xml
===================================================================
diff -u -r37971 -r38317
--- AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 37971)
+++ AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 38317)
@@ -145,6 +145,18 @@
 	quit $Extract($$$Trim(##class(TECH.StringUtils).Replace(Name,";"," ")),1,60)
 ]]></Implementation>
 </Method>
+
+<Method name="FormatPostcode">
+<FormalSpec>Postcode:%String,LandISO3:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Resultaat As %String = $$$Replace(Postcode,"-"," ")
+	If (LandISO3 = "NLD")&&($Extract(Resultaat,1,3)="NL ") {
+		Set Resultaat = $Extract(Resultaat,4,10)
+	}
+	Quit Resultaat
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/AXimpl/BizTalkMessage/Converter/FormatPostcode/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/BizTalkMessage/Converter/FormatPostcode/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/BizTalkMessage/Converter/FormatPostcode/Test.cls.xml	(revision 38317)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.BizTalkMessage.Converter.FormatPostcode.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: standaard Belgische postcode">
+<Implementation><![CDATA[
+	#dim Postcode As %String = "9100"
+	#dim Landcode As %String = "BEL"
+	
+	Set Formatter = ##class(AX.common.impl.Formatter).%New()
+	#dim Resultaat As %String = Formatter.FormatPostcode(Postcode, Landcode)
+	
+	Do $$$AssertEquals(Resultaat,Postcode)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Belgische postcode met karakter vooraan">
+<Implementation><![CDATA[
+	#dim Postcode As %String = "B9100"
+	#dim Landcode As %String = "BEL"
+	
+	Set Formatter = ##class(AX.common.impl.Formatter).%New()
+	#dim Resultaat As %String = Formatter.FormatPostcode(Postcode, Landcode)
+	
+	Do $$$AssertEquals(Resultaat,Postcode)
+]]></Implementation>
+</Method>
+
+<Method name="Test: postcode met koppelteken -&gt; vervangen door spatie">
+<Implementation><![CDATA[
+	#dim Postcode As %String = "B-9100"
+	#dim Landcode As %String = "BEL"
+	
+	Set Formatter = ##class(AX.common.impl.Formatter).%New()
+	#dim Resultaat As %String = Formatter.FormatPostcode(Postcode, Landcode)
+	
+	Do $$$AssertEquals(Resultaat,"B 9100")
+]]></Implementation>
+</Method>
+
+<Method name="Test: NLD postcode landcode verwijderen">
+<Implementation><![CDATA[
+	#dim Postcode As %String = "NL-5301-KR"
+	#dim Landcode As %String = "NLD"
+	
+	Set Formatter = ##class(AX.common.impl.Formatter).%New()
+	#dim Resultaat As %String = Formatter.FormatPostcode(Postcode, Landcode)
+	
+	Do $$$AssertEquals(Resultaat,"5301 KR")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/BizTalkMessage/Converter/CustomerConverter.cls.xml
===================================================================
diff -u -r38280 -r38317
--- AXimpl/BizTalkMessage/Converter/CustomerConverter.cls.xml	(.../CustomerConverter.cls.xml)	(revision 38280)
+++ AXimpl/BizTalkMessage/Converter/CustomerConverter.cls.xml	(.../CustomerConverter.cls.xml)	(revision 38317)
@@ -209,7 +209,7 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	Set ..Customer.HoofdadresLandcode = ..Klant.GeefAdres().GeefLand().GeefIso3()
-	Set ..Customer.HoofdadresPostcode = ..Klant.GeefAdres().GeefPostcode()
+	Set ..Customer.HoofdadresPostcode = ..Formatter.FormatPostcode(..Klant.GeefAdres().GeefPostcode(),..Klant.GeefAdres().GeefLand().GeefIso3())
 	Set ..Customer.HoofdadresPlaats = ..Klant.GeefAdres().GeefGemeente()
 	Set ..Customer.HoofdadresStraat = ..Klant.GeefAdres().GeefStraat()
 	Set ..Customer.HoofdadresVerzendwijze = ..Klant.GeefVerzendWijze()