Index: DOM/common/impl/LocatieAPI.cls.xml
===================================================================
diff -u -r35575 -r35613
--- DOM/common/impl/LocatieAPI.cls.xml	(.../LocatieAPI.cls.xml)	(revision 35575)
+++ DOM/common/impl/LocatieAPI.cls.xml	(.../LocatieAPI.cls.xml)	(revision 35613)
@@ -3,7 +3,7 @@
 <Class name="DOM.common.impl.LocatieAPI">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,DOM.common.LocatieAPI</Super>
+<Super>TECH.RegisteredObject,DOM.common.LocatieAPI</Super>
 <Inheritance>right</Inheritance>
 
 <Method name="GeefLand">
@@ -52,6 +52,23 @@
 	Quit ..GeefLand($$LAND^vhRtn1(LandCode,"I"))
 ]]></Implementation>
 </Method>
+
+<Method name="ConvertLandCode2naar3">
+<FormalSpec>LandCodeIn:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim LandCodeUit As %String = ""
+	#dim LandCode As %String = ""
+	
+	For { Quit:$$$HasLength(LandCodeUit)  Set LandCode=$Order(^ISO(0,"ISO.LAND",LandCode))  Quit:(LandCode="")		
+		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>
 
 
Index: AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml
===================================================================
diff -u -r35608 -r35613
--- AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 35608)
+++ AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 35613)
@@ -28,6 +28,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="LocatieAPI">
+<Type>DOM.common.LocatieAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Utils">
 <Type>AXimpl.AifMessage.Converter.Utils</Type>
 <Private>1</Private>
@@ -49,6 +54,7 @@
 	set ..VerkoopAPI = $$$Inject(VerkoopAPI,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
 	
 	set ..Utils = ##class(AXimpl.AifMessage.Converter.Utils).%New(..FirmaBepaler,..PartijAPI)
+	set ..LocatieAPI = ##class(DOM.common.impl.LocatieAPI).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -199,7 +205,7 @@
 		Set FictiefPostalAddres = ##class(AXaif.Customer.AxdEntityDirPartyPostalAddressView).%New()	
 		Set FictiefPostalAddres.class = "entity"	
 		Set FictiefPostalAddres.IsPrimary = ##class(AXaif.Customer.AxdExtTypeLogisticsIsPrimaryAddress).Yes()		
-		Set FictiefPostalAddres.CountryRegionId = ..Formatter.FormatLandCode2naar3(..LandCodeUitBTWNummer(Partij.GeefBTWNr()))
+		Set FictiefPostalAddres.CountryRegionId = ..LocatieAPI.ConvertLandCode2naar3(..LandCodeUitBTWNummer(Partij.GeefBTWNr()))
 		Set FictiefPostalAddres.Roles = "Business"
 		Set FictiefPostalAddres.LocationName = DirParty.Name
 		Set PostalAddres.LocationName = DirParty.Name
Index: AX/common/impl/Formatter.cls.xml
===================================================================
diff -u -r35536 -r35613
--- AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 35536)
+++ AX/common/impl/Formatter.cls.xml	(.../Formatter.cls.xml)	(revision 35613)
@@ -101,26 +101,6 @@
 ]]></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 { Quit:$$$HasLength(LandCodeUit)  Set LandCode=$Order(^ISO(0,"ISO.LAND",LandCode))  Quit:(LandCode="")		
-		If $Piece(^ISO(0,"ISO.LAND",LandCode,0),"\",1) = LandCodeIn {			
-			Set LandCodeUit = $Piece(^ISO(0,"ISO.LAND",LandCode,0),"\",35)
-		}	
-	}
-	
-	Quit LandCodeUit
-]]></Implementation>
-</Method>
-
 <Method name="ConvertPaymTermId">
 <FormalSpec>Betalingwijze:%String,BetalingTermijn:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
Index: DOM/common/LocatieAPI.cls.xml
===================================================================
diff -u -r29059 -r35613
--- DOM/common/LocatieAPI.cls.xml	(.../LocatieAPI.cls.xml)	(revision 29059)
+++ DOM/common/LocatieAPI.cls.xml	(.../LocatieAPI.cls.xml)	(revision 35613)
@@ -35,6 +35,12 @@
 <FormalSpec>LandCode:%String</FormalSpec>
 <ReturnType>DOM.common.Land</ReturnType>
 </Method>
+
+<Method name="ConvertLandCode2naar3">
+<Abstract>1</Abstract>
+<FormalSpec>LandCodeIn:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+</Method>
 </Class>