Index: AXimpl/AxToAdminUtils.cls.xml
===================================================================
diff -u -r48386 -r48481
--- AXimpl/AxToAdminUtils.cls.xml	(.../AxToAdminUtils.cls.xml)	(revision 48386)
+++ AXimpl/AxToAdminUtils.cls.xml	(.../AxToAdminUtils.cls.xml)	(revision 48481)
@@ -369,6 +369,18 @@
 	quit ##class(DOM.enu.Taal).Nederlands()
 ]]></Implementation>
 </Method>
+
+<Method name="ConvertLeverAdresType">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>PostalAddressRole:%String</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Quit:PostalAddressRole="Delivery" "L"
+	Quit:PostalAddressRole="Real location" "B"
+	Quit:PostalAddressRole="Invoice" "F"
+	Quit ""
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml
===================================================================
diff -u -r48388 -r48481
--- vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 48388)
+++ vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 48481)
@@ -18,6 +18,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="LeverAdresFactoryMock">
+<Type>DOM.VKP.impl.LeverAdresFactory</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -26,6 +31,7 @@
 	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()
 ]]></Implementation>
 </Method>
 
@@ -99,7 +105,8 @@
 	#Dim KlantMock as vhTest.Mock.DOM.VKP.VanHoeckeKlant = ..GeefKlant()
 	Do ..VerwachtMaakKlantMetDI1VerzendWijze(KlantMock)
 	
-	Do ..GeefConverter().Convert(..GeefCust("01111","Klant1"))
+	#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"))
 	
 	Do ..VerkoopApiMock.Verifieer()
 	Do ..KlantLevenCyclusServiceMock.Verifieer()
@@ -109,16 +116,21 @@
 
 <Method name="VerwachtMaakKlantMetDI1VerzendWijze">
 <FormalSpec>KlantMock:vhTest.Mock.DOM.VKP.VanHoeckeKlant</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	Do ..VerkoopApiMock.VerwachtMethodCall("BestaatKlant","K||1111").DanReturn($$$False)
 		
 	#dim VerwachteKlantDto as DOM.common.dto.Partij = ..GeefKlantDto()
 	Set Matcher1 = ##class(vhUnitTest.AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter.PartijMatcher).%New(VerwachteKlantDto)
 	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>
 
@@ -129,8 +141,10 @@
 	
 	#dim Cust As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = ..GeefCust("01111","Klant1")
 	Set Cust.PostalAddress.GetAt(1).DlvModeId = "UnitTestOngekendeDlvMode"
-	Do ..GeefConverter().Convert(Cust)
 	
+	#dim Converter As AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter = ##class(AXimpl.Dynamics.CustomerIn.Converter.CustomerInConverter).%New(..PartijApiMock, ..VerkoopApiMock,..KlantLevenCyclusServiceMock,,,..LeverAdresFactoryMock)
+	Do Converter.Convert(Cust)
+	
 	Do ..VerkoopApiMock.Verifieer()
 	Do ..KlantLevenCyclusServiceMock.Verifieer()
 	Do KlantMock.Verifieer()
@@ -151,6 +165,7 @@
 	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"
@@ -220,7 +235,8 @@
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
 <Implementation><![CDATA[
 	Set Adres =  ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()
-    Do Adres.ZetAanspreking("KLANT1 BVBA")
+	Do Adres.ZetNaam("KLANT1")
+    Do Adres.ZetAanspreking("BVBA")
 	Do Adres.ZetGemeente("PULDERBOS")
 	Do Adres.ZetLandNr(1019)
 	Do Adres.ZetPostcode("2242")
Index: AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml
===================================================================
diff -u -r48388 -r48481
--- AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48388)
+++ AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48481)
@@ -23,6 +23,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="LeverAdresFactory">
+<Type>DOM.VKP.impl.LeverAdresFactory</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="LandRepository">
 <Type>DOM.common.Locatie.impl.LandRepository</Type>
 <Private>1</Private>
@@ -34,7 +39,7 @@
 </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</FormalSpec>
+<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</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -44,6 +49,7 @@
 	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 ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New())
 	Quit $$$OK
@@ -119,6 +125,7 @@
 	#Dim Klant as DOM.VKP.VanHoeckeKlant = ..VerkoopApi.GeefKlant(PartijID)	
 	Do Klant.ZetVerzendingWijze(dtoKlant.Adres.GeefVerzendingWijze())
 	Do Klant.Save()
+	Do ..ZetLeverAdressenNieuweKlant(Klant, Cust)
 ]]></Implementation>
 </Method>
 
@@ -158,15 +165,15 @@
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
 <Implementation><![CDATA[
 	
-	Set Adres =  ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()		
+	#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" ){
-			Do Adres.ZetAanspreking(Address.Description)
+			Do Adres.ZetAanspreking($Piece(Address.Description," ",2))
 			Do Adres.ZetGemeente(Address.City)
 			Do Adres.ZetLandNr(..LandRepository.GeefViaLandCodeIso3(Address.CountryRegionId).GeefID())
-			;??? Do Adres.ZetNaam("AdresNaam")
+			Do Adres.ZetNaam($Piece(Address.Description," ",1))
 			Do Adres.ZetPostcode(Address.ZipCode)
 			Do Adres.ZetStraat(Address.Street)
 			Do Adres.ZetTaal(..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId))
@@ -306,6 +313,40 @@
 <Implementation><![CDATA[	Quit ..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId)
 ]]></Implementation>
 </Method>
+
+<Method name="ZetLeverAdressenNieuweKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set PostalAddressIterator = ##class(TECH.ListIterator).%New(Cust.PostalAddress)
+	While PostalAddressIterator.HasNext() {
+		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
+		Set RoleIterator = ##class(TECH.ListIterator).%New(Address.Role)
+		While RoleIterator.HasNext() {
+			#dim Role As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityRole = RoleIterator.Next()
+			If (..AxToAdminUtils.ConvertLeverAdresType(Role.Name) = "L") {
+				#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
+				Do Adres.ZetNaam($Piece(Address.Description," ",1))
+				;??? Do Adres.ZetToenaam("AdresToenaam")
+				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.ZetTelefoon(Address.Nota1External)
+				Do Adres.ZetOpmerking1($Extract(Address.Nota2External,1,50))
+				Do Adres.ZetOpmerking2($Extract(Address.Nota2External,51,*))
+				Do Adres.ZetVerzendingWijze(..MaakVerzendingWijze(Address.DlvModeId, Cust.CustAccount, "Insert"))
+				Do Adres.ZetType(..AxToAdminUtils.ConvertLeverAdresType(Role.Name))
+				Do Adres.ZetAxLeveradresId(Address.LocationId)
+				Do Adres.ZetVolmacht(Address.TransporterAuth)
+				Do Klant.VoegToeLeverAdres(Adres)
+			}
+		}
+	}
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Mock/DOM/VKP/impl/LeverAdresFactory.cls.xml
===================================================================
diff -u
--- vhTest/Mock/DOM/VKP/impl/LeverAdresFactory.cls.xml	(revision 0)
+++ vhTest/Mock/DOM/VKP/impl/LeverAdresFactory.cls.xml	(revision 48481)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.DOM.VKP.impl.LeverAdresFactory">
+<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.VKP.impl.LeverAdresFactory,vhTest.Mock.DOM.VKP.LeverAdresFactory</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="MaakLeverAdres">
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakLeverAdres")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/DOM/VKP/impl/LeverAdresFactory.cls.xml
===================================================================
diff -u
--- vhTest/Fake/DOM/VKP/impl/LeverAdresFactory.cls.xml	(revision 0)
+++ vhTest/Fake/DOM/VKP/impl/LeverAdresFactory.cls.xml	(revision 48481)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.DOM.VKP.impl.LeverAdresFactory">
+<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>DOM.VKP.impl.LeverAdresFactory</Super>
+
+<Method name="MaakLeverAdres">
+<ReturnType>DOM.VKP.LeverAdres</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/VKP/impl/LeverAdresFactory.cls.xml
===================================================================
diff -u -r29059 -r48481
--- DOM/VKP/impl/LeverAdresFactory.cls.xml	(.../LeverAdresFactory.cls.xml)	(revision 29059)
+++ DOM/VKP/impl/LeverAdresFactory.cls.xml	(.../LeverAdresFactory.cls.xml)	(revision 48481)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="DOM.VKP.impl.LeverAdresFactory">
-<Super>TECH.RegisteredObject,DOM.VKP.LeverAdresFactory</Super>
+<Super>TECH.RegisteredObject,DOM.VKP.LeverAdresFactory,TECH.Mockable</Super>
 
 <Method name="MaakLeverAdres">
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>