Index: APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml
===================================================================
diff -u -r35461 -r35679
--- APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml	(.../DataVerzamelaar.cls.xml)	(revision 35461)
+++ APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar.cls.xml	(.../DataVerzamelaar.cls.xml)	(revision 35679)
@@ -3,6 +3,16 @@
 <Class name="APPS.EDIExport.AankoopOrder.impl.BLUM.DataVerzamelaar">
 <Super>TECH.RegisteredObject</Super>
 
+<Parameter name="COM">
+<Type>%String</Type>
+<Default>COM</Default>
+</Parameter>
+
+<Parameter name="MSGB">
+<Type>%String</Type>
+<Default>##MSGB</Default>
+</Parameter>
+
 <Parameter name="COMSO11">
 <Type>%String</Type>
 <Default>11</Default>
@@ -22,6 +32,12 @@
 <Type>DOM.AKP.ToeleveringAPI</Type>
 </Property>
 
+<Property name="IsCOMSO">
+<Type>%Boolean</Type>
+<InitialExpression>0</InitialExpression>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>ProductAPI:DOM.PM.ProductAPI,ToeleveringAPI:DOM.AKP.ToeleveringAPI</FormalSpec>
 <Private>1</Private>
@@ -45,14 +61,19 @@
 	While (Key '= "")
 	{
 		#dim BLExportLijn As %String = ^BLExport(Key)
-
-		If ($Extract(BLExportLijn,2,3) = ..#COMSO11)
+		
+		If ($Extract(BLExportLijn,1,6) = ..#MSGB)
 		{
+			Set ..IsCOMSO = ($Extract(BLExportLijn,22,24) = ..#COM)
+		}
+		
+		If ..IsCOMSO && ($Extract(BLExportLijn,2,3) = ..#COMSO11)
+		{
 			Set Toelevering = ..MaakToelevering(BLExportLijn)
 			Do COMSO.ToeleveringList.Insert(Toelevering)
 		}
 		
-		if $IsObject(Toelevering) && ($Extract(BLExportLijn,2,3) = ..#COMSO21) 
+		if ..IsCOMSO && $IsObject(Toelevering) && ($Extract(BLExportLijn,2,3) = ..#COMSO21) 
 		{
 			Do Toelevering.ToeleveringDetail.Insert(..MaakToeleveringDetail(BLExportLijn))
 		}
Index: vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar/GeefCOMSO/Test.cls.xml
===================================================================
diff -u -r35461 -r35679
--- vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar/GeefCOMSO/Test.cls.xml	(.../Test.cls.xml)	(revision 35461)
+++ vhUnitTest/APPS/EDIExport/AankoopOrder/impl/BLUM/DataVerzamelaar/GeefCOMSO/Test.cls.xml	(.../Test.cls.xml)	(revision 35679)
@@ -23,6 +23,12 @@
 	Set ^BLExport(13)="""21206816.01       0000741100000020000004.460170109  N                    ""     "
 	Set ^BLExport(14)="##MSGELVH16370                                                                  "
 	Set ^BLExport(15)="##TRUELVH09204                                                                  "
+	Set ^BLExport(16)="##MSGELVH16503                                                                  "
+ 	Set ^BLExport(17)="##MSGBLVH16504ALVHBAUMSG  N1607041607040821PETER VDR 6 000003BAU03436           "
+ 	Set ^BLExport(18)="""11BAU251661607040121""                                                          "
+ 	Set ^BLExport(19)="""11BAU251831607040121""                                                          "
+ 	Set ^BLExport(20)="""11BAU252501607040121""                                                          "
+ 	Set ^BLExport(21)="##MSGELVH16504                    "
 ]]></Implementation>
 </Method>