Index: BL/EC/Data.cls.xml
===================================================================
diff -u -r38084 -r38094
--- BL/EC/Data.cls.xml	(.../Data.cls.xml)	(revision 38084)
+++ BL/EC/Data.cls.xml	(.../Data.cls.xml)	(revision 38094)
@@ -3044,6 +3044,25 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VervangPlaceholder">
+<FormalSpec>NaamMetPlaceholder:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##class(BL.Sys.FOP.CommonTasks).VervangPlaceholderZTSDoorWaarde(NaamMetPlaceholder)
+]]></Implementation>
+</Method>
+
+<Method name="GeefUniekeNaamVoorFTP">
+<FormalSpec>GedeelteNaarBase64:%String,GedeelteLetterlijk:%String,Extensie:%String="pdf"</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set DeelEncoded=$TR($System.Encryption.Base64Encode(GedeelteNaarBase64),"+="_$C(10,13),"_")
+	Set Placeholder=##class(BL.Sys.FOP.CommonTasks).GeefUniekePlaceholderZTS()
+	Quit DeelEncoded_Placeholder_GedeelteLetterlijk_"."_$TR(Extensie,".","")
+]]></Implementation>
+</Method>
+
 <Method name="GetDocumentURLold">
 <Description>
 s x=##class(BL.EC.Data).%New().GetDocumentURL("XX","MN:PL","CHK","",1239)</Description>
@@ -3062,46 +3081,52 @@
 	. Set Status=##class(BL.Flow.Factuur.Doc).ValidateFactNr("F",DocNr,KlantNr)
 	. Quit:($$$ISERR(Status))
 	. If RecordType=$$$rtPDF Do
-	. . Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"FAC"_DocNr_".pdf"
-	. . Set Status=##class(BL.Flow.Factuur.Doc).RenderAndFtpDoc(DocNr,,,$$$vHisieDownloadIntern,,FileName) 
+	. . Set FileNameMetPlaceholder=..GeefUniekeNaamVoorFTP(URLKey,"FAC"_DocNr,"pdf")
+	. . Set FileName=..VervangPlaceholder(FileNameMetPlaceholder)
+	. . Set Status=##class(BL.Flow.Factuur.Doc).RenderAndFtpDoc(DocNr,,,$$$vHisieDownloadIntern,,FileNameMetPlaceholder) 
 	. . Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName
 	;Order
 	Else  If (Toegang=$$$tgOrder) || (Toegang=$$$tgContractOrder) Do
 	. Set Status=##class(BL.Flow.Order.Doc).ValidateORDNr(DocNr,KlantNr)
 	. Quit:($$$ISERR(Status))
 	. If RecordType=$$$rtPDF Do
-	. . Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"ORD"_DocNr_".pdf"
-	. . Set Status=##class(BL.Flow.Order.Doc).RenderAndFtpDoc(DocNr,$$$vHisieDownloadIntern,,FileName) 
+	. . Set FileNameMetPlaceholder=..GeefUniekeNaamVoorFTP(URLKey,"ORD"_DocNr,"pdf")
+	. . Set FileName=..VervangPlaceholder(FileNameMetPlaceholder)
+	. . Set Status=##class(BL.Flow.Order.Doc).RenderAndFtpDoc(DocNr,$$$vHisieDownloadIntern,,FileNameMetPlaceholder) 
 	. . Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName
 	;Offerte
 	Else  If Toegang=$$$tgOfferte Do
 	. Set Status=##class(BL.Flow.Offerte.Doc).ValidateOFFNr(DocNr,KlantNr)
 	. Quit:($$$ISERR(Status))
 	. If RecordType=$$$rtPDF Do
-	. . Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"OFF"_DocNr_".pdf"
-	. . Set Status=##class(BL.Flow.Offerte.Doc).RenderAndFtpDoc("O-"_DocNr,$$$vHisieDownloadIntern,,FileName) 
+	. . Set FileNameMetPlaceholder=..GeefUniekeNaamVoorFTP(URLKey,"OFF"_DocNr,"pdf")
+	. . Set FileName=..VervangPlaceholder(FileNameMetPlaceholder)
+	. . Set Status=##class(BL.Flow.Offerte.Doc).RenderAndFtpDoc("O-"_DocNr,$$$vHisieDownloadIntern,,FileNameMetPlaceholder) 
 	. . Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName
 	;Uitlevering
 	Else  If Toegang=$$$tgUitlevering Do
 	. Set Status=##class(BL.Flow.Levering.Doc).ValidateBONNr(DocNr,KlantNr)
 	. Quit:($$$ISERR(Status))
 	. If RecordType=$$$rtPDF Do
-	. . Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"LEV"_DocNr_".pdf"
-	. . Set Status=##class(BL.Flow.Levering.Doc).RenderAndFtpDoc(DocNr,$$$vHisieDownloadIntern,,FileName) 
+	. . Set FileNameMetPlaceholder=..GeefUniekeNaamVoorFTP(URLKey,"LEV"_DocNr,"pdf")
+	. . Set FileName=..VervangPlaceholder(FileNameMetPlaceholder)
+	. . Set Status=##class(BL.Flow.Levering.Doc).RenderAndFtpDoc(DocNr,$$$vHisieDownloadIntern,,FileNameMetPlaceholder) 
 	. . Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName
 	;Prijslijst
 	Else  If Toegang=$$$tgPrijsLijst Do
 	. If RecordType=$$$rtPDF Do 
 	. . // Converteren van gearchiveerde prijslijst XML naar PDF 
 	. .	Set XMLPad=..GeefXMLPadVoorActuelePrijslijst(KlantNr) 
-	. . Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"PL.pdf"
-	. . Set Status=##class(BL.Flow.PrijsLijst.Doc).RenderAndFtpFromXML(XMLPad,$$$vHisieDownloadIntern,,FileName) 
+	. . Set FileNameMetPlaceholder=..GeefUniekeNaamVoorFTP(URLKey,"PL","pdf")
+	. . Set FileName=..VervangPlaceholder(FileNameMetPlaceholder)
+	. . Set Status=##class(BL.Flow.PrijsLijst.Doc).RenderAndFtpFromXML(XMLPad,$$$vHisieDownloadIntern,,FileNameMetPlaceholder) 
 	. . Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName
 	. Else  If RecordType=$$$rtXML Do
 	. . // Converteren van gearchiveerde prijslijst XML naar XML voor XLS 
 	. .	Set XMLPad=..GeefXMLPadVoorActuelePrijslijst(KlantNr) 
-	. . Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"PL.xml"
-	. . Set Status=##class(BL.Flow.PrijsLijst.Doc).TransformToXMLAndFtpFromXML(XMLPad,$$$vHisieDownloadIntern,,FileName) 
+	. . Set FileNameMetPlaceholder=..GeefUniekeNaamVoorFTP(URLKey,"PL","xml")
+	. . Set FileName=..VervangPlaceholder(FileNameMetPlaceholder)
+	. . Set Status=##class(BL.Flow.PrijsLijst.Doc).TransformToXMLAndFtpFromXML(XMLPad,$$$vHisieDownloadIntern,,FileNameMetPlaceholder) 
 	. . Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName
 	. Else  If RecordType=$$$rtCHECK Do
 	. . // Alleen controleren of er een gearchiveerde prijslijst XML bestaat 
@@ -3123,8 +3148,9 @@
 	. If objOfferte.Controle="P" Do  Quit
 	. . Set Status=$$$ERROR($$$GeneralError,"Er zijn fouten opgetreden tijdens controle van offerte '"_DocNr_"' ("_objOfferte.Commentaar_").") 
 	. If RecordType=$$$rtPDF Do
-	. . Set FileName=$TR($System.Encryption.Base64Encode(URLKey),"+="_$C(10,13),"_")_"F"_DocNr_".pdf"
-	. . Set Status=##class(BL.Flow.Offerte.Doc).RenderAndFtpDoc(DocNr,$$$vHisieDownloadIntern,,FileName) 
+	. . Set FileNameMetPlaceholder=..GeefUniekeNaamVoorFTP(URLKey,"F"_DocNr,"pdf")
+	. . Set FileName=..VervangPlaceholder(FileNameMetPlaceholder)
+	. . Set Status=##class(BL.Flow.Offerte.Doc).RenderAndFtpDoc(DocNr,$$$vHisieDownloadIntern,,FileNameMetPlaceholder) 
 	. . Set:($$$ISOK(Status)) DocURL=$$$vHisieDownloadExtern_"/"_FileName
 	Else  Do
 	. Set Status=$$$ERROR($$$GeneralError,"Toegang '"_Toegang_"' is onbekend")