Index: APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml
===================================================================
diff -u -r36138 -r36189
--- APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml	(.../DespatchNaarCSBSOConverteerder.cls.xml)	(revision 36138)
+++ APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml	(.../DespatchNaarCSBSOConverteerder.cls.xml)	(revision 36189)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder">
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.Mockable</Super>
 
 <Property name="ToeleveringInfoVerzamelaar">
 <Type>APPS.AKP.AankoopControle.BLUM.impl.ToeleveringInfoVerzamelaar</Type>
@@ -24,18 +24,22 @@
 <FormalSpec>DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
 <ReturnType>APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO</ReturnType>
 <Implementation><![CDATA[
+	w !,"begin converteer"
 	#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO).%New()
 	#dim CSBSO11 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011 = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011).%New()
-
 	do ..VoegToeCSBSOHeader(CSBSO,DELVRY03)
+	w !,"Header toegevoegd"
 	do ..VoegToeCSBSO11(CSBSO11,DELVRY03)	
+	w !,"CSBSO11 teogevoegd"
 	do CSBSO.CSBSO11List.Insert(CSBSO11)
+	w !,"einde converteer"
 	quit CSBSO
 ]]></Implementation>
 </Method>
 
 <Method name="VoegToeCSBSOHeader">
 <FormalSpec>CSBSO:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	set CSBSO.CSBSOHeader.MIIDEF = "BAU" _ DELVRY03.IDOC.E1EDL20.GetAt(1).VBELN ; eigenlijk transportnr, en niet berichtnummer, maar beter is er niet voor handen.
 	Set CSBSO.CSBSOHeader.LEVNUR = "5005"
@@ -54,6 +58,7 @@
 
 <Method name="VoegToeCSBSO11">
 <FormalSpec>CSBSO11:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	
 	set CSBSO11.ShipmentID = DELVRY03.IDOC.E1EDL20.GetAt(1).VBELN
@@ -68,6 +73,7 @@
 
 <Method name="VoegToeCSBSO21">
 <FormalSpec>CSBSO21:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	#dim counter as %Integer = 1
 	#dim varnaam as %String
@@ -96,6 +102,7 @@
 
 <Method name="VoegToeCSBSO31">
 <FormalSpec>CSBSO31:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	set CSBSO31.InvoiceNr = "999999"
 	set CSBSO31.InvoiceType = "99"
@@ -122,7 +129,7 @@
 				set CSBSO41.ABLijnNr = ..GeefABLnNr(E1EDL44)
 				set CSBSO41.OrderLineCompletion = "C"
 				set CSBSO41.SetCode = "E"
-				set CSBSO41.OrderLineCustomer = E1EDL44.VBELN _ "." _ E1EDL44.POSNR
+				set CSBSO41.OrderLineCustomer = ..GeefOrderlineCustomer(E1EDL44)
 				set CSBSO41.IdentNr = E1EDL44.KDMAT
 				set CSBSO41.Weigth = 0
 				set CSBSO41.CustomsClassification = "830242"
@@ -139,7 +146,7 @@
 			do ..VoorzieCSBSO44(CSBSO41)
 			for index=1:1:5{
 				if $Property(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()),"SpecialMarking"_ index) = ""{
-					set $Property(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()),"SpecialMarking"_ index) = E1EDL37.EXIDV2
+					set $Property(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()),"SpecialMarking"_ index) = $E( E1EDL37.EXIDV,*-9,*-0)
 					set $Property(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()),"NumberOfParcels"_ index) = ..GeefNrOfPackages(E1EDL44)
 					set $Property(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()),"PiecesPerParcels"_ index) = ..GeefPiecesPerPackage(E1EDL44)					
 					quit
@@ -270,6 +277,7 @@
 
 <Method name="GeefShipmentDateYYMMDD">
 <FormalSpec>DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim E1EDL20Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(DELVRY03.IDOC.E1EDL20)
@@ -292,6 +300,7 @@
 
 <Method name="VoegToeMIOTCR">
 <FormalSpec>CSBSO:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	
 	#dim E1EDL20Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(DELVRY03.IDOC.E1EDL20)
@@ -309,7 +318,6 @@
 		}
 	}
 	
-	
 	/* ofwel 
 	#dim ISDD as %String = DELVRY03.IDOC.E1EDL20.GetAt(1).E1EDT13.GetAt(1).ISDD
 	set CSBSO.CSBSOHeader.MIOTCR = $EXTRACT(ISDD,7,8) _"-" _$EXTRACT(ISDD,5,6) _"-" _$EXTRACT(ISDD,3,4)