Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/Bewaarder/Bewaar/Test.cls.xml
===================================================================
diff -u -r36247 -r36262
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/Bewaarder/Bewaar/Test.cls.xml	(.../Test.cls.xml)	(revision 36247)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/Bewaarder/Bewaar/Test.cls.xml	(.../Test.cls.xml)	(revision 36262)
@@ -3,13 +3,28 @@
 <Class name="vhUnitTest.APPS.AKP.AankoopControle.BLUM.impl.Bewaarder.Bewaar.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="MsgNr">
+<Type>%Integer</Type>
+</Property>
+
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
 	Do ##super()
 	Lock +^BLImp
 ]]></Implementation>
 </Method>
 
+<Method name="OnAfterOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	w !,"Berichtnummer",..MsgNr
+	Kill ^BLImp(..MsgNr)
+	
+	set ..MsgNr = 99999999
+	do ##super(aTestName)
+]]></Implementation>
+</Method>
+
 <Method name="OnAfterAllTests">
 <Implementation><![CDATA[
 	Lock -^BLImp
@@ -21,82 +36,68 @@
 <Implementation><![CDATA[
 	#Dim CSBSODouble As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).GeefCSBSO()
 	#Dim Bewaarder As APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
+	set ..MsgNr = Bewaarder.Bewaar(CSBSODouble)
 	
-	Do Bewaarder.Bewaar(CSBSODouble)
-	
-	Do $$$AssertTrue($DATA(^BLImp(Bewaarder.MsgNr)))
-	Do $$$AssertEquals(^BLImp(Bewaarder.MsgNr),"BAU300332\5005\CSB\SO\C\21-06-16\1200\5\\\1\")
-
-	Kill ^BLImp(Bewaarder.MsgNr)
+	Do $$$AssertTrue($DATA(^BLImp(..MsgNr)))
+	Do $$$AssertEquals(^BLImp(..MsgNr),"BAU300332\5005\CSB\SO\C\21-06-16\1200\5\\\1\")
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Bewaar CSBSO11 in BLImp">
 <Implementation><![CDATA[
 	#Dim CSBSODouble As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).GeefCSBSO()
 	#Dim Bewaarder As APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
-	
-	Do Bewaarder.Bewaar(CSBSODouble)
-	
-	Do $$$AssertTrue($DATA(^BLImp(Bewaarder.MsgNr,1)))
-	Do $$$AssertEquals(^BLImp(Bewaarder.MsgNr,1),"""11300332Van Hoecke -XL      L                                """)
-
-	Kill ^BLImp(Bewaarder.MsgNr)
+	set ..MsgNr = Bewaarder.Bewaar(CSBSODouble)
+		
+	Do $$$AssertTrue($DATA(^BLImp(..MsgNr,1)))
+	Do $$$AssertEquals(^BLImp(..MsgNr,1),"""11300332Van Hoecke -XL      L                                """)
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Bewaar CSBSO21 in BLImp">
 <Implementation><![CDATA[
 	#Dim CSBSODouble As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).GeefCSBSO()
 	#Dim Bewaarder As APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
-	
-	Do Bewaarder.Bewaar(CSBSODouble)
-	
-	Do $$$AssertTrue($DATA(^BLImp(Bewaarder.MsgNr,2)))
-	Do $$$AssertEquals(^BLImp(Bewaarder.MsgNr,2),"""21300332160621EP   000660000100000000000000020758.2000000.000000000.00212250""")
-
-	Kill ^BLImp(Bewaarder.MsgNr)
+	set ..MsgNr = Bewaarder.Bewaar(CSBSODouble)
+		
+	Do $$$AssertTrue($DATA(^BLImp(..MsgNr,2)))
+	Do $$$AssertEquals(^BLImp(..MsgNr,2),"""21300332160621EP   000660000100000000000000020758.2000000.000000000.00212250""")
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Bewaar CSBSO31 in BLImp">
 <Implementation><![CDATA[
 	#Dim CSBSODouble As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).GeefCSBSO()
 	#Dim Bewaarder As APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
-	
-	Do Bewaarder.Bewaar(CSBSODouble)
-	
-	Do $$$AssertTrue($DATA(^BLImp(Bewaarder.MsgNr,3)))
-	Do $$$AssertEquals(^BLImp(Bewaarder.MsgNr,3),"""3199999999160621160621W30000000496.700000000.00212250212250""")
-													
-	Kill ^BLImp(Bewaarder.MsgNr)
+
+	set ..MsgNr = Bewaarder.Bewaar(CSBSODouble)
+		
+	Do $$$AssertTrue($DATA(^BLImp(..MsgNr,3)))
+	Do $$$AssertEquals(^BLImp(..MsgNr,3),"""3199999999160621160621W30000000496.700000000.00212250212250""")
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Bewaar CSBSO41 in BLImp">
 <Implementation><![CDATA[
 	#Dim CSBSODouble As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).GeefCSBSO()
 	#Dim Bewaarder As APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
-	
-	Do Bewaarder.Bewaar(CSBSODouble)
-	
-	Do $$$AssertTrue($DATA(^BLImp(Bewaarder.MsgNr,4)))
-	Do $$$AssertEquals(^BLImp(Bewaarder.MsgNr,4),"""4177946501000CE205834.01  0438123400010000001000000000496.7000000.001070692            830242STAT""")
 
-	Kill ^BLImp(Bewaarder.MsgNr)
+	set ..MsgNr = Bewaarder.Bewaar(CSBSODouble)
+		
+	Do $$$AssertTrue($DATA(^BLImp(..MsgNr,4)))
+	Do $$$AssertEquals(^BLImp(..MsgNr,4),"""4177946501000CE205834.01  0438123400010000001000000000496.7000000.001070692            830242STAT""")
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Bewaar CSBSO44 in BLImp">
 <Implementation><![CDATA[
 	#Dim CSBSODouble As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFactuur.CSBSO).GeefCSBSO()
 	#Dim Bewaarder As APPS.AKP.AankoopControle.BLUM.impl.Bewaarder = ##class(APPS.AKP.AankoopControle.BLUM.impl.Bewaarder).%New()
-	
-	Do Bewaarder.Bewaar(CSBSODouble)
-	Do $$$AssertTrue($DATA(^BLImp(Bewaarder.MsgNr,5)))
-	Do $$$AssertEquals(^BLImp(Bewaarder.MsgNr,5),"""44    0.51.249000010001000            000000000000            000000000000            000000000000            000000000000""")
 
-	Kill ^BLImp(Bewaarder.MsgNr)
+	set ..MsgNr = Bewaarder.Bewaar(CSBSODouble)
+	
+	Do $$$AssertTrue($DATA(^BLImp(..MsgNr,5)))
+	Do $$$AssertEquals(^BLImp(..MsgNr,5),"""44    0.51.249000010001000            000000000000            000000000000            000000000000            000000000000""")
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/AKP/AankoopControle/BLUM/impl/Bewaarder.cls.xml
===================================================================
diff -u -r36229 -r36262
--- APPS/AKP/AankoopControle/BLUM/impl/Bewaarder.cls.xml	(.../Bewaarder.cls.xml)	(revision 36229)
+++ APPS/AKP/AankoopControle/BLUM/impl/Bewaarder.cls.xml	(.../Bewaarder.cls.xml)	(revision 36262)
@@ -6,6 +6,7 @@
 <Property name="MsgNr">
 <Type>%Integer</Type>
 <InitialExpression>99999999</InitialExpression>
+<Private>1</Private>
 </Property>
 
 <Property name="RecNr">
@@ -16,9 +17,13 @@
 
 <Method name="Bewaar">
 <FormalSpec>CSBSO:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO</FormalSpec>
+<ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
 
 	Do ..ZetMsgNr()
+	Kill ^BLImp(..MsgNr)
+ 	Do ..SchrijfHeader("")
+	
 	#dim RecordCount As %Integer = 0
 	#dim CSBSO11Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CSBSO.CSBSO11List)
 	while CSBSO11Iterator.HasNext(){
@@ -57,15 +62,13 @@
 	}
 	Set CSBSO.CSBSOHeader.MICOUN = RecordCount
 	Do ..SchrijfHeader(CSBSO.CSBSOHeader.ToString())
+	quit ..MsgNr
 ]]></Implementation>
 </Method>
 
 <Method name="ZetMsgNr">
 <Private>1</Private>
-<Implementation><![CDATA[
-	Set ..MsgNr = +$O(^BLImp(..MsgNr),-1) + 1
-	Kill ^BLImp(..MsgNr)
- 	Do ..SchrijfHeader("")
+<Implementation><![CDATA[	Set ..MsgNr = +$O(^BLImp(..MsgNr),-1) + 1
 ]]></Implementation>
 </Method>