Index: vhUnitTest/AX/Uitgaand/Klant/KlantNaarBestand/Test.cls.xml
===================================================================
diff -u -r33551 -r33554
--- vhUnitTest/AX/Uitgaand/Klant/KlantNaarBestand/Test.cls.xml	(.../Test.cls.xml)	(revision 33551)
+++ vhUnitTest/AX/Uitgaand/Klant/KlantNaarBestand/Test.cls.xml	(.../Test.cls.xml)	(revision 33554)
@@ -4,12 +4,12 @@
 <Super>vhUnitTest.TestCase</Super>
 
 <Property name="Partij">
-<Type>DOM.PARTIJ.Partij</Type>
+<Type>vhTest.Mock.DOM.PARTIJ.Partij</Type>
 <Private>1</Private>
 </Property>
 
 <Property name="Klant">
-<Type>DOM.VKP.VanHoeckeKlant</Type>
+<Type>vhTest.Mock.DOM.VKP.VanHoeckeKlant</Type>
 <Private>1</Private>
 </Property>
 
@@ -48,6 +48,76 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Hoofdadres - Een belgisch adres">
+<Implementation><![CDATA[
+	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
+	
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	#dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1)
+	#dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	
+	do $$$AssertEquals(PostalAddres.IsPrimary,"Yes")
+	do $$$AssertEquals(PostalAddres.CountryRegionId,"BEL")
+	do $$$AssertEquals(PostalAddres.Street,"Kemzekestraat 6")
+	do $$$AssertEquals(PostalAddres.ZipCode,"9170")
+	do $$$AssertEquals(PostalAddres.City,"SINT-GILLIS-WAAS")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Hoofdadres - Een niet belgisch adres - rekening houden met &apos;-&apos; 1">
+<Implementation><![CDATA[
+	#dim Adres As DOM.common.Adres = ##class(vhTest.Utils.DOM.VKP.LeverAdres).EuLid()
+	do Adres.ZetPostcode("NL-1234 AA")
+	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(Adres)
+	
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	#dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1)
+	#dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	
+	do $$$AssertEquals(PostalAddres.ZipCode,"1234 AA")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Hoofdadres - Een niet belgisch adres - rekening houden met &apos;-&apos; 2">
+<Implementation><![CDATA[
+	#dim Adres As DOM.common.Adres = ##class(vhTest.Utils.DOM.VKP.LeverAdres).EuLid()
+	do Adres.ZetPostcode("NL1234 AA")
+	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(Adres)
+	
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	#dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1)
+	#dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	
+	do $$$AssertEquals(PostalAddres.ZipCode,"NL1234 AA")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Hoofdadres - Een niet belgisch adres - rekening houden met &apos;-&apos; 3">
+<Implementation><![CDATA[
+	#dim Adres As DOM.common.Adres = ##class(vhTest.Utils.DOM.VKP.LeverAdres).EuLid()
+	do Adres.ZetPostcode("NL-1234-AA")
+	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(Adres)
+	
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	#dim Party As AXaif.Customer.AxdEntityDirPartyDirPartyTable = CustTable.DirParty.GetAt(1)
+	#dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	
+	do $$$AssertEquals(PostalAddres.ZipCode,"1234-AA")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Naam variaties - Enkel een klantnaam">
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam")
Index: AXaif/Shared/AxdExtTypeLogisticsIsPrimaryAddress.cls.xml
===================================================================
diff -u -r33487 -r33554
--- AXaif/Shared/AxdExtTypeLogisticsIsPrimaryAddress.cls.xml	(.../AxdExtTypeLogisticsIsPrimaryAddress.cls.xml)	(revision 33487)
+++ AXaif/Shared/AxdExtTypeLogisticsIsPrimaryAddress.cls.xml	(.../AxdExtTypeLogisticsIsPrimaryAddress.cls.xml)	(revision 33554)
@@ -23,6 +23,13 @@
 <Parameter name="VALUELIST">
 <Default>,No,Yes</Default>
 </Parameter>
+
+<Method name="Yes">
+<ClassMethod>1</ClassMethod>
+<ReturnType>AXaif.Shared.AxdExtTypeLogisticsIsPrimaryAddress</ReturnType>
+<Implementation><![CDATA[	quit "Yes"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/Klant/impl/AifConverter.cls.xml
===================================================================
diff -u -r33551 -r33554
--- AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33551)
+++ AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33554)
@@ -27,6 +27,8 @@
 	set DirParty.LanguageId = ..FormatLanuageId(Partij.GeefTaal())
 	set DirParty.Name = Partij.GeefNaam()_$$$IfLength(Partij.GeefToenaam()," ","")
 	
+	do DirParty.DirPartyPostalAddressView.Insert(..ConvertPostalAddress(Partij))
+	
 	do Custable.DirParty.Insert(DirParty)
 	
 	do AxKlant.CustTable.Insert(Custable)
@@ -35,6 +37,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ConvertPostalAddress">
+<FormalSpec>Partij:DOM.PARTIJ.Partij</FormalSpec>
+<Private>1</Private>
+<ReturnType>AXaif.Customer.AxdEntityDirPartyPostalAddressView</ReturnType>
+<Implementation><![CDATA[
+	set PostalAddres = ##class(AXaif.Customer.AxdEntityDirPartyPostalAddressView).%New()
+	#dim Adres As DOM.common.Adres = Partij.GeefAdres()
+	set PostalAddres.City = $$$UCase(Adres.GeefGemeente())
+	set PostalAddres.IsPrimary = ##class(AXaif.Shared.AxdExtTypeLogisticsIsPrimaryAddress).Yes()
+	set PostalAddres.CountryRegionId = Adres.GeefLand().GeefIso3()
+	set PostalAddres.Street = Adres.GeefStraat()
+	set PostalAddres.ZipCode = ##class(DOM.common.impl.AdresUtils).CorrigeerPostcode(Adres.GeefPostcode(),Adres.GeefLandNr())
+	quit PostalAddres
+]]></Implementation>
+</Method>
+
 <Method name="FormatLanuageId">
 <FormalSpec>Taal:DOM.enu.Taal</FormalSpec>
 <Private>1</Private>