Index: Sys/FOP/SubTaskMail.cls.xml
===================================================================
diff -u -r1785 -r1835
--- Sys/FOP/SubTaskMail.cls.xml	(.../SubTaskMail.cls.xml)	(revision 1785)
+++ Sys/FOP/SubTaskMail.cls.xml	(.../SubTaskMail.cls.xml)	(revision 1835)
@@ -7,7 +7,7 @@
 <ClassType>serial</ClassType>
 <IncludeCode>%VHMacro</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>BL.Sys.FOP.SubTask</Super>
+<Super>%SerialObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Aan">
FishEye: Tag 1835 refers to a dead (removed) revision in file `BL/Sys/FOP/SubTask.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: BL/Flow/Pakbon/PakbonXML.cls.xml
===================================================================
diff -u -r1785 -r1835
--- BL/Flow/Pakbon/PakbonXML.cls.xml	(.../PakbonXML.cls.xml)	(revision 1785)
+++ BL/Flow/Pakbon/PakbonXML.cls.xml	(.../PakbonXML.cls.xml)	(revision 1835)
@@ -19,7 +19,7 @@
 	Set ToString = "PakbonXML ("	
 	Set ToString = ToString_"Nr: "_PakbonNr
 	Set Hoofding = ##class(Flow.OrderWMS.Hoofding).%OpenId(PakbonNr)
-	Set ToString = ToString_", KlantNr: "_Hoofding.Klant.Nummer
+	Set:($IsObject(Hoofding) && $IsObject(Hoofding.Klant)) ToString = ToString_", KlantNr: "_Hoofding.Klant.Nummer
 	Set ToString = ToString_")"
 	Quit ToString
 ]]></Implementation>
Index: BL/Flow/TransportLijst/Doc.cls.xml
===================================================================
diff -u -r1798 -r1835
--- BL/Flow/TransportLijst/Doc.cls.xml	(.../Doc.cls.xml)	(revision 1798)
+++ BL/Flow/TransportLijst/Doc.cls.xml	(.../Doc.cls.xml)	(revision 1835)
@@ -47,9 +47,6 @@
 
 <Method name="ToString">
 <Description>
-[Review JBL  WV FOPQueue]  ik heb de commentaar weggehaald en doorverwezen naar de px-klasse. 
-                           de method impl is O.K. 
-
 Opbouw van de ListBuild TransportLijst : zie klasse BL.Flow.Proxy.pxTransportLijst  method Create() </Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>TransportLijst:%List</FormalSpec>
Index: Sys/FOP/Task.cls.xml
===================================================================
diff -u -r1798 -r1835
--- Sys/FOP/Task.cls.xml	(.../Task.cls.xml)	(revision 1798)
+++ Sys/FOP/Task.cls.xml	(.../Task.cls.xml)	(revision 1835)
@@ -367,7 +367,7 @@
 			Set DocInfo = DocInfo_"[Doc"_i_"] "
 		}
 		Set DocInfo = DocInfo_Doc.ToString()
-		Set DocInfo = DocInfo_"    "                  ; [Review JBL  WV FOPQueue]  nieuwe lijn beginnen : is dit mogelijk ?
+		Set DocInfo = DocInfo_$C(13,10)
 	}
 	
 	/// MultiDoc
@@ -382,20 +382,20 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set ActieInfo = ""
-	If (..ActionMail'="" && $IsObject(..ActionMail)){
-		Set ActieInfo= ActieInfo_..ActionMail.ToString()     ; [Review JBL  WV FOPQueue]  nieuwe lijn beginnen : is dit mogelijk ?
+	If ($IsObject(..ActionMail) && $Length(..ActionMail.ToString())){
+		Set ActieInfo= ActieInfo_..ActionMail.ToString()_$C(13,10)
 	}
-	If (..ActionPrint'=""  && $IsObject(..ActionPrint)){
-		Set ActieInfo = ActieInfo_..ActionPrint.ToString()	 ; idem voor de andere ActieInfos
+	If ($IsObject(..ActionPrint) && $Length(..ActionPrint.ToString())){
+		Set ActieInfo = ActieInfo_..ActionPrint.ToString()_$C(13,10)
 	}
-	If (..ActionFax'="" && $IsObject(..ActionFax)){
-		Set ActieInfo = ActieInfo_..ActionFax.ToString()
+	If ($IsObject(..ActionFax)  && $Length(..ActionFax.ToString())){
+		Set ActieInfo = ActieInfo_..ActionFax.ToString()_$C(13,10)
 	}
-	If ..ActionFtp'=""{
-		Set ActieInfo = ActieInfo_..ActionFtp.ToString()
+	If ($IsObject(..ActionFtp)  && $Length(..ActionFtp.ToString())){
+		Set ActieInfo = ActieInfo_..ActionFtp.ToString()_$C(13,10)
 	}
-	If ..ActionFile'=""{
-		Set ActieInfo = ActieInfo_..ActionFile.ToString()
+	If ($IsObject(..ActionFile)  && $Length(..ActionFile.ToString())){
+		Set ActieInfo = ActieInfo_..ActionFile.ToString()_$C(13,10)
 	}
 	Quit ActieInfo
 ]]></Implementation>
Index: Sys/FOP/SubTaskPrint.cls.xml
===================================================================
diff -u -r1798 -r1835
--- Sys/FOP/SubTaskPrint.cls.xml	(.../SubTaskPrint.cls.xml)	(revision 1798)
+++ Sys/FOP/SubTaskPrint.cls.xml	(.../SubTaskPrint.cls.xml)	(revision 1835)
@@ -6,7 +6,7 @@
 Een opdracht bevat een of meerdere te verwerken documenten en een of meerdere actions</Description>
 <ClassType>serial</ClassType>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>BL.Sys.FOP.SubTask</Super>
+<Super>%SerialObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Printer">
@@ -48,7 +48,12 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set ToString = ""
-	Set:(..Printer'="") ToString = ToString_"Printer: "_..Printer_" (LogoPaper:"_..LogoPaper_", PapierLade:"_..PapierLade_", RectoVerso:"_..RectoVerso_")"   ; [Review JBL  WV FOPQueue]  LogoPapier en Papierlade conditioneel, Rectoverso indien <> 0 
+	If (..Printer '= ""){
+		Set ToString = ToString_"Printer: "_..Printer
+		Set:(..LogoPaper'="") ToString = ToString_", LogoPaper:"_..LogoPaper
+		Set:(..PapierLade'="") ToString = ToString_", PapierLade:"_..PapierLade
+		Set:(..RectoVerso'=0) ToString = ToString_", RectoVerso:"_..RectoVerso
+	}
 	Quit ToString
 ]]></Implementation>
 </Method>
Index: Sys/FOP/emDoc.cls.xml
===================================================================
diff -u -r1798 -r1835
--- Sys/FOP/emDoc.cls.xml	(.../emDoc.cls.xml)	(revision 1798)
+++ Sys/FOP/emDoc.cls.xml	(.../emDoc.cls.xml)	(revision 1835)
@@ -308,17 +308,18 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set ToString = ""
-	Set ToString = ..DataType_", "
-	Set ToString = ToString_"Taal: "_..Taal_", "	
 	
-	Set Class = $LI(..DataDefsLB,2)
-	Set ToString = ToString_"'"_Class_"'"
+	If ($$IsList^vhLib(..DataDefsLB) && ($LL(..DataDefsLB) >= 4)) {
+		Set Class = $LI(..DataDefsLB,2)
 	
-	If ($$$IsClassMethod(Class,"ToString")) {
-		Set ToString = $zobjclassmethod($LI(..DataDefsLB,2),"ToString",$LI(..DataDefsLB,4))   ; [Review JBL  WV FOPQueue]  $LI(..DataDefsLB,2) vervangen door var Class 
- 	}Else{
-		Set ToString = $$LCVT^vhLib(..DataDefsLB)
-	} 
+		If ($$$IsClassMethod(Class,"ToString")) {
+			Set ToString = ToString_$zobjclassmethod(Class,"ToString",$LI(..DataDefsLB,4))
+	 	}Else{
+			Set ToString = ToString_$$LCVT^vhLib(..DataDefsLB)
+		} 
+	}Else{
+		Set ToString = ToString_$$LCVT^vhLib(..DataDefsLB)
+	}
 	Quit ToString
 ]]></Implementation>
 </Method>
Index: Sys/FOP/SubTaskArchief.cls.xml
===================================================================
diff -u -r1798 -r1835
--- Sys/FOP/SubTaskArchief.cls.xml	(.../SubTaskArchief.cls.xml)	(revision 1798)
+++ Sys/FOP/SubTaskArchief.cls.xml	(.../SubTaskArchief.cls.xml)	(revision 1835)
@@ -6,7 +6,7 @@
 Een opdracht bevat een of meerdere te verwerken documenten en een of meerdere actions</Description>
 <ClassType>serial</ClassType>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>BL.Sys.FOP.SubTask</Super>
+<Super>%SerialObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="DocName">
@@ -27,8 +27,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set ToString = ""
-	Set:(..DocName_..DocPath '= "") ToString = "Archief : "_..DocPath_"\"_..DocName   ; [Review JBL  WV FOPQueue]  1. Woordje "Archief" mag gewoon "File" zijn
-	                                                                                  ;                            2. Concat Dir en FileName via  ##class(TECH.Files).AppendFile(,)
+	Set:(..DocName_..DocPath '= "") ToString = "File : "_ ##class(TECH.Files).AppendFile(..DocPath,..DocName)
 	Quit ToString
 ]]></Implementation>
 </Method>
Index: Sys/FOP/SubTaskFax.cls.xml
===================================================================
diff -u -r1785 -r1835
--- Sys/FOP/SubTaskFax.cls.xml	(.../SubTaskFax.cls.xml)	(revision 1785)
+++ Sys/FOP/SubTaskFax.cls.xml	(.../SubTaskFax.cls.xml)	(revision 1835)
@@ -6,7 +6,7 @@
 Een opdracht bevat een of meerdere te verwerken documenten en een of meerdere actions</Description>
 <ClassType>serial</ClassType>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>BL.Sys.FOP.SubTask</Super>
+<Super>%SerialObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="FaxNr">
Index: Sys/FOP/SubTaskFTP.cls.xml
===================================================================
diff -u -r1798 -r1835
--- Sys/FOP/SubTaskFTP.cls.xml	(.../SubTaskFTP.cls.xml)	(revision 1798)
+++ Sys/FOP/SubTaskFTP.cls.xml	(.../SubTaskFTP.cls.xml)	(revision 1835)
@@ -6,7 +6,7 @@
 Een opdracht bevat een of meerdere te verwerken documenten en een of meerdere actions</Description>
 <ClassType>serial</ClassType>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>BL.Sys.FOP.SubTask</Super>
+<Super>%SerialObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="FtpServer">
@@ -54,7 +54,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set ToString = ""
-	Set:(..FromPath'="" || (..DestDir'= "") || (..DestFName'="")) ToString = "FTP : "_..FromPath_" -> "_..DestDir_"\"_..DestFName_"("_..UserName_","_..PassWord_")"   ; [Review JBL  WV FOPQueue]  Alleen Destination vermelden, rest NIET 
+	Set:(..FromPath'="" || (..DestDir'= "") || (..DestFName'="")) ToString = "FTP : "_..FromPath_" -> "_ ##class(TECH.Files).AppendFile(..DestDir,..DestFName)
 	Quit ToString
 ]]></Implementation>
 </Method>
Index: BL/Flow/Offerte/Doc.cls.xml
===================================================================
diff -u -r1798 -r1835
--- BL/Flow/Offerte/Doc.cls.xml	(.../Doc.cls.xml)	(revision 1798)
+++ BL/Flow/Offerte/Doc.cls.xml	(.../Doc.cls.xml)	(revision 1835)
@@ -34,9 +34,18 @@
 	Set BronType = $LG(lbOfferte,2)	    ; [Review JBL  WV FOPQueue]  Onderscheid maken tussen BronType = KOF en WS :  komen resp. uit ^KOFKL en uit ^Flow.Offerte.Hoofding 
 	Set ToString = ToString _"Nr: "_OfferteNr
 	
-	If $Data(^KOFKL1(OfferteNr,"F")){   ; [Review JBL  WV FOPQueue]  Dit is deel 1 (KOF) 
-		Set KLNr=$P(^KOFKL1(OfferteNr,"F"),"\")
-		Set ToString = ToString_", KlantNr: "_KLNr
+	If (BronType = "KOF"){
+		If $Data(^KOFKL1(OfferteNr,"F")){   ; [Review JBL  WV FOPQueue]  Dit is deel 1 (KOF) 
+			Set KLNr=$P(^KOFKL1(OfferteNr,"F"),"\")
+			Set ToString = ToString_", KlantNr: "_KLNr
+		}
+	}Else{
+		Set OffBL=##class(BL.Flow.Offerte.Build).%New()
+		Set Offerte=OffBL.Open(OfferteNr)
+		If ($IsObject(Offerte) && $IsObject(Offerte.Klant)){
+			Set KLNr=Offerte.Klant.Nummer
+			Set ToString = ToString_", KlantNr: "_KLNr
+		}
 	}
 	
 	; [Review JBL  WV FOPQueue]  Deel 2 (WS) 
Index: _csp/admin1/FOPQueue.csp
===================================================================
diff -u -r1785 -r1835
--- _csp/admin1/FOPQueue.csp	(.../FOPQueue.csp)	(revision 1785)
+++ _csp/admin1/FOPQueue.csp	(.../FOPQueue.csp)	(revision 1835)
@@ -213,7 +213,7 @@
 				. If arColSpecial(col)="Task" Do
 				. . Set:($L(tmpVal)) tmpVal="<A href=""FOPTask.csp?TASK="_tmpVal_"&"_(QSqueue_"="_queryA.GetDataByName("ID"))_""" target=""_blank"">"_tmpVal_"</A>"
 			</SCRIPT>
-			<td>#($S($L(tmpVal):tmpVal,1:"&nbsp;"))#</td>
+			<td>#($S($L(tmpVal,$$$CRLF)>1:$$$Replace(tmpVal,$$$CRLF,"<BR/>"), $L(tmpVal):tmpVal,1:"&nbsp;"))#</td>
 			</CSP:WHILE>
 		</tr>
 		</CSP:WHILE>