Index: BL/Flow/Rappel/Doc.cls.xml
===================================================================
diff -u -r51606 -r51644
--- BL/Flow/Rappel/Doc.cls.xml	(.../Doc.cls.xml)	(revision 51606)
+++ BL/Flow/Rappel/Doc.cls.xml	(.../Doc.cls.xml)	(revision 51644)
@@ -753,37 +753,47 @@
 </Method>
 
 <Method name="RenderAndFileDocFromDto">
-<FormalSpec><![CDATA[ProxyObject:BL.Flow.Proxy.pxFlowDocs,&FilePath:%String,KlantNummer:%String=""]]></FormalSpec>
+<FormalSpec><![CDATA[pxRappel:BL.Flow.Proxy.pxRappel,&FilePath:%String,KlantNummer:%String=""]]></FormalSpec>
 <Implementation><![CDATA[
+	#dim sc As %Status = $$$OK
+	
+	Set pxDoc = ##class(BL.Flow.Proxy.pxFlowDocs).%New()
+	Do pxDoc.Rappels.Insert(pxRappel)
+
 	#dim DocRef As %String = KlantNummer
 	Set Dir=##class(%File).GetDirectory(FilePath)
 	Set FName=##class(%File).GetFilename(FilePath)
 
 	Do ..BuildFileData("File", .FName,.Dir,.FilePath, DocRef)
-	Quit:(Dir="") $$$ERROR($$$GeneralError,"Invalid directory specified: "_Dir)
 	
-	Set sc=$$ProxyToXMLStream^vhLib(ProxyObject,.DataStream, "DOCS", 0)
-	Quit:($$$ISERR(sc)) sc
+	Set:(Dir="") sc = $$$ERROR($$$GeneralError,"Invalid directory specified: "_Dir)
+	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(sc)
 	
+	Set sc=$$ProxyToXMLStream^vhLib(pxDoc,.DataStream, "DOCS", 0)
+	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(sc)
+	
 	Set Task=..CreateFopTask("DocRenderAndFile",,)
-	Set lbXsltParams=..BuildXsltParams(,$G(pWithLogo,1),,) // Deze regel zorgt nog voor problemen => pWithLogo
+	Set lbXsltParams=..BuildXsltParams(,$G(pWithLogo,1),,)
 	Set sc=##class(BL.Flow.Basis.Doc).DocSetRenderData(Task.AddDoc(),"STREAM",DataStream,..#ADBTemplate,"PDF",$LB(),lbXsltParams)
 	
 	Set:($$$ISOK(sc)) sc=Task.AddActionFile(FName,Dir)
-	Quit:($$$ISERR(sc)) sc
+	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(sc)
+
 	Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine)
-	
 	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(sc)
 ]]></Implementation>
 </Method>
 
 <Method name="PrintToPPODFromDto">
-<FormalSpec>ProxyObject:BL.Flow.Proxy.pxRappel</FormalSpec>
+<FormalSpec>pxRappel:BL.Flow.Proxy.pxRappel</FormalSpec>
 <Implementation><![CDATA[
+	Set pxDoc = ##class(BL.Flow.Proxy.pxFlowDocs).%New()
+	Do pxDoc.Rappels.Insert(pxRappel)
+	
 	Set PrinterName = "PPOD-dummy"
 	Set blnPPOD = 1
 	
-	Set sc=$$ProxyToXMLStream^vhLib(ProxyObject,.DataStream, "DOCS", 0)
+	Set sc=$$ProxyToXMLStream^vhLib(pxDoc,.DataStream, "DOCS", 0)
 	Quit:($$$ISERR(sc)) sc
 	
 	Set Task = ..CreateFopTask("aftRappelPrintOMR",,)
Index: WSimpl/AX/DocGen/RappelService/RenderRappel.cls.xml
===================================================================
diff -u -r51605 -r51644
--- WSimpl/AX/DocGen/RappelService/RenderRappel.cls.xml	(.../RenderRappel.cls.xml)	(revision 51605)
+++ WSimpl/AX/DocGen/RappelService/RenderRappel.cls.xml	(.../RenderRappel.cls.xml)	(revision 51644)
@@ -27,28 +27,27 @@
 </Method>
 
 <Method name="RenderRappel">
-<FormalSpec>RappelData:BL.Flow.Proxy.pxRappel</FormalSpec>
+<FormalSpec>pxRappel:BL.Flow.Proxy.pxRappel</FormalSpec>
 <ReturnType>WS.AX.DocGen.dto.RenderResultaat</ReturnType>
 <Implementation><![CDATA[
 	#dim RenderFile As %Boolean = $$$True
 	#dim PrintToPPOD As %Boolean = $$$False
-	#dim KlantNr As %String = $ZSTRIP($$$Trim(RappelData.KLANTNR),"*C")
+	#dim KlantNr As %String = $ZSTRIP($$$Trim(pxRappel.KLANTNR),"*C")
 	
 	If KlantNr = "" {
-		Do ##class(TECH.Exceptions.InvalidInputException).Throw("The field KLANTNR is empty or invalid ('"_$$$LCVT(RappelData.KLANTNR)_"').")
+		Do ##class(TECH.Exceptions.InvalidInputException).Throw("The field KLANTNR is empty or invalid ('"_$$$LCVT(pxRappel.KLANTNR)_"').")
 	}
 	
-	Do ..ControleerSlottekstTag(RappelData, $$$True)
+	#dim FilePath As %String = ..DefaultPDFName(KlantNr)
 	
+	Do ..ControleerSlottekstTag(pxRappel, $$$True)
+	
 	If RenderFile {
-		Set pxDoc = ##class(BL.Flow.Proxy.pxFlowDocs).%New()
-		Do pxDoc.Rappels.Insert(RappelData)
-		#dim FilePath As %String = ..DefaultPDFName(KlantNr)
-		Do ..RenderAndFileDoc(pxDoc, .FilePath, KlantNr)
+		Do ..RenderAndFileDoc(pxRappel, .FilePath, KlantNr)
 	}
 	
     If PrintToPPOD {
-		Do ..MaakFopTaakVoorPrintRappel(RappelData)
+		Do ..MaakFopTaakVoorPrintRappel(pxRappel)
 	}
 	
 	Set RenderResultaat = ##class(WS.AX.DocGen.dto.RenderResultaat).%New()
@@ -58,9 +57,9 @@
 </Method>
 
 <Method name="ControleerSlottekstTag">
-<FormalSpec>RappelData:BL.Flow.Proxy.pxRappel,FixWhenDollarC0:%Boolean</FormalSpec>
+<FormalSpec>pxRappel:BL.Flow.Proxy.pxRappel,FixWhenDollarC0:%Boolean</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	Do ..Utils.ControleerTekstHTMLTag(RappelData.SLOTTEKST, RappelData.KLANTNR, FixWhenDollarC0)
+<Implementation><![CDATA[	Do ..Utils.ControleerTekstHTMLTag(pxRappel.SLOTTEKST, pxRappel.KLANTNR, FixWhenDollarC0)
 ]]></Implementation>
 </Method>
 
@@ -77,16 +76,16 @@
 </Method>
 
 <Method name="RenderAndFileDoc">
-<FormalSpec><![CDATA[pxDoc:BL.Flow.Proxy.pxFlowDocs,&FilePath:%String,KlantNr:%String]]></FormalSpec>
+<FormalSpec><![CDATA[pxRappel:BL.Flow.Proxy.pxRappel,&FilePath:%String,KlantNr:%String]]></FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	Do ..FlowRappelDoc.RenderAndFileDocFromDto(pxDoc, .FilePath, KlantNr)
+<Implementation><![CDATA[	Do ..FlowRappelDoc.RenderAndFileDocFromDto(pxRappel, .FilePath, KlantNr)
 ]]></Implementation>
 </Method>
 
 <Method name="MaakFopTaakVoorPrintRappel">
-<FormalSpec>RappelData:BL.Flow.Proxy.pxRappel</FormalSpec>
+<FormalSpec>pxRappel:BL.Flow.Proxy.pxRappel</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	Do ..FlowRappelDoc.PrintToPPODFromDto(RappelData)
+<Implementation><![CDATA[	Do ..FlowRappelDoc.PrintToPPODFromDto(pxRappel)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/WSimpl/AX/DocGen/RappelService/RenderRappel/Test.cls.xml
===================================================================
diff -u -r51605 -r51644
--- vhUnitTest/WSimpl/AX/DocGen/RappelService/RenderRappel/Test.cls.xml	(.../Test.cls.xml)	(revision 51605)
+++ vhUnitTest/WSimpl/AX/DocGen/RappelService/RenderRappel/Test.cls.xml	(.../Test.cls.xml)	(revision 51644)
@@ -37,16 +37,13 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Bestemming File roept PrintToPPODFromDto op met correcte parameters">
+<Method name="Test: Bestemming File roept RenderAndFileDocFromDto op met correcte parameters">
 <Implementation><![CDATA[
-	Set pxDoc = ##class(BL.Flow.Proxy.pxFlowDocs).%New()
 	#dim pxRappel As BL.Flow.Proxy.pxRappel = ..MaakRappelDto(..#KlantNummer)
-	Do pxDoc.Rappels.Insert(pxRappel)
-	
 	#dim FullFilename As %String = ..#DocGenFilePath _ "Klant" _ ..#KlantNummer _ "_20110630091500.pdf"
 
 	Set MockFlowRappelDoc = ##class(vhTest.Mock.BL.Flow.Rappel.IDoc).%New()
-	Do MockFlowRappelDoc.VerwachtMethodCall("RenderAndFileDocFromDto", ..Matches.DataTransferObject(pxDoc), FullFilename, ..#KlantNummer).DanDoeNiks().ExactAantalKeer(1)
+	Do MockFlowRappelDoc.VerwachtMethodCall("RenderAndFileDocFromDto", pxRappel, FullFilename, ..#KlantNummer).DanDoeNiks().ExactAantalKeer(1)
 	Do MockFlowRappelDoc.VerwachtMethodCall("PrintToPPODFromDto", pxRappel).DanDoeNiks().Nooit()
 	
 	Set RappelService = ##class(WSimpl.AX.DocGen.RappelService.RenderRappel).%New(MockFlowRappelDoc)