Index: AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34818 -r35138
--- AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34818)
+++ AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 35138)
@@ -126,6 +126,14 @@
 		Quit:Partij.GeefID()="K||1389" "IC"
 		Quit:Partij.GeefID()="K||1377" "IC"
 	}
+	
+	If $$$Not(..IsLandCodeInAdresGelijkAanLandInBTWnummer(Partij) || (##class(TECH.StringUtils).Equals(Partij.GeefBTWNr(),"GEEN","G",""))){
+		#dim Land As DOM.common.Land = ##class(DOM.common.impl.LocatieAPI).%New().GeefLandVoorLandCode($Extract(Partij.GeefBTWNr(),1,2))
+		Quit:Land.GeefCode()="BE" "BE"
+		Quit:Land.IsLidVanEU() "EU"
+		Quit "EX"
+	}
+	
 	Quit:Partij.GeefAdres().GeefLand().GeefCode()="BE" "BE"
 	Quit:Partij.GeefAdres().GeefLand().IsLidVanEU() "EU"	
 	Quit "EX"
Index: DOM/common/impl/Land.cls.xml
===================================================================
diff -u -r33553 -r35138
--- DOM/common/impl/Land.cls.xml	(.../Land.cls.xml)	(revision 33553)
+++ DOM/common/impl/Land.cls.xml	(.../Land.cls.xml)	(revision 35138)
@@ -3,21 +3,32 @@
 <Class name="DOM.common.impl.Land">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,DOM.common.Land</Super>
+<Super>TECH.RegisteredObject,DOM.common.Land</Super>
 <Inheritance>right</Inheritance>
 
 <Property name="LandID">
 <Type>%String</Type>
 <Parameter name="TRUNCATE" value="1"/>
 </Property>
 
+<Method name="OpenId">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>LandID:%String</FormalSpec>
+<ReturnType>DOM.common.impl.Land</ReturnType>
+<Implementation><![CDATA[
+	do:$$$Not($data(^ISO(0,"ISO.LAND",LandID,0))) ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.DataNotFoundException).%New("Geen land met id '"_LandID_"'"))
+	quit ..%New(LandID)
+]]></Implementation>
+</Method>
+
 <Method name="%OnNew">
 <FormalSpec>LandID:%String</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..LandID = LandID
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: DOM/common/impl/LocatieAPI.cls.xml
===================================================================
diff -u -r29059 -r35138
--- DOM/common/impl/LocatieAPI.cls.xml	(.../LocatieAPI.cls.xml)	(revision 29059)
+++ DOM/common/impl/LocatieAPI.cls.xml	(.../LocatieAPI.cls.xml)	(revision 35138)
@@ -14,7 +14,7 @@
 	If LandID = "" {
 		Set Land = ##class(DOM.common.impl.OnbepaaldLand).%New(LandID)
 	}Else{
-		Set Land = ##class(DOM.common.impl.Land).%New(LandID)
+		Set Land = ##class(DOM.common.impl.Land).OpenId(LandID)
 	}
 	Quit Land
 ]]></Implementation>
Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r34840 -r35138
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 34840)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 35138)
@@ -793,6 +793,7 @@
 
 <Method name="Test: KlantenCategorie - EU lid - EU">
 <Implementation><![CDATA[
+	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("DE0402775276")
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).EuLid())
 
 	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
@@ -804,6 +805,7 @@
 
 <Method name="Test: KlantenCategorie - geen EU lid - EX">
 <Implementation><![CDATA[
+	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NZ0402775276")
 	do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).NietEuLid())
 
 	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
@@ -813,6 +815,51 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: KlantenCategorie - Gebruik landcode van fictief adres indien aanwezig - BTW NL en adres BE">
+<Implementation><![CDATA[
+	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL0402775276")
+	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).Belgisch())
+	
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
+	#dim PostalAddresFictief As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	
+	do $$$AssertEquals(CustTable.CustGroup,"EU")
+]]></Implementation>
+</Method>
+
+<Method name="Test: KlantenCategorie - Gebruik landcode van fictief adres indien aanwezig - BTW NL en adres EX">
+<Implementation><![CDATA[
+	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("NL0402775276")
+	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).NietEuLid())
+	
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
+	#dim PostalAddresFictief As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	
+	do $$$AssertEquals(CustTable.CustGroup,"EU")
+]]></Implementation>
+</Method>
+
+<Method name="Test: KlantenCategorie - Gebruik landcode van fictief adres indien aanwezig - BTW BE en adres EX">
+<Implementation><![CDATA[
+	Do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("BE0402775277")
+	Do ..Partij.IndienMethodCall("GeefAdres").DanReturn(##class(vhTest.Utils.DOM.VKP.LeverAdres).NietEuLid())
+	
+	#dim AxKlant As AXaif.Customer.AxdCustomer = ..ConvertToAxdCustomer()
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	#dim Party As AXaif.Customer.AxdEntityDirPartyDirOrganization = CustTable.DirParty.GetAt(1)
+	#dim PostalAddresFictief As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	
+	do $$$AssertEquals(CustTable.CustGroup,"BE")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Geldige Aanspreking">
 <Implementation><![CDATA[
 	Do ..Partij.IndienMethodCall("GeefAanspreking").DanReturn("NV")