Index: BL/Sys/FOP/Verwerker/tmpDev.mac.rou
===================================================================
diff -u -r73436 -r73458
--- BL/Sys/FOP/Verwerker/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 73436)
+++ BL/Sys/FOP/Verwerker/tmpDev.mac.rou	(.../tmpDev.mac.rou)	(revision 73458)
@@ -108,13 +108,14 @@
 #define ConvertDateOLD   $TR($ZDT($H,8)," :","_")
 #define ConvertDate      $$$FormatYMDHMS($H,"_")
  
-	New Task,PrintGroupName,PrinterName,PPODFilePath,PrintFilePath,DestDir,DestName,sc
+	New Task,PrintGroupName,PrinterName,PPODFilePath,PrintFilePath,DestDir,DestName,sc,DocBaseDirectoryUtils
 	New TSeq,SeqItem
 	Set Task=FopTask   ; FopProcess.TaskID
 	Set sc=$$$OK
 	Quit:($$$ISERR(sc)) sc
 	Set PrintGroupName=$S($IsObject(Task.ActionPrint):Task.ActionPrint.OMRCode, 1:"")
 	Set PrinterName=$S($IsObject(Task.ActionPrint):Task.ActionPrint.Printer, 1:"")
+	Set DocBaseDirectoryUtils = ##class(BL.Sys.FOP.DocBaseDirectoryUtils).%New()
 	Set TSeq=##class(BL.Sys.FOP.Data).NewTaskSequence(Task)
 	Set arTaskSeq(0,"OBJTSeq")=TSeq   ; TSeq is passed by this array to the calling method BuildTaskSequence() from class BL.Sys.FOP.Verwerker
 	If (PrintGroupName["\")||($$$LCase(PrintGroupName)[".ps") Do
@@ -123,27 +124,27 @@
 	. Set PrintGroupName=""
 	Else  Do
 	. ;Set blnSkipMergePPOD=0
-	. Set PPODFilePath=$$$OMRSourceDir_PrintGroupName_".ps"
+	. Set PPODFilePath=DocBaseDirectoryUtils.GeefOMRSourceDir()_PrintGroupName_".ps"
 	
 	;Goto:(blnSkipMergePPOD) mpoStartRenamePrint   ; Skip MergePPOD, immediatly go to StartRenamePrint
 	
 	// Build Cach�-SeqItem to clean up files before creating the .ps file
 	If $L(PrintGroupName) Do   ; 'blnSkipMergePPOD
 	. If 1 Do   ; Rename to .BAK
-	. . Set BackupFilePath=$$$OMRSourceDir_PrintGroupName_"_"_$$$ConvertDate_".ps.BAK"
-	. . Do AddSeqItemMoveFile(TSeq,$$$CvtFop2Ntw(PPODFilePath),$$$CvtFop2Ntw(BackupFilePath),0)
+	. . Set BackupFilePath=DocBaseDirectoryUtils.GeefOMRSourceDir()_PrintGroupName_"_"_$$$ConvertDate_".ps.BAK"
+	. . Do AddSeqItemMoveFile(TSeq,DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(PPODFilePath),DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(BackupFilePath),0)
 	. Else  Do   ; Delete
-	. . Do AddSeqItemDeleteFiles(TSeq,$$$CvtFop2Ntw(PPODFilePath),0)
+	. . Do AddSeqItemDeleteFiles(TSeq,DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(PPODFilePath),0)
  
 	// Build SeqItem MergePPOD
 	If $L(PrintGroupName) Do   ; 'blnSkipMergePPOD
 	. Do AddSeqItemMergePPODGroup(TSeq,PrintGroupName)
  
 	// Build Cach�-SeqItem to rename/move the PrintFile
-	Set DestDir=$$$OMRPrintDir
+	Set DestDir=DocBaseDirectoryUtils.GeefOMRPrintDir()
 	Set DestName=$$$ConvertDate_"_"_##class(%File).GetFilename(PPODFilePath)
 	Set PrintFilePath=DestDir_DestName
-	Do AddSeqItemMoveFile(TSeq,$$$CvtFop2Ntw(PPODFilePath),$$$CvtFop2Ntw(PrintFilePath),1)
+	Do AddSeqItemMoveFile(TSeq,DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(PPODFilePath),DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(PrintFilePath),1)
 	;
 	Quit:(PrinterName="")||(PrinterName="~") sc
 	// Build SeqItem to Print File
@@ -394,7 +395,7 @@
 	Set sc=$$FaxRenderToPPODMergeAndSendSub()
 	Quit
 FaxRenderToPPODMergeAndSendSub()
-	New Task,TSeq,CntDocMain,sc,DocM,pxDocMulti,DocKey,Doc, PPODGroupName,PPODFilePath,FaxFilePath,DestDir,DestName,FExt,CmdLine
+	New Task,TSeq,CntDocMain,sc,DocM,pxDocMulti,DocKey,Doc, PPODGroupName,PPODFilePath,FaxFilePath,DestDir,DestName,FExt,CmdLine,DocBaseDirectoryUtils
 	Set Task=FopTask   ; FopProcess.TaskID
 	Set sc=$$$OK
 	Set pxDocMulti=Task.DocMulti
@@ -404,6 +405,7 @@
 	Set PPODGroupName=pxDocMulti.PPODGroupName
 	Set PPODFilePath=##class(BL.Sys.FOP.CommonTasks).BuildPPODFilePath(PPODGroupName,pxDocMulti.PPODOutputType)
 	Set blnSkipVoorblad=(pxDocMulti.MetVoorblad=0)
+	Set DocBaseDirectoryUtils = ##class(BL.Sys.FOP.DocBaseDirectoryUtils).%New()
 	
 	Set TSeq=##class(BL.Sys.FOP.Data).NewTaskSequence(Task)
 	Set arTaskSeq(0,"OBJTSeq")=TSeq   ; TSeq is passed by this array to the calling method BuildTaskSequence() from class BL.Sys.FOP.Verwerker
@@ -426,7 +428,7 @@
 	. . Do AddSeqItemRenderAndSaveToPPOD(TSeq,,Doc,0, "", 1)
  
 	// Build Cach�-SeqItem to clean up files before creating the .pdf file
-	Do AddSeqItemDeleteFiles(TSeq,$$$CvtFop2Ntw(PPODFilePath),0)
+	Do AddSeqItemDeleteFiles(TSeq,DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(PPODFilePath),0)
 	// Build SeqItem MergePPOD : create temp .pdf file 
 	Do AddSeqItemMergePPODGroup(TSeq,PPODGroupName)
 	
@@ -436,7 +438,7 @@
  
 	// Build Cach�-SeqItem to rename/move the temp-file to FaxDir
 	Set FaxFilePath=pxDocMulti.GenerateFaxFilePath(PPODFilePath)
-	Do AddSeqItemMoveFile(TSeq,$$$CvtFop2Ntw(PPODFilePath),(FaxFilePath),1)
+	Do AddSeqItemMoveFile(TSeq,DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(PPODFilePath),(FaxFilePath),1)
 	
 	  Do:(Task.ActionFax.DoNotSend)||('Task.ActionFax.FaxNr) WLFMT^vhDBG("SeqItem ""FaxSendPDF"" will be skipped! FaxNr="_Task.ActionFax.FaxNr_"  Fax.DoNotSend="_Task.ActionFax.DoNotSend, "A")
 	Quit:(Task.ActionFax.DoNotSend)||('Task.ActionFax.FaxNr) sc