Index: APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml
===================================================================
diff -u -r36121 -r36138
--- APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml	(.../DespatchNaarCSBSOConverteerder.cls.xml)	(revision 36121)
+++ APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml	(.../DespatchNaarCSBSOConverteerder.cls.xml)	(revision 36138)
@@ -28,10 +28,8 @@
 	#dim CSBSO11 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011 = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011).%New()
 
 	do ..VoegToeCSBSOHeader(CSBSO,DELVRY03)
-	do ..VoegToeCSBSO11(CSBSO11,DELVRY03)
-	
+	do ..VoegToeCSBSO11(CSBSO11,DELVRY03)	
 	do CSBSO.CSBSO11List.Insert(CSBSO11)
-	
 	quit CSBSO
 ]]></Implementation>
 </Method>
@@ -51,8 +49,6 @@
 	Set CSBSO.CSBSOHeader.MINNRE = ""
 	Set CSBSO.CSBSOHeader.MIACRQ = "1"
 	Set CSBSO.CSBSOHeader.MESPRO = ""
-	
-	Do ##class(Tools.Wlip).%New(207).String(CSBSO.CSBSOHeader.ToString())
 ]]></Implementation>
 </Method>
 
@@ -63,13 +59,9 @@
 	set CSBSO11.ShipmentID = DELVRY03.IDOC.E1EDL20.GetAt(1).VBELN
 	set CSBSO11.DeliveryAddress = "Van Hoecke -XL"
 	set CSBSO11.TransportationMode = "L"	
-	
-	Do ##class(Tools.Wlip).%New(207).String(CSBSO11.ToString())
 		
-	#dim CSBSO21 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021 = ##Class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021).%New()
-	
-	do ..VoegToeCSBSO21(CSBSO21,DELVRY03)
-	
+	#dim CSBSO21 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021 = ##Class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021).%New()	
+	do ..VoegToeCSBSO21(CSBSO21,DELVRY03)	
 	do CSBSO11.CSBSO21List.Insert(CSBSO21)
 ]]></Implementation>
 </Method>
@@ -88,17 +80,14 @@
 	#dim E1EDL20 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL20 = DELVRY03.IDOC.E1EDL20.GetAt(1)
 	
 	#dim E1EDL24Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL20.E1EDL24)
-	#dim E1EDL24 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL24
-	
+	#dim E1EDL24 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL24	
 	While E1EDL24Iterator.HasNext(){
 		set E1EDL24 = E1EDL24Iterator.Next()
 		Set $Property(CSBSO21,"Colli"_ counter) = E1EDL24.MATKL
 		Set $Property(CSBSO21,"NrOfColli"_ counter) = +E1EDL24.LGMNG
 		set counter = counter + 1
 	}
 	
-	Do ##class(Tools.Wlip).%New(207).String(CSBSO21.ToString())
-	
 	#dim CSBSO31 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031 = ##Class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031).%New()	
 	do ..VoegToeCSBSO31(CSBSO31,DELVRY03)	
 	do CSBSO21.CSBSO31List.Insert(CSBSO31)
@@ -118,11 +107,8 @@
 	set CSBSO31.DeliveryCustomerNr = ..GeefShipToCustomerNr(DELVRY03)
 	set CSBSO31.InvoicingCustomerNr = CSBSO31.DeliveryCustomerNr
 
-	Do ##class(Tools.Wlip).%New(207).String(CSBSO31.ToString())
-
 	#dim E1EDL37Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(DELVRY03.IDOC.E1EDL20.GetAt(1).E1EDL37)
 	#dim E1EDL37 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL37
-	
 	While E1EDL37Iterator.HasNext(){
 		set E1EDL37 = E1EDL37Iterator.Next()
 		#dim E1EDL44Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL37.E1EDL44)
@@ -145,28 +131,12 @@
 				do CSBSO31.CSBSO41Array.SetAt(CSBSO41, arraysleutel)
 			}
 			set CSBSO31.CSBSO41Array.GetAt(arraysleutel).QuantityInvoiced = + CSBSO31.CSBSO41Array.GetAt(arraysleutel).QuantityInvoiced + E1EDL44.VEMNG
-			set CSBSO31.CSBSO41Array.GetAt(arraysleutel).QuantityShipped = CSBSO31.CSBSO41Array.GetAt(arraysleutel).QuantityInvoiced 
-			;TODO set CSBSO31.CSBSO41Array.GetAt(arraysleutel).Value = CSBSO31.CSBSO41Array.GetAt(arraysleutel).QuantityInvoiced * price
+			set CSBSO31.CSBSO41Array.GetAt(arraysleutel).QuantityShipped = CSBSO31.CSBSO41Array.GetAt(arraysleutel).QuantityInvoiced 			
+			do ..ToeleveringInfoVerzamelaar.ZetVHProduktInfo(CSBSO41,E1EDL44.VBELN, E1EDL44.POSNR)			
+			set CSBSO31.NetValue = CSBSO31.NetValue + CSBSO31.CSBSO41Array.GetAt(arraysleutel).Value
 
-			do ..ToeleveringInfoVerzamelaar.ZetVHProduktInfo(CSBSO41,E1EDL44.VBELN, E1EDL44.POSNR)
-				Do ##class(Tools.Wlip).%New(207).String("Value " _ CSBSO41.Value)
-
-			Do ##class(Tools.Wlip).%New(207).String( "sleutel "_ arraysleutel)
-			Do ##class(Tools.Wlip).%New(207).String(CSBSO31.CSBSO41Array.GetAt(arraysleutel).ToString())
-						
 			; dan de pallet info toevoegen: tot 5 palletten op 1 record, dan volgend aanmaken etc.
-			#dim CSBSO44 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS044
-			if 'CSBSO41.CSBSO44List.IsDefined(1) {
-				set CSBSO44 = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS044).%New()
-				do CSBSO41.CSBSO44List.InsertAt(CSBSO44,CSBSO41.CSBSO44List.Count()+1)
-			} else {
-				set CSBSO44 = CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count())			
-				;check if this record is 'full' and create new if so
-				if 'CSBSO44.SpecialMarking5=""{
-					set CSBSO44 = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS044).%New()				
-					do CSBSO41.CSBSO44List.InsertAt(CSBSO44,CSBSO41.CSBSO44List.Count()+1)
-				}									
-			}			
+			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
@@ -175,13 +145,29 @@
 					quit
 				}
 			}
-			Do ##class(Tools.Wlip).%New(207).String(CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count()).ToString())
-			
-		}
+		}		
 	}
 ]]></Implementation>
 </Method>
 
+<Method name="VoorzieCSBSO44">
+<FormalSpec>CSBSO41:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	if 'CSBSO41.CSBSO44List.IsDefined(1) {
+		set CSBSO44 = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS044).%New()
+		do CSBSO41.CSBSO44List.InsertAt(CSBSO44,CSBSO41.CSBSO44List.Count()+1)
+	} else {
+		set CSBSO44 = CSBSO41.CSBSO44List.GetAt(CSBSO41.CSBSO44List.Count())			
+		;check if this record is 'full' and create new if so
+		if 'CSBSO44.SpecialMarking5=""{
+			set CSBSO44 = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS044).%New()				
+			do CSBSO41.CSBSO44List.InsertAt(CSBSO44,CSBSO41.CSBSO44List.Count()+1)
+		}									
+	}
+]]></Implementation>
+</Method>
+
 <Method name="GeefOrderlineCustomer">
 <FormalSpec>E1EDL44:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL44</FormalSpec>
 <Private>1</Private>