Index: AX/Uitgaand/EC/Data/impl/DocumentOphalen.cls.xml
===================================================================
diff -u -r39105 -r48405
--- AX/Uitgaand/EC/Data/impl/DocumentOphalen.cls.xml	(.../DocumentOphalen.cls.xml)	(revision 39105)
+++ AX/Uitgaand/EC/Data/impl/DocumentOphalen.cls.xml	(.../DocumentOphalen.cls.xml)	(revision 48405)
@@ -43,7 +43,13 @@
 	Set %Taal=..Request.Header.Taal
 	Set %ECSession=##class(Derde.EC.Session).%New()
 	Set %ECSession.Taal=%Taal
-	Set ..DocURL=##class(BL.EC.Data).%New().GetDocumentURL(..Request.Header.SessieId,..GeefDocumentType(),..GeefResultaatType(),..Request.DocumentId,..Request.Header.KlantId)
+	
+	If ((..Request.DocumentType = "Factuur") && (##class(TECH.StringUtils).StartsWith(..Request.DocumentId,"VF"))) || (..Request.DocumentType = "Order") {
+		#dim Bestandsnaam As %String = ##class(AXimpl.Dynamics.DocumentLocationOut.DocumentLocationService).%New().GeefBestandslocatie(..Request.DocumentId, ..GeefDocumentType())
+		Set ..DocURL = ##class(BL.EC.Data).%New().GetDocumentURLDirect(..Request.Header.SessieId,Bestandsnaam)
+	} Else {
+		Set ..DocURL = ##class(BL.EC.Data).%New().GetDocumentURL(..Request.Header.SessieId,..GeefDocumentType(),..GeefResultaatType(),..Request.DocumentId,..Request.Header.KlantId)
+	}
 ]]></Implementation>
 </Method>
 
@@ -83,8 +89,6 @@
 <IndexLocation>^AX.UitgaanAF18.DocumentOph9A77I</IndexLocation>
 <StreamLocation>^AX.UitgaanAF18.DocumentOph9A77S</StreamLocation>
 <Data name="DocumentOphalenDefaultData">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>%%CLASSNAME</Value>
 </Value>