Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r35138 -r35206
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 35138)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 35206)
@@ -334,6 +334,20 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: BTW variaties - BTW-Nr start met UK -&gt; Land moet GB zijn">
+<Implementation><![CDATA[
+	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("UK814120313001")
+	
+	#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 PostalAddres As AXaif.Customer.AxdEntityDirPartyPostalAddressView = Party.DirPartyPostalAddressView.GetAt(1)
+	
+	do $$$AssertEquals(PostalAddres.CountryRegionId,"GBR")
+]]></Implementation>
+</Method>
+
 <Method name="Test: BTW variaties - G">
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("G")
Index: AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml
===================================================================
diff -u -r35138 -r35206
--- AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 35138)
+++ AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 35206)
@@ -128,7 +128,7 @@
 	}
 	
 	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))
+		#dim Land As DOM.common.Land = ##class(DOM.common.impl.LocatieAPI).%New().GeefLandVoorLandCode(..LandCodeUitBTWNummer(Partij.GeefBTWNr()))
 		Quit:Land.GeefCode()="BE" "BE"
 		Quit:Land.IsLidVanEU() "EU"
 		Quit "EX"
@@ -178,7 +178,7 @@
 		Set FictiefPostalAddres = ##class(AXaif.Customer.AxdEntityDirPartyPostalAddressView).%New()	
 		Set FictiefPostalAddres.class = "entity"	
 		Set FictiefPostalAddres.IsPrimary = ##class(AXaif.Shared.AxdExtTypeLogisticsIsPrimaryAddress).Yes()		
-		Set FictiefPostalAddres.CountryRegionId = ..Formatter.FormatLandCode2naar3($Extract(Partij.GeefBTWNr(),1,2))
+		Set FictiefPostalAddres.CountryRegionId = ..Formatter.FormatLandCode2naar3(..LandCodeUitBTWNummer(Partij.GeefBTWNr()))
 		Set FictiefPostalAddres.Roles = "Business"
 		Set FictiefPostalAddres.LocationName = DirParty.Name
 		Set PostalAddres.LocationName = DirParty.Name
@@ -193,9 +193,9 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim LandCodeBTWnummer As %String
-	#dim LandCodeAdres As %String
+	#dim LandCodeAdres As %String	
 		
-	Set LandCodeBTWnummer = $Extract(Partij.GeefBTWNr(),1,2)
+	Set LandCodeBTWnummer = ..LandCodeUitBTWNummer(Partij.GeefBTWNr())
 	Set LandCodeAdres = Partij.GeefAdres().GeefLand().GeefCode()
 	
 	Quit LandCodeBTWnummer = LandCodeAdres
@@ -214,6 +214,17 @@
 	Quit ""
 ]]></Implementation>
 </Method>
+
+<Method name="LandCodeUitBTWNummer">
+<FormalSpec>BTWNummer:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim LandCode As %String = $Extract(BTWNummer,1,2)
+	Set:LandCode="UK" LandCode = "GB"
+	Quit LandCode
+]]></Implementation>
+</Method>
 </Class>