Index: vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar/GeefCOMSO/Test.cls.xml
===================================================================
diff -u -r35171 -r35194
--- vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar/GeefCOMSO/Test.cls.xml	(.../Test.cls.xml)	(revision 35171)
+++ vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar/GeefCOMSO/Test.cls.xml	(.../Test.cls.xml)	(revision 35194)
@@ -3,10 +3,117 @@
 <Class name="vhUnitTest.APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar.GeefCOMSO.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test : GeefCOMSO() geeft object weer">
+<Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
+	Do ##super()
+	Lock +^BLExport
+	Kill ^BLExport
+	Set ^BLExport(1)="##TRUBLVH09204                                                                  "
+	Set ^BLExport(2)="##MSGBLVH16370ALVHBAUCOMSON1606061606061431KURT TEST 6 100011JO TEST            "
+	Set ^BLExport(3)="""11271250  271250  206397                     W01N L 160518""                    "
+	Set ^BLExport(4)="""21206397.01       0929592300250000000004.632160613  N                    ""     "
+	Set ^BLExport(5)="""11271250  271250  206418                     W01N L 160518""                    "
+	Set ^BLExport(6)="""21206418.01       0158800000000200000196.312160620  N                    ""     "
+	Set ^BLExport(7)="""11271250  271250  206558                     W01N L 160519""                    "
+	Set ^BLExport(8)="""21206558.01       0597750200023040000168.252160627  N                    ""     "
+	Set ^BLExport(9)="""21206558.02       0597768200023040000168.252160627  N                    ""     "
+	Set ^BLExport(10)="""11212250  212250  206595                     W01N L 160519""                    "
+	Set ^BLExport(11)="""21206595.01       0614343400000010000031.080160530  N                    ""     "
+	Set ^BLExport(12)="""11212250  212250  206816                     W01N L 160606""                    "
+	Set ^BLExport(13)="""21206816.01       0000741100000020000004.460170109  N                    ""     "
+	Set ^BLExport(14)="##MSGELVH16370                                                                  "
+	Set ^BLExport(15)="##TRUELVH09204                                                                  "
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Kill ^BLExport
+	Lock -^BLExport
+	Do ##super()
+]]></Implementation>
+</Method>
+
+<Method name="Test : GeefCOMSO() geeft COMSO object weer uit BLExport">
+<Implementation><![CDATA[
 	#dim DataVerzamelaar As APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar = ##class(APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar).%New()
-	Do $$$AssertIsObject(DataVerzamelaar.GeefCOMSO())
+	#dim COMSO As APPS.EDIExport.AankoopOrder.BLUM.dto.COMSO = DataVerzamelaar.GeefCOMSO() 
+	
+	Do $$$AssertIsObject(COMSO)
+	
+	Do $$$AssertEquals(COMSO.ToeleveringList.Count(),5)
+
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringHeader.CustomerNumberForShipment,"271250")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringHeader.CustomerNumberForInvoice,"271250")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringHeader.CustomerOrderReference,"206397")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringHeader.CustomerOrderEntryDate,"160518")
+
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringHeader.CustomerNumberForShipment,"271250")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringHeader.CustomerNumberForInvoice,"271250")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringHeader.CustomerOrderReference,"206418")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringHeader.CustomerOrderEntryDate,"160518")
+
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringHeader.CustomerNumberForShipment,"271250")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringHeader.CustomerNumberForInvoice,"271250")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringHeader.CustomerOrderReference,"206558")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringHeader.CustomerOrderEntryDate,"160519")
+
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringHeader.CustomerNumberForShipment,"212250")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringHeader.CustomerNumberForInvoice,"212250")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringHeader.CustomerOrderReference,"206595")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringHeader.CustomerOrderEntryDate,"160519")
+	
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringHeader.CustomerNumberForShipment,"212250")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringHeader.CustomerNumberForInvoice,"212250")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringHeader.CustomerOrderReference,"206816")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringHeader.CustomerOrderEntryDate,"160606")
+	
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringDetail.Count(),1)
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).OrderLineIdentificationCustomer,"206397.01")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).IdentNumberSupplierBAU ,"09295923")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).OrderQuantity ,"0025000")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).NetPrice ,"0000004.63")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).PriceDimension ,"2")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA ,"160613")
+	
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.Count(),1)
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).OrderLineIdentificationCustomer,"206418.01")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).IdentNumberSupplierBAU ,"01588000")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).OrderQuantity ,"0000020")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).NetPrice ,"0000196.31")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).PriceDimension ,"2")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(2).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA ,"160620")
+	
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.Count(),2)
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(1).OrderLineIdentificationCustomer,"206558.01")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(1).IdentNumberSupplierBAU ,"05977502")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(1).OrderQuantity ,"0002304")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(1).NetPrice ,"0000168.25")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(1).PriceDimension ,"2")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA ,"160627")
+	
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(2).OrderLineIdentificationCustomer,"206558.02")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(2).IdentNumberSupplierBAU ,"05977682")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(2).OrderQuantity ,"0002304")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(2).NetPrice ,"0000168.25")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(2).PriceDimension ,"2")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(3).ToeleveringDetail.GetAt(2).DeliveryDateAxBUA ,"160627")
+	
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.Count(),1)
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.GetAt(1).OrderLineIdentificationCustomer,"206595.01")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.GetAt(1).IdentNumberSupplierBAU ,"06143434")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.GetAt(1).OrderQuantity ,"0000001")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.GetAt(1).NetPrice ,"0000031.08")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.GetAt(1).PriceDimension ,"0")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(4).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA ,"160530")
+	
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.Count(),1)
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).OrderLineIdentificationCustomer,"206816.01")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).IdentNumberSupplierBAU ,"00007411")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).OrderQuantity ,"0000002")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).NetPrice ,"0000004.46")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).PriceDimension ,"0")
+	Do $$$AssertEquals(COMSO.ToeleveringList.GetAt(5).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA ,"170109")
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml
===================================================================
diff -u -r35184 -r35194
--- APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml	(.../DataVerzamelaar.cls.xml)	(revision 35184)
+++ APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml	(.../DataVerzamelaar.cls.xml)	(revision 35194)
@@ -51,7 +51,7 @@
 	Set Toelevering.ToeleveringHeader = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringHeader).%New()
 	Set Toelevering.ToeleveringHeader.CustomerNumberForShipment = $Extract(BLExportLijn,4,9)
 	Set Toelevering.ToeleveringHeader.CustomerNumberForInvoice = $Extract(BLExportLijn,12,17)
-	Set Toelevering.ToeleveringHeader.CustomerOrderReference = $Extract(BLExportLijn,20,31)
+	Set Toelevering.ToeleveringHeader.CustomerOrderReference = $$$Trim($Extract(BLExportLijn,20,31))
 	Set Toelevering.ToeleveringHeader.CustomerOrderEntryDate = $Extract(BLExportLijn,54,59)
 	Quit Toelevering
 ]]></Implementation>
@@ -63,7 +63,7 @@
 <ReturnType>APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail</ReturnType>
 <Implementation><![CDATA[
 	#dim ToeleveringDetail As APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrder.BLUM.dto.ToeleveringDetail).%New()
-	Set ToeleveringDetail.OrderLineIdentificationCustomer = $Extract(BLExportLijn,4,14)
+	Set ToeleveringDetail.OrderLineIdentificationCustomer = $$$Trim($Extract(BLExportLijn,4,14))
 	Set ToeleveringDetail.IdentNumberSupplierBAU = $Extract(BLExportLijn,20,27)
 	Set ToeleveringDetail.OrderQuantity = $Extract(BLExportLijn,28,34)
 	Set ToeleveringDetail.NetPrice = $Extract(BLExportLijn,35,44)