Index: BL/Flow/PrijsLijst/Doc.cls.xml
===================================================================
diff -u -r1889 -r1890
--- BL/Flow/PrijsLijst/Doc.cls.xml	(.../Doc.cls.xml)	(revision 1889)
+++ BL/Flow/PrijsLijst/Doc.cls.xml	(.../Doc.cls.xml)	(revision 1890)
@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="BL.Flow.PrijsLijst.Doc">
-<IncludeCode>BL.Sys.FOP.Common</IncludeCode>
+<IncludeCode>%VHMacro,BL.Sys.FOP.Common,BL.Flow.Doc.Common,%Prod.Product</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>BL.Flow.Docs.Basis,BL.Flow.Basis.DocNew</Super>
+<Super>BL.Flow.Docs.Basis,%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="ADBTemplate">
 <Default>prijslijst_01.01</Default>
 </Parameter>
 
-<Parameter name="DocTypeKWd">
-<Description>
-DocType voor task-keywords (zie ook BL.Sys.FOP.Common.INC) </Description>
-<Default>PRIJSLIJST</Default>
-</Parameter>
-
 <Parameter name="DocName">
 <Default>PrijsLijst</Default>
 </Parameter>
@@ -158,32 +152,31 @@
 De PrijsLijst genereren en als XML file opslaan. 
 Volledig path van file opgeven (t.o.v. Caché-server)
 Oproepen via :
-   s sc=##class(BL.Flow.PrijsLijst.Doc).SaveXmlToArchive(1239,)   w sc,!</Description>
+   s sc=##class(BL.Flow.PrijsLijst.Doc).SaveXmlToFile(1239,,.TFType)   w sc,!</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>KLNr:%String,oPLSettings:BL.Flow.Proxy.pxPrijsLijstSettings,FilePath:%String</FormalSpec>
+<FormalSpec>KLNr:%String,oPLSettings:BL.Flow.Proxy.pxPrijsLijstSettings,FilePath:%String,TFType:%String=""</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Quit:(FilePath="") $$$ERROR($$$GeneralError,"SaveXmlToFile: FilePath for XML is empty.")
 
 	; Define input data
-	Set blPrsL=..Instantiate()
-	Do blPrsL.Init(KLNr,)
-	Set blPrsL.lbDocs=$LB(KLNr)
-	Set blPrsL.lbPPODKeywords=$LB()
-	Set blPrsL.Options=$G(oPLSettings)
-	;Do blPrsL.XsltParams.SetAt($G(pImageCol,0),"pImageColVisible")
+	Set lbPPODKeywords=$LB()
 	Set oDoc=##class(Sys.FOP.emDoc).%New()
-	Set sc=blPrsL.DocSetRenderDefs(oDoc, )   ; $LB(KLNr), "", "PDF", lbPPODKeywords, "", "", "", .oPLSettings)
-	Do blPrsL.Close()   Set blPrsL=""
+	Set sc=..DocSetRenderDefs(oDoc, $LB(KLNr,), "", TFType, lbPPODKeywords, "", "", "", .oPLSettings)
+	Set:(TFType="") oDoc.TransformType=""
+
+	 d WL^vhDBG("SaveXmlToFile  TFType="_TFType_"   oDoc:"_$$$CRLF_$$ObjToText^vhLib(oDoc))
 	Quit:($$$ISERR(sc)) sc
 	
 	; Create TSeq + SeqItem, then call SaveDataInToFile() method
 	Set TSeq=##class(Sys.FOP.TaskSequence).%New()
 	Set SeqItem=TSeq.AddNewItem("DocBase")
 
 	Set blFOPData=##class(BL.Sys.FOP.DataMgr).Instantiate()
-	Do blFOPData.Init()
+	Do blFOPData.Init(,oDoc)
+	 d WL^vhDBG("Before FetchData")
+	 d WL^vhDBG($$ObjToText^vhLib(oDoc))
 	Do blFOPData.FetchData(oDoc,SeqItem)
 	Set sc=blFOPData.ErrorStatus
 	Set:($$$ISOK(sc)) sc=##class(BL.Sys.FOP.DocBase).SaveDataInToFilePPC(SeqItem,TSeq,FilePath)
@@ -206,6 +199,12 @@
 <Implementation><![CDATA[
 	#define FullPath(%f,%d)   ##class(%File).NormalizeDirectory(%d)_%f
 
+ /*
+s fxml="\\fop\e$\FOP\Data\PrijsLijst_4682_20090122_c01_PS.xml"
+s fp="\\fop\e$\FOP\Data\PrijsLijst_4682_20090122_c01_IMG.ps"
+s sc=##class(BL.Flow.PrijsLijst.Doc).RenderAndFileFromXML(fxml,.fp,"PS")   w sc,!,$G(fp),!
+ */
+
 	; Define input data
 	Set DocDatum=..DocDatum(KLNr,.oPLSettings,.SubID)
 	Set Dir=..ArchiveDir(DocDatum)
@@ -229,11 +228,11 @@
 	; Define TempXmlPath and FilePath (full)
 	If (##class(%File).GetFilename($G(FilePath))="") Do
 	. Set Dir=##class(%File).GetDirectory($G(FilePath))
-	. Set FName=..DefaultPDFNameCM(KLNr,"xml")
+	. Set FName=..DefaultPDFName(KLNr,"xml")
 	. Set FilePath=""
 	Set TempDir="\\fop\e$\FOP\PDFTemp" ; "\\fop\e$\FOP\PDFTemp"
-	Do ..BuildFileDataCM("File", .FName,.Dir,.FilePath)
-	Do ..BuildFileDataCM("File",  FName, TempDir,.TempXmlPath)
+	Do ..BuildFileData("File", .FName,.Dir,.FilePath)
+	Do ..BuildFileData("File",  FName, TempDir,.TempXmlPath)
 	; Generate temporary Xml file
 	Set sc=..SaveXmlToFile(KLNr,.oPLSettings,TempXmlPath)   ; TempXmlPath t.o.v. Caché-server
 	Quit:($$$ISERR(sc)) sc
@@ -264,7 +263,7 @@
 	Else  If $G(FilePath)="" Do
 	. Set FName=##class(%File).GetFilename($P(##class(%File).GetFilename(XmlPath),".",1))
 
-	Do ..BuildFileDataCM("File", .FName,.Dir,.FilePath)   ; , FANr,FactType)
+	Do ..BuildFileData("File", .FName,.Dir,.FilePath)   ; , FANr,FactType)
 	Set:($$$LCase(FName)?.E1".xml") FName=$E(FName,1,$L(FName)-4)
 	Quit:(Dir="") $$$ERROR($$$GeneralError,"Invalid directory specified: "_Dir)
 	Set XSLT="PL-BASIC"
@@ -285,70 +284,59 @@
 ]]></Implementation>
 </Method>
 
-<Method name="RenderAndFileWWWFromXML">
-<Description>
-XmlPath t.o.v. FOP-server definiëren
-FileURL : als .local doorgeven
-          enkel de FileName doorgeven indien gewenst, anders wordt deze ge-default. 
-          het volledige pad (server+dir+filename) wordt in URL-vorm teruggegeven</Description>
-<ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[XmlPath:%String,&FileURL:%String]]></FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	Set FilePath=$S($L($G(FileURL)):FileURL, 1:$P(##class(%File).GetFilename(XmlPath),".",1))
-	Set:($$$LCase(FilePath)'?.E1".pdf") FilePath=FilePath_".pdf"
-	Do ..BuildFileDataCM("FileWWW", .FName,.Dir,.FilePath, $G(KLNr,"TestWV"))
-	Do ..BuildFileDataCM("FileWWWUrl", FName, ,.FileURL)
-	Quit ..RenderAndFileFromXML(.XmlPath,FilePath)
-]]></Implementation>
-</Method>
-
 <Method name="RenderAndFileFromXML">
 <Description>
 XmlPath t.o.v. FOP-server definiëren
 FilePath voor pdf-output: mag "" (leeg) zijn 
                           mag Dir+FName zijn 
                           mag Dir zijn (eindigen met "\" !!!), FName from XmlPath
 s sc=##class(BL.Flow.PrijsLijst.Doc).RenderAndFileFromXML("\\fop\e$\PDFTest\PLijst\PrijsLijst\PrijsLijst_1239_20080902.xml","E:\FOP\PDFTest\")   w sc,!
-s fxml="\\fop\e$\FOP\Data\PrijsLijst_4682_20090119_DFL.xml"
-s sc=##class(BL.Flow.PrijsLijst.Doc).RenderAndFileFromXML(fxml,.fp)   w sc,!,$G(fp),! </Description>
+s sc=##class(BL.Flow.PrijsLijst.Doc).RenderAndFileFromXML("\\Notes01\Archive\PrijsLijst\PrijsLijst_1239_20081001.xml",.fp)   w sc,!,$G(fp),! </Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[XmlPath:%String,&FilePath:%String]]></FormalSpec>
+<FormalSpec><![CDATA[XmlPath:%String,&FilePath:%String,TFType:%String="PDF"]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	#define FullPath(%f,%d)   ##class(%File).NormalizeDirectory(%d)_%f
+
 	If ($L($G(FilePath)))&&(##class(%File).GetFilename(FilePath)="") Do
 	. Set Dir=##class(%File).GetDirectory(FilePath)
 	. Set FName=##class(%File).GetFilename($G(XmlPath))   ; FName overnemen van XmlPath
 	. Set:($$$LCase(FName)?.E1".xml") FName=$E(FName,1,$L(FName)-4)
 	. Set FilePath=""
 	Else  If $G(FilePath)="" Do
 	. Set FName=##class(%File).GetFilename($P(##class(%File).GetFilename(XmlPath),".",1))
-
-	Set blFlowDoc=..Instantiate()
-	Do blFlowDoc.Init("?","")
-	Set:($L($G(%ADBTemplate))) blFlowDoc.ADBTemplate=%ADBTemplate
-	Set blFlowDoc.lbDocs=""
-	Set blFlowDoc.TransformType="PDF"
-	Set blFlowDoc.lbPPODKeywords=$LB()
-	Do blFlowDoc.XsltParams.SetAt($G(%pWithLogo,1),"pWithLogo")	
-	Do blFlowDoc.XsltParams.SetAt(0,"pImageColVisible")
-	
-	// Build Task
-	Do blFlowDoc.BuildFileData("File", .FName,.Dir,.FilePath)
-	Set sc=blFlowDoc.BuildTaskRenderAndFileFromXML(XmlPath, .FilePath)
-	Set Task=blFlowDoc.FopTask
+	Do ..BuildFileData("File", .FName,.Dir,.FilePath)   ; , FANr,FactType)
+	Quit:(Dir="") $$$ERROR($$$GeneralError,"Invalid directory specified: "_Dir)
+	Set:(TFType="PDF")&&($$$LCase(FName)'?.E1".pdf") FName=FName_".pdf"
+	Set:(TFType="PS" )&&($$$LCase(FName)'?.E1".ps") FName=FName_".ps"
+	Set Task=..CreateFopTask("DocRenderAndFile",,)
+	Set sc=..DocSetRenderData(Task.AddDoc(), "FILE",XmlPath, ,TFType, $LB(), ..BuildXsltParams(,$G(pWithLogo,1),,"","",1))
+	Set:($$$ISOK(sc)) sc=Task.AddActionFile(FName,Dir)
 	Quit:($$$ISERR(sc)) sc
-
-	Set:(blFlowDoc.TransformType="PDF")&&($$$LCase(FilePath)'?.E1".pdf") FilePath=FilePath_".pdf"
-	Set:(blFlowDoc.TransformType="PS" )&&($$$LCase(FilePath)'?.E1".ps" ) FilePath=FilePath_".ps"
-	Do blFlowDoc.Close()
-	Set blFlowDoc=""
-
+	Set FilePath=$$$FullPath(FName,Dir)
 	Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine)   ; $$$rmBatch   ; $$$rmSync
 	Quit sc
 ]]></Implementation>
 </Method>
 
+<Method name="RenderAndFileWWWFromXML">
+<Description>
+XmlPath t.o.v. FOP-server definiëren
+FileURL : als .local doorgeven
+          enkel de FileName doorgeven indien gewenst, anders wordt deze ge-default. 
+          het volledige pad (server+dir+filename) wordt in URL-vorm teruggegeven</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[XmlPath:%String,&FileURL:%String]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set FilePath=$S($L($G(FileURL)):FileURL, 1:$P(##class(%File).GetFilename(XmlPath),".",1))
+	Set:($$$LCase(FilePath)'?.E1".pdf") FilePath=FilePath_".pdf"
+	Do ..BuildFileData("FileWWW", .FName,.Dir,.FilePath, $G(KLNr,"TestWV"))
+	Do ..BuildFileData("FileWWWUrl", FName, ,.FileURL)
+	Quit ..RenderAndFileFromXML(.XmlPath,FilePath)
+]]></Implementation>
+</Method>
+
 <Method name="RenderAndMailFromXML">
 <Description>
 XmlPath t.o.v. FOP-server definiëren 
@@ -359,16 +347,14 @@
 <FormalSpec>XmlPath:%String,MailTo:%String,Subject:%String,Body:%String,FileName:%String,MailFrom:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	 q:(##class(BL.Sys.FOP.CommonTasks).CurrentUserID()'=1007) $$$ERROR($$$GeneralError,"DocBase Temporarily unavailable.  Contact WimV")
-
 	Set:($G(FileName)="") FileName=##class(%File).GetFilename($P(##class(%File).GetFilename(XmlPath),".",1))
 	Set:($$$LCase(FileName)'?.E1".pdf") FileName=FileName_".pdf"
-	;Set Task=..CreateFopTask("DocRenderAndMail",,)
-	;Set sc=..DocSetRenderData(Task.AddDoc(), "FILE",XmlPath, ,"PDF", $LB(), ..BuildXsltParams(,$G(pWithLogo,1),,"",""))
-	Set:($$$ISOK(sc)) sc=Task.AddActionMail(MailTo,.Subject,.Body,,.MailFrom)
+	Set Task=..CreateFopTask("DocRenderAndMail",,)
+	Set sc=..DocSetRenderData(Task.AddDoc(), "FILE",XmlPath, ,"PDF", $LB(), ..BuildXsltParams(,$G(pWithLogo,1),,"",""))
+	Set:($$$ISOK(sc)) sc=Task.AddActionMail(MailTo,.Subject,.Body,.MailFrom)
 	Set:($$$ISOK(sc)) Task.ActionMail.Attachments=FileName
 	Quit:($$$ISERR(sc)) sc
-	Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmBatch)   ;    ; $$$rmSync
+	Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine)   ;    ; $$$rmSync
 	Quit sc
 ]]></Implementation>
 </Method>
@@ -382,112 +368,95 @@
 <FormalSpec>KLNr:%String,oPLSettings:BL.Flow.Proxy.pxPrijsLijstSettings,blnArchiveXML:%Boolean=0</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Set Check=..CheckKlant(.oPLSettings,KLNr) Quit:Check'=1 $$$ErrorProxyPLEmpty
+	;Quit ..RenderAndPrintDoc(KLNr , oPLSettings,..#PrinterDFL)
+	;Quit ..RenderAndPrintDoc(KLNr , oPLSettings, "LEVBON_PS") ;..#PrinterDFL)
+	
 	#define TraySelect           "1"
 	#define TraySelectVoorblad   "3"
-
+	Set PrinterName=""   ; PPOD-dummy
+	Set NumCopies=1
 	Set blnPPOD=1
-	Set blFlowDoc=..Instantiate()
-	Do blFlowDoc.Init(KLNr,)
-	Set blFlowDoc.lbDocs=$LB(KLNr)
-	Set blFlowDoc.TransformType="PS"
-	Set blFlowDoc.lbPPODKeywords=$S(blnPPOD:$LB(,,,,,,"",,,""), 1:$LB())   ; Bijlage and PrintGroep filled by SQL-update !!!
-	Set blFlowDoc.Options=$G(oPLSettings)
-	Set blFlowDoc.Printer=""
-	Do blFlowDoc.XsltParams.SetAt($G(pWithLogo,0),"pWithLogo")
-	Do blFlowDoc.XsltParams.SetAt($G(pImageCol,0),"pImageColVisible")
-	Do blFlowDoc.XsltParams.SetAt($$$TraySelect  ,"pTraySelect")
-	Do blFlowDoc.XsltParams.SetAt($$$TraySelectVoorblad,"pTraySelectVoorblad")
+	Set lbPPODKeywords=$S(blnPPOD:$LB(,,,,,,"",,,""), 1:$LB()) ; Bijlage and PrintGroep filled by SQL-update !!!
 	
-	// BuildTask RenderToPPOD (with or without Archiving) 
-	Set Task=blFlowDoc.CreateFopTask($S(blnArchiveXML:"PrijsLijstPPODArchiveren", 1:"DocRenderToPPOD"),,)
-	Set sc=blFlowDoc.DocSetRenderDefs(Task.AddDoc(), )   ; blFlowDoc.lbDocs, ..ADBTemplate, ..TransformType, ..lbPPODKeywords)
-
-	// Add archive settings 
+	Set Task=..CreateFopTask($S(blnArchiveXML:"PrijsLijstPPODArchiveren", 1:"DocRenderToPPOD"),,)
+	Set sc=..DocSetRenderDefs(Task.AddDoc(), $LB(KLNr,), , "PS", lbPPODKeywords, $G(pWithLogo,0), $$$TraySelect, $$$TraySelectVoorblad, .oPLSettings)
+	Set:($$$ISOK(sc)) sc=Task.AddActionPrint(PrinterName,NumCopies,,,)   ; OMRCode = $$GenerateUniquePrintGroup(KLNr,"")
 	If ($$$ISOK(sc))&&(blnArchiveXML) Do
-	. Set DocDatum=blFlowDoc.DocDatum(KLNr,.oPLSettings,.SubID)
-	. Set Dir=blFlowDoc.ArchiveDir(DocDatum)
-	. Set FName=blFlowDoc.ArchiveXmlName(KLNr,DocDatum,SubID)
+	. Set DocDatum=..DocDatum(KLNr,.oPLSettings,.SubID)
+	. Set Dir=..ArchiveDir(DocDatum)
+	. Set FName=..ArchiveXmlName(KLNr,DocDatum,SubID)
 	. Set sc=Task.AddActionFile(FName,Dir)
-
-	Set:($$$ISOK(sc)) sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmBatch,$$$qpvLow-1)   ; $$$rmBatch   ; $$$rmSync
+	Quit:($$$ISERR(sc)) sc
+	Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmBatch,$$$qpvLow-1)   ; $$$rmBatch   ; $$$rmSync
 	Quit sc
 ]]></Implementation>
 </Method>
 
-<Method name="RenderAndFileWWWDoc">
+<Method name="CheckKlant">
 <Description>
-FileURL : als .local doorgeven
-          enkel de FileName doorgeven indien gewenst, anders wordt deze ge-default. 
-          het volledige pad (server+dir+filename) wordt in URL-vorm teruggegeven</Description>
+Result : 1 = Toelaten, alle andere waarden NIET toelaten</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[KLNr:%String,oPLSettings:BL.Flow.Proxy.pxPrijsLijstSettings,&FileURL:%String]]></FormalSpec>
-<ReturnType>%Status</ReturnType>
+<FormalSpec>oPLSettings:BL.Flow.Proxy.pxPrijsLijstSettings,KLNr</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-	Set FilePath=$G(FileURL)
-	Set sc=..RenderAndFileDoc(.KLNr,.oPLSettings,FilePath, 1,.FileURL)   ; blnFileWWW=1 , return FileURL 
-	Quit sc
+	New Result,D,KLID,Regio
+	Set D="\"
+	Quit:'$isObject($G(oPLSettings)) -1
+	Quit:'$$CHECK^KLANT6(KLNr,1) -1  ;non aktief of verwijderd
+	
+	; Standaard beperking op regios
+	If 'oPLSettings.AlleRegios Do  Quit:('Regio)||(Regio>29) 0
+	. Set KLID=^KK1(KLNr)
+	. Set Regio=$P(^KKL(KLID,0),"\",20)
+	
+	If oPLSettings.OmzetOndergrens Do  Quit:Omzet<oPLSettings.OmzetOndergrens 0
+	. Set VanMnd=oPLSettings.VanMaand
+	. Set TotMnd=oPLSettings.TotMaand
+	. Set:TotMnd="" TotMnd=$$CALCDATE^vhDTyp($H,"M",-1)
+	. Set:VanMnd="" VanMnd=$$CALCDATE^vhDTyp(TotMnd,"M",-11)
+	. Set TotMnd=$$EXTDATE^vhDTyp(TotMnd,"DM4")_" "
+	. Set VanMnd=$$EXTDATE^vhDTyp(VanMnd,"DM4")_" "
+	. Set Omzet=$$KLANT^STAT(KLNr,0,VanMnd,TotMnd,3)
+	
+	Quit:'$L(oPLSettings.CallBackKlant) 1
+	Do EXECS^vhRES(oPLSettings.CallBackKlant,"Result","(KLNr)")
+	Quit $G(Result) ; 1=Toelaten
 ]]></Implementation>
 </Method>
 
 <Method name="RenderAndFileDoc">
 <Description>
    s sc=##class(BL.Flow.PrijsLijst.Doc).RenderAndFileDoc(1239,,.fp)   w sc,!,"File: "_$G(fp)</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[KLNr:%String,oPLSettings:BL.Flow.Proxy.pxPrijsLijstSettings,&FilePath:%String,blnFileWWW:%Boolean=0,&FileURL:%String]]></FormalSpec>
+<FormalSpec><![CDATA[KLNr:%String,oPLSettings:BL.Flow.Proxy.pxPrijsLijstSettings,&FilePath:%String]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set blPrsL=..Instantiate()
-	Do blPrsL.Init(KLNr,)
-	Set blPrsL.lbDocs=$LB(KLNr)
-	Set blPrsL.TransformType="PDF"
-	Set blPrsL.lbPPODKeywords=$LB()
-	Do blPrsL.XsltParams.SetAt($G(pWithLogo,1),"pWithLogo")
-	;Do blPrsL.XsltParams.SetAt($G(pImageCol,0),"pImageColVisible")
-	Set blPrsL.Options=$G(oPLSettings)
-	
-	If blnFileWWW Do
-	. Set sc=blPrsL.BuildTaskRenderAndFileWWW(.FilePath,.FileURL)   ; returns mod FileURL 
-	Else  Do
-	. Set sc=blPrsL.BuildTaskRenderAndFile(.FilePath)
-	. ;Set sc=..DocSetRenderDefs(Task.AddDoc(), $LB(KLNr,), , "PDF", $LB(), $G(pWithLogo,1), , , .oPLSettings)
-	Set Task=blPrsL.FopTask
-	Do blPrsL.Close()
-	Set blPrsL=""
-	Set:($$$ISOK(sc)) sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine)   ; $$$rmBatch   ; $$$rmSync
+	Do ..BuildFileData("File", .FName,.Dir,.FilePath, KLNr)
+	Quit:(Dir="") $$$ERROR($$$GeneralError,"Invalid directory specified: "_Dir)
+	Set Task=..CreateFopTask("DocRenderAndFile",,)
+	Set sc=..DocSetRenderDefs(Task.AddDoc(), $LB(KLNr,), , "PDF", $LB(), $G(pWithLogo,1), , , .oPLSettings)
+	Set:($$$ISOK(sc)) sc=Task.AddActionFile(FName,Dir)
+	Quit:($$$ISERR(sc)) sc
+	Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine)   ; $$$rmBatch   ; $$$rmSync
 	Quit sc
 ]]></Implementation>
 </Method>
 
-<Method name="RenderAndPrintDoc">
+<Method name="RenderAndFileWWWDoc">
 <Description>
-   s sc=##class(BL.Flow.PrijsLijst.Doc).RenderAndPrintDoc(4682,,"KYOCERAFS4000")   w sc,!</Description>
+FileURL : als .local doorgeven
+          enkel de FileName doorgeven indien gewenst, anders wordt deze ge-default. 
+          het volledige pad (server+dir+filename) wordt in URL-vorm teruggegeven</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>KLNr:%String,oPLSettings:BL.Flow.Proxy.pxPrijsLijstSettings,PrinterName:%String</FormalSpec>
+<FormalSpec><![CDATA[KLNr:%String,oPLSettings:BL.Flow.Proxy.pxPrijsLijstSettings,&FileURL:%String]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
- /*
-Set oSettings=##class(BL.Flow.Proxy.pxPrijsLijstSettings).%New()
-Do oSettings.SDInit(4682)
-Do oSettings.SDSave("","")
-Set oSettings.BeperkProducts=$LB(55776,247828,10479,104752,90133,385199,385200,385208)
-s sc=##class(BL.Flow.PrijsLijst.Doc).RenderAndPrintDoc(4682,oSettings,"KYOCERAFS4000")   w sc,!
- */
-	Set blPrsL=..Instantiate()
-	Do blPrsL.Init(KLNr,)
-	Set blPrsL.lbDocs=$LB(KLNr)
-	Set blPrsL.TransformType="PS"
-	Set blPrsL.lbPPODKeywords=$LB()
-	Do blPrsL.XsltParams.SetAt($G(pWithLogo,1),"pWithLogo")
-	Do blPrsL.XsltParams.SetAt($G(pImageCol,0),"pImageColVisible")
-	Set blPrsL.Options=$G(oPLSettings)
-	Set:($L($G(PrinterName))) blPrsL.Printer=PrinterName
-	
-	Set sc=blPrsL.BuildTaskRenderAndPrint(blPrsL.Printer,)
-	Set Task=blPrsL.FopTask
-	Do blPrsL.Close()
-	Set blPrsL=""
-	Set:($$$ISOK(sc)) sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine)   ; $$$rmBatch   ; $$$rmSync
-	Quit sc
+	Set FilePath=$G(FileURL)
+	Do ..BuildFileData("FileWWW", .FName,.Dir,.FilePath, $G(KLNr,"TestWV"))
+	Do ..BuildFileData("FileWWWUrl", FName, ,.FileURL)
+	Quit ..RenderAndFileDoc(.KLNr,.oPLSettings,FilePath)
 ]]></Implementation>
 </Method>
 
@@ -496,27 +465,41 @@
 <FormalSpec>KLNr:%String,oPLSettings:BL.Flow.Proxy.pxPrijsLijstSettings,MailTo:%String,Subject:%String,Body:%String,FileName:%String,MailFrom:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set blPrsL=..Instantiate()
-	Do blPrsL.Init(KLNr,)
-	Set blPrsL.lbDocs=$LB(KLNr)
-	Set blPrsL.TransformType="PDF"
-	Set blPrsL.lbPPODKeywords=$LB()
-	Do blPrsL.XsltParams.SetAt($G(pWithLogo,1),"pWithLogo")
-	Do blPrsL.XsltParams.SetAt($G(pImageCol,0),"pImageColVisible")
-	Set blPrsL.Options=$G(oPLSettings)
+	Do ..BuildFileData("Mail", .FileName, , , KLNr)
+	Set Task=..CreateFopTask("DocRenderAndMail",,)
+	Set sc=..DocSetRenderDefs(Task.AddDoc(), $LB(KLNr,), , "PDF", $LB(), $G(pWithLogo,1), , , .oPLSettings)
+	Set:($$$ISOK(sc)) sc=Task.AddActionMail(MailTo,.Subject,.Body,.MailFrom)
+	Set:($$$ISOK(sc)) Task.ActionMail.Attachments=FileName
+	Quit:($$$ISERR(sc)) sc
+	Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmBatch)   ;    ; $$$rmSync
+	Quit sc
+]]></Implementation>
+</Method>
 
-	Set sc=blOrd.BuildTaskRenderAndMail(MailTo,.Subject,.Body, .FileName, .MailForm)
-	Set Task=blOrd.FopTask
-	Do blOrd.Close()
-	Set blOrd=""
-	Set:($$$ISOK(sc)) sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmBatch)   ; $$$rmSync
+<Method name="RenderAndPrintDoc">
+<Description>
+Oproepen via :
+  s sc=##class(BL.Flow.PrijsLijst.Doc).RenderAndPrintDoc(6822,,)   w sc,!
+  s sc=##class(BL.Flow.PrijsLijst.Doc).RenderAndPrintDoc(6822,0,"BrotherBoekH",1)   w sc,!</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>KLNr:%String,oPLSettings:BL.Flow.Proxy.pxPrijsLijstSettings,PrinterName:String,pWithLogo:%Boolean=1,pTraySelect:%String=""</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set PrinterName=$G(PrinterName,..#PrinterDFL)   ; "DocuColor"
+	Set Task=..CreateFopTask("DocRenderAndPrint",,)
+	Set sc=..DocSetRenderDefs(Task.AddDoc(), $LB(KLNr,), , "PS", $LB(), $G(pWithLogo,0), .pTraySelect, , .oPLSettings)
+	Set NumCopies=1
+	Set:($$$ISOK(sc)) sc=Task.AddActionPrint(PrinterName,NumCopies,,)
+	Quit:($$$ISERR(sc)) sc
+	Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmBatch,$$$qpvLow)   ; $$$rmBatch   ; $$$rmSync
 	Quit sc
 ]]></Implementation>
 </Method>
 
 <Method name="TestPrintImages">
 <Description>
-   s sc=##class(BL.Flow.PrijsLijst.Doc).TestPrintImages(,)   w sc,! </Description>
+   s sc=##class(BL.Flow.PrijsLijst.Doc).TestPrintImages(,,)   w sc,! 
+   s sc=##class(BL.Flow.PrijsLijst.Doc).TestPrintImages("ICT6050",,lbPRNrs)   w sc,! </Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>PrinterName:%String,MaxPerChunk:%Integer=5,lbPRNrs:%List=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
@@ -541,10 +524,14 @@
 
  */
 	  d WLIP^vhDBG(97,"TestPrintImages")
-	  ;s lbPRNrs=$LB(254322, 246057, 239364)_$LB(55776,247828,10479,104752,90133,385199) _$LB(48867, 299849, 77212, 265935, 71867, 19062, 206458, 145743)
+	  ;s lbPRNrs=$LB(87426, 90133, 87426, 324987, 87426, 324989, 87426, 324991)
 
+	#define MaxDocsPerTask   40
+	#define MaxPerChunkDFL   5
+
+	Set blnPrint=0           ; Print or ToFile ? 
 	Set KLNr=4682            ; VAN HOECKE 
-	Set:((MaxPerChunk\1)<1) MaxPerChunk=5
+	Set:((MaxPerChunk\1)<1) MaxPerChunk=$$$MaxPerChunkDFL
 	Do tpiFetchProducts(5005)   ; Beperken tot Blum-producten 
 	Do tpiBuildChunks(MaxPerChunk)
 	Do tpiRenderPrintChunks(KLNr)
@@ -556,11 +543,18 @@
 	Set blImage=##class(BL.Prod.ImageLink).Instantiate()	
  	Set PRNr=0
 	For  Set PRNr=$O(^KPR(PRNr)) Quit:PRNr=""  Do
-	. Quit:'$D(^KPR(PRNr,"J"_LEVNr))
+	. If ($L(LEVNr)) Quit:('$D(^KPR(PRNr,"J"_LEVNr)))
 	. Set IdentNr=$P(^KPR(PRNr,2),"\",25)
 	. Quit:$E(IdentNr)=7   ; DO-product 
 	. Quit:$E(IdentNr)=6   ; Kindproduct 
 	. Quit:$P(^KPR(PRNr,0),"/")?1(1"CBL",1"MBL").E   ; Catalogen 
+	. 
+	. Set KKey=$$$PRGet($$$KlassificatieKey)
+	. Set KKey=$P($G(^KLAS("K",KKey)),"\",8)	
+	. ;Quit:(KKey'=387)                ; Box 
+	. ;Quit:(KKey'=187)                ; Accessoires 
+	. ;Quit:(KKey'?1(1"387",1"187"))   ; Box of Accessoires 
+	. 
 	. Set ImageURL=blImage.GetProductImageURL(PRNr,"FOPEMBED"_"PS")   ; proxy met URL van product beeld om ge-embed te worden in de PDF door FOP
 	. If ($isObject(ImageURL))&&($L(ImageURL.Content))&&($D(Cache(ImageURL.Content))) Quit
 	. If ($isObject(ImageURL))&&($L(ImageURL.Content)) Set Cache(ImageURL.Content)=""
@@ -588,40 +582,56 @@
 	Quit	
 
 tpiRenderPrintChunks(KLNr)
-	#define MaxDocsPerTask   40
-	For j=0:$$$MaxDocsPerTask:arChunk Do  Quit:($$$ISERR(sc))
-	. Do tpiRenderPrintChunksSub(KLNr,j,j+$$$MaxDocsPerTask)
+	Set (CntTasks,CntChunks)=0
+	Set FirstChunk=0
+	Set LastChunk=arChunk
+	;If $G(blnTest,1) Set LastChunk=3   ; Test with 3 chunks only 
+	For j=FirstChunk:$$$MaxDocsPerTask:LastChunk Do  Quit:($$$ISERR(sc))
+	. Set sc=$$tpiRenderPrintChunksSub(KLNr,j,$$$Min(j+$$$MaxDocsPerTask,LastChunk+1))
+	. Set:($$$ISOK(sc)) CntTasks=CntTasks+1
 	Quit
 tpiRenderPrintChunksSub(KLNr,ChunkStart,ChunkStop)
 	Set oPLSettings=##class(BL.Flow.Proxy.pxPrijsLijstSettings).%New()
 	Do oPLSettings.SDInit(KLNr)
 	Do oPLSettings.SDSave("","")
 	Set oPLSettings.BeperkProducts=""   ; wordt pas in de subroutine ingevuld. 
+	Set oPLSettings.VanMaand=$$CALCDATE^vhDTyp(,"M",-1)
+	Set oPLSettings.CallBackProduct=""
+
 	// Init BL 	
-	Set blPrsL=..Instantiate()
-	Do blPrsL.Init(KLNr,)
-	Set blPrsL.lbDocs=$LB(KLNr)
-	Set blPrsL.TransformType="PS"
-	Set blPrsL.lbPPODKeywords=$LB()
-	Do blPrsL.XsltParams.SetAt(1,"pWithLogo")
-	Do blPrsL.XsltParams.SetAt(1,"pImageColVisible")
-	Set:($L($G(PrinterName))) blPrsL.Printer=PrinterName
+	;Set blPrsL=..Instantiate()
+	;Do blPrsL.Init(KLNr,)
+	;Set blPrsL.lbDocs=$LB(KLNr)
+	;Set blPrsL.TransformType="PS"
+	;Set blPrsL.lbPPODKeywords=$LB()
+	;Do blPrsL.XsltParams.SetAt(1,"pWithLogo")
+	;Do blPrsL.XsltParams.SetAt(1,"pImageColVisible")
+	;Set:($L($G(PrinterName))) blPrsL.Printer=PrinterName
+	Set:($G(PrinterName)="") PrinterName=..#PrinterDFL
+	Set Dir="\\WV_XP\D$\Temp\FOP_pl\"
+	Set FName="pl_TEST001_"
 	// Create FopTask
-	Set Task=blPrsL.CreateFopTask("DocRenderAndPrint",,)
+	Set:(blnPrint) Task=..CreateFopTask("DocRenderAndPrint",,)
+	Set:('blnPrint) Task=..CreateFopTask("DocRenderAndFile",,)
 	// Loop through arChunk 
 	Set i=""
 	For  Set i=$O(arChunk(i)) Quit:(i="")  Do:(i'<ChunkStart)&&(i<ChunkStop) tpiAddRenderDoc(arChunk(i),$G(arChunk(i+1)))  Quit:($$$ISERR(sc))
 	// Terminate BL 
-	Set:($$$ISOK(sc)) sc=Task.AddActionPrint(blPrsL.Printer,1,,)
-	Do blPrsL.Close()
-	Set blPrsL=""
-	Set:($$$ISOK(sc)) sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task, $$$rmInLine)   ; $$$rmBatch
+	Set:(blnPrint)&&($$$ISOK(sc)) sc=Task.AddActionPrint(PrinterName,1,,)
+	Set:('blnPrint)&&($$$ISOK(sc)) sc=Task.AddActionFile(FName_""_i,Dir)
+
+	;Do blPrsL.Close()
+	;Set blPrsL=""
+	Set:($$$ISOK(sc)) sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task, $$$rmInLine,1)   ; $$$rmBatch   ; $$$rmInLine 
 	Quit sc
 tpiAddRenderDoc(lbPRNrs,lbNextPR)
-	Set blPrsL.Options=oPLSettings.%ConstructClone(1)
-	Set blPrsL.Options.BeperkProducts=lbPRNrs
-	Set blPrsL.Options.TekstNa=$LB("Default Settings By WimV")_$S($L(lbNextPR):$LB("De volgende PRNr zijn : "_$$$LCVT(lbNextPR)), 1:"")
-	Set sc=blPrsL.DocSetRenderDefs(Task.AddDoc(), )
+	Set oOptions=oPLSettings.%ConstructClone(1)
+	Set oOptions.BeperkProducts=lbPRNrs
+	Set oOptions.Via="T"
+	Set oOptions.TekstNa=$LB("Default Settings By WimV")_$S($L(lbNextPR):$LB("De volgende PRNr zijn : "_$$$LCVT(lbNextPR)), 1:"")
+	;Set sc=blPrsL.DocSetRenderDefs(Task.AddDoc(), )
+	Set:(blnPrint) sc=..DocSetRenderDefs(Task.AddDoc(), $LB(KLNr,), , "PS", $LB(), $G(pWithLogo,0), , , .oOptions, $G(pImageColVisible,1))
+	Set:('blnPrint) sc=..DocSetRenderDefs(Task.AddDoc(), $LB(KLNr,), , "PDF", $LB(), $G(pWithLogo,1), , , .oOptions, $G(pImageColVisible,1))
 	  ;d WL^vhDBG("RunFopTask "_i_"  "_ChunkStart_"  "_$$$LCVT(lbPRNrs))
 	Quit
 ]]></Implementation>
@@ -647,8 +657,6 @@
 	Set oSettings.TekstNa=$LB("PL:TEKST:GELDIGVANAF")
 	Set oSettings.TekstVoor=$LB("PL:TEKST:GELDIGVANAF","PL:TEKST:ORGALUX2008")
 	Set oSettings.CallBackProduct="CF`BL.Flow.Proxy.pxPrijsLijst`Check2008"
-
-	Set oSettings.BeperkProducts=""   ; $LB(,,)
 	Quit oSettings
 ]]></Implementation>
 </Method>
@@ -774,27 +782,117 @@
 
 <Method name="KeywordsDefault">
 <Description>
-Geeft de standaard Keywords terug op basis van de opgegeven AnalyseRoutine. 
-Deze method kan in de afgeleide klasse overschreven worden voor specifieke uitbreidingen. </Description>
+Geeft de standaard Keywords terug op basis van de opgegeven AnalyseRoutine</Description>
+<ClassMethod>1</ClassMethod>
 <FormalSpec>DocType:%String,AnalyseRoutine:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set DocType=$G(DocType,..#DocTypeKWd)
+	Set DocType=$G(DocType,$$$ppodtPrijsLijst)
 	Quit:(AnalyseRoutine["PrijsLijstPPODArchiveren" ) DocType_";RenderToPPOD;Archive"
 	;Quit:(AnalyseRoutine["PrijsLijstArchiveren"     ) DocType_";Archive"               ; CacheTask or via FOP ?
-	Quit ##class(BL.Flow.Basis.DocNew).KeywordsDefaultCM(DocType,AnalyseRoutine)
+	Quit ##class(BL.Flow.Basis.Doc).KeywordsDefault(DocType,AnalyseRoutine)
 ]]></Implementation>
 </Method>
 
-<Method name="DefaultPDFNameCM">
+<Method name="BuildXsltParams">
+<Description>
+XSLT-parameters voor RenderDoc berekenen. 
+Geeft een $LB() terug.  Bvb:  $LB("pWithLogo=0","pWithBgColors=1")</Description>
 <ClassMethod>1</ClassMethod>
+<FormalSpec>lbXsltParams:%List,pWithLogo:%Boolean=0,pWithBgColors:%Boolean="",pTraySelect:%String="",pTraySelectVoorblad:%String="",pImageColVisible:%String=""</FormalSpec>
+<ReturnType>%List</ReturnType>
+<Implementation><![CDATA[
+	Quit:($G(lbXsltParams)=$LB()) $LB()
+	Quit:($L($G(lbXsltParams))) lbXsltParams
+	
+	;Set pWithLogo=$G(pWithLogo,0)    ; pWithLogo
+	Set pWithBgColors=""              ; pWithBgColors=1
+	Set tmpLB=""
+	Set:($L(pWithLogo)          ) tmpLB=tmpLB_$LB("pWithLogo="_pWithLogo)
+	Set:($L(pWithBgColors)      ) tmpLB=tmpLB_$LB("pWithBgColors="_pWithBgColors)
+	Set:($L(pTraySelect)        ) tmpLB=tmpLB_$LB("pTraySelect="_pTraySelect)
+	Set:($L(pTraySelectVoorblad)) tmpLB=tmpLB_$LB("pTraySelectVoorblad="_pTraySelectVoorblad)
+	Set:($L(pImageColVisible)   ) tmpLB=tmpLB_$LB("pImageColVisible="_pImageColVisible)
+	Quit tmpLB
+]]></Implementation>
+</Method>
+
+<Method name="CreateFopTask">
+<Description>
+Create Task-object
+  AnalyseRoutine is een verplichte parameter 
+  Keywords is optioneel. Bij voorkeur ";"-gescheiden 
+  UserID is optioneel. 
+Keywords en UserID worden berekend indien niet gedefinieerd.</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>AnalyseRoutine:%String,Keywords:%String,UserID:%String</FormalSpec>
+<ReturnType>Sys.FOP.Task</ReturnType>
+<Implementation><![CDATA[
+	Set:('$D(UserID)) UserID=##class(BL.Sys.FOP.CommonTasks).CurrentUserID()   ; 1007 = WimV 
+	Set Task=##class(BL.Sys.FOP.Interface).NewTask(,,UserID)
+	Set Task.AnalyseRoutine=AnalyseRoutine        ; custom routine to convert FopTask to (TaskSeq + SeqItems)
+	Set:($G(Keywords)="") Keywords=..KeywordsDefault(,AnalyseRoutine)
+	Set Task.KeyWords=Keywords
+	Quit Task
+]]></Implementation>
+</Method>
+
+<Method name="DocSetRenderData">
+<Description>
+De render-data toevoegen aan het Doc. </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Doc:Sys.FOP.emDoc,DataInVia:%String,DataIn,Template:%String,TransformType:%String="PDF",lbPPODKeywords:%List,lbXsltParams:%List</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set DataType=$G(DataType,"XML")
+	Set sc=..GetRenderInfo(.Template, .TransformType, .lbXsltParams, .Taal, .Options, .OptionsPDF)
+	Do Doc.SetRenderData(.DataInVia, DataIn, DataType, .Template, .TransformType, .lbPPODKeywords, .lbXsltParams, .Taal, .Options, .OptionsPDF)
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GetRenderInfo">
+<Description>
+De render-data ophalen, i.e. invullen in de parameters (als .local doorgeven). </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[&Template:%String,&TransformType:%String,&lbXsltParams:%List,&Taal:%String,&Options:%String,&OptionsPDF:%String]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set Template=$G(Template,..#ADBTemplate)
+	Set TransformType=$S($$$UCase(TransformType)="PS":"PS", 1:"PDF")
+	Set Taal=$G(Taal,"N")
+	Set lbXsltParams=..BuildXsltParams(lbXsltParams)   ; , .pWithLogo,.pWithBgColors,.pTraySelect)
+	Set Options=$G(Options,"")
+	Set OptionsPDF=$G(OptionsPDF,"")
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="DocSetRenderDefs">
+<Description>
+De render-data toevoegen aan het Doc. 
+Alleen gebruiken wanneer de data van het document gedefinieerd is via lbDocs, i.e. xml wordt pas later gegenereerd via method GetFopXML()</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Doc:Sys.FOP.emDoc,lbDocs:%List,Template:%String,TransformType:%String="PDF",lbPPODKeywords:%List,pWithLogo:%Boolean,pTraySelect:%String,pTraySelectVoorblad:%String,oPLSettings:Sys.FOP.emDocOptions,pImageColVisible:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	;Set:($L(lbDocs)) lbDataIn=$LB("CLS.MTH.XML",..%ClassName(1),"GetFopXML",lbDocs)
+	Set:($L(lbDocs)) lbDataIn=$LB("BL.MTH.PROXY",..%ClassName(1),"BuildProxy",lbDocs)
+	Set lbXsltParams=..BuildXsltParams(,.pWithLogo,,.pTraySelect,.pTraySelectVoorblad, $G(pImageColVisible,$$$xslpFromDoc))   ; ,.pWithBgColors,,,)
+	Set:($IsObject($G(oPLSettings))) Doc.Options=oPLSettings
+	Quit ..DocSetRenderData(Doc, "DEFS", lbDataIn, .Template, .TransformType, .lbPPODKeywords, .lbXsltParams)
+]]></Implementation>
+</Method>
+
+<Method name="DefaultPDFName">
+<ClassMethod>1</ClassMethod>
 <FormalSpec>KLNr:%String,Extension:%String="pdf"</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ..#DocName_"_"_KLNr_"_"_$ZD($H,8)_"."_Extension
 ]]></Implementation>
 </Method>
 
-<Method name="BuildFileDataCM">
+<Method name="BuildFileData">
 <Description>
 DocRef kan ofwel KLNr zijn, ofwel lbDocs (list)
 Target: File, FileWWW, FileWWWUrl, TempFTP, Mail, TempMail</Description>
@@ -818,6 +916,9 @@
 	Do:(Target="File"      ) bfdSetFile()
 	Do:(Target="FileWWW"   ) bfdSetFileWWW()
 	Do:(Target="FileWWWUrl") bfdSetFileWWWUrl()
+	Do:(Target="TempFTP"   ) bfdSetTempFTP()
+	Do:(Target="Mail"      ) bfdSetMail()
+	Do:(Target="TempMail"  ) bfdSetTempMail()
 	Quit
 
 bfdSetFile()
@@ -833,7 +934,7 @@
 	;Set values
 	If (FName="")||(Dir="") Do
 	. Set:(Dir="") Dir=##class(BL.Sys.FOP.CommonTasks).LoggedOnUserPath()
-	. Set:(FName="") FName=..DefaultPDFNameCM($G(DocNr,"000000"))
+	. Set:(FName="") FName=..DefaultPDFName($G(DocNr,"000000"))
 	. Set FilePath=$$$FullPath(FName,Dir)
 	Else  Do
 	. Set:(FilePath="") FilePath=$$$FullPath(FName,Dir)
@@ -847,7 +948,7 @@
 	// OUTPUT: FName,Dir,FilePath
 	Set Dir=$$$FOPInetPubDir_$$$SubDir
 	Set FName=##class(%File).GetFilename($G(FilePath))
-	Set:(FName="") FName=..DefaultPDFNameCM(DocNr)
+	Set:(FName="") FName=..DefaultPDFName(DocNr)
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
 	Quit
 bfdSetFileWWWUrl()
@@ -856,6 +957,37 @@
 	// OUTPUT: FilePath
 	Set FilePath=$$$FOPInetPubURL_$$$SubDirURL_FName
 	Quit
+	
+bfdSetTempFTP()
+	// INPUT : FName or empty
+	//         Dir fixed
+	// OUTPUT: FilePath      ;The returned 'Dir' can be local path to FOP;the 'Dir in the FilePath' is the network-converted 'Dir'
+	Set Dir="E:\FOP\PDFTemp"
+	Set FtpSrcDir=$$$CvtFopE2Ntw(Dir)
+	;Set Dir=FtpSrcDir   ;optional: use same value (network path) to address file from both servers (FOP and Caché0x)
+	Set:($G(FName)="") FName=..#DocCode_"_"_DocNr_"_"_$ZD($H,8)_".pdf"
+	Set FilePath=##class(%File).NormalizeDirectory(FtpSrcDir)_FName
+	Quit
+
+bfdSetMail()
+	// INPUT : FName or empty
+	//         No Dir needed
+	// OUTPUT: FName
+	Set:($G(FName)="") FName=..#DocCode_"_"_DocNr_"_"_$ZD($H,8)_".pdf"
+	Quit
+	
+bfdSetTempMail()
+	// INPUT : FName or empty, Dir or empty (defaulted if empty)
+	// OUTPUT: FName,Dir,FilePath   ;Dir and FilePath : network-converted 'Dir'
+	// OPM: FilePath wordt zowel gebruikt bij RenderToFile (WS) en LoadFile (WS) in FOP, als bij DeleteFile from Caché-task 
+	  d WL^vhDBG("BuildFileData IN ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
+	If $G(Dir)="" Do
+	. Set Dir=$$$PDFMailDirNtw   
+	. ;Set Dir=$$$PDFMailDir    ;Set Dir=$$$CvtFopE2Ntw(Dir)
+	Do bfdSetMail
+	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
+	  d WL^vhDBG("BuildFileData OUT ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
+	Quit
 ]]></Implementation>
 </Method>
 </Class>