Index: AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34220 -r34265
--- AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34220)
+++ AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34265)
@@ -53,9 +53,7 @@
 	set OrganizationName.Name = DirParty.Name
 	do DirParty.OrganizationName.Insert(OrganizationName)
 	
-	#dim PostalAddress As AXaif.Customer.AxdEntityDirPartyPostalAddressView = ..ConvertPostalAddress(Partij)
-	set PostalAddress.LocationName = DirParty.Name
-	do DirParty.DirPartyPostalAddressView.Insert(PostalAddress)
+	Do ..ConvertAndAddPostalAddress(Partij, DirParty)	
 	
 	do:$length(Partij.GeefTelefoon1()) DirParty.DirPartyContactInfoView.Insert(..ConvertContactInfo("Telefoon 1",Partij.GeefTelefoon1(),"Phone"))
 	do:$length(Partij.GeefTelefoon2()) DirParty.DirPartyContactInfoView.Insert(..ConvertContactInfo("Telefoon 2",Partij.GeefTelefoon2(),"Phone",$$$IsEmptyString(Partij.GeefTelefoon1())))
@@ -132,8 +130,8 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ConvertPostalAddress">
-<FormalSpec>Partij:DOM.PARTIJ.Partij</FormalSpec>
+<Method name="ConvertAndAddPostalAddress">
+<FormalSpec>Partij:DOM.PARTIJ.Partij,DirParty:AXaif.Customer.AxdEntityDirPartyDirOrganization</FormalSpec>
 <Private>1</Private>
 <ReturnType>AXaif.Customer.AxdEntityDirPartyPostalAddressView</ReturnType>
 <Implementation><![CDATA[
@@ -145,8 +143,23 @@
 	set PostalAddres.Roles = "Business"
 	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
+	set PostalAddres.ZipCode = ##class(DOM.common.impl.AdresUtils).CorrigeerPostcode(Adres.GeefPostcode(),Adres.GeefLandNr())	
+	set PostalAddres.LocationName = DirParty.Name
+	
+	If ..VergelijkLandCodeMetBTWnummer(Partij) {	
+		Do DirParty.DirPartyPostalAddressView.Insert(PostalAddres)
+	} Else {
+		#dim DummyPostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView
+		
+		Set DummyPostalAddres = ##class(AXaif.Customer.AxdEntityDirPartyPostalAddressView).%New()		
+		Set DummyPostalAddres.IsPrimary = ##class(AXaif.Shared.AxdExtTypeLogisticsIsPrimaryAddress).Yes()
+		Set DummyPostalAddres.CountryRegionId = Partij.GeefAdres().GeefLand().GeefIso3()
+		Set DummyPostalAddres.Roles = "Business"
+		Set PostalAddres.LocationName = DirParty.Name
+		Set PostalAddres.IsPrimary = ##class(AXaif.Shared.AxdExtTypeLogisticsIsPrimaryAddress).No()
+		Do DirParty.DirPartyPostalAddressView.Insert(DummyPostalAddres)
+		Do DirParty.DirPartyPostalAddressView.Insert(PostalAddres)
+	}
 ]]></Implementation>
 </Method>
 
@@ -199,6 +212,20 @@
 	quit "BX"
 ]]></Implementation>
 </Method>
+
+<Method name="VergelijkLandCodeMetBTWnummer">
+<FormalSpec>Partij:DOM.PARTIJ.Partij</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim LandCodeBTWnummer As %String
+	#dim LandCodeAdres As %String
+		
+	Set LandCodeBTWnummer = $Extract(Partij.GeefBTWNr(),1,2)
+	Set LandCodeAdres = Partij.GeefAdres().GeefLand().GeefCode()
+	
+	Quit LandCodeBTWnummer = LandCodeAdres
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXaif/Shared/AxdExtTypeLogisticsIsPrimaryAddress.cls.xml
===================================================================
diff -u -r33889 -r34265
--- AXaif/Shared/AxdExtTypeLogisticsIsPrimaryAddress.cls.xml	(.../AxdExtTypeLogisticsIsPrimaryAddress.cls.xml)	(revision 33889)
+++ AXaif/Shared/AxdExtTypeLogisticsIsPrimaryAddress.cls.xml	(.../AxdExtTypeLogisticsIsPrimaryAddress.cls.xml)	(revision 34265)
@@ -27,6 +27,13 @@
 <Implementation><![CDATA[	quit "Yes"
 ]]></Implementation>
 </Method>
+
+<Method name="No">
+<ClassMethod>1</ClassMethod>
+<ReturnType>AXaif.Shared.AxdExtTypeLogisticsIsPrimaryAddress</ReturnType>
+<Implementation><![CDATA[	quit "No"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34220 -r34265
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34220)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34265)
@@ -39,13 +39,14 @@
 	#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)
+	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL0402775276")
 	
 	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)
+	#dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(2)
 	
 	do $$$AssertEquals(PostalAddres.ZipCode,"1234 AA")
 ]]></Implementation>
@@ -56,13 +57,14 @@
 	#dim Adres As DOM.common.Adres = ##class(vhTest.Utils.DOM.VKP.LeverAdres).EuLid()
 	do Adres.ZetPostcode("NL1234 AA")
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(Adres)
+	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL0402775276")
 	
 	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)
+	#dim PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(2)
 	
 	do $$$AssertEquals(PostalAddres.ZipCode,"NL1234 AA")
 ]]></Implementation>
@@ -73,13 +75,14 @@
 	#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)
+	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL0402775276")
 	
 	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.AxdEntityDifrPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	#dim PostalAddres As AXaif.Customer.AxdEntityDifrPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(2)
 	
 	do $$$AssertEquals(PostalAddres.ZipCode,"1234-AA")
 ]]></Implementation>
@@ -839,39 +842,74 @@
 
 <Method name="Test: Geldige Aanspreking">
 <Implementation><![CDATA[
-	do ..Partij.IndienMethodCall("GeefAanspreking").DanReturn("NV")
-	do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam")
-	do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("")
+	Do ..Partij.IndienMethodCall("GeefAanspreking").DanReturn("NV")
+	Do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam")
+	Do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
+	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)
 	
-	do $$$AssertEquals(Party.Name,"Klantnaam NV")
-	do $$$AssertEquals(Party.OrganizationName.GetAt(1).Name,"Klantnaam NV")
-	do $$$AssertEquals(Party.DirPartyPostalAddressView.GetAt(1).LocationName,"Klantnaam NV")
+	Do $$$AssertEquals(Party.Name,"Klantnaam NV")
+	Do $$$AssertEquals(Party.OrganizationName.GetAt(1).Name,"Klantnaam NV")
+	Do $$$AssertEquals(Party.DirPartyPostalAddressView.GetAt(1).LocationName,"Klantnaam NV")
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Geen geldige Aanspreking">
 <Implementation><![CDATA[
-	do ..Partij.IndienMethodCall("GeefAanspreking").DanReturn("oink")
-	do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam")
-	do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("")
+	Do ..Partij.IndienMethodCall("GeefAanspreking").DanReturn("oink")
+	Do ..Partij.IndienMethodCall("GeefNaam").DanReturn("Klantnaam")
+	Do ..Partij.IndienMethodCall("GeefToenaam").DanReturn("")
 	
-	set Converter = ##class(AX.Uitgaand.VKP.VanHoeckeKlant.impl.AifConverter).%New()
+	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)
 	
-	do $$$AssertEquals(Party.Name,"Klantnaam")
-	do $$$AssertEquals(Party.OrganizationName.GetAt(1).Name,"Klantnaam")
-	do $$$AssertEquals(Party.DirPartyPostalAddressView.GetAt(1).LocationName,"Klantnaam")
+	Do $$$AssertEquals(Party.Name,"Klantnaam")
+	Do $$$AssertEquals(Party.OrganizationName.GetAt(1).Name,"Klantnaam")
+	Do $$$AssertEquals(Party.DirPartyPostalAddressView.GetAt(1).LocationName,"Klantnaam")
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Landcode verschillend in adres en BTWnummer">
+<Implementation><![CDATA[
+	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL0402775276")
+	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 PostalAddresDummy As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	#dim PostalAddresEcht As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(2)
+	
+	do $$$AssertEquals(PostalAddresDummy.IsPrimary,"Yes")
+	do $$$AssertEquals(PostalAddresEcht.IsPrimary,"No")
+	do $$$AssertEquals(Party.DirPartyPostalAddressView.Count(),2)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Landcode gelijk in adres en BTWnummer">
+<Implementation><![CDATA[
+	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("BE0402775276")
+	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)
+]]></Implementation>
+</Method>
 </Class>