Index: vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml
===================================================================
diff -u -r49735 -r49738
--- vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml	(.../Test.cls.xml)	(revision 49735)
+++ vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/AdresZetter/Test.cls.xml	(.../Test.cls.xml)	(revision 49738)
@@ -60,6 +60,38 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Opmerking1 en Opmerking2 moeten afgekapt worden op 40 karakters">
+<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 = "12345678901234567890123456789012345678901234567890"
+	Set Address.Nota2External = "12345678901234567890123456789012345678901234567890"
+	#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(),"1234567890123456789012345678901234567890")
+	Do $$$AssertEquals(GezetAdres.GeefOpmerking2(),"1234567890123456789012345678901234567890")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Volmacht moet afgekapt worden op 35 karakters">
+<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 = "12345678901234567890123456789012345678901234567890"
+	#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(),"12345678901234567890123456789012345")
+]]></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 -r49735 -r49738
--- AXimpl/Dynamics/CustomerIn/Converter/AdresZetter.cls.xml	(.../AdresZetter.cls.xml)	(revision 49735)
+++ AXimpl/Dynamics/CustomerIn/Converter/AdresZetter.cls.xml	(.../AdresZetter.cls.xml)	(revision 49738)
@@ -59,11 +59,11 @@
 	Do Adres.ZetType("")
 	If $$$Not(IsPrimairAdres) {
 		Do Adres.ZetTelefoon(BestaandLeverAdres.GeefTelefoon())
-		Do Adres.ZetOpmerking1(Address.Nota1External)
-		Do Adres.ZetOpmerking2(Address.Nota2External)
+		Do Adres.ZetOpmerking1($Extract(Address.Nota1External,1,40))
+		Do Adres.ZetOpmerking2($Extract(Address.Nota2External,1,40))
 		Do Adres.ZetType(..AxToAdminUtils.ConvertLeverAdresType(Address.Role))
 		Do Adres.ZetAxLeveradresId(Address.LocationId)
-		Do Adres.ZetVolmacht(Address.TransporterAuth)
+		Do Adres.ZetVolmacht($Extract(Address.TransporterAuth,1,35))
 	}
 	Quit Adres
 ]]></Implementation>