Index: APPS/TRANSP/impl/TransportService.cls.xml
===================================================================
diff -u -r52404 -r52405
--- APPS/TRANSP/impl/TransportService.cls.xml	(.../TransportService.cls.xml)	(revision 52404)
+++ APPS/TRANSP/impl/TransportService.cls.xml	(.../TransportService.cls.xml)	(revision 52405)
@@ -251,12 +251,14 @@
 <Method name="DoeNacalculatie">
 <FormalSpec>KlantId:DOM.common.PartijID,BeginDatum:%Date,EindDatum:%Date</FormalSpec>
 <Implementation><![CDATA[
+	#dim Bestandsnaam = "c:\tom.csv"
+	
 	//Data ophalen
 	#dim RitDataLijst = ##class(APPS.TRANSP.dto.NacalculatieLijst).%New()
 	Set RitDataLijst = ..TransportdataVoorKlantBepaler.BepaalTransportData(KlantId, BeginDatum, EindDatum)
 	
 	//csv maken
-	Do ..RapportGenerator.MaakBestand(..RapportDataFactory.MaakRapportData(RitDataLijst))
+	Do ..RapportGenerator.MaakBestand(..RapportDataFactory.MaakRapportData(RitDataLijst, Bestandsnaam))
 	
 	//mailen
 	//csv verwijderen
Index: APPS/TRANSP/impl/TransportService/RapportDataFactory.cls.xml
===================================================================
diff -u -r52403 -r52405
--- APPS/TRANSP/impl/TransportService/RapportDataFactory.cls.xml	(.../RapportDataFactory.cls.xml)	(revision 52403)
+++ APPS/TRANSP/impl/TransportService/RapportDataFactory.cls.xml	(.../RapportDataFactory.cls.xml)	(revision 52405)
@@ -4,14 +4,14 @@
 <Super>TECH.Mockable</Super>
 
 <Method name="MaakRapportData">
-<FormalSpec>RitDataLijst:APPS.TRANSP.dto.NacalculatieLijst</FormalSpec>
+<FormalSpec>RitDataLijst:APPS.TRANSP.dto.NacalculatieLijst,Bestandsnaam:%String</FormalSpec>
 <ReturnType>APPS.common.Rapport.dto.BestandRapportDataDataTransferObjectBased</ReturnType>
 <Implementation><![CDATA[
 	#dim RapportData As APPS.common.Rapport.dto.BestandRapportDataDataTransferObjectBased = ##class(APPS.common.Rapport.dto.BestandRapportDataDataTransferObjectBased).%New()
 	
 	Set RapportData.DataVelden = ..GeefDataVelden()
 	Set RapportData.DataTransferObjecten = RitDataLijst
-	Set RapportData.BestandVolledigeNaam = "c:\tom.csv"
+	Set RapportData.BestandVolledigeNaam = Bestandsnaam
 	
 	Quit RapportData
 ]]></Implementation>
Index: vhTest/Mock/APPS/TRANSP/impl/TransportService/RapportDataFactory.cls.xml
===================================================================
diff -u -r52402 -r52405
--- vhTest/Mock/APPS/TRANSP/impl/TransportService/RapportDataFactory.cls.xml	(.../RapportDataFactory.cls.xml)	(revision 52402)
+++ vhTest/Mock/APPS/TRANSP/impl/TransportService/RapportDataFactory.cls.xml	(.../RapportDataFactory.cls.xml)	(revision 52405)
@@ -9,9 +9,9 @@
 <Inheritance>right</Inheritance>
 
 <Method name="MaakRapportData">
-<FormalSpec>RitDataLijst:APPS.TRANSP.dto.NacalculatieLijst</FormalSpec>
+<FormalSpec>RitDataLijst:APPS.TRANSP.dto.NacalculatieLijst,Bestandsnaam:%String</FormalSpec>
 <ReturnType>APPS.common.Rapport.dto.BestandRapportDataDataTransferObjectBased</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakRapportData",RitDataLijst)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("MaakRapportData",RitDataLijst,Bestandsnaam)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/TRANSP/impl/TransportService/DoeNalculatie/Test.cls.xml
===================================================================
diff -u -r52400 -r52405
--- vhUnitTest/APPS/TRANSP/impl/TransportService/DoeNalculatie/Test.cls.xml	(.../Test.cls.xml)	(revision 52400)
+++ vhUnitTest/APPS/TRANSP/impl/TransportService/DoeNalculatie/Test.cls.xml	(.../Test.cls.xml)	(revision 52405)
@@ -14,14 +14,19 @@
 	Set TransportdataVoorKlantBepalerMock = ##class(vhTest.Mock.APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler).%New()
 	Do TransportdataVoorKlantBepalerMock.VerwachtMethodCall("BepaalTransportData",KlantId,BeginDatum,EindDatum).ExactAantalKeer(1).DanReturn(GegenereerdAntwoord)
 	
+	Set BestandRapportDataDataTransferObjectBased = ##class(APPS.common.Rapport.dto.BestandRapportDataDataTransferObjectBased).%New()
+	Set RapportDataFactoryMock = ##class(vhTest.Mock.APPS.TRANSP.impl.TransportService.RapportDataFactory).%New()
+	Do RapportDataFactoryMock.VerwachtMethodCall("MaakRapportData",GegenereerdAntwoord,$$$ElkeWaarde).DanReturn(BestandRapportDataDataTransferObjectBased)
+	
 	Set RapportGeneratorMock = ##class(vhTest.Mock.APPS.common.Rapport.impl.BestandGeneratorTemplate).%New()
-	Do RapportGeneratorMock.VerwachtMethodCall("MaakBestand",$$$ElkeWaarde).ExactAantalKeer(1)
+	Do RapportGeneratorMock.VerwachtMethodCall("MaakBestand",BestandRapportDataDataTransferObjectBased).ExactAantalKeer(1)
 	
-	Set TransportService = ##class(APPS.TRANSP.impl.TransportService).%New(,,TransportdataVoorKlantBepalerMock,RapportGeneratorMock)
+	Set TransportService = ##class(APPS.TRANSP.impl.TransportService).%New(,,TransportdataVoorKlantBepalerMock,RapportGeneratorMock,RapportDataFactoryMock)
 	Do TransportService.DoeNacalculatie(KlantId,BeginDatum,EindDatum)
 	
 	Do TransportdataVoorKlantBepalerMock.Verifieer()
 	Do RapportGeneratorMock.Verifieer()
+	Do RapportDataFactoryMock.Verifieer()
 ]]></Implementation>
 </Method>