Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34299 -r34367
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34299)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34367)
@@ -890,7 +890,7 @@
 	#dim PostalAddresEcht As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(2)
 	
 	do $$$AssertEquals(PostalAddresFictief.IsPrimary,"Yes")
-	do $$$AssertEquals(PostalAddresFictief.CountryRegionId,"NL")
+	do $$$AssertEquals(PostalAddresFictief.CountryRegionId,"NLD")
 	do $$$AssertEquals(PostalAddresFictief.Roles,"Business")
 	do $$$AssertEquals(PostalAddresFictief.LocationName,"Een Willekeurige naam Toenaam")
 	do $$$AssertEquals(PostalAddresEcht.IsPrimary,"No")
@@ -914,6 +914,60 @@
 	do $$$AssertEquals(PostalAddres.IsPrimary,"Yes")
 ]]></Implementation>
 </Method>
+
+<Method name="Test: BTWnummer = GEEN -&gt; geen fictief adres aanmaken">
+<Implementation><![CDATA[
+	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("GEEN")
+	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
+	
+	Set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.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.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
+	#dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	
+	do $$$AssertEquals(Party.DirPartyPostalAddressView.Count(),1)
+	do $$$AssertEquals(PostalAddres.IsPrimary,"Yes")
+	do $$$AssertEquals(PostalAddres.CountryRegionId,"BEL")
+]]></Implementation>
+</Method>
+
+<Method name="Test: BTWnummer = G -&gt; geen fictief adres aanmaken">
+<Implementation><![CDATA[
+	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("G")
+	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
+	
+	Set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.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.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
+	#dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	
+	do $$$AssertEquals(Party.DirPartyPostalAddressView.Count(),1)
+	do $$$AssertEquals(PostalAddres.IsPrimary,"Yes")
+	do $$$AssertEquals(PostalAddres.CountryRegionId,"BEL")
+]]></Implementation>
+</Method>
+
+<Method name="Test: BTWnummer = &apos;&apos; -&gt; geen fictief adres aanmaken">
+<Implementation><![CDATA[
+	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("")
+	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
+	
+	Set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.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.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
+	#dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	
+	do $$$AssertEquals(Party.DirPartyPostalAddressView.Count(),1)
+	do $$$AssertEquals(PostalAddres.IsPrimary,"Yes")
+	do $$$AssertEquals(PostalAddres.CountryRegionId,"BEL")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34334 -r34367
--- AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34334)
+++ AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34367)
@@ -158,14 +158,14 @@
 	set PostalAddres.ZipCode = ##class(DOM.common.impl.AdresUtils).CorrigeerPostcode(Adres.GeefPostcode(),Adres.GeefLandNr())	
 	set PostalAddres.LocationName = DirParty.Name
 	
-	If ..IsLandCodeInAdresGelijkAanLandInBTWnummer(Partij) {	
+	If ..IsLandCodeInAdresGelijkAanLandInBTWnummer(Partij) || ($Find($ListBuild("GEEN","G",""),Partij.GeefBTWNr())) {	
 		Do DirParty.DirPartyPostalAddressView.Insert(PostalAddres)
 	} Else {
 		#dim FictiefPostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView
 		
 		Set FictiefPostalAddres = ##class(AXaif.Customer.AxdEntityDirPartyPostalAddressView).%New()		
-		Set FictiefPostalAddres.IsPrimary = ##class(AXaif.Shared.AxdExtTypeLogisticsIsPrimaryAddress).Yes()
-		Set FictiefPostalAddres.CountryRegionId = $Extract(Partij.GeefBTWNr(),1,2)
+		Set FictiefPostalAddres.IsPrimary = ##class(AXaif.Shared.AxdExtTypeLogisticsIsPrimaryAddress).Yes()		
+		Set FictiefPostalAddres.CountryRegionId = ..Formatter.FormatLandCode2naar3($Extract(Partij.GeefBTWNr(),1,2))
 		Set FictiefPostalAddres.Roles = "Business"
 		Set FictiefPostalAddres.LocationName = DirParty.Name
 		Set PostalAddres.LocationName = DirParty.Name
Index: AX/common/impl/Formatter.cls.xml
===================================================================
diff -u -r34334 -r34367
--- AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 34334)
+++ AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 34367)
@@ -85,6 +85,27 @@
 	quit $extract(BTWNr,3,*)
 ]]></Implementation>
 </Method>
+
+<Method name="FormatLandCode2naar3">
+<FormalSpec>LandCodeIn:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	//dees kan beter in een LandService of LandAPI of zoiets
+	//code nog wip : mooie oplossing indien landcodeuit niet gevonden
+	//               testjes op de juiste plaats zetten
+	#dim LandCodeUit As %String = ""
+	#dim LandCode As %String = ""
+	
+	For { 
+		Set LandCode=$Order(^ISO(0,"ISO.LAND",LandCode))  Quit:(LandCode="")||($$$HasLength(LandCodeUit))		
+		If $Piece(^ISO(0,"ISO.LAND",LandCode,0),"\",1) = LandCodeIn {			
+			Set LandCodeUit = $Piece(^ISO(0,"ISO.LAND",LandCode,0),"\",35)
+		}	
+	}
+	
+	Quit LandCodeUit
+]]></Implementation>
+</Method>
 </Class>