Index: vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml
===================================================================
diff -u -r49893 -r49941
--- vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml	(.../Test.cls.xml)	(revision 49893)
+++ vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml	(.../Test.cls.xml)	(revision 49941)
@@ -172,6 +172,23 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: LineFeeds in Opmerking1 en Opmerking2 worden vervangen door een spatie">
+<Implementation><![CDATA[
+	Set AdresZetter = ##class(AXimpl.Dynamics.CustomerIn.Converter.AdresZetter).%New()
+	#dim Adres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()
+	#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = ..GeefAxLeverAdres()
+	Set Address.Nota1External = "1234567890"_$Char(10)_"1234567890123456789012345678901234567890"
+	Set Address.Nota2External = "1234567890"_$Char(10)_"1234567890123456789012345678901234567890"
+	#dim Cust As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = ..GeefAxCust()
+	#dim BestaandLeverAdres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	#dim IsPrimairAdres As %Boolean = $$$False
+	#dim GezetAdres As DOM.VKP.LeverAdres = AdresZetter.ZetAdres(Adres, Address, Cust, BestaandLeverAdres, IsPrimairAdres)
+	
+	Do $$$AssertEquals(GezetAdres.GeefOpmerking1(),"1234567890 12345678901234567890123456789")
+	Do $$$AssertEquals(GezetAdres.GeefOpmerking2(),"1234567890 12345678901234567890123456789")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Volmacht moet afgekapt worden op 35 karakters">
 <Implementation><![CDATA[
 	Set AdresZetter = ##class(AXimpl.Dynamics.CustomerIn.Converter.AdresZetter).%New()
@@ -187,6 +204,21 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: LineFeeds in Volmacht worden vervangen door een spatie">
+<Implementation><![CDATA[
+	Set AdresZetter = ##class(AXimpl.Dynamics.CustomerIn.Converter.AdresZetter).%New()
+	#dim Adres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdresFactory).%New().MaakLeverAdres()
+	#dim Address As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityPostalAddress = ..GeefAxLeverAdres()
+	Set Address.TransporterAuth = "1234567890"_$Char(10)_"1234567890123456789012345678901234567890"
+	#dim Cust As AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = ..GeefAxCust()
+	#dim BestaandLeverAdres As DOM.VKP.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
+	#dim IsPrimairAdres As %Boolean = $$$False
+	#dim GezetAdres As DOM.VKP.LeverAdres = AdresZetter.ZetAdres(Adres, Address, Cust, BestaandLeverAdres, IsPrimairAdres)
+	
+	Do $$$AssertEquals(GezetAdres.GeefVolmacht(),"1234567890 123456789012345678901234")
+]]></Implementation>
+</Method>
+
 <Method name="GeefAxCust">
 <Private>1</Private>
 <ReturnType>AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust</ReturnType>
Index: AXimpl/Dynamics/CustomerIn/Converter/AdresZetter.cls.xml
===================================================================
diff -u -r49911 -r49941
--- AXimpl/Dynamics/CustomerIn/Converter/AdresZetter.cls.xml	(.../AdresZetter.cls.xml)	(revision 49911)
+++ AXimpl/Dynamics/CustomerIn/Converter/AdresZetter.cls.xml	(.../AdresZetter.cls.xml)	(revision 49941)
@@ -58,11 +58,11 @@
 		Do Adres.ZetNaam($Extract(Address.Description,1,25))
 		Do Adres.ZetPostcode(Address.ZipCode)
 		Do Adres.ZetTelefoon(BestaandLeverAdres.GeefTelefoon())
-		Do Adres.ZetOpmerking1($Extract(Address.Nota1External,1,40))
-		Do Adres.ZetOpmerking2($Extract(Address.Nota2External,1,40))
+		Do Adres.ZetOpmerking1($Extract($Translate(Address.Nota1External,$Char(10)," "),1,40))
+		Do Adres.ZetOpmerking2($Extract($Translate(Address.Nota2External,$Char(10)," "),1,40))
 		Do Adres.ZetType(..AxToAdminUtils.ConvertLeverAdresType(Address.Role))
 		Do Adres.ZetAxLeveradresId(Address.LocationId)
-		Do Adres.ZetVolmacht($Extract($Piece(Address.TransporterAuth,"$$##",1),1,35))
+		Do Adres.ZetVolmacht($Extract($Piece($Translate(Address.TransporterAuth,$Char(10)," "),"$$##",1),1,35))
 		Do Adres.ZetVerzendingWijze($$$If(Address.DlvModeId="",..GeefDlvModeIsLeeg(Cust.CustAccount, Address.LocationId),..MaakVerzendingWijze(Address.DlvModeId, Cust.CustAccount, Address.LocationId)))
 		Do Adres.ZetKlantAdresNr(BestaandLeverAdres.GeefKlantAdresNr())
 	}