Index: BL/Flow/Factuur/Doc.cls.xml
===================================================================
diff -u -r48221 -r48851
--- BL/Flow/Factuur/Doc.cls.xml	(.../Doc.cls.xml)	(revision 48221)
+++ BL/Flow/Factuur/Doc.cls.xml	(.../Doc.cls.xml)	(revision 48851)
@@ -372,24 +372,36 @@
 Oproepen via :
    s sc=##class(BL.Flow.Factuur.Doc).PrintAndFileDoc(255275,,"\C","AO;PP")   w sc,!</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>FANr:%String,FactType:%String="F",pdlExemplaren:%String="",ProcessorFlag:%String</FormalSpec>
+<FormalSpec>FANr:%String,FactType:%String="F",pdlExemplaren:%String="",ProcessorFlag:%String,FactuurDto:BL.Flow.Proxy.pxFactuur=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set:($G(ProcessorFlag)="") ProcessorFlag="AO;PP"
 	
+	#dim DataOphalenViaDto As %Boolean = ($IsObject(FactuurDto))
+	If DataOphalenViaDto {
+		Set DocData = ##class(BL.Flow.Proxy.pxFlowDocs).%New()
+		Do DocData.Facturen.Insert(FactuurDto)
+	}
+	Else {
+		// Exceptie smijten indien Factuur niet bestaat 
+	}
+	
+	#dim sc As %Status = ""
+	#dim blFact As BL.Flow.Factuur.Doc = ""
+	
 	Set blFact=..Instantiate()
 	Do blFact.Init(FANr,)
 	Set blFact.FactType=FactType
 	Set blFact.Printer="PPOD-dummy"
 		
-	Set sc=$$pfdBuildFopTasks()   ;Set sc=blFact.BuildTaskRenderAndPrint(blFact.Printer,)
+	Set sc=$$pfdBuildFopTasks(DataOphalenViaDto, DocData)   ;Set sc=blFact.BuildTaskRenderAndPrint(blFact.Printer,)
 	;Set Task=blFact.FopTask
 	Do blFact.Close()
 	Set blFact=""
 	Set:($$$ISOK(sc)) sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmBatch,$S(ProcessorFlag="AO":$$$qpvLow+1, 1:$$$qpvLow-1))   ; $$$rmSync
 	Quit sc
 	
-pfdBuildFopTasks()
+pfdBuildFopTasks(DataOphalenViaDto,DocData)
 	// in de meeste gevallen is ProcessorFlag="AO;PP" (default) --> Task.AnalyseRoutine="aftFactuurPrintOMRAndFile"
 	Set sc=$$$OK
 	Set Dir=..ArchiveDir(..DocDatum(FANr,FactType)) 
@@ -417,7 +429,13 @@
 	;Do blFact.XsltParams.SetAt(pTraySelect,"pTraySelect")	
 	// Build Task
 	Set Task=blFact.CreateFopTask(ARtn,,)
-	Set sc=blFact.DocSetRenderDefs(Task.AddDoc(), )   ; blFact.lbDocs, , blFact.TransformType, blFact.lbPPODKeywords)
+	If DataOphalenViaDto {
+		Set blFact.lbDocs=""
+		Set sc=blFact.DocSetRenderDataFromDto(Task.AddDoc(), DocData, "DOCS")
+	}
+	Else {
+		Set sc=blFact.DocSetRenderDefs(Task.AddDoc(), )   ; blFact.lbDocs, , blFact.TransformType, blFact.lbPPODKeywords)
+	}
 	Set:($$$ISOK(sc))&&(blnFile) sc=Task.AddActionFile(FName,Dir)
 	Set:($$$ISOK(sc))&&(blnPPOD) sc=Task.AddActionPrint(blFact.Printer,1,,,)
 	Quit sc
Index: WSimpl/AX/DocGen/FactuurService/RenderFactuur.cls.xml
===================================================================
diff -u -r48222 -r48851
--- WSimpl/AX/DocGen/FactuurService/RenderFactuur.cls.xml	(.../RenderFactuur.cls.xml)	(revision 48222)
+++ WSimpl/AX/DocGen/FactuurService/RenderFactuur.cls.xml	(.../RenderFactuur.cls.xml)	(revision 48851)
@@ -79,7 +79,7 @@
 	#dim pdlExemplaren As %String = ..GeefExemplaren(ExtraKopieen)
 	#dim ProcessorFlag As %String = "PP"   ; alleen printen, niet archiveren in ADMIN-global en Notes01-map.
 	
-	Quit ..FlowFactuurDoc.PrintAndFileDoc(FactuurNummer,FactType,pdlExemplaren,ProcessorFlag)
+	Quit ..FlowFactuurDoc.PrintAndFileDoc(FactuurNummer,FactType,pdlExemplaren,ProcessorFlag,FactuurData)
 ]]></Implementation>
 </Method>