Index: Sys/FOP/SubTaskArchief.cls.xml =================================================================== diff -u -r1074 -r1785 --- Sys/FOP/SubTaskArchief.cls.xml (.../SubTaskArchief.cls.xml) (revision 1074) +++ Sys/FOP/SubTaskArchief.cls.xml (.../SubTaskArchief.cls.xml) (revision 1785) @@ -6,7 +6,7 @@ Een opdracht bevat een of meerdere te verwerken documenten en een of meerdere actions serial 1 -%SerialObject +BL.Sys.FOP.SubTask 0 @@ -19,14 +19,19 @@ - - + + Sleutels voor de zoekengine + Property ArchiefSleutels As %String [ Collection = array ]; + +%String + + -]]> - - %Library.CacheStorage SubTaskArchiefDefaultData @@ -38,7 +43,6 @@ "ArchiefSleutels" -listnode "SubTaskArchief" DocName @@ -48,7 +52,6 @@ -listnode "Sys.FOP.SubTaskArchief" DocName Index: BL/Flow/Offerte/Doc.cls.xml =================================================================== diff -u -r1074 -r1785 --- BL/Flow/Offerte/Doc.cls.xml (.../Doc.cls.xml) (revision 1074) +++ BL/Flow/Offerte/Doc.cls.xml (.../Doc.cls.xml) (revision 1785) @@ -22,6 +22,29 @@ A + +1 +lbOfferte:%Integer +%String + + + 1 OFFNr:%String,KLNr:%String Index: BL/Sys/FOP/SubTaks.cls.xml =================================================================== diff -u --- BL/Sys/FOP/SubTaks.cls.xml (revision 0) +++ BL/Sys/FOP/SubTaks.cls.xml (revision 1785) @@ -0,0 +1,21 @@ + + + +serial +1 +%SerialObject +0 + + +%Library.String +1 + Set {*}="ToString Niet Geimplementeerd." +1 + + + +%Library.CacheSerialState +^BL.Sys.FOP.SubTaksS + + + Index: Sys/FOP/SubTaskFax.cls.xml =================================================================== diff -u -r1074 -r1785 --- Sys/FOP/SubTaskFax.cls.xml (.../SubTaskFax.cls.xml) (revision 1074) +++ Sys/FOP/SubTaskFax.cls.xml (.../SubTaskFax.cls.xml) (revision 1785) @@ -6,7 +6,7 @@ Een opdracht bevat een of meerdere te verwerken documenten en een of meerdere actions serial 1 -%SerialObject +BL.Sys.FOP.SubTask 0 @@ -52,14 +52,21 @@ Derde.Fax.UitgaandeFaxen - - + + ClassMethod FaxSendPDF(RecipientNr As %String, RecipientName As %String, SenderName As %String, Subject As %String, FilePath As %String, OnErrorMailTo As %String) As %Status + s sc=##class(BL.Sys.FOP.Test).FaxSendPDF("037601919","Dummy","WimV@VH","Test001 van WimV",fp,"wv@vanhoecke.be") w sc,! +%String + + -]]> - - %Library.CacheSerialState SubTaskFaxState Index: csp/fopqueue.cls.xml =================================================================== diff -u -r1074 -r1785 --- csp/fopqueue.cls.xml (.../fopqueue.cls.xml) (revision 1074) +++ csp/fopqueue.cls.xml (.../fopqueue.cls.xml) (revision 1785) @@ -7,7 +7,20 @@ %VHMacro cache %CSP.Page +0 + +c:\cache\cache2005v021\csp\admin1\FOPQueue.csp + + + +/csp/admin1/FOPQueue.csp + + + +62308,62343 + + 1 code @@ -18,7 +31,6 @@ #define QryVal(%v) query.GetDataByName(%v) New sDomain,sDomFull,sRef Quit "" - ]]> @@ -28,9 +40,7 @@ PrioCode cache %String - @@ -475,11 +485,11 @@ /*** SQL STATEMENTS ***/ /*** ============== ***/ ; SQL-statement for FOP Queue - Set sqlFOP="SELECT Top 100 ID,Status,Priority,RunMode,Task,Task->KeyWords As Task_KeyWords, Created,Started,Finished,(InternePersoonInits || ' - ' || InternePersoon) As InternePersoon " + Set sqlFOP="SELECT Top 100 ID,Status,Priority,RunMode,Task,Task->KeyWords As Task_KeyWords,Task->ActionToString As Action,Task->DocInfo, Created,Started,Finished,(InternePersoonInits || ' - ' || InternePersoon) As InternePersoon " Set sqlFOP=sqlFOP_$C(13,10)_" FROM Sys_FOP.TaskQueue WHERE (ID > 1) " Set sqlFOP=sqlFOP_$C(13,10)_" ORDER BY StatusNum DESC, ID, Priority DESC " ; SQL-statement for FOP QueueArchive - Set sqlArchive="SELECT ID,Status,Priority,RunMode,Task,Task->KeyWords As Task_KeyWords, Created,Started,Finished,(InternePersoonInits || ' - ' || InternePersoon) As InternePersoon " + Set sqlArchive="SELECT ID,Status,Priority,RunMode,Task,Task->KeyWords As Task_KeyWords,Task->ActionToString, Task->DocInfo ,Created,Started,Finished,(InternePersoonInits || ' - ' || InternePersoon) As InternePersoon " Set sqlArchive=sqlArchive_$C(13,10)_" FROM Sys_FOP.QueueArchive " Set sqlArchive=sqlArchive_$C(13,10)_" WHERE Created BETWEEN '"_##class(Sys.cTimeStamp).LogicalToDisplay(+$H)_"' and '"_##class(Sys.cTimeStamp).LogicalToDisplay(+$H+1)_"'" Set sqlArchive=sqlArchive_$C(13,10)_" ORDER BY ID DESC" @@ -524,7 +534,6 @@ Set CspPageTitle="FOP Queue"_$S($G(blnFOPNOW):"", $G(blnFOPCNT):" Count", $G(blnFOPARCHIVE):" Archive", $G(blnFOPLevBon):" LevBons", 1:"") Set CurMaxBT=..GetMaxBusyTask("") Quit 1 - ]]> @@ -539,7 +548,6 @@ Set ^Sys.FOP.Settings("Scheduler","MaxBusyTask")=NewMaxBT Do:($G(blnTrigger,1)) ##class(BL.Sys.FOP.Scheduler).Trigger() Quit "" - ]]> @@ -552,7 +560,6 @@ @@ -565,20 +572,7 @@ - - -c:\cachesys\csp\admin1\FOPQueue.csp - - - -/csp/admin1/FOPQueue.csp - - - -62105,37022 - Index: Sys/FOP/SubTaskMail.cls.xml =================================================================== diff -u -r1074 -r1785 --- Sys/FOP/SubTaskMail.cls.xml (.../SubTaskMail.cls.xml) (revision 1074) +++ Sys/FOP/SubTaskMail.cls.xml (.../SubTaskMail.cls.xml) (revision 1785) @@ -7,7 +7,7 @@ serial %VHMacro 1 -%SerialObject +BL.Sys.FOP.SubTask 0 @@ -59,13 +59,27 @@ ]]> + +%String +","") + Set StrippedAan = $TR($$LCVT^vhLib(..Aan),"<>","") + If (($Length(..CC)>0) && ($LL(..CC) > 0) &&($LG(..CC,1) '= "")){ Set StrippedCC = ", CC: "_$TR($$LCVT^vhLib(..CC),"<>","") } + If (($Length(..BCC)>0) && ($LL(..BCC) > 0) &&($LG(..BCC,1) '= "")){ Set StrippedBCC = ", BCC: "_$TR($$LCVT^vhLib(..BCC),"<>","") } + Set ToString = ToString_"Mail : "_StrippedFrom_" -> "_StrippedAan_$G(StrippedCC)_$G(StrippedBCC) + } + Quit ToString +]]> + + %Library.CacheStorage SubTaskMailDefaultData SubTaskMailState ^Sys.FOP.SubTaskMailS -listnode "SubTaskMail" Aan @@ -81,7 +95,6 @@ -listnode "Sys.FOP.SubTaskMail" Aan Index: BL/Flow/Order/Doc.cls.xml =================================================================== diff -u -r1074 -r1785 --- BL/Flow/Order/Doc.cls.xml (.../Doc.cls.xml) (revision 1074) +++ BL/Flow/Order/Doc.cls.xml (.../Doc.cls.xml) (revision 1785) @@ -28,6 +28,32 @@ KyoceraFS4000 + +1 +lbOrders:%Integer +%String + + + 1 ORDNr:%String,KLNr:%String Index: BL/Flow/Factuur/Doc.cls.xml =================================================================== diff -u -r1074 -r1785 --- BL/Flow/Factuur/Doc.cls.xml (.../Doc.cls.xml) (revision 1074) +++ BL/Flow/Factuur/Doc.cls.xml (.../Doc.cls.xml) (revision 1785) @@ -32,6 +32,29 @@ %String + +1 +lbFacturen:%Integer +%String + + + 1 FactType:%String,FANr:%String,KLNr:%String Index: Sys/FOP/SubTaskPrint.cls.xml =================================================================== diff -u -r1074 -r1785 --- Sys/FOP/SubTaskPrint.cls.xml (.../SubTaskPrint.cls.xml) (revision 1074) +++ Sys/FOP/SubTaskPrint.cls.xml (.../SubTaskPrint.cls.xml) (revision 1785) @@ -6,7 +6,7 @@ Een opdracht bevat een of meerdere te verwerken documenten en een of meerdere actions serial 1 -%SerialObject +BL.Sys.FOP.SubTask 0 @@ -44,6 +44,15 @@ + +%String + + + %Library.CacheStorage SubTaskPrintDefaultData Index: WV FOP DocBase.prj.xml =================================================================== diff -u -r1682 -r1785 --- WV FOP DocBase.prj.xml (.../WV FOP DocBase.prj.xml) (revision 1682) +++ WV FOP DocBase.prj.xml (.../WV FOP DocBase.prj.xml) (revision 1785) @@ -1,6 +1,6 @@ - + @@ -12,9 +12,14 @@ + + + + + Index: BL/Flow/Pakbon/Doc.cls.xml =================================================================== diff -u -r1074 -r1785 --- BL/Flow/Pakbon/Doc.cls.xml (.../Doc.cls.xml) (revision 1074) +++ BL/Flow/Pakbon/Doc.cls.xml (.../Doc.cls.xml) (revision 1785) @@ -43,6 +43,20 @@ BL.Flow.Pakbon.PakbonXML + +1 +BonNr:%String +%String + + + Ophalen van de ADBTemplate (stapled of not stapled) Index: BL/Flow/Toelevering/Doc.cls.xml =================================================================== diff -u -r1074 -r1785 --- BL/Flow/Toelevering/Doc.cls.xml (.../Doc.cls.xml) (revision 1074) +++ BL/Flow/Toelevering/Doc.cls.xml (.../Doc.cls.xml) (revision 1785) @@ -28,6 +28,25 @@ BROTHERBOEKH + +1 +Toeleveringen:%List +%String + + + 1 TOENr:%String,LEVNr:%String Index: Sys/FOP/SubTaskFTP.cls.xml =================================================================== diff -u -r1074 -r1785 --- Sys/FOP/SubTaskFTP.cls.xml (.../SubTaskFTP.cls.xml) (revision 1074) +++ Sys/FOP/SubTaskFTP.cls.xml (.../SubTaskFTP.cls.xml) (revision 1785) @@ -6,7 +6,7 @@ Een opdracht bevat een of meerdere te verwerken documenten en een of meerdere actions serial 1 -%SerialObject +BL.Sys.FOP.SubTask 0 @@ -50,6 +50,15 @@ %Boolean + +%String + "_..DestDir_"\"_..DestFName_"("_..UserName_","_..PassWord_")" + Quit ToString +]]> + + %Library.CacheSerialState SubTaskFTPState Index: BL/Flow/TransportLijst/Doc.cls.xml =================================================================== diff -u -r1074 -r1785 --- BL/Flow/TransportLijst/Doc.cls.xml (.../Doc.cls.xml) (revision 1074) +++ BL/Flow/TransportLijst/Doc.cls.xml (.../Doc.cls.xml) (revision 1785) @@ -45,6 +45,46 @@ LEVBON_PS + + +Aanmaken van het TransportLijst-proxy object +Als $LI(lbCrit)="TRANSP" + - 2de item : Transportnr +Als $LI(lbCrit)="TOER" + - 2de item : VanDatum ($H format) + - 3de item : TotDatum ($H format) + - 4de item : VerzendWijze +Als $LI(lbCrit)="BONS" + - 2de item : List van BONNr + + +1 +TransportLijst:%List +%String + " + If (TYPE = "TRANSP"){ + Set ToString = ToString_"Nr: "_$LG(TransportLijst,2) + }ElseIf (TYPE = "TOER"){ + Set ToString = ToString_"Van: "_$zd($LG(TransportLijst,2),4) + Set ToString = ToString_", Tot: "_$zd($LG(TransportLijst,3),4) + Set ToString = ToString_", VerzendWijze: "_$LG(TransportLijst,4) + }ElseIf (TYPE = "BONS"){ + Set BonNrs = $LG(TransportLijst,2) + Set ToString = ToString_"BonNrs: " + For i=1:1:$LL(BonNrs) { + Set ToString = ToString_$LG(BonNrs,i) + If (i'= $LL(BonNrs)) Set ToString = ToString_", " + } + } + Set ToString = ToString_")" + + Quit ToString +]]> + + 1 Index: Sys/FOP/emDoc.cls.xml =================================================================== diff -u -r1074 -r1785 --- Sys/FOP/emDoc.cls.xml (.../emDoc.cls.xml) (revision 1074) +++ Sys/FOP/emDoc.cls.xml (.../emDoc.cls.xml) (revision 1785) @@ -2,7 +2,7 @@ serial -%VHMacro +%VHMacro,vhLib.Macro 1 %SerialObject 0 @@ -304,6 +304,25 @@ ]]> + +%String + + + %Library.CacheSerialState emDocState Index: BL/Sys/FOP/SubTask.cls.xml =================================================================== diff -u --- BL/Sys/FOP/SubTask.cls.xml (revision 0) +++ BL/Sys/FOP/SubTask.cls.xml (revision 1785) @@ -0,0 +1,21 @@ + + + +serial +1 +%SerialObject +0 + + +%Library.String +1 + Set {*}="ToString Niet Geimplementeerd." +1 + + + +%Library.CacheSerialState +^BL.Sys.FOP.SubTaskS + + + Index: Sys/FOP/emDocMulti.cls.xml =================================================================== diff -u -r1074 -r1785 --- Sys/FOP/emDocMulti.cls.xml (.../emDocMulti.cls.xml) (revision 1074) +++ Sys/FOP/emDocMulti.cls.xml (.../emDocMulti.cls.xml) (revision 1785) @@ -465,6 +465,23 @@ ]]> + +%String + 1 { + Set ToString = ToString_" [Doc"_i_"] " + } + Set ToString = ToString_Doc.ToString() + + } + Quit ToString +]]> + + %Library.CacheSerialState emDocMultiState Index: BL/Flow/PrijsLijst/Doc.cls.xml =================================================================== diff -u -r1074 -r1785 --- BL/Flow/PrijsLijst/Doc.cls.xml (.../Doc.cls.xml) (revision 1074) +++ BL/Flow/PrijsLijst/Doc.cls.xml (.../Doc.cls.xml) (revision 1785) @@ -28,6 +28,19 @@ KyoceraFS4000 + +1 +Klanten:%List +%String + + + 1 KLNr:%String Index: Sys/FOP/Task.cls.xml =================================================================== diff -u -r1074 -r1785 --- Sys/FOP/Task.cls.xml (.../Task.cls.xml) (revision 1074) +++ Sys/FOP/Task.cls.xml (.../Task.cls.xml) (revision 1785) @@ -95,6 +95,20 @@ + +%Library.String +1 + Set {*}=##class(Sys.FOP.Task).%OpenId({ID}_"||"_{SubID}).GeefActieInfo() +1 + + + +%Library.String +1 + Set {*}=##class(Sys.FOP.Task).%OpenId({ID}_"||"_{SubID}).GeefDocInfo() +1 + + + +%String + 1){ + Set DocInfo = DocInfo_"[Doc"_i_"] " + } + Set DocInfo = DocInfo_Doc.ToString() + Set DocInfo = DocInfo_" " + } + + /// MultiDoc + If $IsObject(..DocMulti){ + Set DocInfo = DocInfo_..DocMulti.ToString() + } + Quit DocInfo +]]> + + + + + + + +%String + + + %Library.CacheStorage ^Sys.FOP.TaskD Index: WV FOP Proxy.prj.xml =================================================================== diff -u -r1030 -r1785 --- WV FOP Proxy.prj.xml (.../WV FOP Proxy.prj.xml) (revision 1030) +++ WV FOP Proxy.prj.xml (.../WV FOP Proxy.prj.xml) (revision 1785) @@ -1,6 +1,6 @@ - - + + @@ -89,6 +89,7 @@ + @@ -130,11 +131,18 @@ + + + + + + + + - Index: JBL Product AMF.prj.xml =================================================================== diff -u -r1727 -r1785 --- JBL Product AMF.prj.xml (.../JBL Product AMF.prj.xml) (revision 1727) +++ JBL Product AMF.prj.xml (.../JBL Product AMF.prj.xml) (revision 1785) @@ -1,6 +1,6 @@ - + @@ -88,6 +88,7 @@ + Index: Default_JorenB.prj.xml =================================================================== diff -u -r1507 -r1785 --- Default_JorenB.prj.xml (.../Default_JorenB.prj.xml) (revision 1507) +++ Default_JorenB.prj.xml (.../Default_JorenB.prj.xml) (revision 1785) @@ -1,6 +1,6 @@ - + @@ -59,6 +59,7 @@ + Index: BL/Flow/Levering/Doc.cls.xml =================================================================== diff -u -r1074 -r1785 --- BL/Flow/Levering/Doc.cls.xml (.../Doc.cls.xml) (revision 1074) +++ BL/Flow/Levering/Doc.cls.xml (.../Doc.cls.xml) (revision 1785) @@ -44,6 +44,28 @@ 6 + +1 +lbLevering:%Integer +%String + + + 1 BONNr:%String,KLNr:%String Index: _csp/admin1/FOPQueue.csp =================================================================== diff -u -r757 -r1785 --- _csp/admin1/FOPQueue.csp (.../FOPQueue.csp) (revision 757) +++ _csp/admin1/FOPQueue.csp (.../FOPQueue.csp) (revision 1785) @@ -290,7 +290,7 @@ Set sqlFOP=sqlFOP_$C(13,10)_" FROM Sys_FOP.TaskQueue WHERE (ID > 1) " Set sqlFOP=sqlFOP_$C(13,10)_" ORDER BY StatusNum DESC, ID, Priority DESC " ; SQL-statement for FOP QueueArchive - Set sqlArchive="SELECT ID,Status,Priority,RunMode,Task,Task->KeyWords As Task_KeyWords, Created,Started,Finished,(InternePersoonInits || ' - ' || InternePersoon) As InternePersoon " + Set sqlArchive="SELECT ID,Status,Priority,RunMode,Task,Task->KeyWords As Task_KeyWords,Task->ActionToString, Task->DocInfo ,Created,Started,Finished,(InternePersoonInits || ' - ' || InternePersoon) As InternePersoon " Set sqlArchive=sqlArchive_$C(13,10)_" FROM Sys_FOP.QueueArchive " Set sqlArchive=sqlArchive_$C(13,10)_" WHERE Created BETWEEN '"_##class(Sys.cTimeStamp).LogicalToDisplay(+$H)_"' and '"_##class(Sys.cTimeStamp).LogicalToDisplay(+$H+1)_"'" Set sqlArchive=sqlArchive_$C(13,10)_" ORDER BY ID DESC" Index: WS/EC/UserServer.cls.xml =================================================================== diff -u -r1762 -r1785 --- WS/EC/UserServer.cls.xml (.../UserServer.cls.xml) (revision 1762) +++ WS/EC/UserServer.cls.xml (.../UserServer.cls.xml) (revision 1785) @@ -136,7 +136,7 @@ $$$WebServiceTrap $$$ReInstateSession(SessionKey) $$$blToegang - + Set:$G(ZoekType)=$C(0) ZoekType="" Set %Logging=$$AddToLog^BL.EC.Common($$$logGrpToegang,$$$tgKlantSelect,"ZoekKlant","Crit:"_$G(Criteria)_";Type:"_$G(ZoekType)) Quit:(Criteria="")||(Criteria=$C(0)) "" Index: BL/Flow/Pakbon/PakbonXML.cls.xml =================================================================== diff -u -r1074 -r1785 --- BL/Flow/Pakbon/PakbonXML.cls.xml (.../PakbonXML.cls.xml) (revision 1074) +++ BL/Flow/Pakbon/PakbonXML.cls.xml (.../PakbonXML.cls.xml) (revision 1785) @@ -9,6 +9,22 @@ DOCS + +1 +lbPakbon:%List +%String + + + Aanmaken van het proxy-object "DOCS" dat de proxy-facturen bevat. Index: BL/Flow/Rappel/Doc.cls.xml =================================================================== diff -u -r1074 -r1785 --- BL/Flow/Rappel/Doc.cls.xml (.../Doc.cls.xml) (revision 1074) +++ BL/Flow/Rappel/Doc.cls.xml (.../Doc.cls.xml) (revision 1785) @@ -28,6 +28,33 @@ KyoceraFS4000 + +1 +Rappels:%List +%String + + + Verhogen van de rappelnrs op de facturen.