Index: AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml
===================================================================
diff -u -r48483 -r48495
--- AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48483)
+++ AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48495)
@@ -170,14 +170,7 @@
 	While PostalAddressIterator.HasNext() {
 		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
 		if (Address.IsPrimary = "Yes") && ..RolesContains(Address.Role ,"Business" ){
-			Do Adres.ZetAanspreking($Piece(Address.Description," ",2))
-			Do Adres.ZetGemeente(Address.City)
-			Do Adres.ZetLandNr(..LandRepository.GeefViaLandCodeIso3(Address.CountryRegionId).GeefID())
-			Do Adres.ZetNaam($Piece(Address.Description," ",1))
-			Do Adres.ZetPostcode(Address.ZipCode)
-			Do Adres.ZetStraat(Address.Street)
-			Do Adres.ZetTaal(..AxToAdminUtils.ConvertLanguageId(Cust.LanguageId))
-			Do Adres.ZetVerzendingWijze(..MaakVerzendingWijze(Address.DlvModeId, Cust.CustAccount, InsertOfUpdate))
+			Set Adres = ..ZetGemeenschappelijkePropertiesOpAdres(Adres, Address, Cust, InsertOfUpdate)
 			Do Adres.ZetType("")
 		}
 	}
@@ -313,33 +306,40 @@
 ]]></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>
+
 <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.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.ZetOpmerking1(Address.Nota1External)
-				Do Adres.ZetOpmerking2(Address.Nota2External)
-				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)
-			}
+		If ..RolesContains(Address.Role ,"Delivery" ) {
+			#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
+			#dim InsertOfUpdate As %String = "Insert"
+			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(Address.TransporterAuth)
+			Do Klant.VoegToeLeverAdres(Adres)
 		}
 	}
 ]]></Implementation>
Index: vhTest/Fake/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml
===================================================================
diff -u -r48388 -r48495
--- vhTest/Fake/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48388)
+++ vhTest/Fake/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 48495)
@@ -19,6 +19,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetLeverAdressenNieuweKlant">
+<FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
 <Method name="RolesContains">
 <FormalSpec>Roles:%ListOfDataTypes,Name:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>