Index: AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml
===================================================================
diff -u -r38304 -r38310
--- AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38304)
+++ AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38310)
@@ -59,6 +59,8 @@
 	Set ..Address.ToonzaalAdres = $$$False
 	If Adres.GeefAdresType() = "F" {
 		Set ..Address.FacturatieAdres = $$$True
+	} ElseIf Adres.GeefAdresType() = "B" {
+		Set ..Address.BezoekAdres = $$$True
 	} Else {
 		Set ..Address.LeveringAdres = $$$True
 	}
Index: vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml
===================================================================
diff -u -r38304 -r38310
--- vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 38304)
+++ vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 38310)
@@ -57,9 +57,21 @@
 	#dim GeconverteerdeLeverAdres As AXBizTalk.Crm.Address.Upsert.Address = ..GeefAddress(..Leveradres.GeefID())
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.FacturatieAdres,$$$True)
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.LeveringAdres,$$$False)
+	Do $$$AssertEquals(GeconverteerdeLeverAdres.BezoekAdres,$$$False)
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Bezoekadres">
+<Implementation><![CDATA[
+	Do ..Leveradres.ZetAdresType("B")
+	
+	#dim GeconverteerdeLeverAdres As AXBizTalk.Crm.Address.Upsert.Address = ..GeefAddress(..Leveradres.GeefID())
+	Do $$$AssertEquals(GeconverteerdeLeverAdres.FacturatieAdres,$$$False)
+	Do $$$AssertEquals(GeconverteerdeLeverAdres.LeveringAdres,$$$False)
+	Do $$$AssertEquals(GeconverteerdeLeverAdres.BezoekAdres,$$$True)
+]]></Implementation>
+</Method>
+
 <Method name="Test: Verzendingwijze met ;&apos;s wijzigen naar -&apos;s">
 <Implementation><![CDATA[
 	Do ..Leveradres.ZetVerzendingWijze("OD;2`OD;5")