Index: vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml
===================================================================
diff -u -r38269 -r38281
--- vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 38269)
+++ vhUnitTest/AXimpl/BizTalkMessage/Converter/AddressUpsertConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 38281)
@@ -60,6 +60,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Verzendingwijze met ;&apos;s wijzigen naar -&apos;s">
+<Implementation><![CDATA[
+	Do ..Leveradres.ZetVerzendingWijze("OD;2'OD;5")
+	
+	#dim GeconverteerdeLeverAdres As AXBizTalk.Crm.Address.Upsert.Address = ..GeefAddress(..Leveradres.GeefID())
+	Do $$$AssertEquals(GeconverteerdeLeverAdres.Verzendwijze,"OD-2'OD-5")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Geen landcode in leveradres -&gt; defaulten naar landcode van hoofdadres">
 <Implementation><![CDATA[
 	Do ..Leveradres.ZetLandNr("")
Index: AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml
===================================================================
diff -u -r38269 -r38281
--- AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38269)
+++ AXimpl/BizTalkMessage/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 38281)
@@ -52,7 +52,7 @@
 		Set ..Address.LandCodeISO3 = Adres.GeefLand().GeefIso3()
 	}
 	Set ..Address.Telefoon = Adres.GeefTelefoon()
-	Set ..Address.Verzendwijze = Adres.GeefVerzendingWijze()
+	Set ..Address.Verzendwijze = $$$Replace(Adres.GeefVerzendingWijze(),";","-")
 	Set ..Address.BezoekAdres = $$$False
 	Set ..Address.FacturatieAdres = $$$False
 	Set ..Address.LeveringAdres = $$$False
Index: vhTest/Fake/DOM/VKP/LeverAdres.cls.xml
===================================================================
diff -u -r38269 -r38281
--- vhTest/Fake/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 38269)
+++ vhTest/Fake/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 38281)
@@ -18,6 +18,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="VerzendingWijze">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>ID:%String=""</FormalSpec>
 <Private>1</Private>
@@ -80,7 +85,7 @@
 
 <Method name="GeefVerzendingWijze">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "VerzendingWijze"_..ID
+<Implementation><![CDATA[	Quit $Select(..VerzendingWijze="":"VerzendingWijze"_..ID,1:..VerzendingWijze)
 ]]></Implementation>
 </Method>
 
@@ -107,6 +112,12 @@
 <Implementation><![CDATA[	Set ..LandNr = LandNr
 ]]></Implementation>
 </Method>
+
+<Method name="ZetVerzendingWijze">
+<FormalSpec>VerzendingWijze:%String</FormalSpec>
+<Implementation><![CDATA[	Set ..VerzendingWijze = VerzendingWijze
+]]></Implementation>
+</Method>
 </Class>