Index: vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml
===================================================================
diff -u -r50267 -r50732
--- vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml	(.../Test.cls.xml)	(revision 50267)
+++ vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml	(.../Test.cls.xml)	(revision 50732)
@@ -48,6 +48,36 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Als het LeverAdres in binnenland is wordt de Postcode niet voorafgegaan door de LandCode en een streepje">
+<Implementation><![CDATA[
+	Set AdresZetter = ##class(AXimpl.Dynamics.CustomerIn.Converter.AdresZetter).%New()
+	#dim Adres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()
+	#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = ..GeefAxLeverAdres()
+	#dim Cust As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = ..GeefAxCust()
+	#dim BestaandLeverAdres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	#dim IsPrimairAdres As %Boolean = $$$False
+	#dim GezetAdres As DOM.VKP.LeverAdres = AdresZetter.ZetAdres(Adres, Address, Cust, BestaandLeverAdres, IsPrimairAdres)
+	
+	Do $$$AssertEquals(GezetAdres.GeefPostcode(),"9100")
+	Do $$$AssertEquals(GezetAdres.GeefLandNr(),"1019")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Als het LeverAdres in buitenland is wordt de Postcode voorafgegaan door de LandCode en een streepje">
+<Implementation><![CDATA[
+	Set AdresZetter = ##class(AXimpl.Dynamics.CustomerIn.Converter.AdresZetter).%New()
+	#dim Adres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()
+	#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = ..GeefAxLeverAdresBuitenland()
+	#dim Cust As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = ..GeefAxCust()
+	#dim BestaandLeverAdres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	#dim IsPrimairAdres As %Boolean = $$$False
+	#dim GezetAdres As DOM.VKP.LeverAdres = AdresZetter.ZetAdres(Adres, Address, Cust, BestaandLeverAdres, IsPrimairAdres)
+	
+	Do $$$AssertEquals(GezetAdres.GeefPostcode(),"NL-7442 DV")
+	Do $$$AssertEquals(GezetAdres.GeefLandNr(),"1147")
+]]></Implementation>
+</Method>
+
 <Method name="Test: De properties op het meegegeven AX-object zijn ingevuld en worden dus gebruikt voor een LeverAdres">
 <Implementation><![CDATA[
 	Set AdresZetter = ##class(AXimpl.Dynamics.CustomerIn.Converter.AdresZetter).%New()
@@ -308,6 +338,23 @@
 	Quit AxPostalAddress
 ]]></Implementation>
 </Method>
+
+<Method name="GeefAxLeverAdresBuitenland">
+<Private>1</Private>
+<ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress</ReturnType>
+<Implementation><![CDATA[
+	Set AxPostalAddress = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress).%New()
+	Set AxPostalAddress.ZipCode = "7442 DV"
+	Set AxPostalAddress.CountryRegionId = "NLD"
+	
+	Set AxRole = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityRole).%New()
+	Set AxRole.Name = "Delivery"
+	
+	Do AxPostalAddress.Role.Insert(AxRole)
+	
+	Quit AxPostalAddress
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXimpl/Dynamics/CustomerIn/Converter/AdresZetter.cls.xml
===================================================================
diff -u -r50275 -r50732
--- AXimpl/Dynamics/CustomerIn/Converter/AdresZetter.cls.xml	(.../AdresZetter.cls.xml)	(revision 50275)
+++ AXimpl/Dynamics/CustomerIn/Converter/AdresZetter.cls.xml	(.../AdresZetter.cls.xml)	(revision 50732)
@@ -45,18 +45,13 @@
 	Do Adres.ZetNaam($Extract(Address.Description,1,27))
 	Do Adres.ZetAanspreking("")
 	Do Adres.ZetStraat($Translate(Address.Street,$Char(10)," "))
-	If (Address.CountryRegionId = "BEL") {
-		Do Adres.ZetPostcode(Address.ZipCode)
-	} Else {
-		Do Adres.ZetPostcode(..LandRepository.GeefViaLandCodeIso3(Address.CountryRegionId).GeefCode()_"-"_Address.ZipCode, $$$False)
-	}
 	Do Adres.ZetGemeente(Address.City)
 	Do Adres.ZetLandNr(..LandRepository.GeefViaLandCodeIso3(Address.CountryRegionId).GeefID())
 	Do Adres.ZetTaal(..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId))
 	Do Adres.ZetType("")
+	Do ..ZetPostcodeVolgensLandcode(Adres, Address.CountryRegionId, Address.ZipCode)
 	If $$$Not(IsPrimairAdres) {
 		Do Adres.ZetNaam($Extract(Address.Description,1,25))
-		Do Adres.ZetPostcode(Address.ZipCode)
 		Do Adres.ZetTelefoon(BestaandLeverAdres.GeefTelefoon())
 		Do Adres.ZetOpmerking1($Extract($Translate(Address.Nota1External,$Char(10)," "),1,40))
 		Do Adres.ZetOpmerking2($Extract($Translate(Address.Nota2External,$Char(10)," "),1,40))
@@ -107,6 +102,18 @@
 	Quit ""
 ]]></Implementation>
 </Method>
+
+<Method name="ZetPostcodeVolgensLandcode">
+<FormalSpec>Adres:DOM.VKP.LeverAdres,CountryRegionId:%String,ZipCode:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If (CountryRegionId = "BEL") {
+		Do Adres.ZetPostcode(ZipCode)
+	} Else {
+		Do Adres.ZetPostcode(..LandRepository.GeefViaLandCodeIso3(CountryRegionId).GeefCode()_"-"_ZipCode, $$$False)
+	}
+]]></Implementation>
+</Method>
 </Class>