Index: DOM/PARTIJ/impl/LegacyPartijAPI.cls.xml
===================================================================
diff -u -r38756 -r54711
--- DOM/PARTIJ/impl/LegacyPartijAPI.cls.xml	(.../LegacyPartijAPI.cls.xml)	(revision 38756)
+++ DOM/PARTIJ/impl/LegacyPartijAPI.cls.xml	(.../LegacyPartijAPI.cls.xml)	(revision 54711)
@@ -6,6 +6,24 @@
 <Super>DOM.PARTIJ.LegacyPartijAPI,TECH.RegisteredObject</Super>
 <Inheritance>right</Inheritance>
 
+<Property name="CommonApi">
+<Type>DOM.common.CommonAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>initvalue:%CacheString</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..CommonApi = ##class(DOM.common.impl.CommonAPI).%New()
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefKlantNummerVoorPartijID">
 <FormalSpec>PartijID:DOM.common.PartijID</FormalSpec>
 <ReturnType>%String</ReturnType>
@@ -49,6 +67,28 @@
 	quit $get(^KL1(LeverancierNr))
 ]]></Implementation>
 </Method>
+
+<Method name="VerwijderPrefixVanHandelKlantId">
+<FormalSpec>HandelKlantId:%String,PersonalityId:DOM.common.enu.Personality=1</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Personality As DOM.common.Personality = ..CommonApi.GeefPersonality(PersonalityId)
+	If $$$Not($$$StartsWithVar(HandelKlantId, Personality.GeefPrefix())){
+		Do ##class(TECH.Exceptions.InvalidInputException).Throw("HandelKlantId '"_HandelKlantId_"' heeft niet de juiste prefix voor Personality '"_Personality.GeefNaam()_"' ("_Personality.GeefPrefix()_")")
+	} Else {
+		Quit ##class(TECH.StringUtils).Replace(HandelKlantId, Personality.GeefPrefix(), "")
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VoegPrefixToeAanHandelKlantId">
+<FormalSpec>HandelKlantId:%String,PersonalityId:DOM.common.enu.Personality=1</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim Personality As DOM.common.Personality = ..CommonApi.GeefPersonality(PersonalityId)
+	Quit Personality.GeefPrefix()_HandelKlantId
+]]></Implementation>
+</Method>
 </Class>