Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml
===================================================================
diff -u -r36189 -r36366
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 36189)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger/Ontvang/Test.cls.xml	(.../Test.cls.xml)	(revision 36366)
@@ -3,6 +3,28 @@
 <Class name="vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger.Ontvang.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Method name="Test : Converteer wordt opgeroepen">
+<Implementation><![CDATA[
+	#dim VolledigeBestandNaam1 As %String = ..GeefDespatchFileLocatie() _"DESADV_dummy.xml"	
+	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
+	Do FileUtilsFake.VoegToeFileInfo(VolledigeBestandNaam1)
+
+	#dim ConverteerderMock as vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder).%New()
+	#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).%New().GeefCSBSO()
+	do ConverteerderMock.VerwachtMethodCall("Converteer",$$$ElkeWaarde).DanReturn(CSBSO)
+
+	#dim ClassName As %String = "APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03"
+	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanDoeNiks()
+	
+	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock)
+	
+	Do Ontvanger.Ontvang()
+
+	do ConverteerderMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test : GeefObjectVanBestand() wordt opgeroepen met de juiste bestandnaam">
 <Implementation><![CDATA[
 	#dim VolledigeBestandNaam1 As %String = ..GeefDespatchFileLocatie() _"DESADV_dummy.xml"
@@ -20,6 +42,60 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test : Na fout wordt volgend bestand nog verwerkt">
+<Implementation><![CDATA[
+	#dim VolledigeBestandNaam1 As %String = ..GeefDespatchFileLocatie() _"DESADV_dummy.xml"	
+	#dim VolledigeBestandNaam2 As %String = ..GeefDespatchFileLocatie() _"DESADV_dummy2.xml"	
+	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
+	Do FileUtilsFake.VoegToeFileInfo(VolledigeBestandNaam1)
+	Do FileUtilsFake.VoegToeFileInfo(VolledigeBestandNaam2)
+
+	#dim ConverteerderMock as vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder).%New()
+	#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).%New().GeefCSBSO()
+	do ConverteerderMock.IndienMethodCall("Converteer",$$$ElkeWaarde).DanReturn(CSBSO)
+
+	#dim ClassName As %String = "APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03"
+	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanException($$$DummyException)
+	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam2,ClassName,"DELVRY03").DanDoeNiks()
+	
+	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock)
+	
+	Do Ontvanger.Ontvang()
+
+	Do $$$AssertFalse(FileUtilsFake.FileExists(VolledigeBestandNaam1))
+	Do $$$AssertFalse(FileUtilsFake.FileExists(VolledigeBestandNaam2))
+	#dim VolledigeBestandNaam1NAVerwerking As %String = ..GeefDespatchFileLocatie() _"Error\DESADV_dummy.xml"	
+	#dim VolledigeBestandNaam2NAVerwerking As %String = ..GeefDespatchFileLocatie() _"Archief\DESADV_dummy2.xml"	
+	Do $$$AssertTrue(FileUtilsFake.FileExists(VolledigeBestandNaam1NAVerwerking))
+	Do $$$AssertTrue(FileUtilsFake.FileExists(VolledigeBestandNaam2NAVerwerking))
+]]></Implementation>
+</Method>
+
+<Method name="Test : Bestand wordt in error map gezet na fout in verwerking">
+<Implementation><![CDATA[
+	#dim VolledigeBestandNaam1 As %String = ..GeefDespatchFileLocatie() _"DESADV_dummy.xml"	
+	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
+	Do FileUtilsFake.VoegToeFileInfo(VolledigeBestandNaam1)
+
+	#dim ConverteerderMock as vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder).%New()
+	#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).%New().GeefCSBSO()
+	do ConverteerderMock.IndienMethodCall("Converteer",$$$ElkeWaarde).DanReturn(CSBSO)
+
+	#dim ClassName As %String = "APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03"
+	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	Do XMLCorrelaterStub.IndienMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanException($$$DummyException)
+	
+	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock)
+	
+	Do Ontvanger.Ontvang()
+
+	Do $$$AssertFalse(FileUtilsFake.FileExists(VolledigeBestandNaam1))
+	#dim VolledigeBestandNaam1NAVerwerking As %String = ..GeefDespatchFileLocatie() _"Error\DESADV_dummy.xml"	
+	Do $$$AssertTrue(FileUtilsFake.FileExists(VolledigeBestandNaam1NAVerwerking))
+]]></Implementation>
+</Method>
+
 <Method name="Test : Correct bestand wordt na verwerking in archief map gezet">
 <Implementation><![CDATA[
 	#dim VolledigeBestandNaam1 As %String = ..GeefDespatchFileLocatie() _"DESADV_dummy.xml"	
@@ -44,6 +120,27 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test : GeefObjectVanBestand wordt opgeroepen met de juiste naam">
+<Implementation><![CDATA[
+	#dim VolledigeBestandNaam1 As %String = ..GeefDespatchFileLocatie() _"DESADV_dummy.xml"	
+	#dim FileUtilsFake As vhTest.Fake.TECH.File.FileUtils = ##class(vhTest.Fake.TECH.File.FileUtils).%New()
+	Do FileUtilsFake.VoegToeFileInfo(VolledigeBestandNaam1)
+
+	#dim ConverteerderMock as vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder = ##class(vhTest.Mock.APPS.AKP.AankoopControle.BLUM.impl.DespatchNaarCSBSOConverteerder).%New()
+	#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).%New().GeefCSBSO()
+	do ConverteerderMock.IndienMethodCall("Converteer",$$$ElkeWaarde).DanReturn(CSBSO)
+
+	#dim ClassName As %String = "APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03"
+	#dim XMLCorrelaterStub As vhTest.Mock.TECH.XMLCorrelater = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	Do XMLCorrelaterStub.VerwachtMethodCall("GeefObjectVanBestand", VolledigeBestandNaam1,ClassName,"DELVRY03").DanDoeNiks()
+	
+	#dim Ontvanger As APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger = ##class(APPS.AKP.AankoopControle.BLUM.impl.DespatchBerichtOntvanger).%New(,FileUtilsFake,XMLCorrelaterStub,ConverteerderMock)
+	
+	Do Ontvanger.Ontvang()
+	Do XMLCorrelaterStub.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefDespatchFileLocatie">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
Index: APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml
===================================================================
diff -u -r36229 -r36366
--- APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml	(.../DespatchBerichtOntvanger.cls.xml)	(revision 36229)
+++ APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml	(.../DespatchBerichtOntvanger.cls.xml)	(revision 36366)
@@ -116,7 +116,7 @@
 <Method name="KopieerNaarErrorMap">
 <FormalSpec>BestandVolledigeNaam:%String</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	;do ..KopieerNaarMap(BestandVolledigeNaam,"Error")
+<Implementation><![CDATA[	do ..KopieerNaarMap(BestandVolledigeNaam,"Error")
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder/Converteer/Test.cls.xml
===================================================================
diff -u -r36343 -r36366
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 36343)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder/Converteer/Test.cls.xml	(.../Test.cls.xml)	(revision 36366)
@@ -10,36 +10,56 @@
 	#dim DELVRY03Double As APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03 = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03).%New().GeefDELVRY03()
 	
 	#dim CSBSO As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = Converteerder.Converteer(DELVRY03Double)
+	
 		
 	Do $$$AssertIsObject(CSBSO)
 	Do $$$AssertEquals(CSBSO.CSBSOHeader.MIOTCR,"21-06-16")
+	Do $$$AssertEquals(CSBSO.CSBSOHeader.MIIDEF, "BAU300332")
 	
 	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).ShipmentID,"300332")
+	Do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).DeliveryAddress,"Van Hoecke -XL")
+	Do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).TransportationMode,"L")
 	
 	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).Colli1,"E")
 	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).Colli2,"P")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).Colli3,"")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).Colli4,"")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).Colli5,"")
 	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).GrosWeight,"20758.20")
 	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).NrOfColli1,"66")
 	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).NrOfColli2,"1")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).NrOfColli3,"")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).NrOfColli4,"")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).NrOfColli5,"")
+
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).DeliveryCustomerNr,"212250")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).InvoicingCustomerNr,"212250")
 	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).InvoiceNr,"999999")
 	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).InvoiceType,"99")
 	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).InvoiceDate,"160621")
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).ValutaDate,"160621")
 	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).Currency,"W30")
 	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).NetValue,496.7)
+	do $$$AssertEquals(CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).Tax,0)
 	
 	#dim CSBSO41 as  APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041 = CSBSO.CSBSO11List.GetAt(1).CSBSO21List.GetAt(1).CSBSO31List.GetAt(1).CSBSO41Array.GetAt("0438123420583401")	
 	
 	do $$$AssertIsObject(CSBSO41)
 	do $$$AssertEquals(CSBSO41.ABNr,"779465")
 	do $$$AssertEquals(CSBSO41.ABLijnNr,"01000")
+	do $$$AssertEquals(CSBSO41.CountryOfOrigin,"AT")
+	do $$$AssertEquals(CSBSO41.CustomsClassification,"830242")
 	do $$$AssertEquals(CSBSO41.OrderLineCompletion,"C")
 	do $$$AssertEquals(CSBSO41.SetCode,"E")
 	do $$$AssertEquals(CSBSO41.OrderLineCustomer, "205834.01")
 	do $$$AssertEquals(CSBSO41.IdentNr,"04381234")
+	do $$$AssertEquals(CSBSO41.UnitOfMeasure,"ST")
 	do $$$AssertEquals(CSBSO41.QuantityShipped,"1000")
 	do $$$AssertEquals(CSBSO41.QuantityInvoiced,"1000")
 	do $$$AssertEquals(CSBSO41.ProductNrCustomer,"1070692")
+	do $$$AssertEquals(CSBSO41.Weigth,0)
 	Do $$$AssertEquals(CSBSO41.Value,496.7)	
+	; controleer ook in CSBSO44
 	do $$$AssertEquals(CSBSO41.CSBSO44List.GetAt(1).SpecialMarking1,"0034512494")
 	do $$$AssertEquals(CSBSO41.CSBSO44List.GetAt(1).NumberOfParcels1,"00001")
 	do $$$AssertEquals(CSBSO41.CSBSO44List.GetAt(1).PiecesPerParcels1,"0001000")
Index: vhTest/Utils/APPS/AKP/AankoopControle/BLUM/XML/Transport/Despatch/DELVRY03.cls.xml
===================================================================
diff -u -r36352 -r36366
--- vhTest/Utils/APPS/AKP/AankoopControle/BLUM/XML/Transport/Despatch/DELVRY03.cls.xml	(.../DELVRY03.cls.xml)	(revision 36352)
+++ vhTest/Utils/APPS/AKP/AankoopControle/BLUM/XML/Transport/Despatch/DELVRY03.cls.xml	(.../DELVRY03.cls.xml)	(revision 36366)
@@ -96,6 +96,11 @@
 <Type>%String</Type>
 <Default>1</Default>
 </Parameter>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<StreamLocation>^vhTest.Utils.APPS69CB.DELVRY03S</StreamLocation>
+</Storage>
 </Class>