Index: BL/Legacy/DCPRINT2.cls.xml
===================================================================
diff -u -r60616 -r61691
--- BL/Legacy/DCPRINT2.cls.xml (.../DCPRINT2.cls.xml) (revision 60616)
+++ BL/Legacy/DCPRINT2.cls.xml (.../DCPRINT2.cls.xml) (revision 61691)
@@ -229,6 +229,37 @@
quit Extrabon
]]>
+
+
+1
+KlantNr:%String
+%Boolean
+
+
+
+
+1
+KlantNr:%String,BonNr:%String
+%String
+
+
Index: DCPRINT2.mac.rou
===================================================================
diff -u -r56867 -r61691
--- DCPRINT2.mac.rou (.../DCPRINT2.mac.rou) (revision 56867)
+++ DCPRINT2.mac.rou (.../DCPRINT2.mac.rou) (revision 61691)
@@ -6,7 +6,7 @@
; Drukken leveringsbons
; Warn = 0 (geen melding van foutieve status)
BON(lbBONNrs,Warn,Printer)
- New li,sc,BONNr,IsTerugName,DocType,KLNr,PosPakbon
+ New li,sc,BONNr,IsTerugName,DocType,KLNr,PosPakbon, PdfFilename
set Printer = $get(Printer)
Set Warn=$G(Warn,1)
For li=1:1:$LL(lbBONNrs) Do
@@ -32,8 +32,15 @@
. Do ##class(BL.Legacy.DCPRINT2).WijzigPrinterEnDocType(BONNr, .Printer, .DocType)
.
. // Taak aan FOP-scheduler toevoegen
- . Set sc=##class(BL.Flow.Levering.Doc).RenderAndPrintDocViaType(BONNr,DocType,Printer,1) ; printer: leeg=default
- .
+ . If ##class(BL.Legacy.DCPRINT2).WerktKlantMetEigenLeverbonPdf(KLNr) Do
+ . . Set PdfFilename = ##class(BL.Legacy.DCPRINT2).GeefPadGecopieerdePdfLeverbon(KLNr, BONNr) ; leeg indien niet gevonden, dan terug de standaard vh leverbon.
+ . . if $$$HasLength(PdfFilename) Do
+ . . . Set sc=##class(BL.Flow.Pakbon.Doc).RenderAndPrintPakbonAndPrintLeverbonPdfFile(BONNr,Printer,PdfFilename)
+ . . else Do
+ . . . Set sc=##class(BL.Flow.Levering.Doc).RenderAndPrintDocViaType(BONNr,DocType,Printer,1) ; printer: leeg=default
+ . else Do
+ . . Set sc=##class(BL.Flow.Levering.Doc).RenderAndPrintDocViaType(BONNr,DocType,Printer,1) ; printer: leeg=default
+ .
. Kill ^KUB(BONNr,"F")
. If Warn,$$$ISERR(sc) Do CLOSE^vhPRINTER,WARN^vhTXTPOP($$ParseStatus^vhLib(sc),"")
Quit