Index: BL/Flow/TransportLijst/Doc.cls.xml
===================================================================
diff -u -r66129 -r66145
--- BL/Flow/TransportLijst/Doc.cls.xml	(.../Doc.cls.xml)	(revision 66129)
+++ BL/Flow/TransportLijst/Doc.cls.xml	(.../Doc.cls.xml)	(revision 66145)
@@ -94,29 +94,62 @@
 
 <Method name="RenderAndPrintANotas">
 <Description>
-Oproepen via :
-  s sc=##class(BL.Flow.TransportLijst.Doc).RenderAndPrintANotas(+$H,+$H,"OD1",,)   w sc,!
-  s sc=##class(BL.Flow.TransportLijst.Doc).RenderAndPrintANotas(61349,61349,"OD5","BrotherBoekH",)   w sc,!</Description>
+DEPRECATED !!!  Gebruik de nieuwe method RenderAndPrintLevBewijzen() 
+AfleveringNotas werden tot nov 2021 ge"RenderAndPrint"ed via ADBTemplateANotas = "aflevnotas_01.01" 
+Deze DocBase-template heeft geen ondersteuning voor TraySelect en de Stapling=true staat hard-coded in de DocBase-template. 
+In de nieuwe method wordt gebruik gemaakt van ADBTemplateBewijsStapled = "levbewijsStapled_01.01", deze ondersteunt wel TraySelect en Stapling. </Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>DatumVan:%String,DatumTot:%String,VerzendWijze:%String,PrinterName:%String,pWithLogo:%Boolean=1</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	#dim PapierSoort As %String = "GEEL"
+	#dim pTraySelect As %String = ##class(BL.Sys.FOP.CommonTasks).GetPrinterTray(PrinterName,PapierSoort,"TRAY")
+	Quit ..RenderAndPrintLevBewijzen(.DatumVan, .DatumTot, .VerzendWijze, .PrinterName, .pWithLogo, pTraySelect)
+	
+ /*
 	Set PrinterName=$G(PrinterName,..#PrinterDFL)   ; "DocuColor"
 	#dim Task As Sys.FOP.Task =..CreateFopTask("DocRenderAndPrint",,)
 	#dim Doc As Sys.FOP.emDoc = Task.AddDoc()
 	Set sc=..DocSetRenderDefs(Doc, $LB("TOER",+DatumVan,+DatumTot,VerzendWijze), ..#ADBTemplateANotas, "PS", $LB(), pWithLogo)   ; lbDocs = $LB("TOER",+$H,+$H,"OD1")
-	If PrinterName = "LEVBON_PS" {
-		#dim pTraySelect As %String = ##class(BL.Sys.FOP.CommonTasks).GetPrinterTray(PrinterName,"GEEL","TRAY")
-		Set Doc.XSLParameters = ..BuildXsltParams(Doc.XSLParameters,,,pTraySelect)   ; pTraySelect toevoegen aan XsltParams (Let op: er is nog geen controle op dubbele KVP's) 
-	}
 	Set NumCopies=1
 	Set:($$$ISOK(sc)) sc=Task.AddActionPrint(PrinterName,NumCopies,,)
 	Quit:($$$ISERR(sc)) sc
 	Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmBatch,$$$qpvLow+1)   ; $$$rmBatch   ; $$$rmSync
 	Quit sc
+ */
 ]]></Implementation>
 </Method>
 
+<Method name="RenderAndPrintLevBewijzen">
+<Description>
+Nieuwe method ter vervanging van RenderAndPrintANotas() 
+Via deze nieuwere docBase-template "levbewijs" kan TraySelect en stapling gekozen worden.  Momenteel is Stapling nog fixed in de implementatie. 
+Oproepen via :
+  s sc=##class(BL.Flow.TransportLijst.Doc).RenderAndPrintLevBewijzen(+$H,+$H,"OD1",,)   w sc,!
+  s sc=##class(BL.Flow.TransportLijst.Doc).RenderAndPrintLevBewijzen(61349,61349,"OD5","BrotherBoekH",)   w sc,!</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>DatumVan:%String,DatumTot:%String,VerzendWijze:%String,PrinterName:%String,pWithLogo:%Boolean=1,pTraySelect:%String=""</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set PrinterName = $G(PrinterName, ..#PrinterDFL)
+	#dim Task As Sys.FOP.Task = ..CreateFopTask("DocRenderAndPrint",,)
+	#dim Doc As Sys.FOP.emDoc = Task.AddDoc()
+	#dim lbDocs As %List = $LB("TOER",+DatumVan,+DatumTot,VerzendWijze)
+	#dim sc As %Status = ..DocSetRenderDefs(Doc, lbDocs, ..#ADBTemplateBewijsStapled, "PS", $LB(), pWithLogo)
+	
+	#dim StaplingMode As %String = "1"
+	#dim OutputTray As %String = ""
+	#dim pStaplingConfig As %String = ##class(BL.Sys.FOP.CommonTasks).GetStaplingConfig(PrinterName, .StaplingMode, .OutputTray)
+	Set Doc.XSLParameters = Doc.XSLParameters _ ..BuildXsltParams("", "", "", pTraySelect, "", pStaplingConfig)   ; Let op: er is nog geen controle op dubbele KVP's 
+	
+	#dim NumCopies As %Integer = 1
+	Set:($$$ISOK(sc)) sc = Task.AddActionPrint(PrinterName,NumCopies,,)
+	Quit:($$$ISERR(sc)) sc
+	Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmBatch,$$$qpvLow+1)
+	Quit sc
+]]></Implementation>
+</Method>
+
 <Method name="RenderAndPrintANotasViaBons">
 <Description>
 Oproepen via :