Index: AXimpl/Utils/KlantIdConverter.cls.xml
===================================================================
diff -u -r50061 -r51147
--- AXimpl/Utils/KlantIdConverter.cls.xml	(.../KlantIdConverter.cls.xml)	(revision 50061)
+++ AXimpl/Utils/KlantIdConverter.cls.xml	(.../KlantIdConverter.cls.xml)	(revision 51147)
@@ -3,11 +3,29 @@
 <Class name="AXimpl.Utils.KlantIdConverter">
 <Super>TECH.Mockable</Super>
 
+<Property name="LegacyPartijApi">
+<Type>DOM.PARTIJ.impl.LegacyPartijAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>LegacyPartijApi:DOM.PARTIJ.impl.LegacyPartijAPI=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..LegacyPartijApi = $$$Inject(LegacyPartijApi, ##class(DOM.PARTIJ.impl.LegacyPartijAPI).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="ConvertToVanHoecke">
 <FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") && (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke())) {
+	If (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke()) {
 		Set KlantId = +KlantId
 	}
 	
@@ -19,13 +37,12 @@
 <FormalSpec>KlantId:%String,PersonalityId:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("KlantIdAx2A") && (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke())) {
-		If ##class(TECH.StringUtils).StartsWith(KlantId,"K||") {
-			Set KlantId = ##class(TECH.StringUtils).AlignRight($Extract(KlantId, 4, *), 0, 5)
-		} Else {
-			Set KlantId = ##class(TECH.StringUtils).AlignRight(+KlantId, 0, 5)
+	If (PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke()) {
+		If (..LegacyPartijApi.IsKlantPartijID(KlantId)) {
+			Set KlantId = ..LegacyPartijApi.GeefKlantNummerVoorPartijID(KlantId)
 		}
-
+		
+		Set KlantId = ##class(TECH.StringUtils).AlignRight(+KlantId, 0, 5)
 	}
 	
 	Quit KlantId