Index: AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml
===================================================================
diff -u -r49725 -r49727
--- AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml	(.../LeverAdresUtils.cls.xml)	(revision 49725)
+++ AXimpl/Dynamics/CustomerIn/Converter/LeverAdresUtils.cls.xml	(.../LeverAdresUtils.cls.xml)	(revision 49727)
@@ -59,7 +59,7 @@
 	While PostalAddressIterator.HasNext() {
 		#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = PostalAddressIterator.Next()
 		If (Address.IsPrimary = "Yes") && ..RolesContains(Address.Role ,"Business") {
-			Set Adres = ..ZetAdres(Adres, Address, Cust, Adres)
+			Set Adres = ..ZetAdres(Adres, Address, Cust, Adres, $$$True)
 		}
 	}
 	Quit Adres
@@ -77,7 +77,7 @@
 		If ..RolesContains(Address.Role ,"Delivery" ) {
 			#dim Adres As DOM.VKP.LeverAdres = ..LeverAdresFactory.MaakLeverAdres()
 			#dim BestaandLeverAdres As DOM.VKP.LeverAdres = $$$If(..LeveradresRepository.BestaatViaAXLeverAdresId(Address.LocationId),..LeveradresRepository.GeefViaAXLeverAdresId(Address.LocationId),Adres)
-			Do ..ZetAdres(Adres, Address, Cust, BestaandLeverAdres)
+			Do ..ZetAdres(Adres, Address, Cust, BestaandLeverAdres, $$$False)
 			If $$$Not(..LeveradresRepository.BestaatViaAXLeverAdresId(Address.LocationId)) {
 				Do Klant.VoegToeLeverAdres(Adres)
 			} Else {
@@ -110,7 +110,7 @@
 </Method>
 
 <Method name="ZetAdres">
-<FormalSpec>Adres:DOM.VKP.LeverAdres,Address:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,BestaandLeverAdres:DOM.VKP.LeverAdres</FormalSpec>
+<FormalSpec>Adres:DOM.VKP.LeverAdres,Address:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress,Cust:AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust,BestaandLeverAdres:DOM.VKP.LeverAdres,IsPrimairAdres:%Boolean</FormalSpec>
 <Private>1</Private>
 <ReturnType>DOM.VKP.LeverAdres</ReturnType>
 <Implementation><![CDATA[
@@ -125,7 +125,7 @@
 		Do Adres.ZetVerzendingWijze($$$If($$$HasLength(Address.DlvModeId),..MaakVerzendingWijze(Address.DlvModeId, Cust.CustAccount, Address.LocationId),BestaandLeverAdres.GeefVerzendingWijze()))
 	}
 	Do Adres.ZetType("")
-	If (($$$Not(..RolesContains(Address.Role ,"Business")) && ($$$Not(Address.IsPrimary = "Yes")))) {
+	If $$$Not(IsPrimairAdres) {
 		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()))