Index: vhTest/Mock/APPS/AKP/Zending/impl/ZendingService.cls.xml
===================================================================
diff -u -r36475 -r36524
--- vhTest/Mock/APPS/AKP/Zending/impl/ZendingService.cls.xml	(.../ZendingService.cls.xml)	(revision 36475)
+++ vhTest/Mock/APPS/AKP/Zending/impl/ZendingService.cls.xml	(.../ZendingService.cls.xml)	(revision 36524)
@@ -9,16 +9,6 @@
 <Super>APPS.AKP.Zending.impl.ZendingService,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
-<Parameter name="Global">
-<Type>%String</Type>
-<Default>..MultiDim</Default>
-</Parameter>
-
-<Property name="MultiDim">
-<Type>%String</Type>
-<MultiDimensional>1</MultiDimensional>
-</Property>
-
 <Method name="BestaatFaktuurLijn">
 <FormalSpec>Levnr:%String,ZendingId:%String,FaktuurNr:%String,Lijnnr:%Integer</FormalSpec>
 <ReturnType>%String</ReturnType>
Index: APPS/AKP/Zending/impl/ZendingService.cls.xml
===================================================================
diff -u -r36475 -r36524
--- APPS/AKP/Zending/impl/ZendingService.cls.xml	(.../ZendingService.cls.xml)	(revision 36475)
+++ APPS/AKP/Zending/impl/ZendingService.cls.xml	(.../ZendingService.cls.xml)	(revision 36524)
@@ -69,6 +69,22 @@
 <Default>16</Default>
 </Parameter>
 
+<Property name="ReceptieService">
+<Type>APPS.AKP.Receptie.impl.ReceptieService</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ReceptieService:APPS.AKP.Receptie.impl.ReceptieService</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..ReceptieService = $$$Inject(ReceptieService,##class(APPS.AKP.Receptie.impl.ReceptieService).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefType">
 <FormalSpec>LeverancierID:%String,ZendingNr:%String,BlumFaktuurNr:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
@@ -82,16 +98,14 @@
 	#dim VervFaktuurData as %String
 	Set $Piece(VervFaktuurData,"\",##class(APPS.AKP.Zending.impl.ZendingService).#VervFaktuurType) = BlumFaktuur.FactuurType
 	Set $Piece(VervFaktuurData,"\",##class(APPS.AKP.Zending.impl.ZendingService).#VervFaktuurDatum) = BlumFaktuur.FactuurDatum
-	Set $Piece(VervFaktuurData,"\",##class(APPS.AKP.Zending.impl.ZendingService).#VervFaktuurValutaDatum ) = BlumFaktuur.FactuurDatum
+	Set $Piece(VervFaktuurData,"\",##class(APPS.AKP.Zending.impl.ZendingService).#VervFaktuurValutaDatum ) =  $$FormatDateTime^vhLib("YY.MM.DD",BlumFaktuur.FactuurDatum)
 	Set $Piece(VervFaktuurData,"\",##class(APPS.AKP.Zending.impl.ZendingService).#VervFaktuurMunt) = "EUR"
 	Set $Piece(VervFaktuurData,"\",##class(APPS.AKP.Zending.impl.ZendingService).#VervFaktuurNetto) = BlumFaktuur.BedragGoederen
 	Set $Piece(VervFaktuurData,"\",##class(APPS.AKP.Zending.impl.ZendingService).#VervFaktuurBlumKlantnr) = BlumFaktuur.BlumKlantNr
 	Set $Piece(VervFaktuurData,"\",##class(APPS.AKP.Zending.impl.ZendingService).#VervFaktuurPrijsVerschil) = ""
 	Set $Piece(VervFaktuurData,"\",##class(APPS.AKP.Zending.impl.ZendingService).#VervFaktuurStatus) = ""
 	Set $Piece(VervFaktuurData,"\",##class(APPS.AKP.Zending.impl.ZendingService).#VervFaktuurInternFaktuurNr) = ""
 	set @..#Global(BlumLevNr,"D",ZendingID,FaktuurNr) = VervFaktuurData
-
-	;Do ..ZendingService.MaakZendingFaktuur(..#BlumLevNr,ZendingID,FaktuurNr,VervFaktuurData)
 ]]></Implementation>
 </Method>
 
@@ -107,6 +121,9 @@
 			#dim nieuweindex as %Integer = $Order(@..#Global(BlumLevNr,"D",ZendingID,BlumFaktuurNr,100),-1) + 1
 			Merge @..#Global(BlumLevNr,"D",ZendingID,BlumFaktuurNr,nieuweindex) = @..#Global(BlumLevNr,"D",ZendingID,"999999",index)
 			kill @..#Global(BlumLevNr,"D",ZendingID,"999999",index)
+			w !,"Voor update receptie",..GeefReceptieNummerZending(BlumLevNr,ZendingID)," " ,ToeleveringInfo," ","999999"," ",index," ",BlumFaktuurNr," ",nieuweindex 
+			do ..ReceptieService.UpdateReceptie(..GeefReceptieNummerZending(BlumLevNr,ZendingID) ,ToeleveringInfo,"999999",index,BlumFaktuurNr,nieuweindex )
+			w !,"Na update receptie"
 			quit
 		} 
 		set index = $Order(@..#Global(BlumLevNr,"D",ZendingID,"999999",index))
Index: vhUnitTest/APPS/AKP/Receptie/impl/ReceptieService/Test.cls.xml
===================================================================
diff -u -r36478 -r36524
--- vhUnitTest/APPS/AKP/Receptie/impl/ReceptieService/Test.cls.xml	(.../Test.cls.xml)	(revision 36478)
+++ vhUnitTest/APPS/AKP/Receptie/impl/ReceptieService/Test.cls.xml	(.../Test.cls.xml)	(revision 36524)
@@ -10,32 +10,11 @@
 <Method name="OnBeforeOneTest">
 <FormalSpec>TestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	
 	do ##super(TestName)
+
 	set ..ReceptieService = ##class(vhTest.Fake.APPS.AKP.Receptie.impl.ReceptieService).%New()	
-	;Opzetten ^RCP state in geheugen
 	#dim Data As TECH.MultiDim  
-	
-	Set Data("D",175658) ="L\5005\884234\64166,41787"
-	Set Data("D",175658,"D",209821,100) = "1060074\\\256\\\\\\999999\2"
-	Set Data("D",175658,"D",209821,100,100) = "1060074\\256\\\\\\\999999\2\"
-	Set Data("D",175658,"D",209821,200) = "939544\\\128\\\\\\999999\1"
-	Set Data("D",175658,"D",209821,200,100) = "939544\\128\\\\\\\999999\1\"
-	Set Data("D",175658,"D",209821,300) = "784189\\\2880\\\\\\999999\9"
-	Set Data("D",175658,"D",209821,300,100) = "784189\\2880\\\\\\\999999\9\"
-	Set Data("D",175658,"D",209821,400) = "134343\\\192\\\\\\999999\6"
-	Set Data("D",175658,"D",209821,400,100) = "134343\\192\\\\\\\999999\6\"
-	Set Data("D",175658,"D",209821,500) = "134343\\\1920\\\\\\999999\7"
-	Set Data("D",175658,"D",209821,500,100) = "134343\\1920\\\\\\\999999\7\"
-	Set Data("D",175658,"D",209821,600) = "134342\\\192\\\\\\999999\5"
-	Set Data("D",175658,"D",209821,600,100) = "134342\\192\\\\\\\999999\5\"
-	Set Data("D",175658,"D",209821,700) = "141647\\\400\\\\\\999999\3"
-	Set Data("D",175658,"D",209821,700,100) = "141647\\400\\\\\\\999999\3\"
-	Set Data("D",175658,"D",209821,800) = "141634\\\600\\\\\\999999\4"
-	Set Data("D",175658,"D",209821,800,100) = "141634\\600\\\\\\\999999\4\"
-	Set Data("D",175658,"D",209821,900) = "1168398\\\480\\\\\\999999\8"
-	Set Data("D",175658,"D",209821,900,100) = "1168593\\480\\\\\\\999999\8\0"	
-
+	do ##class(vhTest.Fake.APPS.AKP.Receptie.impl.ReceptieService).ZetTestData(.Data)
 	do ..ReceptieService.Setup(.Data)
 ]]></Implementation>
 </Method>
Index: APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml
===================================================================
diff -u -r36384 -r36524
--- APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml	(.../FactuurBerichtOntvanger.cls.xml)	(revision 36384)
+++ APPS/AKP/AankoopControle/BLUM/impl/FactuurBerichtOntvanger.cls.xml	(.../FactuurBerichtOntvanger.cls.xml)	(revision 36524)
@@ -42,11 +42,12 @@
 <Implementation><![CDATA[
 	#Dim BestandenList = ..GeefTeVerwerkenBestanden()
 	#Dim BestandenListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(BestandenList)
-	
+	w !,"Start"
 	While BestandenListIterator.HasNext()
 	{		
 		Do ..VerwerkFactuurBestand(BestandenListIterator.Next().Name)
 	}
+	w !,"Einde"
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -57,14 +58,19 @@
 <Implementation><![CDATA[
 	
 	try{
+		w !,"verwerken bestand ", BestandVolledigeNaam
 		#dim INVOIC02 as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02 = ..LeesXMLBestand(BestandVolledigeNaam)
+		w !,"Gelezen"
 		do ..INVOIC02Verwerker.Verwerk(INVOIC02)	
-		Do ..KopieerNaarArchiefMap(BestandVolledigeNaam)
+		w !,"Verwerkt"
+		;Do ..KopieerNaarArchiefMap(BestandVolledigeNaam)
+		w !,"Gearchiveerd"
 	} catch {		
+		w !,"Niet verwerkt"
 		#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 ##class(vhLib.Logger).%New("").ErrorMail("VerwerkFactuurBestand",(BerichtVoorGebruiker _" " _Exceptie.ToString()))
-		Do ..KopieerNaarErrorMap(BestandVolledigeNaam)		
+		;Do ..KopieerNaarErrorMap(BestandVolledigeNaam)		
 	}
 ]]></Implementation>
 </Method>
Index: vhTest/Fake/APPS/AKP/Receptie/impl/ReceptieService.cls.xml
===================================================================
diff -u -r36478 -r36524
--- vhTest/Fake/APPS/AKP/Receptie/impl/ReceptieService.cls.xml	(.../ReceptieService.cls.xml)	(revision 36478)
+++ vhTest/Fake/APPS/AKP/Receptie/impl/ReceptieService.cls.xml	(.../ReceptieService.cls.xml)	(revision 36524)
@@ -21,6 +21,32 @@
 	Merge ..MultiDim = MultiDim
 ]]></Implementation>
 </Method>
+
+<Method name="ZetTestData">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Data:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set Data("D",175658) ="L\5005\884234\64166,41787"
+	Set Data("D",175658,"D",209821,100) = "1060074\\\256\\\\\\999999\2"
+	Set Data("D",175658,"D",209821,100,100) = "1060074\\256\\\\\\\999999\2\"
+	Set Data("D",175658,"D",209821,200) = "939544\\\128\\\\\\999999\1"
+	Set Data("D",175658,"D",209821,200,100) = "939544\\128\\\\\\\999999\1\"
+	Set Data("D",175658,"D",209821,300) = "784189\\\2880\\\\\\999999\9"
+	Set Data("D",175658,"D",209821,300,100) = "784189\\2880\\\\\\\999999\9\"
+	Set Data("D",175658,"D",209821,400) = "134343\\\192\\\\\\999999\6"
+	Set Data("D",175658,"D",209821,400,100) = "134343\\192\\\\\\\999999\6\"
+	Set Data("D",175658,"D",209821,500) = "134343\\\1920\\\\\\999999\7"
+	Set Data("D",175658,"D",209821,500,100) = "134343\\1920\\\\\\\999999\7\"
+	Set Data("D",175658,"D",209821,600) = "134342\\\192\\\\\\999999\5"
+	Set Data("D",175658,"D",209821,600,100) = "134342\\192\\\\\\\999999\5\"
+	Set Data("D",175658,"D",209821,700) = "141647\\\400\\\\\\999999\3"
+	Set Data("D",175658,"D",209821,700,100) = "141647\\400\\\\\\\999999\3\"
+	Set Data("D",175658,"D",209821,800) = "141634\\\600\\\\\\999999\4"
+	Set Data("D",175658,"D",209821,800,100) = "141634\\600\\\\\\\999999\4\"
+	Set Data("D",175658,"D",209821,900) = "1168398\\\480\\\\\\999999\8"
+	Set Data("D",175658,"D",209821,900,100) = "1168593\\480\\\\\\\999999\8\0"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Fake/APPS/AKP/Zending/impl/ZendingService.cls.xml
===================================================================
diff -u -r36478 -r36524
--- vhTest/Fake/APPS/AKP/Zending/impl/ZendingService.cls.xml	(.../ZendingService.cls.xml)	(revision 36478)
+++ vhTest/Fake/APPS/AKP/Zending/impl/ZendingService.cls.xml	(.../ZendingService.cls.xml)	(revision 36524)
@@ -21,6 +21,33 @@
 	Merge ..MultiDim = MultiDim
 ]]></Implementation>
 </Method>
+
+<Method name="ZetTestData">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Data:%String</FormalSpec>
+<Implementation><![CDATA[
+	set Data(5005,"D",884234)				= "0\884234\18.07.16\212250\21666.04\0\\E;3\\\\\\\SO\175658"	
+	set Data(5005,"D",884234,999999)		= "99\18.07.16\18.07.16\EUR\32139.49\212250\"
+	set Data(5005,"D",884234,999999,1) 		= "209821\2\789703\2000\209821.02\\939544\1686477\E\128\128\128\\312.2\0\\\473.69\H\.4851\\2.44"
+	set Data(5005,"D",884234,999999,1,"V") 	= "0031412537;16;8\"
+	set Data(5005,"D",884234,999999,2)		= "209821\1\789703\1000\209821.01\\1060074\4292244\E\256\256\256\\328.06\0\\\248.88\H\.4851\\1.28"
+	set Data(5005,"D",884234,999999,2,"V")  = "0031412537;32;8\"
+	set Data(5005,"D",884234,999999,3)		= "209821\7\789703\7000\209821.07\\141647\5385402\E\400\400\400\\1269.23\0\\\616.25\H\.4851\\3.17"
+	set Data(5005,"D",884234,999999,3,"V")	= "0031412557;50;8\"
+	set Data(5005,"D",884234,999999,4)		= "209821\8\789703\8000\209821.08\\141634\5389662\E\600\600\600\\1903.84\0\\\616.25\H\.4851\\3.17"
+	set Data(5005,"D",884234,999999,4,"V")	= "0031412557;75;8\"
+	set Data(5005,"D",884234,999999,5)		= "209821\6\789703\6000\209821.06\\134342\5808302\E\192\192\192\\867.65\0\\\877.65\H\.4851\\4.52"
+	set Data(5005,"D",884234,999999,5,"V")	= "0031412547;24;8\"
+	set Data(5005,"D",884234,999999,6)		= "209821\4\789703\4000\209821.04\\134343\5809112\E\192\192\192\\867.65\0\\\877.65\H\.4851\\4.52"
+	set Data(5005,"D",884234,999999,6,"V")	= "0031412547;24;8\"
+	set Data(5005,"D",884234,999999,7)		= "209821\5\789703\5000\209821.05\\134343\5809112\E\1920\1920\1920\\8676.52\0\\\877.65\H\.4851\\4.52"
+	set Data(5005,"D",884234,999999,7,"V")	= "0031412547;240;8\"
+	set Data(5005,"D",884234,999999,8)		= "209821\9\789703\9000\209821.09\\1168398\6522234\E\480\480\480\\1239.74\0\\\501.61\H\.4851\\2.58"
+	set Data(5005,"D",884234,999999,8,"V")	= "0031412557;60;8\"
+	set Data(5005,"D",884234,999999,9)		= "209821\3\789703\3000\209821.03\\784189\9067647\E\2880\2880\2880\\16674.6\0\\\1124.45\H\.4851\\5.79"
+	set Data(5005,"D",884234,999999,9,"V")	= "0031412537;360;8\"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/APPS/AKP/Zending/impl/ZendingService/Test.cls.xml
===================================================================
diff -u -r36442 -r36524
--- vhUnitTest/APPS/AKP/Zending/impl/ZendingService/Test.cls.xml	(.../Test.cls.xml)	(revision 36442)
+++ vhUnitTest/APPS/AKP/Zending/impl/ZendingService/Test.cls.xml	(.../Test.cls.xml)	(revision 36524)
@@ -7,42 +7,45 @@
 <Type>APPS.AKP.Zending.impl.ZendingService</Type>
 </Property>
 
+<Property name="ReceptieServiceMock">
+<Type>vhTest.Mock.APPS.AKP.Receptie.impl.ReceptieService</Type>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>TestName:%String</FormalSpec>
 <Implementation><![CDATA[
 	
 	do ##super(TestName)
 
-	set ..ZendingService = ##class(vhTest.Fake.APPS.AKP.Zending.impl.ZendingService).%New()	
-	;Setup a ^Verv state in Memory
-	#dim Data As TECH.MultiDim  
-	set Data(5005,"D",884234)				= "0\884234\18.07.16\212250\21666.04\0\\E;3\\\\\\\SO"	
-	set Data(5005,"D",884234,999999)		= "99\18.07.16\18.07.16\EUR\32139.49\212250\"
-	set Data(5005,"D",884234,999999,1) 		= "209821\2\789703\2000\209821.02\\939544\1686477\E\128\128\128\\312.2\0\\\473.69\H\.4851\\2.44"
-	set Data(5005,"D",884234,999999,1,"V") 	= "0031412537;16;8\"
-	set Data(5005,"D",884234,999999,2)		= "209821\1\789703\1000\209821.01\\1060074\4292244\E\256\256\256\\328.06\0\\\248.88\H\.4851\\1.28"
-	set Data(5005,"D",884234,999999,2,"V")  = "0031412537;32;8\"
-	set Data(5005,"D",884234,999999,3)		= "209821\7\789703\7000\209821.07\\141647\5385402\E\400\400\400\\1269.23\0\\\616.25\H\.4851\\3.17"
-	set Data(5005,"D",884234,999999,3,"V")	= "0031412557;50;8\"
-	set Data(5005,"D",884234,999999,4)		= "209821\8\789703\8000\209821.08\\141634\5389662\E\600\600\600\\1903.84\0\\\616.25\H\.4851\\3.17"
-	set Data(5005,"D",884234,999999,4,"V")	= "0031412557;75;8\"
-	set Data(5005,"D",884234,999999,5)		= "209821\6\789703\6000\209821.06\\134342\5808302\E\192\192\192\\867.65\0\\\877.65\H\.4851\\4.52"
-	set Data(5005,"D",884234,999999,5,"V")	= "0031412547;24;8\"
-	set Data(5005,"D",884234,999999,6)		= "209821\4\789703\4000\209821.04\\134343\5809112\E\192\192\192\\867.65\0\\\877.65\H\.4851\\4.52"
-	set Data(5005,"D",884234,999999,6,"V")	= "0031412547;24;8\"
-	set Data(5005,"D",884234,999999,7)		= "209821\5\789703\5000\209821.05\\134343\5809112\E\1920\1920\1920\\8676.52\0\\\877.65\H\.4851\\4.52"
-	set Data(5005,"D",884234,999999,7,"V")	= "0031412547;240;8\"
-	set Data(5005,"D",884234,999999,8)		= "209821\9\789703\9000\209821.09\\1168398\6522234\E\480\480\480\\1239.74\0\\\501.61\H\.4851\\2.58"
-	set Data(5005,"D",884234,999999,8,"V")	= "0031412557;60;8\"
-	set Data(5005,"D",884234,999999,9)		= "209821\3\789703\3000\209821.03\\784189\9067647\E\2880\2880\2880\\16674.6\0\\\1124.45\H\.4851\\5.79"
-	set Data(5005,"D",884234,999999,9,"V")	= "0031412537;360;8\"
+	set ..ReceptieServiceMock = ##class(vhTest.Mock.APPS.AKP.Receptie.impl.ReceptieService).%New()
 
-	do ..ZendingService.Setup(.Data)
+	set ..ZendingService = ##class(vhTest.Fake.APPS.AKP.Zending.impl.ZendingService).%New(..ReceptieServiceMock)	
+	#dim VervData As TECH.MultiDim  
+ 	do ##class(vhTest.Fake.APPS.AKP.Zending.impl.ZendingService).ZetTestData(.VervData)
+	do ..ZendingService.Setup(.VervData)
 ]]></Implementation>
 </Method>
 
+<Method name="Test GeefReceptie geeft de juiste receptienummer uit Verv">
+<Implementation><![CDATA[	 do $$$AssertEquals(..ZendingService.GeefReceptieNummerZending(5005,884234),"175658")
+]]></Implementation>
+</Method>
+
+<Method name="Test VerplaatsDummyFaktuurLijn roept UpdateReceptie aan met de juiste parameters">
+<Implementation><![CDATA[
+	do ..ReceptieServiceMock.VerwachtMethodCall("UpdateReceptie",175658,"209821.04",999999,6,123456,1).DanDoeNiks()
+	
+	; verplaats de lijn van toelevering 209821.04, ident nr 5809112 192 stuks naar factuur 123456
+	do ..ZendingService.VerplaatsDummyFaktuurLijn(5005,"884234",123456, "209821.04", "5809112",192)	
+
+	do ..ReceptieServiceMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test VerplaatsDummyFaktuurLijn verplaatst de dummy factuurlijn onder de echte factuur">
 <Implementation><![CDATA[
+	do ..ReceptieServiceMock.IndienMethodCall("UpdateReceptie",175658,"209821.04",999999,6,123456,1).DanDoeNiks()
+	
 	; verplaats de lijn van toelevering 209821.04, ident nr 5809112 192 stuks naar factuur 123456
 	do ..ZendingService.VerplaatsDummyFaktuurLijn(5005,"884234",123456, "209821.04", "5809112",192)	
 
@@ -54,6 +57,7 @@
 
 <Method name="Test HerrekenDummyFaktuur herberekent totaal dummy factuur">
 <Implementation><![CDATA[
+	do ..ReceptieServiceMock.IndienMethodCall("UpdateReceptie",175658,"209821.04",999999,6,123456,1).DanDoeNiks()
 	do ..ZendingService.VerplaatsDummyFaktuurLijn(5005,"884234",123456, "209821.04", "5809112",192)	
 	do ..ZendingService.HerrekenDummyFaktuur(5005,"884234")
 	do $$$AssertEquals($Piece(..ZendingService.GeefFaktuur(5005,884234,999999),"\",5),31271.84)
Index: APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker.cls.xml
===================================================================
diff -u -r36475 -r36524
--- APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker.cls.xml	(.../INVOIC02Verwerker.cls.xml)	(revision 36475)
+++ APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker.cls.xml	(.../INVOIC02Verwerker.cls.xml)	(revision 36524)
@@ -13,25 +13,19 @@
 <Private>1</Private>
 </Property>
 
-<Property name="ReceptieService">
-<Type>APPS.AKP.Receptie.impl.ReceptieService</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="BlumFacturenRepository">
 <Type>Blum.FacturenRepository</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ZendingService:APPS.AKP.Zending.impl.ZendingService,ReceptieService:APPS.AKP.Receptie.impl.ReceptieService,BlumFacturenRepository:Blum.FacturenRepository</FormalSpec>
+<FormalSpec>ZendingService:APPS.AKP.Zending.impl.ZendingService,BlumFacturenRepository:Blum.FacturenRepository</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..ZendingService = $$$Inject(ZendingService,##class(APPS.AKP.Zending.impl.ZendingService).%New())
-	set ..ReceptieService = $$$Inject(ReceptieService,##class(APPS.AKP.Receptie.impl.ReceptieService).%New())
 	set ..BlumFacturenRepository = $$$Inject(BlumFacturenRepository,##class(Blum.FacturenRepository).%New())
 	Quit $$$OK
 ]]></Implementation>
@@ -49,15 +43,18 @@
 		#dim BlumFaktuurNr as %String = ..GeefBlumFaktuurNummer(INVOIC02)
 		#dim BlumFaktuur as Blum.Facturen = ..BlumFacturenRepository.GeefViaLeverancierEnFactuur(..#BlumLevNr,BlumFaktuurNr)
 		if '$isObject(BlumFaktuur){
+			w !,"maak blum.factuur"
 			set BlumFaktuur = ..MaakBlumFaktuur(INVOIC02,E1EDP01)
+			w !,"maak blum.factuur gedaan"
 		}
 		Do ..ZendingService.MaakZendingFaktuur(..#BlumLevNr,..GeefZendingID(E1EDP01),..GeefBlumFaktuurNummer(INVOIC02),BlumFaktuur)
 		Do ..ZendingService.VerplaatsDummyFaktuurLijn(..#BlumLevNr,..GeefZendingID(E1EDP01),BlumFaktuurNr,..GeefToelevingInfo(E1EDP01),..GeefIdentNummer(E1EDP01),..GeefAantalGefaktureerd(E1EDP01))
 		Do ..ZendingService.HerrekenDummyFaktuur(..#BlumLevNr,..GeefZendingID(E1EDP01))
 		
-		if ..ZendingService.GeefReceptieNummerZending(..#BlumLevNr,..GeefZendingID(E1EDP01)){
+		;if ..ZendingService.GeefReceptieNummerZending(..#BlumLevNr,..GeefZendingID(E1EDP01)){
+		;	do ..ReceptieService.UpdateReceptie(ZendingService.GeefReceptieNummerZending(..#BlumLevNr,..GeefZendingID(E1EDP01),..GeefToelevingInfo(E1EDP01))
 			;TODO	indien aanwezig, update de referentie naar de blum factuurnummer in ^RCP			
-		}
+		;}
 	}
 ]]></Implementation>
 </Method>
@@ -66,17 +63,16 @@
 <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()
-	
+	w !,"MaakBlumFaktuur gemaakt"
 	Set BlumFaktuur.CreatieTijdStip=$zdt($H,3)
 	set BlumFaktuur.FactuurType = ..GeefFaktuurType(INVOIC02)
 	Do BlumFaktuur.LeverancierSetObjectId(..#BlumLevNr)
 	Set BlumFaktuur.FactuurNrLev=..GeefBlumFaktuurNummer(INVOIC02)
-	Set BlumFaktuur.BlumKlantNr=..GeefBlumKlantNummer(INVOIC02)
-	Set BlumFaktuur.FactuurDatum=..GeefFaktuurDatum(INVOIC02)
+	Set BlumFaktuur.BlumKlantNr=..GeefBlumKlantNummer(INVOIC02)	
+	Set BlumFaktuur.FactuurDatum=$zdh(..GeefFaktuurDatum(INVOIC02),3,,6)
 	Set BlumFaktuur.BedragGoederen = ..GeefNettoFaktuurBedrag(INVOIC02)
 	Set BlumFaktuur.Status = "V"
 	Set BlumFaktuur.IsDO=$P($G(^BLBeri("K",BlumFaktuur.BlumKlantNr)),"\",6)'="SO"
-	
 	//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	//vanaf  nieuw BLUM ERP systeem kan 1 facuur over verschillende transporten gaan!!!!!!
 	//dan kunnen er producten van verschillende leveringen op 1 facuur staan!!!!!!
@@ -85,7 +81,9 @@
 	//kan dat niet alle shipments all ontvangen zijn, dus mag de faktuur nog niet ingeboekt worden.
 	// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	Set BlumFaktuur.VervoersID = ..GeefZendingID(E1EDP01)
+	w !,"zending id ",BlumFaktuur.VervoersID
 	Do ..BlumFacturenRepository.Bewaar(BlumFaktuur)
+	w !,"Blumfactuur bewaard"
 	quit BlumFaktuur
 ]]></Implementation>
 </Method>
@@ -184,8 +182,8 @@
 	#dim datum as %String = ""
 	While E1EDK03Iterator.HasNext(){
 		set E1EDK03 = E1EDK03Iterator.Next()
-		;YYYYMMDD -> YY.MM.DD
-		set:(E1EDK03.IDDAT="012" ) datum = $Extract(E1EDK03.DATUM,3,4) _ "." _ $Extract(E1EDK03.DATUM,5,6)_ "."_ $Extract(E1EDK03.DATUM,7,8)
+		;YYYYMMDD -> YY-MM-DD
+		set:(E1EDK03.IDDAT="012" ) datum = $Extract(E1EDK03.DATUM,3,4) _ "-" _ $Extract(E1EDK03.DATUM,5,6)_ "-"_ $Extract(E1EDK03.DATUM,7,8)
 	}
 	quit datum
 ]]></Implementation>
Index: vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker/Test.cls.xml
===================================================================
diff -u -r36475 -r36524
--- vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker/Test.cls.xml	(.../Test.cls.xml)	(revision 36475)
+++ vhUnitTest/APPS/AKP/AankoopControle/BLUM/impl/INVOIC02Verwerker/Test.cls.xml	(.../Test.cls.xml)	(revision 36524)
@@ -8,7 +8,7 @@
 	#dim INVOIC02Verwerker as APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker = ##class(APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%New()
 	#dim INVOIC02Double as APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOIC02 = ##class(vhTest.Utils.APPS.AKP.AankoopControle.BLUM.XML.Faktuur.Invoice.INVOICE02).%New().GeefINVOICE02()
 	Do $$$AssertEquals(INVOIC02Verwerker.GeefBlumFaktuurNummer(INVOIC02Double ),"857382")	
-	Do $$$AssertEquals(INVOIC02Verwerker.GeefFaktuurDatum(INVOIC02Double),"16.06.08")
+	Do $$$AssertEquals(INVOIC02Verwerker.GeefFaktuurDatum(INVOIC02Double),"16-06-08")
 	Do $$$AssertEquals(INVOIC02Verwerker.GeefFaktuurType(INVOIC02Double),"01")
 	Do $$$AssertEquals(INVOIC02Verwerker.GeefNettoFaktuurBedrag(INVOIC02Double),1106.88)
 	Do $$$AssertEquals(INVOIC02Verwerker.GeefBlumKlantNummer(INVOIC02Double),"271250")
@@ -17,15 +17,14 @@
 
 <Method name="Test INVOIC02Verwerker Verwerk maakt nieuwe factuur aan in Blum-Facturen en ^Verv">
 <Implementation><![CDATA[
-	#dim ZendingServiceMock as vhTest.Mock.APPS.AKP.Zending.impl.ZendingService = ##class(vhTest.Mock.APPS.AKP.Zending.impl.ZendingService).%New()
-	#dim ReceptieServiceMock as vhTest.Mock.APPS.AKP.Receptie.impl.ReceptieService = ##class(vhTest.Mock.APPS.AKP.Receptie.impl.ReceptieService).%New()
-	;#dim BlumFacturenRepoMock as vhTest.Mock.TECH.Persistentie.Repository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
+	#dim ReceptieServiceFake as vhTest.Mock.APPS.AKP.Receptie.impl.ReceptieService = ##class(vhTest.Fake.APPS.AKP.Receptie.impl.ReceptieService).%New()
+	#dim ZendingServiceMock as vhTest.Mock.APPS.AKP.Zending.impl.ZendingService = ##class(vhTest.Mock.APPS.AKP.Zending.impl.ZendingService).%New(ReceptieServiceFake)
 	#dim BlumFacturenRepoMock as vhTest.Mock.Blum.FacturenRepository = ##class(vhTest.Mock.Blum.FacturenRepository).%New()
 	
 	#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,ReceptieServiceMock,BlumFacturenRepoMock)
+	#dim INVOIC02Verwerker as APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker = ##class(APPS.AKP.AankoopControle.BLUM.impl.INVOIC02Verwerker).%New(ZendingServiceMock,BlumFacturenRepoMock)
 
 	do BlumFacturenRepoMock.VerwachtMethodCall("Maak").DanReturn(BlumFactuurDummy)
 	do BlumFacturenRepoMock.VerwachtMethodCall("Bewaar", BlumFactuurDummy).DanDoeNiks()
@@ -34,16 +33,11 @@
 	do ZendingServiceMock.VerwachtMethodCall("VerplaatsDummyFaktuurLijn","5005","297851","857382","202267.01","05430289",192).DanDoeNiks()
 	do ZendingServiceMock.VerwachtMethodCall("VerplaatsDummyFaktuurLijn","5005","297851","857382","202267.02","05417931",192).DanDoeNiks()
 	do ZendingServiceMock.VerwachtMethodCall("HerrekenDummyFaktuur","5005","297851").DanDoeNiks()
-
-	do ZendingServiceMock.VerwachtMethodCall("GeefReceptieNummerZending",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn("aa")
-
-	;do ReceptieServiceMo
 	
 	do INVOIC02Verwerker.Verwerk(INVOIC02)
 	
 	do ZendingServiceMock.Verifieer()
 	do BlumFacturenRepoMock.Verifieer()
-	;do ReceptieServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Mock/APPS/AKP/Receptie/impl/ReceptieService.cls.xml
===================================================================
diff -u -r36478 -r36524
--- vhTest/Mock/APPS/AKP/Receptie/impl/ReceptieService.cls.xml	(.../ReceptieService.cls.xml)	(revision 36478)
+++ vhTest/Mock/APPS/AKP/Receptie/impl/ReceptieService.cls.xml	(.../ReceptieService.cls.xml)	(revision 36524)
@@ -25,7 +25,7 @@
 
 <Method name="GeefVervLijnNummerVanProductLijn">
 <FormalSpec>ReceptieNummer:%String,ToeleveringNummer:%String,indextlunr:%Integer</FormalSpec>
-<ReturnType>%Integer</ReturnType>
+<ReturnType>%Library.Integer</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefVervLijnNummerVanProductLijn",ReceptieNummer,ToeleveringNummer,indextlunr)
 ]]></Implementation>
 </Method>
Index: APPS/AKP/Receptie/impl/ReceptieService.cls.xml
===================================================================
diff -u -r36478 -r36524
--- APPS/AKP/Receptie/impl/ReceptieService.cls.xml	(.../ReceptieService.cls.xml)	(revision 36478)
+++ APPS/AKP/Receptie/impl/ReceptieService.cls.xml	(.../ReceptieService.cls.xml)	(revision 36524)
@@ -9,15 +9,18 @@
 </Parameter>
 
 <Method name="UpdateReceptie">
-<FormalSpec>ReceptieNummer:%String,ToeleveringNummer:%String,FaktuurNummerVan:%String,VervLijnNummerVan:%Integer,FaktuurNummerNaar:%String,VervLijnNummerNaar:%Integer</FormalSpec>
+<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
 	
+	set ToeleveringNummer = $Piece(ToeleveringInfo,".",1)
+	
 	set indextlunr = -1
-	set indextlunr = $Order(@..#Global("D",ReceptieNummer,"D",ToeleveringNummer,indextlunr))
+	set indextlunr = $Order(@..#Global("D", ReceptieNummer, "D", ToeleveringNummer, indextlunr))
 	While ((indextlunr '= "")){
 		set rec = @..#Global("D",ReceptieNummer,"D",ToeleveringNummer,indextlunr)		
 		if (($Piece(rec,"\",10) = FaktuurNummerVan) && ($Piece(rec,"\",11) = VervLijnNummerVan)){