Index: vhTest/Fake/DOM/VKP/LeverAdres.cls.xml
===================================================================
diff -u -r38109 -r38113
--- vhTest/Fake/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 38109)
+++ vhTest/Fake/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 38113)
@@ -8,6 +8,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="AdresType">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>ID:%String=""</FormalSpec>
 <Private>1</Private>
@@ -73,6 +78,18 @@
 <Implementation><![CDATA[	Quit "Klant "_..ID
 ]]></Implementation>
 </Method>
+
+<Method name="GeefAdresType">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $Select(..AdresType="":"L",1:..AdresType)
+]]></Implementation>
+</Method>
+
+<Method name="ZetAdresType">
+<FormalSpec>AdresType:%String</FormalSpec>
+<Implementation><![CDATA[	Set ..AdresType = AdresType
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml
===================================================================
diff -u -r38108 -r38113
--- vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 38108)
+++ vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 38113)
@@ -47,6 +47,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Facturatieadres">
+<Implementation><![CDATA[
+	Do ..Leveradres.ZetAdresType("F")
+	
+	#dim GeconverteerdeLeverAdres As AXBizTalk.Crm.Address.Upsert.Address = ..GeefAddress(..Leveradres.GeefID())
+	Do $$$AssertEquals(GeconverteerdeLeverAdres.FacturatieAdres,$$$True)
+	Do $$$AssertEquals(GeconverteerdeLeverAdres.LeveringAdres,$$$False)
+]]></Implementation>
+</Method>
+
 <Method name="GeefAddress">
 <FormalSpec>LeveradresId:%String</FormalSpec>
 <ReturnType>AXBizTalk.Crm.Address.Upsert.Address</ReturnType>
Index: AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml
===================================================================
diff -u -r38108 -r38113
--- AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38108)
+++ AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38113)
@@ -49,10 +49,15 @@
 	Set ..Address.LandCodeISO3 = Adres.GeefLand().GeefIso3()
 	Set ..Address.Telefoon = Adres.GeefTelefoon()
 	Set ..Address.Verzendwijze = Adres.GeefVerzendingWijze()
-	Set ..Address.LeveringAdres = $$$True
 	Set ..Address.BezoekAdres = $$$False
-	Set ..Address.ToonzaalAdres = $$$False
 	Set ..Address.FacturatieAdres = $$$False
+	Set ..Address.LeveringAdres = $$$False
+	Set ..Address.ToonzaalAdres = $$$False
+	If Adres.GeefAdresType() = "F" {
+		Set ..Address.FacturatieAdres = $$$True
+	} Else {
+		Set ..Address.LeveringAdres = $$$True
+	}
 		
 	Set MessageParts = ##class(AXBizTalk.Crm.Address.Upsert.MessageParts).%New()
 	Set MessageParts.Address = ..Address
Index: vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/LeveradresRepository/GeefViaKlantIdEnAdresVolgnummer/Test.cls.xml
===================================================================
diff -u -r38109 -r38113
--- vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/LeveradresRepository/GeefViaKlantIdEnAdresVolgnummer/Test.cls.xml	(.../Test.cls.xml)	(revision 38109)
+++ vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/LeveradresRepository/GeefViaKlantIdEnAdresVolgnummer/Test.cls.xml	(.../Test.cls.xml)	(revision 38113)
@@ -37,15 +37,15 @@
 	Set LeveradresRepository = ##class(AXimpl.BizTalkMessage.Converter.AddressUpsertConverter.LeveradresRepository).%New()
 	#dim LeverAdres As DOM.VKP.impl.LeverAdres = LeveradresRepository.GeefViaKlantIdEnAdresVolgnummer("K||"_..#TestKlantnummer,"1")
 	
-	Do $$$AssertEquals(LeverAdres.UniekId,"84691")
+	Do $$$AssertEquals(LeverAdres.GeefUniekId(),"84691")
 	Do $$$AssertEquals(LeverAdres.Straat,"TRADEBOULEVARD 5 A")
 	Do $$$AssertEquals(LeverAdres.Postcode,"NL-4761-RL")
 	Do $$$AssertEquals(LeverAdres.Gemeente,"ZEVENBERGEN")
 	Do $$$AssertEquals(LeverAdres.LandNr,"1147")
 	Do $$$AssertEquals(LeverAdres.Telefoon,"0031887651900")
 	Do $$$AssertEquals(LeverAdres.VerzendingWijze,"OD;4")
-	Do $$$AssertEquals(LeverAdres.AdresType,"L")
-	Do $$$AssertEquals(LeverAdres.KlantId,"K||"_..#TestKlantnummer)
+	Do $$$AssertEquals(LeverAdres.GeefAdresType(),"L")
+	Do $$$AssertEquals(LeverAdres.GeefKlantId(),"K||"_..#TestKlantnummer)
 ]]></Implementation>
 </Method>
 
@@ -57,15 +57,15 @@
 	Set LeveradresRepository = ##class(AXimpl.BizTalkMessage.Converter.AddressUpsertConverter.LeveradresRepository).%New()
 	#dim LeverAdres As DOM.VKP.impl.LeverAdres = LeveradresRepository.GeefViaKlantIdEnAdresVolgnummer("K||"_..#TestKlantnummer,"2")
 	
-	Do $$$AssertEquals(LeverAdres.UniekId,"84692")
+	Do $$$AssertEquals(LeverAdres.GeefUniekId(),"84692")
 	Do $$$AssertEquals(LeverAdres.Straat,"TRADEBOULEVARD 5 A")
 	Do $$$AssertEquals(LeverAdres.Postcode,"NL-4761-RL")
 	Do $$$AssertEquals(LeverAdres.Gemeente,"ZEVENBERGEN")
 	Do $$$AssertEquals(LeverAdres.LandNr,"1147")
 	Do $$$AssertEquals(LeverAdres.Telefoon,"0031887651900")
 	Do $$$AssertEquals(LeverAdres.VerzendingWijze,"OD;4")
-	Do $$$AssertEquals(LeverAdres.AdresType,"L")
-	Do $$$AssertEquals(LeverAdres.KlantId,"K||"_..#TestKlantnummer)
+	Do $$$AssertEquals(LeverAdres.GeefAdresType(),"L")
+	Do $$$AssertEquals(LeverAdres.GeefKlantId(),"K||"_..#TestKlantnummer)
 ]]></Implementation>
 </Method>
 
Index: DOM/VKP/impl/LeverAdres.cls.xml
===================================================================
diff -u -r38109 -r38113
--- DOM/VKP/impl/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 38109)
+++ DOM/VKP/impl/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 38113)
@@ -72,14 +72,17 @@
 
 <Property name="UniekId">
 <Type>%String</Type>
+<Private>1</Private>
 </Property>
 
 <Property name="AdresType">
 <Type>%String</Type>
+<Private>1</Private>
 </Property>
 
 <Property name="KlantId">
 <Type>%String</Type>
+<Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
@@ -222,11 +225,16 @@
 
 <Method name="ZetAdresType">
 <FormalSpec>AdresType:%String</FormalSpec>
-<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Set ..AdresType = AdresType
 ]]></Implementation>
 </Method>
 
+<Method name="ZetKlantId">
+<FormalSpec>KlantId:%String</FormalSpec>
+<Implementation><![CDATA[	Set ..KlantId = KlantId
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
 <DataLocation>^DOM.common.impl.AdresD</DataLocation>
Index: AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/LeveradresRepository.cls.xml
===================================================================
diff -u -r38107 -r38113
--- AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/LeveradresRepository.cls.xml	(.../LeveradresRepository.cls.xml)	(revision 38107)
+++ AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/LeveradresRepository.cls.xml	(.../LeveradresRepository.cls.xml)	(revision 38113)
@@ -46,15 +46,15 @@
 	}
 	
 	Set Leveradres = ##class(DOM.VKP.impl.LeverAdres).%New()
-	Set Leveradres.UniekId = $Piece(Key,"\",28)
+	Do Leveradres.ZetUniekId($Piece(Key,"\",28))
 	Set Leveradres.Straat = $Piece(Key,"\",5)
 	Set Leveradres.Postcode = $Piece(Key,"\",6)
 	Set Leveradres.Gemeente = $Piece(Key,"\",7)
 	Set Leveradres.LandNr = $Piece(Key,"\",8)
 	Set Leveradres.Telefoon = $Piece(Key,"\",13)
 	Set Leveradres.VerzendingWijze = $Piece(Key,"\",26)
-	Set Leveradres.AdresType = $Piece(Key,"\",12)
-	Set Leveradres.KlantId = KlantId
+	Do Leveradres.ZetAdresType($Piece(Key,"\",12))
+	Do Leveradres.ZetKlantId(KlantId)
 	
 	Quit Leveradres
 ]]></Implementation>