Index: BL/Flow/Offerte/Doc.cls.xml
===================================================================
diff -u -r1835 -r1892
--- BL/Flow/Offerte/Doc.cls.xml	(.../Doc.cls.xml)	(revision 1835)
+++ BL/Flow/Offerte/Doc.cls.xml	(.../Doc.cls.xml)	(revision 1892)
@@ -31,26 +31,25 @@
 	Set ToString = ..#DocName_" ("
 	
 	Set OfferteNr = $LG(lbOfferte,1)
-	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 BronType = $LG(lbOfferte,2)
 	Set ToString = ToString _"Nr: "_OfferteNr
 	
 	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{
+	}ElseIf (BronType = "WS") {
 		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
 		}
+	}Else{
+		Set ToString = ToString_", BronType onbekend! "
 	}
 	
-	; [Review JBL  WV FOPQueue]  Deel 2 (WS) 
-	; Klasse Flow.Offerte.Hoofding openen en property KlantGetObjectId() opvragen 
-	
 	Set ToString = ToString _ ", BronType: "_BronType_")"
 		
 	Quit ToString
Index: Sys/FOP/emDocMulti.cls.xml
===================================================================
diff -u -r1785 -r1892
--- Sys/FOP/emDocMulti.cls.xml	(.../emDocMulti.cls.xml)	(revision 1785)
+++ Sys/FOP/emDocMulti.cls.xml	(.../emDocMulti.cls.xml)	(revision 1892)
@@ -269,7 +269,8 @@
 	. If DocType=$$$ppodtFactuur Do
 	. . Do ardBuildBasisDocDef("BL.Flow.Factuur.Doc", $LI(lbDocDefs,i))
 	. Else  If DocType=$$$ppodtOfferte Do
-	. . Do ardBuildBasisDocDef("BL.Flow.Offerte.Doc", $LI(lbDocDefs,i))
+	. . ;Do ardBuildBasisDocDef("BL.Flow.Offerte.Doc", $LI(lbDocDefs,i))
+	. . Do ardBuildOfferteDocDef(##class(BL.Flow.Offerte.Doc).%New(), $LI(lbDocDefs,i))   ; De klasse BL.Flow.Offerte.Doc is nog volgens de oude implementatie  - modified by WimV on 26/08/2011  (na Sync 01) 
 	. Else  If DocType=$$$ppodtOrder Do
 	. . Do ardBuildBasisDocDef("BL.Flow.Order.Doc", $LI(lbDocDefs,i))
 	. Else  If DocType=$$$ppodtLevBon Do
@@ -310,62 +311,7 @@
 	Do emDoc.Tags.SetAt(FName,$$$TagMailFile)
 	Set emDoc=""
 	Quit
-ardBuildRappelDocDef(ClassBLDoc,lbDocDef)
-	; No validation on Rappel, just add DocDef.
-	Set emDoc=DocMulti.AddDoc()
-	Set sc=ClassBLDoc.DocSetRenderDefs(emDoc, lbDocDef, , TFType, lbKeywordsPPOD, pWithLogo, $G(blnIncRappel,0))
-	Do ClassBLDoc.BuildFileData("Mail", .FName, , , lbDocDef)   ; Get FileName for Mail-attachment
-	Do emDoc.Tags.SetAt(FName,$$$TagMailFile)
-	Set emDoc=""
-	Quit
-ardBuildSpecialDocDef(ClassBLDoc,lbDocDef)
-	;Set sc=ClassBLDoc.ValidateDocDefs(lbDocDef,.KLNr)  Quit:($$$ISERR(sc))
-	;Set emDoc=DocMulti.AddDoc()
-	;Set sc=ClassBLDoc.DocSetRenderDefs(emDoc, lbDocDef, , TFType, lbKeywordsPPOD, pWithLogo)
-	;Do ClassBLDoc.BuildFileData("Mail", .FName, , , lbDocDef)   ; Get FileName for Mail-attachment
-	;Do emDoc.Tags.SetAt(FName,$$$TagMailFile)
-	;Set emDoc=""
-	;Quit
-]]></Implementation>
-</Method>
-
-<Method name="AddListOfRenderDefsXXXxxxOLD">
-<FormalSpec>lbDocTypes:%List,lbDocDefs:%List,KLNr:%String,TFType:%String,lbKeywordsPPOD:%List,pWithLogo:%String</FormalSpec>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-#define TagMailFile   "TempFName"
-	Set DocMulti=%this
-	Set TFType=$G(TFType,"PDF")
-	Set lbKeywordsPPOD=$G(lbKeywordsPPOD,"")   ; Defaulted by Proxy + set by Tseq-builder AnalyseFopTask()
-	Set pWithLogo=$G(pWithLogo)
-	Set sc=$$$OK
-	; Add RenderData  for each doc 
-	For i=1:1:$LL(lbDocTypes) Do:($$$ISOK(sc))
-	. Set DocType=$$$UCase($LI(lbDocTypes,i))
-	. Set FName=""
-	. If DocType=$$$ppodtFactuur Do
-	. . Do ardBuildBasisDocDef(##class(BL.Flow.Factuur.Doc).%New(), $LI(lbDocDefs,i))
-	. Else  If DocType=$$$ppodtOfferte Do
-	. . Do ardBuildBasisDocDef(##class(BL.Flow.Offerte.Doc).%New(), $LI(lbDocDefs,i))
-	. Else  If DocType=$$$ppodtOrder Do
-	. . Do ardBuildBasisDocDef(##class(BL.Flow.Order.Doc).%New(), $LI(lbDocDefs,i))
-	. Else  If DocType=$$$ppodtLevBon Do
-	. . Do ardBuildBasisDocDef(##class(BL.Flow.Levering.Doc).%New(), $LI(lbDocDefs,i))
-	. Else  If DocType=$$$ppodtToelev Do
-	. . Do ardBuildBasisDocDef(##class(BL.Flow.Toelevering.Doc).%New(), $LI(lbDocDefs,i))
-	. Else  If DocType=$$$ppodtPrijsLijst Do
-	. . Set sc=$$$ERROR($$$GeneralError,"DocType "_DocType_" not implemented in DocMulti.AddListOfRenderDefs()")  Quit
-	. . Do ardBuildBasisDocDef(##class(BL.Flow.PrijsLijst.Doc).%New(), $LI(lbDocDefs,i))
-	. Else  If DocType=$$$ppodtRappel Do
-	. . Set sc=$$$ERROR($$$GeneralError,"DocType "_DocType_" not implemented in DocMulti.AddListOfRenderDefs()")  Quit
-	. . Do ardBuildRappelDocDef(##class(BL.Flow.Rappel.Doc).%New(), $LI(lbDocDefs,i))
-	. Else  If DocType="xxSPECIALxx" Do
-	. . Set sc=$$$ERROR($$$GeneralError,"DocType "_DocType_" not implemented in DocMulti.AddListOfRenderDefs()")  Quit
-	. . ;Do ardBuildSpecialDocDef(##class(BL.Flow.Special.Doc).%New(), $LI(lbDocDefs,i))
-	. Else  Do
-	. . Set sc=$$$ERROR($$$GeneralError,"DocType "_DocType_" not implemented in DocMulti.AddListOfRenderDefs()")  Quit
-	Quit sc
-ardBuildBasisDocDef(ClassBLDoc,lbDocDef)
+ardBuildOfferteDocDef(ClassBLDoc,lbDocDef)
 	Set sc=ClassBLDoc.ValidateDocDefs(lbDocDef,.KLNr)  Quit:($$$ISERR(sc))
 	Set emDoc=DocMulti.AddDoc()
 	Set sc=ClassBLDoc.DocSetRenderDefs(emDoc, lbDocDef, , TFType, lbKeywordsPPOD, pWithLogo)
@@ -469,14 +415,15 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set ToString = ""
-	Set AantalDocs = ..Docs.Count()
+	Set Docs = ..Docs
+	Set AantalDocs = Docs.Count()
 	For i=1:1:AantalDocs {
-		Set Doc = ..Docs.GetAt(i)
-		If AantalDocs > 1 {
-			Set ToString = ToString_" [Doc"_i_"] "
+		Set Doc = Docs.GetAt(i)
+		If (AantalDocs > 1) {
+			Set ToString = ToString_"[Doc"_i_"] "
 		}
 		Set ToString = ToString_Doc.ToString()
-		
+		Set ToString = ToString_$C(13,10)
 	}
 	Quit ToString
 ]]></Implementation>
Index: WV FOP Proxy.prj.xml
===================================================================
diff -u -r1785 -r1892
--- WV FOP Proxy.prj.xml	(.../WV FOP Proxy.prj.xml)	(revision 1785)
+++ WV FOP Proxy.prj.xml	(.../WV FOP Proxy.prj.xml)	(revision 1892)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
-<Project name="WV FOP Proxy" LastModified="2011-08-10 15:02:30" Target="DiffTime^vhDTyp" TargetType="2">
+<Project name="WV FOP Proxy" LastModified="2011-08-25 14:37:50" Target="DiffTime^vhDTyp" TargetType="2">
   <Items>
     <ProjectItem name="APPS.HR.WerknemersLijstBijBrand.dto.Statuut" type="CLS"/>
     <ProjectItem name="APPS.HR.WerknemersLijstBijBrand.dto.Werkgever" type="CLS"/>
@@ -27,7 +27,6 @@
     <ProjectItem name="BL.Flow.Factuur.Doc" type="CLS"/>
     <ProjectItem name="BL.Flow.Levering.Doc" type="CLS"/>
     <ProjectItem name="BL.Flow.Offerte.Doc" type="CLS"/>
-    <ProjectItem name="BL.Flow.Offerte.DocOLD" type="CLS"/>
     <ProjectItem name="BL.Flow.Order.Doc" type="CLS"/>
     <ProjectItem name="BL.Flow.Pakbon.Doc" type="CLS"/>
     <ProjectItem name="BL.Flow.Pakbon.PakbonXML" type="CLS"/>
@@ -89,7 +88,6 @@
     <ProjectItem name="BL.Sys.FOP.Common.INC" type="MAC"/>
     <ProjectItem name="BL.Sys.FOP.DataMgr" type="CLS"/>
     <ProjectItem name="BL.Sys.FOP.DataXML" type="CLS"/>
-    <ProjectItem name="BL.Sys.FOP.SubTask" type="CLS"/>
     <ProjectItem name="BL.Sys.FOP.TaskMgr" type="CLS"/>
     <ProjectItem name="DCBON.MAC" type="MAC"/>
     <ProjectItem name="DCFAKT.MAC" type="MAC"/>
@@ -141,8 +139,6 @@
     <ProjectItem name="Sys.FOP.emDocMulti" type="CLS"/>
     <ProjectItem name="WS.FOP.StatusServer" type="CLS"/>
     <ProjectItem name="WS.SOAPClientExt" type="CLS"/>
-    <ProjectItem name="WV.FaktuurPrint.MAC" type="MAC"/>
-    <ProjectItem name="zTryout.CSC.Try" type="CLS"/>
   </Items>
 </Project>
 </Export>