Index: vhTest/Mock/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml
===================================================================
diff -u -r48522 -r48545
--- vhTest/Mock/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48522)
+++ vhTest/Mock/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48545)
@@ -20,25 +20,6 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("ElecRolesContains",ElecRoles,Role)
 ]]></Implementation>
 </Method>
-
-<Method name="RolesContains">
-<FormalSpec>Roles:%ListOfDataTypes,Name:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("RolesContains",Roles,Name)
-]]></Implementation>
-</Method>
-
-<Method name="ZetLeverAdressenBestaandeKlant">
-<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLeverAdressenBestaandeKlant",Klant,Cust)
-]]></Implementation>
-</Method>
-
-<Method name="ZetLeverAdressenNieuweKlant">
-<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
-<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLeverAdressenNieuweKlant",Klant,Cust)
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml
===================================================================
diff -u -r48522 -r48545
--- AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48522)
+++ AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48545)
@@ -23,28 +23,23 @@
 <Private>1</Private>
 </Property>
 
-<Property name="LeverAdresFactory">
-<Type>DOM.VKP.impl.LeverAdresFactory</Type>
+<Property name="LandRepository">
+<Type>DOM.common.Locatie.impl.LandRepository</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="LeveradresRepository">
-<Type>DOM.VKP.impl.LeverAdresRepository</Type>
+<Property name="LeverAdresUtils">
+<Type>AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="LandRepository">
-<Type>DOM.common.Locatie.impl.LandRepository</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="Logger">
 <Type>vhLib.Logger</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>PartijApi:DOM.PARTIJ.PartijAPI,VerkoopApi:DOM.VKP.VerkoopAPI,KlantLevenCyclusService:APPS.KlantBeheer.KlantLevenCyclusService,LandRepository:DOM.common.Locatie.impl.LandRepository,Logger:vhLib.Logger,LeverAdresFactory:DOM.VKP.impl.LeverAdresFactory,LeveradresRepository:DOM.VKP.impl.LeverAdresRepository</FormalSpec>
+<FormalSpec>PartijApi:DOM.PARTIJ.PartijAPI,VerkoopApi:DOM.VKP.VerkoopAPI,KlantLevenCyclusService:APPS.KlantBeheer.KlantLevenCyclusService,LandRepository:DOM.common.Locatie.impl.LandRepository,LeverAdresUtils:AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils,Logger:vhLib.Logger</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -54,9 +49,8 @@
 	Set ..VerkoopApi = $$$Inject(VerkoopApi,##class(DOM.DomeinContext).Instance().GeefVerkoopAPI())
 	Set ..AxToAdminUtils = ##class(AXimpl.AxToAdminUtils).%New()
 	Set ..KlantLevenCyclusService = $$$Inject(KlantLevenCyclusService,##class(APPS.KlantBeheer.KlantLevenCyclusService).%New())
-	Set ..LeverAdresFactory = $$$Inject(LeverAdresFactory,##class(DOM.VKP.impl.LeverAdresFactory).%New())
 	Set ..LandRepository  = $$$Inject(LandRepository,##class(DOM.common.Locatie.impl.LandRepository).%New())
-	Set ..LeveradresRepository = $$$Inject(LeveradresRepository,##class(DOM.VKP.impl.LeverAdresRepository).%New())
+	Set ..LeverAdresUtils = $$$Inject(LeverAdresUtils,##class(AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils).%New())
 	Set ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New())
 	Quit $$$OK
 ]]></Implementation>
@@ -92,14 +86,14 @@
 	Do KlantPartij.ZetToenaam(..GeefKlantToenaam(Cust))
 	Do KlantPartij.ZetTaal(..GeefTaal(Cust))
 	Do KlantPartij.ZetTelefoon1(..GeefTelefoon1(Cust))
-	#dim PrimairAdres As DOM.VKP.LeverAdres = ..GeefPrimairAdres(Cust, "Update")
+	#dim PrimairAdres As DOM.VKP.LeverAdres = ..LeverAdresUtils.GeefPrimairAdres(Cust, "Update")
 	;Do KlantPartij.Zet ??? (..GeefFax(Cust)) geen zetbare property op klant of partij
 	Do KlantPartij.ZetAdres(PrimairAdres)
 	Do KlantPartij.Save()
 	
 	Do:($$$Not(""=PrimairAdres.GeefVerzendingWijze())) Klant.ZetVerzendingWijze(PrimairAdres.GeefVerzendingWijze())
 	Do Klant.Save()
-	Do ..ZetLeverAdressenBestaandeKlant(Klant, Cust)
+	Do ..LeverAdresUtils.ZetLeverAdressenBestaandeKlant(Klant, Cust)
 ]]></Implementation>
 </Method>
 
@@ -126,13 +120,13 @@
 	; Set dtoKlant.Opmerking1 = ???
 	; Set dtoKlant.FrequentieAanbrengerCommissie = ???
 
-	Set dtoKlant.Adres = ..GeefPrimairAdres(Cust, "Insert")
+	Set dtoKlant.Adres = ..LeverAdresUtils.GeefPrimairAdres(Cust, "Insert")
 	#dim PartijID As DOM.common.PartijID = ..KlantLevenCyclusService.MaakKlant(dtoKlant,TypeTemplateKlant)
 	
 	#Dim Klant as DOM.VKP.VanHoeckeKlant = ..VerkoopApi.GeefKlant(PartijID)	
 	Do Klant.ZetVerzendingWijze(dtoKlant.Adres.GeefVerzendingWijze())
 	Do Klant.Save()
-	Do ..ZetLeverAdressenNieuweKlant(Klant, Cust)
+	Do ..LeverAdresUtils.ZetLeverAdressenNieuweKlant(Klant, Cust)
 ]]></Implementation>
 </Method>
 
@@ -166,25 +160,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefPrimairAdres">
-<FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,InsertOfUpdate:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.VKP.LeverAdres</ReturnType>
-<Implementation><![CDATA[
-	
-	#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()	
-	Set PostalAddressIterator = ##class(TECH.ListIterator).%New(Cust.PostalAddress)
-	While PostalAddressIterator.HasNext() {
-		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
-		if (Address.IsPrimary = "Yes") && ..RolesContains(Address.Role ,"Business" ){
-			Set Adres = ..ZetGemeenschappelijkePropertiesOpAdres(Adres, Address, Cust, InsertOfUpdate)
-			Do Adres.ZetType("")
-		}
-	}
-	Quit Adres
-]]></Implementation>
-</Method>
-
 <Method name="MaakVerzendingWijze">
 <FormalSpec>DlvMode:%String,CustAccount:%String,InsertOfUpdate:%String</FormalSpec>
 <Private>1</Private>
@@ -252,20 +227,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="RolesContains">
-<FormalSpec>Roles:%ListOfDataTypes,Name:%String</FormalSpec>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#dim Result as %Boolean = $$$False
-	Set RoleIterator = ##class(TECH.ListIterator).%New(Roles)
-	While (RoleIterator.HasNext() && $$$Not(Result)) {
-		#dim Role as  AXif.Dynamics.CustomerIn.MessageParts.AxdEntityRole = RoleIterator.Next()
-		Set:(Role.Name = Name) Result = $$$True
-	}
-	Quit Result
-]]></Implementation>
-</Method>
-
 <Method name="ElecRolesContains">
 <FormalSpec>ElecRoles:%ListOfDataTypes,Role:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
@@ -294,8 +255,7 @@
 		Set RoleIterator = ##class(TECH.ListIterator).%New(Address.Role)
 		While RoleIterator.HasNext() {
 			#dim Role As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityRole = RoleIterator.Next()
-			If ((Role.Name = "Business") && (Address.IsPrimary="Yes") && $$$Not(Address.CountryRegionId = "")) {
-				
+			If ((Role.Name = "Business") && (Address.IsPrimary="Yes") && $$$Not(Address.CountryRegionId = "")) {				
 				Set CountryRegionId = ..LandRepository.GeefViaLandCodeIso3(Address.CountryRegionId).GeefCode()
 			} Else {
 				// Error wegens geen Role = "Business" of geen CountryRegionId
@@ -312,105 +272,6 @@
 <Implementation><![CDATA[	Quit ..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId)
 ]]></Implementation>
 </Method>
-
-<Method name="ZetLeverAdressenNieuweKlant">
-<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
-<Implementation><![CDATA[
-	Set PostalAddressIterator = ##class(TECH.ListIterator).%New(Cust.PostalAddress)
-	While PostalAddressIterator.HasNext() {
-		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
-		If ..RolesContains(Address.Role ,"Delivery" ) {
-			#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
-			#dim InsertOfUpdate As %String = "Insert"
-			Do ..ZetNieuwLeverAdres(Adres, Address, Cust, InsertOfUpdate)
-			Do Klant.VoegToeLeverAdres(Adres)
-		}
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ZetLeverAdressenBestaandeKlant">
-<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
-<Implementation><![CDATA[
-	#dim CacheLeverAdresLijst As %ListOfObjects = Klant.GeefLeverAdressen()
-	Set CacheIdLeverAdresLijst = ##class(%ListOfDataTypes).%New()
-	#dim N As %Integer
-	#dim CacheIdLeverAdresCount As %Integer = 0
-	For N=1:1:CacheLeverAdresLijst.Count() {
-		Set CacheIdLeverAdresCount = CacheIdLeverAdresCount + 1
-		#dim CacheIdLeverAdres As DOM.VKP.LeverAdres = CacheLeverAdresLijst.GetAt(CacheIdLeverAdresCount)
-		Do CacheIdLeverAdresLijst.Insert(CacheIdLeverAdres.ID)
-	}
-	Set PostalAddressIterator = ##class(TECH.ListIterator).%New(Cust.PostalAddress)
-	While PostalAddressIterator.HasNext() {
-		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
-		If ..RolesContains(Address.Role ,"Delivery" ) {
-			#dim CacheLeverAdresId As %String = ##class(TECH.StringUtils).LeftTrim($Extract($Piece(Address.TransporterAuth,"$$##",2),2,*))
-			#dim IsNieuwLeverAdres As %Boolean
-			#dim InsertOfUpdate As %String
-			Set IsNieuwLeverAdres = $$$If($$$Not(##class(TECH.ListUtils).Contains(CacheIdLeverAdresLijst,CacheLeverAdresId)),$$$True,$$$False)
-			If IsNieuwLeverAdres {
-				#dim NieuwAdres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
-				Set InsertOfUpdate = "Insert"
-				Do ..ZetNieuwLeverAdres(NieuwAdres, Address, Cust, InsertOfUpdate)
-				Do Klant.VoegToeLeverAdres(NieuwAdres)
-			} Else {
-				#Dim Node As %String = "L"_##class(TECH.StringUtils).AddLeadingSpace(CacheLeverAdresId,3)
-				#dim BestaandLeverAdres As DOM.VKP.LeverAdres = Klant.GeefSpecifiekAdres(Node)
-				#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
-				Set InsertOfUpdate = "Update"
-				Do Adres.ZetNaam($$$If($$$HasLength(Address.Description),$Piece(Address.Description," ",1),BestaandLeverAdres.GeefNaam()))
-				Do Adres.ZetAanspreking($$$If($$$HasLength(Address.Description),$Piece(Address.Description," ",2),BestaandLeverAdres.GeefAanspreking()))
-				Do Adres.ZetStraat($$$If($$$HasLength(Address.Street),Address.Street,BestaandLeverAdres.GeefStraat()))
-				Do Adres.ZetPostcode($$$If($$$HasLength(Address.ZipCode),Address.ZipCode,BestaandLeverAdres.GeefPostcode()))
-				Do Adres.ZetGemeente($$$If($$$HasLength(Address.City),Address.City,BestaandLeverAdres.GeefGemeente()))
-				Do Adres.ZetLandNr($$$If($$$HasLength(Address.CountryRegionId),..LandRepository.GeefViaLandCodeIso3(Address.CountryRegionId).GeefID(),BestaandLeverAdres.GeefLandNr()))
-				Do Adres.ZetTaal($$$If($$$HasLength(Cust.LanguageId),..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId),Klant.GeefTaal()))
-				Do Adres.ZetVerzendingWijze($$$If($$$HasLength(Address.DlvModeId),..MaakVerzendingWijze(Address.DlvModeId, Cust.CustAccount, InsertOfUpdate),BestaandLeverAdres.GeefVerzendingWijze()))
-				Do Adres.ZetOpmerking1($$$If($$$HasLength(Address.Nota1External),Address.Nota1External,BestaandLeverAdres.GeefOpmerking1()))
-				Do Adres.ZetOpmerking2($$$If($$$HasLength(Address.Nota2External),Address.Nota2External,BestaandLeverAdres.GeefOpmerking2()))
-				Do Adres.ZetType($$$If($$$HasLength(Address.Role),..AxToAdminUtils.ConvertLeverAdresType(Address.Role),BestaandLeverAdres.GeefType()))
-				Do Adres.ZetAxLeveradresId($$$If($$$HasLength(Address.LocationId),Address.LocationId,BestaandLeverAdres.GeefAxLeveradresId()))
-				Do Adres.ZetVolmacht($$$If($$$HasLength(Address.TransporterAuth),$Piece(Address.TransporterAuth,"$$##",1),BestaandLeverAdres.GeefVolmacht()))
-				Set Adres.ID = CacheLeverAdresId
-				Do ..LeveradresRepository.Bewaar(Klant, Adres)
-			}
-		}
-	}
-]]></Implementation>
-</Method>
-
-<Method name="ZetNieuwLeverAdres">
-<FormalSpec>Adres:DOM.VKP.LeverAdres,Address:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,InsertOfUpdate:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.VKP.LeverAdres</ReturnType>
-<Implementation><![CDATA[
-	Set Adres = ..ZetGemeenschappelijkePropertiesOpAdres(Adres, Address, Cust, InsertOfUpdate)
-	Do Adres.ZetOpmerking1(Address.Nota1External)
-	Do Adres.ZetOpmerking2(Address.Nota2External)
-	Do Adres.ZetType(..AxToAdminUtils.ConvertLeverAdresType(Address.Role))
-	Do Adres.ZetAxLeveradresId(Address.LocationId)
-	Do Adres.ZetVolmacht($Piece(Address.TransporterAuth,"$$##",1))
-	Quit Adres
-]]></Implementation>
-</Method>
-
-<Method name="ZetGemeenschappelijkePropertiesOpAdres">
-<FormalSpec>Adres:DOM.VKP.LeverAdres,Address:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,InsertOfUpdate:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.VKP.LeverAdres</ReturnType>
-<Implementation><![CDATA[
-	Do Adres.ZetNaam($Piece(Address.Description," ",1))
-	Do Adres.ZetAanspreking($Piece(Address.Description," ",2))
-	Do Adres.ZetStraat(Address.Street)
-	Do Adres.ZetPostcode(Address.ZipCode)
-	Do Adres.ZetGemeente(Address.City)
-	Do Adres.ZetLandNr(..LandRepository.GeefViaLandCodeIso3(Address.CountryRegionId).GeefID())
-	Do Adres.ZetTaal(..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId))
-	Do Adres.ZetVerzendingWijze(..MaakVerzendingWijze(Address.DlvModeId, Cust.CustAccount, InsertOfUpdate))
-	Quit Adres
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Fake/AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml
===================================================================
diff -u
--- vhTest/Fake/AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml	(revision 0)
+++ vhTest/Fake/AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml	(revision 48545)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils</Super>
+
+<Method name="GeefPrimairAdres">
+<FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,InsertOfUpdate:%String</FormalSpec>
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="RolesContains">
+<FormalSpec>Roles:%ListOfDataTypes,Name:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="ZetLeverAdressenBestaandeKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Method name="ZetLeverAdressenNieuweKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/common/Land.cls.xml
===================================================================
diff -u -r33553 -r48545
--- DOM/common/Land.cls.xml	(.../Land.cls.xml)	(revision 33553)
+++ DOM/common/Land.cls.xml	(.../Land.cls.xml)	(revision 48545)
@@ -2,8 +2,7 @@
 <Export generator="Cache" version="24">
 <Class name="DOM.common.Land">
 <Abstract>1</Abstract>
-<ClassType/>
-<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Interface</Super>
 
 <Method name="GeefID">
 <Abstract>1</Abstract>
Index: DOM/VKP/impl/LeverAdresRepository.cls.xml
===================================================================
diff -u -r48522 -r48545
--- DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48522)
+++ DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48545)
@@ -24,19 +24,18 @@
 		Set $Piece(AdresNode,"\",7) = LeverAdres.GeefGemeente()
 		Set $Piece(AdresNode,"\",8) = LeverAdres.GeefLand().GeefID()
 		Set $Piece(AdresNode,"\",9) = LeverAdres.GeefTaal()
+		Set $Piece(AdresNode,"\",12) = "L"
 		Set $Piece(AdresNode,"\",13) = LeverAdres.GeefTelefoon()
 		Set $Piece(AdresNode,"\",23) = LeverAdres.GeefVolmacht()
 		Set $Piece(AdresNode,"\",24) = LeverAdres.GeefOpmerking1()
 		Set $Piece(AdresNode,"\",25) = LeverAdres.GeefOpmerking2()
 		Set $Piece(AdresNode,"\",26) = LeverAdres.GeefVerzendingWijze()	
-		Set $Piece(AdresNode,"\",12) = "L"
 		Set $Piece(AdresNode,"\",19) = "."
 		Set $Piece(AdresNode,"\",29) = LeverAdres.GeefAxLeveradresId()
 		#dim AdresId As %String = $I(^KKL.AdresD)
 		Set $Piece(AdresNode,"\",28) = AdresId
 		#dim Node As %String = "L"_$$$LeftPadding(LeverAdresId,3," ")
 		Set ^KKL(KlantIndexKKL,Node) = AdresNode
-	 	
 		Set $Piece(^KKL(KlantIndexKKL,0),"\",19) = 1
 		
 		#dim PartijId As DOM.common.PartijID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID($Piece(Klant.GeefID(),"||",2))
Index: vhTest/Mock/AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml
===================================================================
diff -u
--- vhTest/Mock/AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml	(revision 0)
+++ vhTest/Mock/AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml	(revision 48545)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="GeefPrimairAdres">
+<FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,InsertOfUpdate:%String</FormalSpec>
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefPrimairAdres",Cust,InsertOfUpdate)
+]]></Implementation>
+</Method>
+
+<Method name="RolesContains">
+<FormalSpec>Roles:%ListOfDataTypes,Name:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("RolesContains",Roles,Name)
+]]></Implementation>
+</Method>
+
+<Method name="ZetLeverAdressenBestaandeKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLeverAdressenBestaandeKlant",Klant,Cust)
+]]></Implementation>
+</Method>
+
+<Method name="ZetLeverAdressenNieuweKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("ZetLeverAdressenNieuweKlant",Klant,Cust)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml
===================================================================
diff -u -r48481 -r48545
--- vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 48481)
+++ vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 48545)
@@ -18,11 +18,16 @@
 <Private>1</Private>
 </Property>
 
-<Property name="LeverAdresFactoryMock">
-<Type>DOM.VKP.impl.LeverAdresFactory</Type>
+<Property name="LandRepositoryMock">
+<Type>DOM.common.Locatie.impl.LandRepository</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="LeverAdresUtilsMock">
+<Type>vhTest.Mock.AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -31,7 +36,8 @@
 	Set ..VerkoopApiMock = ##class(vhTest.Mock.DOM.VKP.VerkoopAPI).MockInstance()
 	Set ..PartijApiMock = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).MockInstance()
 	Set ..KlantLevenCyclusServiceMock = ##class(vhTest.Mock.APPS.KlantBeheer.KlantLevenCyclusService).%New()
-	Set ..LeverAdresFactoryMock = ##class(vhTest.Mock.DOM.VKP.impl.LeverAdresFactory).%New()
+	Set ..LandRepositoryMock = ##class(vhTest.Mock.DOM.common.Locatie.impl.LandRepository).%New()
+	Set ..LeverAdresUtilsMock = ##class(vhTest.Mock.AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils).%New()
 ]]></Implementation>
 </Method>
 
@@ -49,6 +55,15 @@
 	Do KlantMock.VerwachtMethodCall("ZetVerzendingWijze", "DI1").DanDoeNiks()
 	Do KlantMock.VerwachtMethodCall("Save").DanDoeNiks()
 	
+	Do ..LeverAdresUtilsMock.IndienMethodCall("GeefPrimairAdres",KlantMock,"Update").DanReturn(..GeefAddress())
+	
+	#dim LandMock As vhTest.Mock.DOM.common.Land = ##class(vhTest.Mock.DOM.common.Land).%New()
+	Do LandMock.IndienMethodCall("GeefCode").DanReturn("BE")
+	Do ..LandRepositoryMock.IndienMethodCall("GeefViaLandCodeIso3","BEL").DanReturn(LandMock)
+	
+	Do ..LeverAdresUtilsMock.IndienMethodCall("GeefPrimairAdres",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(..GeefAddress())
+	Do ..LeverAdresUtilsMock.IndienMethodCall("ZetLeverAdressenBestaandeKlant",KlantMock,$$$ElkeWaarde).DanDoeNiks()
+	
 	Do ..GeefConverter().Convert(..GeefCust("01111","Klant1"))
 
 	Do ..PartijApiMock.Verifieer()
@@ -73,41 +88,63 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test Geen update van verzendwijze bij update klant, indien ongekende verzendwijze">
-<Implementation><![CDATA[
+<UDLText name="T">
+<Content><![CDATA[
+/*
+Method "Test Geen update van verzendwijze bij update klant, indien ongekende verzendwijze"()
+{
 	Do ..VerkoopApiMock.VerwachtMethodCall("BestaatKlant","K||1111").DanReturn($$$True)
 	#Dim PartijMock as vhTest.Mock.DOM.PARTIJ.Partij = ..GeefPartij()
 	Do ..PartijApiMock.VerwachtMethodCall("GeefPartij","K||1111").DanReturn(PartijMock)
 	
 	#Dim KlantMock as vhTest.Mock.DOM.VKP.VanHoeckeKlant = ..GeefKlant()
-	DO ..VerkoopApiMock.VerwachtMethodCall("GeefKlant","K||1111").DanReturn(KlantMock)
-
+	Do ..VerkoopApiMock.VerwachtMethodCall("GeefKlant","K||1111").DanReturn(KlantMock)
+	
 	#dim Adres As DOM.VKP.LeverAdres = ..GeefAddress()
 	Do Adres.ZetVerzendingWijze("")
 
 	Do ..VerwachtZetNawGegevens(PartijMock, Adres)
 
 	Do KlantMock.VerwachtMethodCall("Save").DanDoeNiks()
+	;Do KlantMock.VerwachtMethodCall("GeefLeverAdressen").DanDoeNiks()
 	
+	Do ..LeverAdresUtilsMock.IndienMethodCall("GeefPrimairAdres",KlantMock,"Update").DanReturn(..GeefAddress())
+	
 	#dim Cust As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = ..GeefCust("01111","Klant1")
 	Set Cust.PostalAddress.GetAt(1).DlvModeId = "UnitTestOngekendeDlvMode"
+	
+	#dim LandMock As vhTest.Mock.DOM.common.Land = ##class(vhTest.Mock.DOM.common.Land).%New()
+	Do LandMock.IndienMethodCall("GeefCode").DanReturn("BE")
+	Do ..LandRepositoryMock.IndienMethodCall("GeefViaLandCodeIso3","BEL").DanReturn(LandMock)
+	
+	Do ..LeverAdresUtilsMock.IndienMethodCall("GeefPrimairAdres",Cust,$$$ElkeWaarde).DanReturn(..GeefAddress())
+	Do ..LeverAdresUtilsMock.IndienMethodCall("ZetLeverAdressenBestaandeKlant",KlantMock,Cust).DanDoeNiks()
+	
 	Do ..GeefConverter().Convert(Cust)
 
 	Do ..PartijApiMock.Verifieer()
 	Do ..VerkoopApiMock.Verifieer()
 	Do PartijMock.Verifieer()
 	Do KlantMock.Verifieer()
-]]></Implementation>
-</Method>
+}
+*/
+]]></Content>
+</UDLText>
 
 <Method name="Test Standaard gedrag bij creatie nieuwe klant">
 <Implementation><![CDATA[
 	#Dim KlantMock as vhTest.Mock.DOM.VKP.VanHoeckeKlant = ..GeefKlant()
 	Do ..VerwachtMaakKlantMetDI1VerzendWijze(KlantMock)
 	
-	#dim Converter As AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter = ##class(AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter).%New(..PartijApiMock, ..VerkoopApiMock,..KlantLevenCyclusServiceMock,,,..LeverAdresFactoryMock)
-	Do Converter.Convert(..GeefCust("01111","Klant1"))
+	#dim LandMock As vhTest.Mock.DOM.common.Land = ##class(vhTest.Mock.DOM.common.Land).%New()
+	Do LandMock.IndienMethodCall("GeefCode").DanReturn("BE")
+	Do ..LandRepositoryMock.IndienMethodCall("GeefViaLandCodeIso3","BEL").DanReturn(LandMock)
 	
+	Do ..LeverAdresUtilsMock.IndienMethodCall("GeefPrimairAdres",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(..GeefAddress())
+	Do ..LeverAdresUtilsMock.IndienMethodCall("ZetLeverAdressenNieuweKlant",KlantMock,$$$ElkeWaarde).DanDoeNiks()
+	
+	Do ..GeefConverter().Convert(..GeefCust("01111","Klant1"))
+	
 	Do ..VerkoopApiMock.Verifieer()
 	Do ..KlantLevenCyclusServiceMock.Verifieer()
 	Do KlantMock.Verifieer()
@@ -125,12 +162,10 @@
 	Do ..KlantLevenCyclusServiceMock.VerwachtMethodCall("MaakKlant",Matcher1,"ONDERNEMING").DanReturn("K||1111")
 	
 	#dim LeverAdres As DOM.VKP.LeverAdres = ..GeefAddress()
-	Do ..LeverAdresFactoryMock.IndienMethodCall("MaakLeverAdres").DanReturn(LeverAdres)
 	
 	DO ..VerkoopApiMock.VerwachtMethodCall("GeefKlant","K||1111").DanReturn(KlantMock)
 	Do KlantMock.VerwachtMethodCall("Save").DanDoeNiks()
 	Do KlantMock.VerwachtMethodCall("ZetVerzendingWijze", "DI1").DanDoeNiks()
-	Do KlantMock.VerwachtMethodCall("VoegToeLeverAdres", LeverAdres).DanDoeNiks()
 ]]></Implementation>
 </Method>
 
@@ -142,9 +177,15 @@
 	#dim Cust As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = ..GeefCust("01111","Klant1")
 	Set Cust.PostalAddress.GetAt(1).DlvModeId = "UnitTestOngekendeDlvMode"
 	
-	#dim Converter As AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter = ##class(AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter).%New(..PartijApiMock, ..VerkoopApiMock,..KlantLevenCyclusServiceMock,,,..LeverAdresFactoryMock)
-	Do Converter.Convert(Cust)
+	#dim LandMock As vhTest.Mock.DOM.common.Land = ##class(vhTest.Mock.DOM.common.Land).%New()
+	Do LandMock.IndienMethodCall("GeefCode").DanReturn("BE")
+	Do ..LandRepositoryMock.IndienMethodCall("GeefViaLandCodeIso3","BEL").DanReturn(LandMock)
 	
+	Do ..LeverAdresUtilsMock.IndienMethodCall("GeefPrimairAdres",Cust,$$$ElkeWaarde).DanReturn(..GeefAddress())
+	Do ..LeverAdresUtilsMock.IndienMethodCall("ZetLeverAdressenNieuweKlant",KlantMock,Cust).DanDoeNiks()
+	
+	Do ..GeefConverter().Convert(Cust)
+	
 	Do ..VerkoopApiMock.Verifieer()
 	Do ..KlantLevenCyclusServiceMock.Verifieer()
 	Do KlantMock.Verifieer()
@@ -165,10 +206,16 @@
 	DO ..VerkoopApiMock.VerwachtMethodCall("GeefKlant","K||1111").DanReturn(KlantMock)
 	Do KlantMock.VerwachtMethodCall("Save").DanDoeNiks()
 	Do KlantMock.VerwachtMethodCall("ZetVerzendingWijze", "DI1").DanDoeNiks()
-	Do KlantMock.VerwachtMethodCall("VoegToeLeverAdres", $$$ElkeWaarde).DanDoeNiks()
 	
 	#dim Cust as AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = ..GeefCust("01111","Klant1")
 	Set Cust.Name = "Klant1 GEENBVBA"
+	
+	#dim LandMock As vhTest.Mock.DOM.common.Land = ##class(vhTest.Mock.DOM.common.Land).%New()
+	Do LandMock.IndienMethodCall("GeefCode").DanReturn("BE")
+	Do ..LandRepositoryMock.IndienMethodCall("GeefViaLandCodeIso3","BEL").DanReturn(LandMock)
+	
+	Do ..LeverAdresUtilsMock.IndienMethodCall("GeefPrimairAdres",Cust,$$$ElkeWaarde).DanReturn(..GeefAddress())
+	Do ..LeverAdresUtilsMock.IndienMethodCall("ZetLeverAdressenNieuweKlant",KlantMock,Cust).DanDoeNiks()
 
 	Do ..GeefConverter().Convert(Cust)
 	
@@ -181,7 +228,7 @@
 <Method name="GeefConverter">
 <Private>1</Private>
 <ReturnType>AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter</ReturnType>
-<Implementation><![CDATA[	Quit ##class(AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter).%New(..PartijApiMock, ..VerkoopApiMock,..KlantLevenCyclusServiceMock,)
+<Implementation><![CDATA[	Quit ##class(AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter).%New(..PartijApiMock, ..VerkoopApiMock,..KlantLevenCyclusServiceMock, ..LandRepositoryMock, ..LeverAdresUtilsMock,)
 ]]></Implementation>
 </Method>
 
@@ -234,7 +281,7 @@
 <Private>1</Private>
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
 <Implementation><![CDATA[
-	Set Adres =  ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()
+	#dim Adres As DOM.VKP.LeverAdres =  ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()
 	Do Adres.ZetNaam("KLANT1")
     Do Adres.ZetAanspreking("BVBA")
 	Do Adres.ZetGemeente("PULDERBOS")
Index: AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml
===================================================================
diff -u
--- AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml	(revision 0)
+++ AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml	(revision 48545)
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.Dynamics.CustomerIn.Converter.LeverAdresUtils">
+<Super>TECH.RegisteredObject,TECH.Mockable</Super>
+
+<Property name="AxToAdminUtils">
+<Type>AXimpl.AxToAdminUtils</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="LeverAdresFactory">
+<Type>DOM.VKP.impl.LeverAdresFactory</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="LeveradresRepository">
+<Type>DOM.VKP.impl.LeverAdresRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="LandRepository">
+<Type>DOM.common.Locatie.impl.LandRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>LandRepository:DOM.common.Locatie.impl.LandRepository,Logger:vhLib.Logger,LeverAdresFactory:DOM.VKP.impl.LeverAdresFactory,LeveradresRepository:DOM.VKP.impl.LeverAdresRepository</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..AxToAdminUtils = ##class(AXimpl.AxToAdminUtils).%New()
+	Set ..LeverAdresFactory = $$$Inject(LeverAdresFactory,##class(DOM.VKP.impl.LeverAdresFactory).%New())
+	Set ..LandRepository  = $$$Inject(LandRepository,##class(DOM.common.Locatie.impl.LandRepository).%New())
+	Set ..LeveradresRepository = $$$Inject(LeveradresRepository,##class(DOM.VKP.impl.LeverAdresRepository).%New())
+	Set ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ZetLeverAdressenNieuweKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Implementation><![CDATA[
+	Set PostalAddressIterator = ##class(TECH.ListIterator).%New(Cust.PostalAddress)
+	While PostalAddressIterator.HasNext() {
+		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
+		If ..RolesContains(Address.Role ,"Delivery" ) {
+			#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
+			#dim InsertOfUpdate As %String = "Insert"
+			Do ..ZetNieuwLeverAdres(Adres, Address, Cust, InsertOfUpdate)
+			Do Klant.VoegToeLeverAdres(Adres)
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ZetLeverAdressenBestaandeKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Implementation><![CDATA[
+	#dim CacheLeverAdresLijst As %ListOfObjects = Klant.GeefLeverAdressen()
+	Set CacheIdLeverAdresLijst = ##class(%ListOfDataTypes).%New()
+	#dim N As %Integer
+	#dim CacheIdLeverAdresCount As %Integer = 0
+	For N=1:1:CacheLeverAdresLijst.Count() {
+		Set CacheIdLeverAdresCount = CacheIdLeverAdresCount + 1
+		#dim CacheIdLeverAdres As DOM.VKP.LeverAdres = CacheLeverAdresLijst.GetAt(CacheIdLeverAdresCount)
+		Do CacheIdLeverAdresLijst.Insert(CacheIdLeverAdres.ID)
+	}
+	Set PostalAddressIterator = ##class(TECH.ListIterator).%New(Cust.PostalAddress)
+	While PostalAddressIterator.HasNext() {
+		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
+		If ..RolesContains(Address.Role ,"Delivery" ) {
+			#dim CacheLeverAdresId As %String = ##class(TECH.StringUtils).LeftTrim($Extract($Piece(Address.TransporterAuth,"$$##",2),2,*))
+			#dim IsNieuwLeverAdres As %Boolean
+			#dim InsertOfUpdate As %String
+			Set IsNieuwLeverAdres = $$$If($$$Not(##class(TECH.ListUtils).Contains(CacheIdLeverAdresLijst,CacheLeverAdresId)),$$$True,$$$False)
+			If IsNieuwLeverAdres {
+				#dim NieuwAdres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
+				Set InsertOfUpdate = "Insert"
+				Do ..ZetNieuwLeverAdres(NieuwAdres, Address, Cust, InsertOfUpdate)
+				Do Klant.VoegToeLeverAdres(NieuwAdres)
+			} Else {
+				#Dim Node As %String = "L"_##class(TECH.StringUtils).AddLeadingSpace(CacheLeverAdresId,3)
+				#dim BestaandLeverAdres As DOM.VKP.LeverAdres = Klant.GeefSpecifiekAdres(Node)
+				#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
+				Set InsertOfUpdate = "Update"
+				Do Adres.ZetNaam($$$If($$$HasLength(Address.Description),$Piece(Address.Description," ",1),BestaandLeverAdres.GeefNaam()))
+				Do Adres.ZetAanspreking($$$If($$$HasLength(Address.Description),$Piece(Address.Description," ",2),BestaandLeverAdres.GeefAanspreking()))
+				Do Adres.ZetStraat($$$If($$$HasLength(Address.Street),Address.Street,BestaandLeverAdres.GeefStraat()))
+				Do Adres.ZetPostcode($$$If($$$HasLength(Address.ZipCode),Address.ZipCode,BestaandLeverAdres.GeefPostcode()))
+				Do Adres.ZetGemeente($$$If($$$HasLength(Address.City),Address.City,BestaandLeverAdres.GeefGemeente()))
+				Do Adres.ZetLandNr($$$If($$$HasLength(Address.CountryRegionId),..LandRepository.GeefViaLandCodeIso3(Address.CountryRegionId).GeefID(),BestaandLeverAdres.GeefLandNr()))
+				Do Adres.ZetTaal($$$If($$$HasLength(Cust.LanguageId),..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId),Klant.GeefTaal()))
+				If (($$$HasLength(Address.DlvModeId)) || ($$$HasLength(BestaandLeverAdres.GeefVerzendingWijze()))) {
+					Do Adres.ZetVerzendingWijze($$$If($$$HasLength(Address.DlvModeId),..MaakVerzendingWijze(Address.DlvModeId, Cust.CustAccount, InsertOfUpdate),BestaandLeverAdres.GeefVerzendingWijze()))
+				}
+				Do Adres.ZetOpmerking1($$$If($$$HasLength(Address.Nota1External),Address.Nota1External,BestaandLeverAdres.GeefOpmerking1()))
+				Do Adres.ZetOpmerking2($$$If($$$HasLength(Address.Nota2External),Address.Nota2External,BestaandLeverAdres.GeefOpmerking2()))
+				Do Adres.ZetType($$$If($$$HasLength(Address.Role),..AxToAdminUtils.ConvertLeverAdresType(Address.Role),BestaandLeverAdres.GeefType()))
+				Do Adres.ZetAxLeveradresId($$$If($$$HasLength(Address.LocationId),Address.LocationId,BestaandLeverAdres.GeefAxLeveradresId()))
+				Do Adres.ZetVolmacht($$$If($$$HasLength(Address.TransporterAuth),$Piece(Address.TransporterAuth,"$$##",1),BestaandLeverAdres.GeefVolmacht()))
+				Set Adres.ID = CacheLeverAdresId
+				Do ..LeveradresRepository.Bewaar(Klant, Adres)
+			}
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ZetNieuwLeverAdres">
+<FormalSpec>Adres:DOM.VKP.LeverAdres,Address:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,InsertOfUpdate:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[
+	Set Adres = ..ZetGemeenschappelijkePropertiesOpAdres(Adres, Address, Cust, InsertOfUpdate)
+	Do Adres.ZetOpmerking1(Address.Nota1External)
+	Do Adres.ZetOpmerking2(Address.Nota2External)
+	Do Adres.ZetType(..AxToAdminUtils.ConvertLeverAdresType(Address.Role))
+	Do Adres.ZetAxLeveradresId(Address.LocationId)
+	Do Adres.ZetVolmacht($Piece(Address.TransporterAuth,"$$##",1))
+	Quit Adres
+]]></Implementation>
+</Method>
+
+<Method name="ZetGemeenschappelijkePropertiesOpAdres">
+<FormalSpec>Adres:DOM.VKP.LeverAdres,Address:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,InsertOfUpdate:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[
+	Do Adres.ZetNaam($Piece(Address.Description," ",1))
+	Do Adres.ZetAanspreking($Piece(Address.Description," ",2))
+	Do Adres.ZetStraat(Address.Street)
+	Do Adres.ZetPostcode(Address.ZipCode)
+	Do Adres.ZetGemeente(Address.City)
+	Do Adres.ZetLandNr(..LandRepository.GeefViaLandCodeIso3(Address.CountryRegionId).GeefID())
+	Do Adres.ZetTaal(..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId))
+	If ($$$HasLength(Address.DlvModeId)) {
+		Do Adres.ZetVerzendingWijze(..MaakVerzendingWijze(Address.DlvModeId, Cust.CustAccount, InsertOfUpdate))
+	}
+	Quit Adres
+]]></Implementation>
+</Method>
+
+<Method name="MaakVerzendingWijze">
+<FormalSpec>DlvMode:%String,CustAccount:%String,InsertOfUpdate:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim VerzendWijzeAdmin = ""
+	Try {
+		Set VerzendWijzeAdmin = ..AxToAdminUtils.ConvertVerzendingWijze(DlvMode)
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		If ##class(TECH.Config.ConfigMgr).Instance().GetBoolean("AXimpl.AxToAdminUtils.ConvertVerzendingWijze.NeemDI1IndienNietGevondenActief") {
+			Do ..Logger.ErrorMail("MaakVerzendingWijze gefaald", "Klant='"_CustAccount_"', Probleem: "_Exception.ToString())
+		} Else {
+			Do ..Logger.Warning("MaakVerzendingWijze gefaald", "Klant='"_CustAccount_"', Probleem: "_Exception.ToString())
+		}
+		If ("Insert" = InsertOfUpdate) {
+			Set VerzendWijzeAdmin = $Translate(##class(DOM.VKP.enu.VerzendWijze).Distributeur1()," ")
+		} Else {
+			Set VerzendWijzeAdmin = ""
+		}
+	}
+	Quit VerzendWijzeAdmin
+]]></Implementation>
+</Method>
+
+<Method name="RolesContains">
+<FormalSpec>Roles:%ListOfDataTypes,Name:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim Result as %Boolean = $$$False
+	Set RoleIterator = ##class(TECH.ListIterator).%New(Roles)
+	While (RoleIterator.HasNext() && $$$Not(Result)) {
+		#dim Role as  AXif.Dynamics.CustomerIn.MessageParts.AxdEntityRole = RoleIterator.Next()
+		Set:(Role.Name = Name) Result = $$$True
+	}
+	Quit Result
+]]></Implementation>
+</Method>
+
+<Method name="GeefPrimairAdres">
+<FormalSpec>Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,InsertOfUpdate:%String</FormalSpec>
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[
+	
+	#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()	
+	Set PostalAddressIterator = ##class(TECH.ListIterator).%New(Cust.PostalAddress)
+	While PostalAddressIterator.HasNext() {
+		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
+		if (Address.IsPrimary = "Yes") && ..RolesContains(Address.Role ,"Business" ){
+			Set Adres = ..ZetGemeenschappelijkePropertiesOpAdres(Adres, Address, Cust, InsertOfUpdate)
+			Do Adres.ZetType("")
+		}
+	}
+	Quit Adres
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/DOM/common/Land.cls.xml
===================================================================
diff -u
--- vhTest/Mock/DOM/common/Land.cls.xml	(revision 0)
+++ vhTest/Mock/DOM/common/Land.cls.xml	(revision 48545)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.DOM.common.Land">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>DOM.common.Land,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="GeefCode">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefCode")
+]]></Implementation>
+</Method>
+
+<Method name="GeefID">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefID")
+]]></Implementation>
+</Method>
+
+<Method name="GeefIso3">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefIso3")
+]]></Implementation>
+</Method>
+
+<Method name="GeefNaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefNaam")
+]]></Implementation>
+</Method>
+
+<Method name="IsBENELUX">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("IsBENELUX")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>