Index: BL/Sys/FOP/DocBaseDirectoryUtils.cls.xml
===================================================================
diff -u -r73452 -r73478
--- BL/Sys/FOP/DocBaseDirectoryUtils.cls.xml	(.../DocBaseDirectoryUtils.cls.xml)	(revision 73452)
+++ BL/Sys/FOP/DocBaseDirectoryUtils.cls.xml	(.../DocBaseDirectoryUtils.cls.xml)	(revision 73478)
@@ -46,7 +46,9 @@
 <Method name="GeefPDFTestDir">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Quit "E:\FOP\PDFTest"   ; Dit pad is relatief t.o.v. FOP-server, m.a.w. op de E-schijf van FOP. 
+	Quit:(..IsActiefDocBaseV7()) ##class(TECH.Files).AppendSubPath(..DocBaseDfsDir, "PDFTest")
+	
+	Quit "E:\FOP\PDFTest"   ; Dit pad is relatief t.o.v. FOP-server, m.a.w. op de E-schijf van FOP.
 ]]></Implementation>
 </Method>
 
@@ -61,43 +63,52 @@
 Value before DocBaseV7      : "\\CacheTst2010\e$\CacheExport\2010v2\ADMIN1\PAS.ProductieDetailBlad"
 New value (after July 2024) : "\\Notes01\FOP\TestOutput\CacheTst2010\CacheExport\2010v2\DEV1\PAS.ProductieDetailBlad"</Description>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..ConfigMgr.GeefString("APPS.Halux.PPS.ProductieDetailBlad.DocumentGenerator_FileLocation")
+<Implementation><![CDATA[	Quit ..ConfigMgr.GeefString("APPS.Halux.PPS.ProductieDetailBlad.DocumentGenerator_FileLocation")   ; Zelfde configItem voor V7, maar de waarde is wellicht veranderd
 ]]></Implementation>
 </Method>
 
 <Method name="GeefOMRSourceDir">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $$$OMRSourceDir
+<Implementation><![CDATA[
+	Quit:(..IsActiefDocBaseV7()) ##class(TECH.Files).AppendSubPath(..DocBaseDfsDir, "PPOD_Out")
+	
+	Quit $$$OMRSourceDir
 ]]></Implementation>
 </Method>
 
 <Method name="GeefOMRSourceDirNtw">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..ConvertFopLocalDirToNetworkPath($$$OMRSourceDir)
+<Implementation><![CDATA[	Quit ..ConvertFopLocalDirToNetworkPath(..GeefOMRSourceDir())
 ]]></Implementation>
 </Method>
 
 <Method name="GeefOMRPrintDir">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $$$OMRPrintDir
+<Implementation><![CDATA[
+	Quit:(..IsActiefDocBaseV7()) ##class(TECH.Files).AppendSubPath(..DocBaseDfsDir, "OMR_Print")
+	
+	Quit $$$OMRPrintDir
 ]]></Implementation>
 </Method>
 
 <Method name="GeefOMRPrintDirNtw">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..ConvertFopLocalDirToNetworkPath($$$OMRPrintDir)
+<Implementation><![CDATA[	Quit ..ConvertFopLocalDirToNetworkPath(..GeefOMRPrintDir())
 ]]></Implementation>
 </Method>
 
 <Method name="GeefPDFMailDir">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $$$PDFMailDir
+<Implementation><![CDATA[
+	Quit:(..IsActiefDocBaseV7()) ##class(TECH.Files).AppendSubPath(..DocBaseDfsDir, "PDF_Mail")
+	
+	Quit $$$PDFMailDir
 ]]></Implementation>
 </Method>
 
 <Method name="GeefPDFMailDirNtw">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..ConvertFopLocalDirToNetworkPath($$$PDFMailDir)
+<Implementation><![CDATA[	Quit ..ConvertFopLocalDirToNetworkPath(..GeefPDFMailDir())
 ]]></Implementation>
 </Method>
 
@@ -109,7 +120,7 @@
 
 <Method name="GeefFOPInetPubDirNtw">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..ConvertFopLocalDirToNetworkPath($$$FOPInetPubDir)
+<Implementation><![CDATA[	Quit ..ConvertFopLocalDirToNetworkPath(..GeefFOPInetPubDir())
 ]]></Implementation>
 </Method>