Index: APPS/common/Document/impl/DocBase/DocumentVerwerker/PDFMailer.cls.xml
===================================================================
diff -u
--- APPS/common/Document/impl/DocBase/DocumentVerwerker/PDFMailer.cls.xml	(revision 0)
+++ APPS/common/Document/impl/DocBase/DocumentVerwerker/PDFMailer.cls.xml	(revision 67392)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.common.Document.impl.DocBase.DocumentVerwerker.PDFMailer">
+<Super>APPS.common.Document.impl.DocBase.DocumentVerwerker</Super>
+
+<Property name="DocBaseUtils">
+<Type>APPS.common.Document.impl.DocBase.DocBaseUtils</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..DocBaseUtils = ##class(APPS.common.Document.impl.DocBase.DocBaseUtils).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Verwerk">
+<FormalSpec>DocBaseDocument:APPS.common.Document.DocBase.dto.Document,DocumentType:%String,DocBaseMailParams:Sys.FOP.SubTaskMail</FormalSpec>
+<Implementation><![CDATA[
+	#dim DocBaseTaak As Sys.FOP.Task = ..MaakDocBaseTaakRenderAndMail(DocBaseDocument, DocumentType, DocBaseMailParams)
+	Do ..VoerUitDocBaseTaak(DocBaseTaak,##class(BL.Sys.FOP.enu.RunMode).Inline())
+]]></Implementation>
+</Method>
+
+<Method name="MaakDocBaseTaakRenderAndMail">
+<FormalSpec>DocBaseDocument:APPS.common.Document.DocBase.dto.Document,DocumentType:%String,DocBaseMailParams:Sys.FOP.SubTaskMail</FormalSpec>
+<Private>1</Private>
+<ReturnType>Sys.FOP.Task</ReturnType>
+<Implementation><![CDATA[
+	#dim lbXsltParams As %List = $LB()
+	#dim DataStream As %FileBinaryStream = ..GeefXMLStreamVanDocument(DocBaseDocument)
+	#dim Task As Sys.FOP.Task = ##class(BL.Flow.Basis.Doc).CreateFopTask("DocRenderAndMail","DocType="_..DocBaseUtils.GeefSysFOPDocType(DocumentType),)
+	#dim Status As %Status
+	set Status = ##class(BL.Flow.Basis.Doc).DocSetRenderData(Task.AddDoc(), "STREAM", DataStream, ..DocBaseUtils.GeefTemplate(DocumentType), "PDF" ,$LB(), lbXsltParams)
+	Do ..ControleerStatus(Status,"DocSetRenderData niet gelukt.")
+	Set DataStream=""   ; Unswizzle CacheStream after being copied into the TaskDoc 
+	
+	Set Status = Task.AddActionMail(DocBaseMailParams.Aan, DocBaseMailParams.Subject, DocBaseMailParams.Body, DocBaseMailParams.From, DocBaseMailParams.CC, DocBaseMailParams.BCC)
+	Do ..ControleerStatus(Status,"AddActionMail niet gelukt.")
+	
+	Quit Task
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/common/Document/DocumentAPI.cls.xml
===================================================================
diff -u -r29059 -r67392
--- APPS/common/Document/DocumentAPI.cls.xml	(.../DocumentAPI.cls.xml)	(revision 29059)
+++ APPS/common/Document/DocumentAPI.cls.xml	(.../DocumentAPI.cls.xml)	(revision 67392)
@@ -30,6 +30,11 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="GeefPDFDocumentMailer">
+<Abstract>1</Abstract>
+<ReturnType>APPS.common.Document.DocumentMailer</ReturnType>
+</Method>
+
 <Method name="GeefDocumentBuilder">
 <Abstract>1</Abstract>
 <FormalSpec>Type:APPS.common.Document.enu.DocumentType</FormalSpec>
Index: APPS/common/Document/impl/PDFDocumentMailer.cls.xml
===================================================================
diff -u
--- APPS/common/Document/impl/PDFDocumentMailer.cls.xml	(revision 0)
+++ APPS/common/Document/impl/PDFDocumentMailer.cls.xml	(revision 67392)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.common.Document.impl.PDFDocumentMailer">
+<Super>TECH.RegisteredObject,APPS.common.Document.DocumentMailer</Super>
+
+<Property name="DocBaseUtils">
+<Type>APPS.common.Document.impl.DocBase.DocBaseUtils</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..DocBaseUtils = ##class(APPS.common.Document.impl.DocBase.DocBaseUtils).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="MailPdf">
+<FormalSpec>Document:APPS.common.Document.Blad,DocBaseMailParams:Sys.FOP.SubTaskMail</FormalSpec>
+<Implementation><![CDATA[
+	Do ..ControleerDocument(Document)
+	#dim DocBaseDocument As APPS.common.Document.DocBase.dto.Document = ..ConverteerNaarDocBaseDocument(Document)
+	
+	#dim DocBaseDocumentVerwerker As APPS.common.Document.impl.DocBase.DocumentVerwerker = ..GeefDocBaseDocumentVerwerker()
+	Do DocBaseDocumentVerwerker.Verwerk(DocBaseDocument, Document.GeefType(), DocBaseMailParams)
+]]></Implementation>
+</Method>
+
+<Method name="MailPdfBundel">
+<FormalSpec>DocumentBundel:APPS.common.Document.DocumentBundel,DocBaseMailParams:Sys.FOP.SubTaskMail</FormalSpec>
+<Implementation><![CDATA[
+	Do ..ControleerDocumentBundel(DocumentBundel)
+	#dim DocBaseDocument As APPS.common.Document.DocBase.dto.Document = ..ConverteerNaarDocBaseDocumentBundel(DocumentBundel)
+	
+	#dim DocBaseDocumentVerwerker As APPS.common.Document.impl.DocBase.DocumentVerwerker = ..GeefDocBaseDocumentVerwerker()
+	Do DocBaseDocumentVerwerker.Verwerk(DocBaseDocument, DocumentBundel.GeefType(), DocBaseMailParams)
+]]></Implementation>
+</Method>
+
+<Method name="GeefDocBaseDocumentVerwerker">
+<FormalSpec>Document:APPS.common.Document.Blad</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.common.Document.impl.DocBase.DocumentVerwerker.PDFMailer</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.common.Document.impl.DocBase.DocumentVerwerker.PDFMailer).%New()
+]]></Implementation>
+</Method>
+
+<Method name="ControleerDocument">
+<FormalSpec>Document:APPS.common.Document.Blad</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If 0 {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("DocumentLijst is leeg en kan niet geprint worden."))	
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ControleerDocumentBundel">
+<FormalSpec>DocumentBundel:APPS.common.Document.DocumentBundel</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If $$$Not(DocumentBundel.HeeftDocumenten()) {
+		Set Exceptie = ##class(TECH.Exceptions.GeneralErrorException).%New("De document bundel bevat geen documenten.")
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
+	}
+	Set DocumentIt = ##class(TECH.ListIterator).%New(DocumentBundel.GeefDocumenten())
+	While DocumentIt.HasNext() {
+		Do ..ControleerDocument(DocumentIt.Next())
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ConverteerNaarDocBaseDocument">
+<FormalSpec>Document:APPS.common.Document.Blad</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.DataTransferObject</ReturnType>
+<Implementation><![CDATA[
+	#dim DocumentNaarDocBaseDocumentConverter As APPS.common.Document.impl.DocBase.DocumentNaarDocBaseDocumentConverter = ..GeefDocumentNaarDocBaseDocumentConverter(Document)
+	Quit DocumentNaarDocBaseDocumentConverter.Converteer(Document)
+]]></Implementation>
+</Method>
+
+<Method name="ConverteerNaarDocBaseDocumentBundel">
+<FormalSpec>DocumentBundel:APPS.common.Document.impl.DocumentBundel</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.DataTransferObject</ReturnType>
+<Implementation><![CDATA[
+	#dim DocumentNaarDocBaseDocumentConverter As APPS.common.Document.impl.DocBase.DocumentNaarDocBaseDocumentConverter = ..GeefDocumentNaarDocBaseDocumentConverter(DocumentBundel.GeefDocumenten().GetAt(1))
+	Quit DocumentNaarDocBaseDocumentConverter.ConverteerBundel(DocumentBundel)
+]]></Implementation>
+</Method>
+
+<Method name="GeefDocumentNaarDocBaseDocumentConverter">
+<FormalSpec>Document:APPS.common.Document.Blad</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.DataTransferObject</ReturnType>
+<Implementation><![CDATA[	Quit ..DocBaseUtils.GeefConverter(Document.GeefType())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/common/Document/impl/DocumentAPI.cls.xml
===================================================================
diff -u -r30882 -r67392
--- APPS/common/Document/impl/DocumentAPI.cls.xml	(.../DocumentAPI.cls.xml)	(revision 30882)
+++ APPS/common/Document/impl/DocumentAPI.cls.xml	(.../DocumentAPI.cls.xml)	(revision 67392)
@@ -40,6 +40,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPDFDocumentMailer">
+<ReturnType>APPS.common.Document.DocumentMailer</ReturnType>
+<Implementation><![CDATA[	Quit ##class(APPS.common.Document.impl.PDFDocumentMailer).%New()
+]]></Implementation>
+</Method>
+
 <Method name="GeefDocumentBuilder">
 <FormalSpec>Type:APPS.common.Document.enu.DocumentType</FormalSpec>
 <ReturnType>APPS.common.Document.DocumentBuilder</ReturnType>
Index: APPS/common/Document/DocumentMailer.cls.xml
===================================================================
diff -u
--- APPS/common/Document/DocumentMailer.cls.xml	(revision 0)
+++ APPS/common/Document/DocumentMailer.cls.xml	(revision 67392)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.common.Document.DocumentMailer">
+<Abstract>1</Abstract>
+<Super>TECH.Interface</Super>
+
+<Method name="MailPdf">
+<Abstract>1</Abstract>
+<FormalSpec>Document:APPS.common.Document.Blad,DocBaseMailParams:Sys.FOP.SubTaskMail</FormalSpec>
+</Method>
+
+<Method name="MailPdfBundel">
+<Abstract>1</Abstract>
+<FormalSpec>DocumentBundel:APPS.common.Document.DocumentBundel,DocBaseMailParams:Sys.FOP.SubTaskMail</FormalSpec>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/APPS/common/Document/DocumentMailer.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/common/Document/DocumentMailer.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/common/Document/DocumentMailer.cls.xml	(revision 67392)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.common.Document.DocumentMailer">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.common.Document.DocumentMailer,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="MailPdf">
+<FormalSpec>Document:APPS.common.Document.Blad,DocBaseMailParams:Sys.FOP.SubTaskMail</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("MailPdf",Document,DocBaseMailParams)
+]]></Implementation>
+</Method>
+
+<Method name="MailPdfBundel">
+<FormalSpec>DocumentBundel:APPS.common.Document.DocumentBundel,DocBaseMailParams:Sys.FOP.SubTaskMail</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("MailPdfBundel",DocumentBundel,DocBaseMailParams)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/APPS/common/Document/DocumentAPI.cls.xml
===================================================================
diff -u -r29059 -r67392
--- vhTest/Mock/APPS/common/Document/DocumentAPI.cls.xml	(.../DocumentAPI.cls.xml)	(revision 29059)
+++ vhTest/Mock/APPS/common/Document/DocumentAPI.cls.xml	(.../DocumentAPI.cls.xml)	(revision 67392)
@@ -3,8 +3,7 @@
 <Class name="vhTest.Mock.APPS.common.Document.DocumentAPI">
 <Description>
 Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
-Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
-Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.common.Document.DocumentAPI,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
@@ -37,6 +36,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPDFDocumentMailer">
+<ReturnType>APPS.common.Document.DocumentMailer</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefPDFDocumentMailer")
+]]></Implementation>
+</Method>
+
 <Method name="GeefTagBasedDocumentBuilder">
 <ReturnType>APPS.common.Document.DocumentBuilder</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefTagBasedDocumentBuilder")