Index: APPS/AKP/AankoopControle/BLUM/impl/INVOIC02TransactionService.cls.xml
===================================================================
diff -u -r36789 -r37273
--- APPS/AKP/AankoopControle/BLUM/impl/INVOIC02TransactionService.cls.xml	(.../INVOIC02TransactionService.cls.xml)	(revision 36789)
+++ APPS/AKP/AankoopControle/BLUM/impl/INVOIC02TransactionService.cls.xml	(.../INVOIC02TransactionService.cls.xml)	(revision 37273)
@@ -34,18 +34,16 @@
 <Method name="ZetZendingen">
 <FormalSpec>Zendingen:%ListOfDataTypes</FormalSpec>
 <Implementation><![CDATA[
-	#dim ZendingIterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(Zendingen)
-	#dim zending as %String
-	#dim receptienr as %String
+	#Dim ZendingIterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(Zendingen)
+	#Dim zending as %String
+	#Dim receptienr as %String
 	while ZendingIterator.HasNext(){
 		set zending = ZendingIterator.Next()
-		;^Verv(..#BlumLevNr,"D",zending)
-		do ..MGLocker.VoegToeGlobalRef("^Verv(" _ ..#BlumLevNr _ ",""D""," _ zending _ ")")
+		do ..MGLocker.VoegToeGlobalRef($name(^Verv(..#BlumLevNr,"D",zending)))
 
 		set receptienr = ..ZendingService.GeefReceptieNummerZending(..#BlumLevNr,zending)
 		if receptienr{
-			;Lock +^RCP("D",receptienr)		
-			do ..MGLocker.VoegToeGlobalRef("^RCP(""D""," _ receptienr _ ")")
+			do ..MGLocker.VoegToeGlobalRef($Name(^RCP("D",receptienr)))
 		}
 	}
 ]]></Implementation>
@@ -54,7 +52,7 @@
 <Method name="StartTransactie">
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
-	#dim Lockresult as %Integer = ..MGLocker.Lock()
+	#Dim Lockresult as %Integer = ..MGLocker.Lock()
 	TSTART:Lockresult
 	quit Lockresult
 ]]></Implementation>
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker/Test.cls.xml
===================================================================
diff -u -r36789 -r37273
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker/Test.cls.xml	(.../Test.cls.xml)	(revision 36789)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker/Test.cls.xml	(.../Test.cls.xml)	(revision 37273)
@@ -25,7 +25,7 @@
 	#dim BlumFactuurDummy as Blum.Facturen = ##class(Blum.Facturen).%New()
 		
 	#dim INVOIC02 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02 = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOICE02).%New().GeefINVOICE02()
-	#dim INVOIC02Verwerker as APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker = ##class(APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%New(ZendingServiceMock,BlumFacturenRepoMock,PrijsVerschilMailerMock,TransactionServiceMock)
+	#dim INVOIC02Verwerker as APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker = ##class(APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%New(ZendingServiceMock,BlumFacturenRepoMock,,TransactionServiceMock)
 	;Blum.Facturen
 	do BlumFacturenRepoMock.IndienMethodCall("BestaatFactuurViaLeverancierEnFactuurNummer",5005,"857382").DanReturn(0)
 	do BlumFacturenRepoMock.VerwachtMethodCall("Maak").DanReturn(BlumFactuurDummy)
@@ -165,7 +165,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test INVOIC02Verwerker Verwerk throwt een exceptie als een toeleveringlijn 2 maal op een faktuur staat">
+<Method name="Test INVOIC02Verwerker Verwerk start tx,throwt een exceptie als een toeleveringlijn 2 maal op een faktuur staat en doet rollback">
 <Implementation><![CDATA[
 	#dim ReceptieServiceMock as vhTest.Mock.APPS.AKP.Receptie.impl.ReceptieService = ##class(vhTest.Mock.APPS.AKP.Receptie.impl.ReceptieService).%New()
 	#dim ZendingServiceMock as vhTest.Mock.APPS.AKP.Zending.ZendingService = ##class(vhTest.Mock.APPS.AKP.Zending.ZendingService).%New(ReceptieServiceMock)
@@ -188,7 +188,7 @@
 	;1e lijn verplaatsen,Geen prijsVerschil op lijn
 	do ZendingServiceMock.IndienMethodCall("VerplaatsDummyFaktuurLijn","5005","297851","857382","202267.01","05430289",192).DanReturn(1)	
 	do ZendingServiceMock.IndienMethodCall("GeefFaktuurLijnWaarde","5005","297851","857382",1).DanReturn(553.44) ;
-	do ZendingServiceMock.VerwachtMethodCall("HerrekenDummyFaktuur","5005","297851").DanDoeNiks()
+	do ZendingServiceMock.IndienMethodCall("HerrekenDummyFaktuur","5005","297851").DanDoeNiks()
 	
 	;2de lijn verplaatsen,reeds op andere faktuur 
 	do ZendingServiceMock.IndienMethodCall("VerplaatsDummyFaktuurLijn","5005","297851","857382","202267.03","05417931",192).DanReturn(0)
@@ -203,8 +203,6 @@
 
 	do INVOIC02Verwerker.Verwerk(INVOIC02)
 	
-	do BlumFacturenRepoMock.Verifieer()
-	do ZendingServiceMock.Verifieer()
 	do TransactionServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
Index: APPS/AKP/AankoopControle/BLUM/impl/MultiGlobalLocker.cls.xml
===================================================================
diff -u -r36795 -r37273
--- APPS/AKP/AankoopControle/BLUM/impl/MultiGlobalLocker.cls.xml	(.../MultiGlobalLocker.cls.xml)	(revision 36795)
+++ APPS/AKP/AankoopControle/BLUM/impl/MultiGlobalLocker.cls.xml	(.../MultiGlobalLocker.cls.xml)	(revision 37273)
@@ -65,10 +65,10 @@
 <Private>1</Private>
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
-	#dim GlobalRefIterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(##class(TECH.ListUtils).RemoveDuplicateItems(..GlobalRefs))
-	#dim GlobalRef as %String
+	#Dim GlobalRefIterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(##class(TECH.ListUtils).RemoveDuplicateItems(..GlobalRefs))
+	#Dim GlobalRef as %String
 	
-	#dim LockCmd as String = "Lock "_Operation_"("
+	#Dim LockCmd as String = "Lock "_Operation_"("
 	while GlobalRefIterator.HasNext(){
 		set GlobalRef = GlobalRefIterator.Next()
 		set LockCmd = LockCmd _ GlobalRef
Index: APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker.cls.xml
===================================================================
diff -u -r37208 -r37273
--- APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker.cls.xml	(.../INVOIC02Verwerker.cls.xml)	(revision 37208)
+++ APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker.cls.xml	(.../INVOIC02Verwerker.cls.xml)	(revision 37273)
@@ -47,9 +47,9 @@
 <FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDP01Iterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDP01)
-	#dim E1EDP01 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01
-	#dim BerichtBehandelen as %Integer = 1
+	#Dim E1EDP01Iterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDP01)
+	#Dim E1EDP01 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01
+	#Dim BerichtBehandelen as %Integer = 1
 	while E1EDP01Iterator.HasNext(){ //per factuurlijn
 		set E1EDP01 = E1EDP01Iterator.Next()
 		Set BerichtBehandelen = BerichtBehandelen && ..ZendingService.BestaatZending(..#BlumLevNr,..GeefZendingID(E1EDP01))
@@ -63,10 +63,10 @@
 <FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDP01Iterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDP01)
-	#dim E1EDP01 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01
-	#dim zendingnummer as %String
-	#dim zendinglist as %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	#Dim E1EDP01Iterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDP01)
+	#Dim E1EDP01 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01
+	#Dim zendingnummer as %String
+	#Dim zendinglist as %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
 	while E1EDP01Iterator.HasNext(){ //per factuurlijn
 		set E1EDP01 = E1EDP01Iterator.Next()
 		set zendingnummer = ..GeefZendingID(E1EDP01)
@@ -82,9 +82,9 @@
 <FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDP01Iterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDP01)
-	#dim E1EDP01 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01
-	#dim zendingen as %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	#Dim E1EDP01Iterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDP01)
+	#Dim E1EDP01 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01
+	#Dim zendingen as %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
 	
 	while E1EDP01Iterator.HasNext(){ //per factuurlijn
 		set E1EDP01 = E1EDP01Iterator.Next()
@@ -98,12 +98,12 @@
 <FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDP01Iterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDP01)
-	#dim E1EDP01 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01
-	#dim NieuweVervLijnNr as %Integer
-	#dim BerichtBehandelen as %Integer = 1
-	#dim BlumFaktuurAangemaakt as %Integer = 0
-	#dim exceptionbericht as %String = "" 
+	#Dim E1EDP01Iterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDP01)
+	#Dim E1EDP01 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01
+	#Dim NieuweVervLijnNr as %Integer
+	#Dim BerichtBehandelen as %Integer = 1
+	#Dim BlumFaktuurAangemaakt as %Integer = 0
+	#Dim exceptionbericht as %String = "" 
 	if $$$Not(..MagBerichtVerwerktWorden(INVOIC02)) {
 		quit 0
 	} else {
@@ -115,8 +115,8 @@
 					set E1EDP01 = E1EDP01Iterator.Next()
 					// zoekt de factuur , maar onafhankelijk van de zending( die voor 1/1/2017 gelinkt is één factuur, daarna mogelijk meerdere)
 					// zal dus moeten aangepast worden
-					#dim BlumFaktuurNr as %String = ..GeefBlumFaktuurNummer(INVOIC02)
-					#dim BlumFaktuur as Blum.Facturen
+					#Dim BlumFaktuurNr as %String = ..GeefBlumFaktuurNummer(INVOIC02)
+					#Dim BlumFaktuur as Blum.Facturen
 					if $$$Not( ..BlumFacturenRepository.BestaatFactuurViaLeverancierEnFactuurNummer( ..#BlumLevNr,BlumFaktuurNr) ){
 						set BlumFaktuur = ..MaakBlumFaktuur(INVOIC02,E1EDP01)
 						set BlumFaktuurAangemaakt = 1
@@ -132,14 +132,14 @@
 					set NieuweVervLijnNr = ..ZendingService.VerplaatsDummyFaktuurLijn(..#BlumLevNr,..GeefZendingID(E1EDP01),BlumFaktuurNr,..GeefToeleveringInfo(E1EDP01),..GeefIdentNummer(E1EDP01),..GeefAantalGefaktureerd(E1EDP01))
 					if NieuweVervLijnNr {
 						if ..ZendingService.GeefFaktuurLijnWaarde(..#BlumLevNr,..GeefZendingID(E1EDP01),BlumFaktuurNr,NieuweVervLijnNr) '= ..GeefFaktuurLijnBedrag(E1EDP01){
-							#dim prijsverschil as String = ..BepaalTypePrijsVerschil(E1EDP01)
+							#Dim prijsverschil as String = ..BepaalTypePrijsVerschil(E1EDP01)
 							do ..ZendingService.ZetFaktuurPrijsVerschil(..#BlumLevNr,..GeefZendingID(E1EDP01),BlumFaktuurNr,"1")
 							do ..ZendingService.ZetFaktuurLijnPrijsVerschil(..#BlumLevNr,..GeefZendingID(E1EDP01),BlumFaktuurNr,NieuweVervLijnNr, prijsverschil)
 							do ..ZendingService.ZetFaktuurLijnWaarde(..#BlumLevNr,..GeefZendingID(E1EDP01),BlumFaktuurNr,NieuweVervLijnNr, ..GeefFaktuurLijnBedrag(E1EDP01))
 						}
 					} else {				
 						;is voor deze zending dit product/aantal van de toelevering al gefaktureerd? 
-						#dim tmpblumfaktuurnr as %String = ..ZendingService.GeefBlumFaktuurNrVanVervFaktuurLijnVoorProductAantal(..#BlumLevNr,..GeefZendingID(E1EDP01),..GeefToeleveringInfo(E1EDP01),..GeefIdentNummer(E1EDP01),..GeefAantalGefaktureerd(E1EDP01))	
+						#Dim tmpblumfaktuurnr as %String = ..ZendingService.GeefBlumFaktuurNrVanVervFaktuurLijnVoorProductAantal(..#BlumLevNr,..GeefZendingID(E1EDP01),..GeefToeleveringInfo(E1EDP01),..GeefIdentNummer(E1EDP01),..GeefAantalGefaktureerd(E1EDP01))	
 						if tmpblumfaktuurnr {
 							set exceptionbericht = ..GeefAantalGefaktureerd(E1EDP01) _ "stuks van Identnr " _ ..GeefIdentNummer(E1EDP01) _ " van toelevering "
 							set exceptionbericht = exceptionbericht _ ..GeefToeleveringInfo(E1EDP01) _ " zijn reeds gefaktureerd op blumfaktuurnummer " _ tmpblumfaktuurnr _ " voor zending " _ ..GeefZendingID(E1EDP01)
@@ -154,7 +154,7 @@
 				do ..TransactionService.CommitTransactie()
 			} catch {
 				do ..TransactionService.RollBackTransactie()
-				#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+				#Dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 				Do ##class(TECH.ExceptionHandler).Rethrow(Exception)
 			}
 		} else {
@@ -174,7 +174,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	;prijs verschil indien toelevering bekend, T in, indien manuele toelevering P, manuele Prijs M
-	#dim prijsverschil as String
+	#Dim prijsverschil as String
 	if $Length(..GeefToeleveringInfo(E1EDP01),".") = 2{ ;toelevering is ingevuld
 		set prijsverschil = "T"
 	} else {
@@ -191,7 +191,7 @@
 <Method name="MaakBlumFaktuur">
 <FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02,E1EDP01:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01</FormalSpec>
 <Implementation><![CDATA[
-	#dim BlumFaktuur as Blum.Facturen = ..BlumFacturenRepository.Maak()
+	#Dim BlumFaktuur as Blum.Facturen = ..BlumFacturenRepository.Maak()
 	Set BlumFaktuur.CreatieTijdStip=$zdt($H,3)
 	set BlumFaktuur.FactuurType = ..GeefFaktuurTypeVoorBlumFacturen(INVOIC02)
 	Do BlumFaktuur.LeverancierSetObjectId(..#BlumLevNr)
@@ -216,13 +216,15 @@
 
 <Method name="GeefIdentNummer">
 <FormalSpec>E1EDP01:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit E1EDP01.MATNR
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAantalGefaktureerd">
 <FormalSpec>E1EDP01:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01</FormalSpec>
+<Private>1</Private>
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
 	//geen andere MENEE dan PCE gevonden
@@ -232,10 +234,11 @@
 
 <Method name="GeefFaktuurLijnBedrag">
 <FormalSpec>E1EDP01:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01</FormalSpec>
+<Private>1</Private>
 <ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	#dim Bedrag as %Numeric = 0
-	#dim E1EDP26Iterator as TECH.Iterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP26)
+	#Dim Bedrag as %Numeric = 0
+	#Dim E1EDP26Iterator as TECH.Iterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP26)
 	#Dim E1EDP26 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP26
 	while E1EDP26Iterator.HasNext(){
 		set E1EDP26 = E1EDP26Iterator.Next()
@@ -247,10 +250,11 @@
 
 <Method name="GeefToeleveringInfo">
 <FormalSpec>E1EDP01:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim ToeleveringInfo as %String = ""
-	#dim E1EDP02Iterator as TECH.Iterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP02)
+	#Dim ToeleveringInfo as %String = ""
+	#Dim E1EDP02Iterator as TECH.Iterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP02)
 	#Dim E1EDP02 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP02
 	while E1EDP02Iterator.HasNext(){
 		set E1EDP02 = E1EDP02Iterator.Next()
@@ -262,10 +266,11 @@
 
 <Method name="GeefZendingID">
 <FormalSpec>E1EDP01:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim ZendingId as %String = ""
-	#dim E1EDP02Iterator as TECH.Iterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP02)
+	#Dim ZendingId as %String = ""
+	#Dim E1EDP02Iterator as TECH.Iterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP02)
 	#Dim E1EDP02 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP02
 	while E1EDP02Iterator.HasNext(){
 		set E1EDP02 = E1EDP02Iterator.Next()
@@ -286,9 +291,9 @@
 <FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDKA1Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDKA1)
-	#dim E1EDKA1 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDKA1
-	#dim BlumKlantNummer as %String = ""
+	#Dim E1EDKA1Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDKA1)
+	#Dim E1EDKA1 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDKA1
+	#Dim BlumKlantNummer as %String = ""
 	While E1EDKA1Iterator.HasNext(){
 		set E1EDKA1 = E1EDKA1Iterator.Next()
 		set:(E1EDKA1.PARVW="BY" ) BlumKlantNummer = E1EDKA1.PARTN
@@ -301,9 +306,9 @@
 <FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDK02Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDK02)
-	#dim E1EDK02 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDK02
-	#dim faktuurtype as %String = ""
+	#Dim E1EDK02Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDK02)
+	#Dim E1EDK02 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDK02
+	#Dim faktuurtype as %String = ""
 	While E1EDK02Iterator.HasNext(){
 		set E1EDK02 = E1EDK02Iterator.Next()
 		set:(E1EDK02.BELNR=..GeefBlumFaktuurNummer(INVOIC02) ) faktuurtype = E1EDK02.QUALF		
@@ -316,11 +321,12 @@
 
 <Method name="GeefFaktuurTypeVoorBlumFacturen">
 <FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
+<Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDK02Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDK02)
-	#dim E1EDK02 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDK02
-	#dim faktuurtype as %String = ""
+	#Dim E1EDK02Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDK02)
+	#Dim E1EDK02 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDK02
+	#Dim faktuurtype as %String = ""
 	While E1EDK02Iterator.HasNext(){
 		set E1EDK02 = E1EDK02Iterator.Next()
 		set:(E1EDK02.BELNR=..GeefBlumFaktuurNummer(INVOIC02) ) faktuurtype = E1EDK02.QUALF		
@@ -335,9 +341,9 @@
 <FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDK03Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDK03)
-	#dim E1EDK03 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDK03
-	#dim datum as %String = ""
+	#Dim E1EDK03Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDK03)
+	#Dim E1EDK03 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDK03
+	#Dim datum as %String = ""
 	While E1EDK03Iterator.HasNext(){
 		set E1EDK03 = E1EDK03Iterator.Next()
 		;YYYYMMDD -> YY-MM-DD
@@ -351,9 +357,9 @@
 <FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
 <ReturnType>%Numeric</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDS01Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDS01)
-	#dim E1EDS01 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDS01
-	#dim bedrag as %Numeric = 0
+	#Dim E1EDS01Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(INVOIC02.IDOC.E1EDS01)
+	#Dim E1EDS01 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDS01
+	#Dim bedrag as %Numeric = 0
 	While E1EDS01Iterator.HasNext(){
 		set E1EDS01 = E1EDS01Iterator.Next()
 		set:(E1EDS01.SUMID = "010" ) bedrag = E1EDS01.SUMME
Index: APPS/AKP/Zending/impl/ZendingService.cls.xml
===================================================================
diff -u -r36900 -r37273
--- APPS/AKP/Zending/impl/ZendingService.cls.xml	(.../ZendingService.cls.xml)	(revision 36900)
+++ APPS/AKP/Zending/impl/ZendingService.cls.xml	(.../ZendingService.cls.xml)	(revision 37273)
@@ -103,8 +103,8 @@
 <Method name="MaakZendingFaktuur">
 <FormalSpec>BlumLevNr:%String,ZendingId:%String,FaktuurNr:%String,BlumFaktuur:Blum.Facturen</FormalSpec>
 <Implementation><![CDATA[
-	#dim VervFaktuurData as %String
-	#dim faktuurtype as %String = ""
+	#Dim VervFaktuurData as %String
+	#Dim faktuurtype as %String = ""
 	set faktuurtype = $Select(BlumFaktuur.FactuurType="F":"01",BlumFaktuur.FactuurType="C":"03",BlumFaktuur.FactuurType="D":"04",BlumFaktuur.FactuurType="P":"05")
 	
 	Set $Piece(VervFaktuurData,"\",##class(APPS.AKP.Zending.impl.ZendingService).#VervFaktuurType) = faktuurtype
@@ -124,9 +124,9 @@
 <FormalSpec>BlumLevNr:%Integer,ZendingId:%String,BlumFaktuurNr:%String,ToeleveringInfo:%String,IdentNummer:%String,AantalGefaktureerd:%Integer</FormalSpec>
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
-	#dim rec as %String
-	#dim index as %Integer = -1
-	#dim nieuweindex as %Integer = 0
+	#Dim rec as %String
+	#Dim index as %Integer = -1
+	#Dim nieuweindex as %Integer = 0
 	set index = $Order(@..#Global(BlumLevNr,"D",ZendingId,"999999",index))
 	While ((index '= "")){
 		set rec = @..#Global(BlumLevNr,"D",ZendingId,"999999",index)		
@@ -151,11 +151,11 @@
 <FormalSpec>BlumLevNr:%Integer,ZendingId:%String,ToeleveringInfo:%String,IdentNummer:%String,AantalGefaktureerd:%Integer</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim result as String = ""
-	#dim rec as %String
-	#dim FaktuurNr as %String = ""	
-	#dim index as %Integer = -1
-	#dim nieuweindex as %Integer = 0
+	#Dim result as String = ""
+	#Dim rec as %String
+	#Dim FaktuurNr as %String = ""	
+	#Dim index as %Integer = -1
+	#Dim nieuweindex as %Integer = 0
 	set FaktuurNr = $Order(@..#Global(BlumLevNr,"D",ZendingId,FaktuurNr))
 	While ((FaktuurNr '= "")){
 		if $$$Not(FaktuurNr="999999") {
@@ -178,10 +178,10 @@
 <Method name="HerrekenDummyFaktuur">
 <FormalSpec>BlumLevNr:%String,ZendingId:%String</FormalSpec>
 <Implementation><![CDATA[
-	#dim rec as %String
-	#dim index = -1
-	#dim totaal as %Numeric = 0
-	#dim aantallijnen as %integer = 0
+	#Dim rec as %String
+	#Dim index = -1
+	#Dim totaal as %Numeric = 0
+	#Dim aantallijnen as %integer = 0
 	set index = $Order(@..#Global(BlumLevNr,"D",ZendingId,"999999",index))
 	While ((index '= "")){
 		set aantallijnen = aantallijnen + 1
Index: APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml
===================================================================
diff -u -r36343 -r37273
--- APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml	(.../DespatchNaarCSBSOConverteerder.cls.xml)	(revision 36343)
+++ APPS/AKP/AankoopControle/BLUM/impl/DespatchNaarCSBSOConverteerder.cls.xml	(.../DespatchNaarCSBSOConverteerder.cls.xml)	(revision 37273)
@@ -24,8 +24,8 @@
 <FormalSpec>DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
 <ReturnType>APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO</ReturnType>
 <Implementation><![CDATA[
-	#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO).%New()
-	#dim CSBSO11 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011 = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011).%New()
+	#Dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO).%New()
+	#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 CSBSO.CSBSO11List.Insert(CSBSO11)
@@ -61,7 +61,7 @@
 	set CSBSO11.DeliveryAddress = "Van Hoecke -XL"
 	set CSBSO11.TransportationMode = "L"	
 		
-	#dim CSBSO21 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021 = ##Class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021).%New()	
+	#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>
@@ -71,26 +71,26 @@
 <FormalSpec>CSBSO21:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021,DELVRY03:APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim counter as %Integer = 1
-	#dim varnaam as %String
+	#Dim counter as %Integer = 1
+	#Dim varnaam as %String
 	set CSBSO21.ShipmentID = DELVRY03.IDOC.E1EDL20.GetAt(1).VBELN
 	set CSBSO21.ShipmentDate = ..GeefShipmentDateYYMMDD(DELVRY03)
 	set CSBSO21.GrosWeight = DELVRY03.IDOC.E1EDL20.GetAt(1).BTGEW
 	set CSBSO21.NetWeight = 0
 	set CSBSO21.ShiptoCustomerNr = ..GeefShipToCustomerNr(DELVRY03)
 
-	#dim E1EDL20 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL20 = DELVRY03.IDOC.E1EDL20.GetAt(1)
+	#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 E1EDL24Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL20.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
 	}
 	
-	#dim CSBSO31 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031 = ##Class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031).%New()	
+	#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)
 ]]></Implementation>
@@ -110,17 +110,17 @@
 	set CSBSO31.DeliveryCustomerNr = ..GeefShipToCustomerNr(DELVRY03)
 	set CSBSO31.InvoicingCustomerNr = CSBSO31.DeliveryCustomerNr
 
-	#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
+	#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)
-		#dim E1EDL44 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL44
+		#Dim E1EDL44Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL37.E1EDL44)
+		#Dim E1EDL44 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL44
 		While E1EDL44Iterator.HasNext(){
 			set E1EDL44 = E1EDL44Iterator.Next()
-			#dim arraysleutel as %String = E1EDL44.KDMAT _ E1EDL44.VBELN _ E1EDL44.POSNR
+			#Dim arraysleutel as %String = E1EDL44.KDMAT _ E1EDL44.VBELN _ E1EDL44.POSNR
 			if 'CSBSO31.CSBSO41Array.IsDefined(arraysleutel){
-				#dim CSBSO41 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041 = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041).%New()
+				#Dim CSBSO41 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041 = ##class(APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041).%New()
 				set CSBSO41.ABNr = ..GeefABNr(E1EDL44)
 				set CSBSO41.ABLijnNr = ..GeefABLnNr(E1EDL44)
 				set CSBSO41.OrderLineCompletion = "C"
@@ -177,9 +177,9 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
-	#dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
-	#dim orderlinecustomer as %String = ""
+	#Dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
+	#Dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
+	#Dim orderlinecustomer as %String = ""
 	While (E1EDL46Iterator.HasNext()) && (orderlinecustomer =""){ 
 		set E1EDL46 = E1EDL46Iterator.Next()		
 		set:(E1EDL46.UII = "ZON" ) orderlinecustomer = E1EDL46.SERNR
@@ -193,9 +193,9 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
-	#dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
-	#dim nrofpackages as %Integer = 0
+	#Dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
+	#Dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
+	#Dim nrofpackages as %Integer = 0
 	While (E1EDL46Iterator.HasNext()) && (nrofpackages = 0){ 
 		set E1EDL46 = E1EDL46Iterator.Next()		
 		set:(E1EDL46.UII = "ZNP" ) nrofpackages = E1EDL46.SERNR
@@ -209,9 +209,9 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
-	#dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
-	#dim pieces as %Integer = 0
+	#Dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
+	#Dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
+	#Dim pieces as %Integer = 0
 	While (E1EDL46Iterator.HasNext()) && (pieces = 0){ 
 		set E1EDL46 = E1EDL46Iterator.Next()		
 		set:(E1EDL46.UII = "ZQP" ) pieces = E1EDL46.SERNR
@@ -225,9 +225,9 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
-	#dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
-	#dim abnr as %String = ""
+	#Dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
+	#Dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
+	#Dim abnr as %String = ""
 	While (E1EDL46Iterator.HasNext()) && (abnr = ""){ 
 		set E1EDL46 = E1EDL46Iterator.Next()		
 		set:(E1EDL46.UII = "ZVN" ) abnr = E1EDL46.SERNR
@@ -241,9 +241,9 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
-	#dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
-	#dim ablnnr as %String = ""
+	#Dim E1EDL46Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL44.E1EDL46)
+	#Dim E1EDL46 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL46
+	#Dim ablnnr as %String = ""
 	While (E1EDL46Iterator.HasNext()) && (ablnnr = ""){ 
 		set E1EDL46 = E1EDL46Iterator.Next()		
 		set:(E1EDL46.UII = "ZVP" ) ablnnr = E1EDL46.SERNR
@@ -257,12 +257,12 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDL20 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL20 = DELVRY03.IDOC.E1EDL20.GetAt(1)
+	#Dim E1EDL20 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL20 = DELVRY03.IDOC.E1EDL20.GetAt(1)
 	
-	#dim E1ADRM1Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL20.E1ADRM1)
-	#dim E1ADRM1 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1ADRM1
+	#Dim E1ADRM1Iterator As TECH.ListIterator = ##Class(TECH.ListIterator).%New(E1EDL20.E1ADRM1)
+	#Dim E1ADRM1 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1ADRM1
 	
-	#dim CustomerNr as String = ""
+	#Dim CustomerNr as String = ""
 	
 	While E1ADRM1Iterator.HasNext(){
 		set E1ADRM1 = E1ADRM1Iterator.Next()
@@ -277,11 +277,11 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim E1EDL20Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(DELVRY03.IDOC.E1EDL20)
-	#dim E1EDL20 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL20
-	#dim E1EDT13Iterator As TECH.ListIterator
-	#dim E1EDT13 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDT13
-	#dim Shipmentdate as %String = ""
+	#Dim E1EDL20Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(DELVRY03.IDOC.E1EDL20)
+	#Dim E1EDL20 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL20
+	#Dim E1EDT13Iterator As TECH.ListIterator
+	#Dim E1EDT13 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDT13
+	#Dim Shipmentdate as %String = ""
 	
 	While E1EDL20Iterator.HasNext(){
 		set E1EDL20 = E1EDL20Iterator.Next()
@@ -300,11 +300,11 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	
-	#dim E1EDL20Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(DELVRY03.IDOC.E1EDL20)
-	#dim E1EDL20 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL20
+	#Dim E1EDL20Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(DELVRY03.IDOC.E1EDL20)
+	#Dim E1EDL20 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDL20
 	
-	#dim E1EDT13Iterator As TECH.ListIterator
-	#dim E1EDT13 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDT13
+	#Dim E1EDT13Iterator As TECH.ListIterator
+	#Dim E1EDT13 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.E1EDT13
 	
 	While E1EDL20Iterator.HasNext(){
 		set E1EDL20 = E1EDL20Iterator.Next()
@@ -316,7 +316,7 @@
 	}
 	
 	/* ofwel 
-	#dim ISDD as %String = DELVRY03.IDOC.E1EDL20.GetAt(1).E1EDT13.GetAt(1).ISDD
+	#Dim ISDD as %String = DELVRY03.IDOC.E1EDL20.GetAt(1).E1EDT13.GetAt(1).ISDD
 	set CSBSO.CSBSOHeader.MIOTCR = $EXTRACT(ISDD,7,8) _"-" _$EXTRACT(ISDD,5,6) _"-" _$EXTRACT(ISDD,3,4)
 	wegens maar één occurence of E1EDL20 en E1EDT13 in een bestand.
 	*/
Index: APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml
===================================================================
diff -u -r37139 -r37273
--- APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml	(.../FactuurBerichtOntvanger.cls.xml)	(revision 37139)
+++ APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml	(.../FactuurBerichtOntvanger.cls.xml)	(revision 37273)
@@ -71,7 +71,7 @@
 	
 	try{
 		Do ..Logger.Info("Factuurberichten verwerken",BestandVolledigeNaam)
-		#dim INVOIC02 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02 = ..LeesXMLBestand(BestandVolledigeNaam)
+		#Dim INVOIC02 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02 = ..LeesXMLBestand(BestandVolledigeNaam)
 		if ..INVOIC02Verwerker.Verwerk(INVOIC02) {			
 			Do ..KopieerNaarArchiefMap(BestandVolledigeNaam)	
 			Do ..Logger.Info("Factuurberichten verwerken","Bericht verwerkt en gearchiveerd")
@@ -81,8 +81,8 @@
 		
 		
 	} catch {		
-		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()		
-		#dim BerichtVoorGebruiker As %String = "Een INVOIC bericht van BLUM kon niet verwerkt worden. : " _BestandVolledigeNaam
+		#Dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()		
+		#Dim BerichtVoorGebruiker As %String = "Een INVOIC bericht van BLUM kon niet verwerkt worden. : " _BestandVolledigeNaam
 		do ..Logger.ErrorMail("VerwerkFactuurBestand",(BerichtVoorGebruiker _" " _Exceptie.ToString()))
 		Do ..KopieerNaarErrorMap(BestandVolledigeNaam)		
 	}
@@ -94,8 +94,8 @@
 <Private>1</Private>
 <ReturnType>APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</ReturnType>
 <Implementation><![CDATA[
-	#dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02).%ClassName(1)
-	#dim INVOIC02 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02 = ..XmlCorrelater.GeefObjectVanBestand(BestandVolledigeNaam,ClassName,"INVOIC02")
+	#Dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02).%ClassName(1)
+	#Dim INVOIC02 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02 = ..XmlCorrelater.GeefObjectVanBestand(BestandVolledigeNaam,ClassName,"INVOIC02")
 	quit INVOIC02
 ]]></Implementation>
 </Method>
@@ -119,9 +119,9 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	try {
-		#dim Bestandsnaam As %String = ##class(TECH.File).GeefBestandsnaam(BestandVolledigeNaam)
-		#dim NieuwBestandLocatie As %String = ##class(TECH.Files).AppendSubPath(..GeefBestandLocatie(),MapNaam) 
-		#dim NieuwBestandVolledigeNaam As %String = ##class(TECH.Files).AppendFile(NieuwBestandLocatie, Bestandsnaam)
+		#Dim Bestandsnaam As %String = ##class(TECH.File).GeefBestandsnaam(BestandVolledigeNaam)
+		#Dim NieuwBestandLocatie As %String = ##class(TECH.Files).AppendSubPath(..GeefBestandLocatie(),MapNaam) 
+		#Dim NieuwBestandVolledigeNaam As %String = ##class(TECH.Files).AppendFile(NieuwBestandLocatie, Bestandsnaam)
 		Do ..FileUtils.CopyFile(BestandVolledigeNaam,NieuwBestandVolledigeNaam)
 		Do ..FileUtils.Delete(BestandVolledigeNaam)
 	} catch {}
@@ -138,7 +138,7 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim BestandLocatie As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("MSMGATEWAY")
+	#Dim BestandLocatie As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("MSMGATEWAY")
 	Quit ##class(TECH.Files).AppendSubPath(BestandLocatie,"\EDI_BLUM_XML_IN\")
 ]]></Implementation>
 </Method>
Index: APPS/AKP/Receptie/impl/ReceptieService.cls.xml
===================================================================
diff -u -r36524 -r37273
--- APPS/AKP/Receptie/impl/ReceptieService.cls.xml	(.../ReceptieService.cls.xml)	(revision 36524)
+++ APPS/AKP/Receptie/impl/ReceptieService.cls.xml	(.../ReceptieService.cls.xml)	(revision 37273)
@@ -11,11 +11,11 @@
 <Method name="UpdateReceptie">
 <FormalSpec>ReceptieNummer:%String,ToeleveringInfo:%String,FaktuurNummerVan:%String,VervLijnNummerVan:%Integer,FaktuurNummerNaar:%String,VervLijnNummerNaar:%Integer</FormalSpec>
 <Implementation><![CDATA[
-	#dim rec as %String
-	#dim indextlunr as %Integer
-	#dim recsubnr as %String
-	#dim indexsubnr as %Integer
-	#dim ToeleveringNummer As %String
+	#Dim rec as %String
+	#Dim indextlunr as %Integer
+	#Dim recsubnr as %String
+	#Dim indexsubnr as %Integer
+	#Dim ToeleveringNummer As %String
 	
 	set ToeleveringNummer = $Piece(ToeleveringInfo,".",1)
 	
Index: vhTest/Mock/APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker.cls.xml
===================================================================
diff -u -r36789 -r37273
--- vhTest/Mock/APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker.cls.xml	(.../INVOIC02Verwerker.cls.xml)	(revision 36789)
+++ vhTest/Mock/APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker.cls.xml	(.../INVOIC02Verwerker.cls.xml)	(revision 37273)
@@ -16,13 +16,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefAantalGefaktureerd">
-<FormalSpec>E1EDP01:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01</FormalSpec>
-<ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefAantalGefaktureerd",E1EDP01)
-]]></Implementation>
-</Method>
-
 <Method name="GeefBlumFaktuurNummer">
 <FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
 <ReturnType>%String</ReturnType>
@@ -44,34 +37,13 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefFaktuurLijnBedrag">
-<FormalSpec>E1EDP01:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01</FormalSpec>
-<ReturnType>%Numeric</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefFaktuurLijnBedrag",E1EDP01)
-]]></Implementation>
-</Method>
-
 <Method name="GeefFaktuurType">
 <FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefFaktuurType",INVOIC02)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefFaktuurTypeVoorBlumFacturen">
-<FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefFaktuurTypeVoorBlumFacturen",INVOIC02)
-]]></Implementation>
-</Method>
-
-<Method name="GeefIdentNummer">
-<FormalSpec>E1EDP01:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefIdentNummer",E1EDP01)
-]]></Implementation>
-</Method>
-
 <Method name="GeefNettoFaktuurBedrag">
 <FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
 <ReturnType>%Numeric</ReturnType>
@@ -86,20 +58,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefToeleveringInfo">
-<FormalSpec>E1EDP01:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefToeleveringInfo",E1EDP01)
-]]></Implementation>
-</Method>
-
-<Method name="GeefZendingID">
-<FormalSpec>E1EDP01:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.E1EDP01</FormalSpec>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefZendingID",E1EDP01)
-]]></Implementation>
-</Method>
-
 <Method name="GeefZendingNummers">
 <FormalSpec>INVOIC02:APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
Index: APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml
===================================================================
diff -u -r37139 -r37273
--- APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml	(.../DespatchBerichtOntvanger.cls.xml)	(revision 37139)
+++ APPS/AKP/AankoopControle/BLUM/impl/DespatchBerichtOntvanger.cls.xml	(.../DespatchBerichtOntvanger.cls.xml)	(revision 37273)
@@ -85,8 +85,8 @@
 		Do ..Logger.Info("Transportberichten verwerken","Bericht verwerkt en gearchiveerd")
 
 	} catch {		
-		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()		
-		#dim BerichtVoorGebruiker As %String = "Een DESPATCH bericht van BLUM kon niet verwerkt worden. : " _BestandVolledigeNaam
+		#Dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()		
+		#Dim BerichtVoorGebruiker As %String = "Een DESPATCH bericht van BLUM kon niet verwerkt worden. : " _BestandVolledigeNaam
 		Do ##class(vhLib.Logger).%New("").ErrorMail("VerwerkDESPATCHBestand",(BerichtVoorGebruiker _" " _Exceptie.ToString()))
 		Do ..KopieerNaarErrorMap(BestandVolledigeNaam)		
 	}
@@ -107,7 +107,7 @@
 <Private>1</Private>
 <ReturnType>APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO</ReturnType>
 <Implementation><![CDATA[
-	#dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ..Delvry03Converteerder.Converteer(DELVRY03)
+	#Dim CSBSO as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBSO = ..Delvry03Converteerder.Converteer(DELVRY03)
 	quit CSBSO
 ]]></Implementation>
 </Method>
@@ -117,8 +117,8 @@
 <Private>1</Private>
 <ReturnType>APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03</ReturnType>
 <Implementation><![CDATA[
-	#dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03).%ClassName(1)
-	#dim DELVRY03 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03 = ..XmlCorrelater.GeefObjectVanBestand(BestandVolledigeNaam,ClassName,"DELVRY03")
+	#Dim ClassName As %String = ##class(APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03).%ClassName(1)
+	#Dim DELVRY03 as APPS.AKP.AankoopControle.BLUM.XML.Transport.Despatch.DELVRY03 = ..XmlCorrelater.GeefObjectVanBestand(BestandVolledigeNaam,ClassName,"DELVRY03")
 	quit DELVRY03
 ]]></Implementation>
 </Method>
@@ -142,9 +142,9 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	try {
-		#dim Bestandsnaam As %String = ##class(TECH.File).GeefBestandsnaam(BestandVolledigeNaam)
-		#dim NieuwBestandLocatie As %String = ##class(TECH.Files).AppendSubPath(..GeefBestandLocatie(),MapNaam) 
-		#dim NieuwBestandVolledigeNaam As %String = ##class(TECH.Files).AppendFile(NieuwBestandLocatie, Bestandsnaam)
+		#Dim Bestandsnaam As %String = ##class(TECH.File).GeefBestandsnaam(BestandVolledigeNaam)
+		#Dim NieuwBestandLocatie As %String = ##class(TECH.Files).AppendSubPath(..GeefBestandLocatie(),MapNaam) 
+		#Dim NieuwBestandVolledigeNaam As %String = ##class(TECH.Files).AppendFile(NieuwBestandLocatie, Bestandsnaam)
 		Do ..FileUtils.CopyFile(BestandVolledigeNaam,NieuwBestandVolledigeNaam)
 		Do ..FileUtils.Delete(BestandVolledigeNaam)
 	} catch {}
@@ -163,7 +163,7 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim BestandLocatie As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("MSMGATEWAY")
+	#Dim BestandLocatie As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("MSMGATEWAY")
 	Quit ##class(TECH.Files).AppendSubPath(BestandLocatie,"\EDI_BLUM_XML_IN\")
 ]]></Implementation>
 </Method>
Index: APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaar.cls.xml
===================================================================
diff -u -r36581 -r37273
--- APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaar.cls.xml	(.../ToeleveringInfoVerzamelaar.cls.xml)	(revision 36581)
+++ APPS/AKP/AankoopControle/BLUM/impl/ToeleveringInfoVerzamelaar.cls.xml	(.../ToeleveringInfoVerzamelaar.cls.xml)	(revision 37273)
@@ -28,17 +28,17 @@
 <FormalSpec>CSBSO31:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031,CSBSO41:APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041,ToeleveringNr:%String,ToeleveringLijnNr:%String</FormalSpec>
 <Implementation><![CDATA[
 	if ..ToeleveringAPI.BestaatToelevering(ToeleveringNr){		
-		#dim Toelevering As DOM.AKP.Toelevering = ..ToeleveringAPI.GeefToelevering(ToeleveringNr)	
-		#dim ToeleveringLijnID As %Integer = ToeleveringLijnNr * 100
+		#Dim Toelevering As DOM.AKP.Toelevering = ..ToeleveringAPI.GeefToelevering(ToeleveringNr)	
+		#Dim ToeleveringLijnID As %Integer = ToeleveringLijnNr * 100
 		if Toelevering.BestaatToeleveringLijn(ToeleveringLijnID){
-			#dim ToeleveringLijn As DOM.AKP.impl.DataM.DataMProductToeleveringLijn = Toelevering.GeefToeleveringLijn(ToeleveringLijnID)	
+			#Dim ToeleveringLijn As DOM.AKP.impl.DataM.DataMProductToeleveringLijn = Toelevering.GeefToeleveringLijn(ToeleveringLijnID)	
 			set CSBSO41.ProductNrCustomer = ToeleveringLijn.GeefProductID()
-			#dim Product as DOM.PM.Product = ..ProductAPI.GeefProduct(CSBSO41.ProductNrCustomer)
+			#Dim Product as DOM.PM.Product = ..ProductAPI.GeefProduct(CSBSO41.ProductNrCustomer)
 			;Theoretische prijs volgens toelevering. 
 			set CSBSO41.Value = CSBSO41.QuantityInvoiced * ToeleveringLijn.GeefEenheidsPrijs() / $Select(Product.GeefGrootteOrdeAankoop()="M":1000,Product.GeefGrootteOrdeAankoop()="H":100,1:1 )
 			set CSBSO41.Value = CSBSO41.Value * (1 - ToeleveringLijn.GeefKorting())
 		} else {
-			#dim Error As %String = ""
+			#Dim Error As %String = ""
 			if ToeleveringLijnNr = "" {
 				set Error = "Geen lijnnr gespecifieerd voor van toelevering " _ ToeleveringNr _" in xml bestand"
 			} else {
@@ -53,9 +53,9 @@
 
 			if ##class(Blum.Product).%ExistsId(CSBSO41.IdentNr) {
 				;Theorische prijs volgens product
-				#dim BlumProduct as Blum.Product = ##class(Blum.Product).%OpenId(CSBSO41.IdentNr)
-				#dim ProductPrijs as Blum.ProductPrijs = ##class(Blum.ProductPrijs).%OpenId(CSBSO41.IdentNr_"||"_ $Select(CSBSO31.InvoicingCustomerNr="212250":"E12",1:"E24"))
-				#dim Rabat as Blum.Rabat = ##class(Blum.Rabat).%OpenId(CSBSO31.InvoicingCustomerNr)
+				#Dim BlumProduct as Blum.Product = ##class(Blum.Product).%OpenId(CSBSO41.IdentNr)
+				#Dim ProductPrijs as Blum.ProductPrijs = ##class(Blum.ProductPrijs).%OpenId(CSBSO41.IdentNr_"||"_ $Select(CSBSO31.InvoicingCustomerNr="212250":"E12",1:"E24"))
+				#Dim Rabat as Blum.Rabat = ##class(Blum.Rabat).%OpenId(CSBSO31.InvoicingCustomerNr)
 
 				set CSBSO41.Value = CSBSO41.QuantityInvoiced * ProductPrijs.Prijs / $Select(ProductPrijs.PrijsDimensie="M":1000,ProductPrijs.PrijsDimensie="H":100,1:1 ) 
 				set CSBSO41.Value = CSBSO41.Value * (1- Rabat.KortingsPercentageDefault)
Index: APPS/AKP/AankoopControle/BLUM/impl/Bewaarder.cls.xml
===================================================================
diff -u -r37065 -r37273
--- APPS/AKP/AankoopControle/BLUM/impl/Bewaarder.cls.xml	(.../Bewaarder.cls.xml)	(revision 37065)
+++ APPS/AKP/AankoopControle/BLUM/impl/Bewaarder.cls.xml	(.../Bewaarder.cls.xml)	(revision 37273)
@@ -28,34 +28,34 @@
 	Do ..ZetMsgNr()
 	Kill @..#Global(..MsgNr)
  	Do ..SchrijfHeader("")
-	#dim RecordCount As %Integer = 0
-	#dim CSBSO11Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CSBSO.CSBSO11List)
+	#Dim RecordCount As %Integer = 0
+	#Dim CSBSO11Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CSBSO.CSBSO11List)
 	while CSBSO11Iterator.HasNext(){
-		#dim CSBSO11 As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011 = CSBSO11Iterator.Next()
+		#Dim CSBSO11 As APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS011 = CSBSO11Iterator.Next()
 		Do ..SchrijfRecord(CSBSO11.ToString())
 		Set RecordCount = RecordCount + 1
 
-		#dim CSBSO21Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CSBSO11.CSBSO21List)
+		#Dim CSBSO21Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CSBSO11.CSBSO21List)
 		while CSBSO21Iterator.HasNext(){
-			#dim CSBSO21 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021 = CSBSO21Iterator.Next()
+			#Dim CSBSO21 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS021 = CSBSO21Iterator.Next()
 			Do ..SchrijfRecord(CSBSO21.ToString())
 			Set RecordCount = RecordCount + 1
 
-			#dim CSBSO31Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CSBSO21.CSBSO31List)
+			#Dim CSBSO31Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CSBSO21.CSBSO31List)
 			while CSBSO31Iterator.HasNext(){
-				#dim CSBSO31 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031 = CSBSO31Iterator.Next()
+				#Dim CSBSO31 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031 = CSBSO31Iterator.Next()
 				Do ..SchrijfRecord(CSBSO31.ToString())
 				Set RecordCount = RecordCount + 1
-				#dim arrindex as %String = ""
+				#Dim arrindex as %String = ""
 				do {
-					#dim CSBSO41 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041 = CSBSO31.CSBSO41Array.GetNext(.arrindex)
+					#Dim CSBSO41 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS041 = CSBSO31.CSBSO41Array.GetNext(.arrindex)
 					if arrindex '= "" {
 						Do ..SchrijfRecord(CSBSO41.ToString())
 						Set RecordCount = RecordCount + 1
 
-						#dim CSBSO44Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CSBSO41.CSBSO44List)
+						#Dim CSBSO44Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(CSBSO41.CSBSO44List)
 						while CSBSO44Iterator.HasNext(){
-							#dim CSBSO44 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031 = CSBSO44Iterator.Next()
+							#Dim CSBSO44 as APPS.AKP.AankoopControle.BLUM.TXT.TransportEnFaktuur.CSBS031 = CSBSO44Iterator.Next()
 							Do ..SchrijfRecord(CSBSO44.ToString())
 							Set RecordCount = RecordCount + 1
 						}