Index: APPS/TRANSP/impl/TransportService.cls.xml
===================================================================
diff -u -r52405 -r52406
--- APPS/TRANSP/impl/TransportService.cls.xml	(.../TransportService.cls.xml)	(revision 52405)
+++ APPS/TRANSP/impl/TransportService.cls.xml	(.../TransportService.cls.xml)	(revision 52406)
@@ -13,33 +13,15 @@
 <Private>1</Private>
 </Property>
 
-<Property name="TransportdataVoorKlantBepaler">
-<Type>APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="RapportGenerator">
-<Type>APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="RapportDataFactory">
-<Type>APPS.TRANSP.impl.TransportService.RapportDataFactory</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>EmailVoorBevestigingBepaler:APPS.TRANSP.impl.TransportService.EmailVoorBevestigingBepaler="",VerpakkingEenheidFactory:APPS.TRANSP.impl.VerpakkingEenheidFactory,TransportdataVoorKlantBepaler:APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler="",RapportGenerator:APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased="",RapportDataFactory:APPS.TRANSP.impl.TransportService.RapportDataFactory=""</FormalSpec>
+<FormalSpec>EmailVoorBevestigingBepaler:APPS.TRANSP.impl.TransportService.EmailVoorBevestigingBepaler="",VerpakkingEenheidFactory:APPS.TRANSP.impl.VerpakkingEenheidFactory</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..EmailVoorBevestigingBepaler = $$$Implementation(EmailVoorBevestigingBepaler,##class(APPS.TRANSP.impl.TransportService.EmailVoorBevestigingBepaler).%New())
 	Set ..VerpakkingEenheidFactory = $$$Inject(VerpakkingEenheidFactory, ##class(APPS.TRANSP.impl.VerpakkingEenheidFactory).%New())
-	Set ..TransportdataVoorKlantBepaler = $$$Inject(TransportdataVoorKlantBepaler, ##class(APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler).%New())
-	Set ..RapportGenerator = $$$Inject(RapportGenerator, ##class(APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased).%New())
-	Set ..RapportDataFactory = $$$Inject(RapportDataFactory, ##class(APPS.TRANSP.impl.TransportService.RapportDataFactory).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -250,18 +232,7 @@
 
 <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, Bestandsnaam))
-	
-	//mailen
-	//csv verwijderen
+<Implementation><![CDATA[	Do ##class(APPS.TRANSP.impl.TransportService.Nacalculator).DoeNacalculatie(KlantId, BeginDatum, EindDatum)
 ]]></Implementation>
 </Method>
 </Class>