Index: BL/Flow/Offerte/Doc.cls.xml
===================================================================
diff -u -r734 -r771
--- BL/Flow/Offerte/Doc.cls.xml	(.../Doc.cls.xml)	(revision 734)
+++ BL/Flow/Offerte/Doc.cls.xml	(.../Doc.cls.xml)	(revision 771)
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-01-27 17:00:51">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-02-02 15:30:13">
 <Class name="BL.Flow.Offerte.Doc">
 <IncludeCode>BL.Sys.FOP.Common</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>BL.Flow.Docs.Basis,BL.Flow.Basis.DocNew</Super>
-<TimeChanged>62013,65309.998388</TimeChanged>
+<Super>BL.Flow.Docs.Basis,%RegisteredObject</Super>
+<TimeChanged>62124,55856.55067</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Parameter name="ADBTemplate">
 <Default>offerte_01.01</Default>
 </Parameter>
 
-<Parameter name="DocTypeKWd">
-<Description>
-DocType voor task-keywords (zie ook BL.Sys.FOP.Common.INC) </Description>
-<Default>OFFERTE</Default>
+<Parameter name="PrinterDFL">
+<Default>KyoceraFS4000</Default>
 </Parameter>
 
 <Parameter name="DocName">
@@ -25,16 +23,6 @@
 <Default>A</Default>
 </Parameter>
 
-<Parameter name="PrinterDFL">
-<Default>KyoceraFS4000</Default>
-</Parameter>
-
-<Property name="BronType">
-<Description>
-Offerte is afkomstig van Admin (KOF) of van WebShop (WS)</Description>
-<Type>%String</Type>
-</Property>
-
 <Method name="ValidateOFFNr">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>OFFNr:%String,KLNr:%String</FormalSpec>
@@ -79,72 +67,57 @@
 <FormalSpec><![CDATA[OFFNr:%String,&FileURL:%String]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+#define SubDir      "Tmp\"
+#define SubDirURL   $TR($$$SubDir,"\","/")
+	; New FName,Dir,FilePath
+
+	Set lbOfferte=$S((OFFNr?1"O-".E):$LB($P(OFFNr,"-",2),"KOF"), 1:$LB(OFFNr,"WS"))
 	Set FilePath=$G(FileURL)
-	Set sc=..RenderAndFileDoc(.OFFNr,FilePath, 1,.FileURL)   ; blnFileWWW=1 , return FileURL 
-	Quit sc
+	Do ..BuildFileData("FileWWW", .FName,.Dir,.FilePath, $LG(lbOfferte,1),$LG(lbOfferte,2))
+	Do ..BuildFileData("FileWWWUrl", FName, ,.FileURL)
+	Quit ..RenderAndFileDoc(.OFFNr,FilePath)
 ]]></Implementation>
 </Method>
 
 <Method name="RenderAndFileDoc">
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[OFFNr:%String,&FilePath:%String,blnFileWWW:%Boolean=0,&FileURL:%String]]></FormalSpec>
+<FormalSpec><![CDATA[OFFNr:%String,&FilePath:%String]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	;New Task,FName,Dir,sc
 	Set lbOfferte=$S((OFFNr?1"O-".E):$LB($P(OFFNr,"-",2),"KOF"), 1:$LB(OFFNr,"WS"))
 	Set:(OFFNr?1"O-".E) OFFNr=$P(OFFNr,"-",2)
 
-	Set blOff=..Instantiate()
-	Do blOff.Init(OFFNr,)
-	Set blOff.lbDocs=lbOfferte
-	Set blOff.BronType=$LG(lbOfferte,2)
-	Set blOff.TransformType="PDF"
-	Set blOff.lbPPODKeywords=$LB()
-	Do blOff.XsltParams.SetAt($G(pWithLogo,1),"pWithLogo")	
-	
-	If blnFileWWW Do
-	. Set sc=blOff.BuildTaskRenderAndFileWWW(.FilePath,.FileURL)   ; returns mod FileURL 
-	Else  Do
-	. Set sc=blOff.BuildTaskRenderAndFile(.FilePath)
-	Set Task=blOff.FopTask
-	Do blOff.Close()
-	Set blOff=""
-	Set:($$$ISOK(sc)) sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine)   ; $$$rmBatch   ; $$$rmSync
+	Do ..BuildFileData("File", .FName,.Dir,.FilePath, OFFNr,$LG(lbOfferte,2))
+	Quit:(Dir="") $$$ERROR($$$GeneralError,"Invalid directory specified: "_Dir)
+	Set Task=..CreateFopTask("DocRenderAndFile",,)
+	Set sc=..DocSetRenderDefs(Task.AddDoc(), lbOfferte, , "PDF", $LB(), $G(pWithLogo,1))
+	Set:($$$ISOK(sc)) sc=Task.AddActionFile(FName,Dir)
+	Quit:($$$ISERR(sc)) sc
+	Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine)   ; $$$rmBatch   ; $$$rmSync
 	Quit sc
 ]]></Implementation>
 </Method>
 
 <Method name="RenderAndPrintDoc">
 <Description>
 Oproepen via :
-  s sc=##class(BL.Flow.Offerte.Doc).RenderAndPrintDoc("O-528368","KYOCERAFS4000")   w sc,!</Description>
+  s sc=##class(BL.Flow.Offerte.Doc).RenderAndPrintDoc("O-560390","BrotherBoekH",1)   w sc,!</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>OFFNr:%String,PrinterName:%String</FormalSpec>
+<FormalSpec>OFFNr:%String,PrinterName:String,pWithLogo:%Boolean=1</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set lbOfferte=$S((OFFNr?1"O-".E):$LB($P(OFFNr,"-",2),"KOF"), 1:$LB(OFFNr,"WS"))
 	Set:(OFFNr?1"O-".E) OFFNr=$P(OFFNr,"-",2)
-	
-	Set blOff=..Instantiate()
-	Do blOff.Init(OFFNr,)
-	Set blOff.lbDocs=lbOfferte
-	Set blOff.BronType=$LG(lbOfferte,2)
-	Set blOff.TransformType="PS"
 
-	Set %PrintViaPCL=0
-	Set:(%PrintViaPCL) blOff.TransformType="PDF"
-
-	Set blOff.lbPPODKeywords=$LB()
-	Do blOff.XsltParams.SetAt($G(pWithLogo,1),"pWithLogo")	
-	Set:($L($G(PrinterName))) blOff.Printer=PrinterName
-	
-	Set sc=blOff.BuildTaskRenderAndPrint(blOff.Printer,)
-	Set Task=blOff.FopTask
-	Do blOff.Close()
-	Set blOff=""
-	Set:($$$ISOK(sc)) sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine)   ; $$$rmSync
-
-	Kill %PrintViaPCL
-
+	Set PrinterName=$G(PrinterName,..#PrinterDFL)   ; "DocuColor"
+	Set Task=..CreateFopTask("DocRenderAndPrint",,)
+	Set sc=..DocSetRenderDefs(Task.AddDoc(), lbOfferte, , "PS", $LB(), pWithLogo)
+	Set NumCopies=1
+	;Set:(+NumCopies'>0) 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)   ; $$$rmBatch   ; $$$rmSync
 	Quit sc
 ]]></Implementation>
 </Method>
@@ -154,50 +127,53 @@
 <FormalSpec>OFFNr:%String,MailTo:%String,Subject:%String,Body:%String,FileName:%String,MailFrom:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	;New Task,sc
 	Set lbOfferte=$S((OFFNr?1"O-".E):$LB($P(OFFNr,"-",2),"KOF"), 1:$LB(OFFNr,"WS"))
 	Set:(OFFNr?1"O-".E) OFFNr=$P(OFFNr,"-",2)
-
-	Set blOff=..Instantiate()
-	Do blOff.Init(OFFNr,)
-	Set blOff.lbDocs=lbOfferte
-	Set blOff.BronType=$LG(lbOfferte,2)
-	Set blOff.TransformType="PDF"
-	Set blOff.lbPPODKeywords=$LB()
-	Do blOff.XsltParams.SetAt($G(pWithLogo,1),"pWithLogo")	
-	
-	Set sc=blOff.BuildTaskRenderAndMail(MailTo,.Subject,.Body, .FileName, .MailFrom)
-	Set Task=blOff.FopTask
-	Do blOff.Close()
-	Set blOff=""
-	Set:($$$ISOK(sc)) sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine)   ; $$$rmBatch   ; $$$rmSync
+	Do ..BuildFileData("Mail", .FileName, , , OFFNr,$LG(lbOfferte,2))
+ /*
+	Set:($G(FileName)="") FileName="A_"_OFFNr_"_"_$ZD($H,8)_".pdf"
+	;Set Task=..CreateFopTask(lbOfferte,"PDF",1)   ; adds the emDoc
+ */
+	Set Task=..CreateFopTask("DocRenderAndMail",,)
+	Set sc=..DocSetRenderDefs(Task.AddDoc(), lbOfferte, , "PDF", $LB(), $G(pWithLogo,1))
+	Set:($$$ISOK(sc)) sc=Task.AddActionMail(MailTo,.Subject,.Body,.MailFrom)
+	Set:($$$ISOK(sc)) Task.ActionMail.Attachments=FileName
+	Quit:($$$ISERR(sc)) sc
+	Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine)   ;    ; $$$rmSync
 	Quit sc
 ]]></Implementation>
 </Method>
 
 <Method name="RenderAndFtpDoc">
 <Description>
 Oproepen via :
-  s sc=##class(BL.Flow.Offerte.Doc).RenderAndFtpDoc("O-171251","vhisiedownload.vanhoecke.be",,"TestWimV002.pdf")   w sc,!</Description>
+  s sc=##class(BL.Flow.Offerte.Doc).RenderAndFtpDoc(171251,"vhisiedownload.vanhoecke.be",,"TestWimV002.pdf")   w sc,!</Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>OFFNr:%String,FtpServer:%String,DestDir:%String,DestFName:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+#define SaveTempFile   1
+	;New Task,sc
 	Set lbOfferte=$S((OFFNr?1"O-".E):$LB($P(OFFNr,"-",2),"KOF"), 1:$LB(OFFNr,"WS"))
 	Set:(OFFNr?1"O-".E) OFFNr=$P(OFFNr,"-",2)
-	
-	Set blOff=..Instantiate()
-	Do blOff.Init(OFFNr,)
-	Set blOff.lbDocs=lbOfferte
-	Set blOff.BronType=$LG(lbOfferte,2)
-	Set blOff.TransformType="PDF"
-	Set blOff.lbPPODKeywords=$LB()
-	Do blOff.XsltParams.SetAt($G(pWithLogo,1),"pWithLogo")	
+	Set Task=..CreateFopTask("DocRenderAndFtp",,)
+	Set sc=..DocSetRenderDefs(Task.AddDoc(), lbOfferte, , "PDF", $LB(), $G(pWithLogo,1))
+	If $$$SaveTempFile  Do
+	. Do ..BuildFileData("TempFTP", .FName,.Dir,.FilePath, OFFNr,$LG(lbOfferte,2))   ; The returned 'Dir' can be local path to FOP; the 'Dir in the FilePath' is the network-converted 'Dir'
+	. Set FtpSrcPath=FilePath
+	. Set:($$$ISOK(sc)) sc=Task.AddActionFile(FName,Dir)
+	Else  Do
+	. Set FtpSrcPath=""   ; TO DO : indicate that SourceData should be retrieved from the (temp)Stream object
 
-	Set sc=blOff.BuildTaskRenderAndFtp(FtpServer,.DestDir,.DestFName)
-	Set Task=blOff.FopTask
-	Do blOff.Close()
-	Set blOff=""
-	Set:($$$ISOK(sc)) sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine)   ; $$$rmSync
+	If $$$LCase(FtpServer)?1(1"vhisiedownload.vanhoecke.be",1"testftp") Do
+	. Set tmpUserName="Tineke"
+	. Set tmpPassWord="T!neKe"
+	. Set tmpPort=""
+	. Set tmpBinaryFtp=""
+	Set:($$$ISOK(sc)) sc=Task.AddActionFtp(FtpServer,FtpSrcPath,.DestDir,.DestFName, .tmpUserName, .tmpPassWord, .tmpPort, tmpBinaryFtp)
+	Quit:($$$ISERR(sc)) sc
+	Set sc=##class(BL.Sys.FOP.CommonTasks).RunFopTask(Task,$$$rmInLine)   ; $$$rmSync
 	Quit sc
 ]]></Implementation>
 </Method>
@@ -304,24 +280,123 @@
 
 <Method name="KeywordsDefault">
 <Description>
-Geeft de standaard Keywords terug op basis van de opgegeven AnalyseRoutine. 
-Deze method kan in de afgeleide klasse overschreven worden voor specifieke uitbreidingen. </Description>
+Geeft de standaard Keywords terug op basis van de opgegeven AnalyseRoutine</Description>
+<ClassMethod>1</ClassMethod>
 <FormalSpec>DocType:%String,AnalyseRoutine:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set DocType=$G(DocType,..#DocTypeKWd)
-	Quit ##class(BL.Flow.Basis.DocNew).KeywordsDefaultCM(DocType,AnalyseRoutine)
+	Set DocType=$G(DocType,$$$ppodtOfferte)
+	Quit ##class(BL.Flow.Basis.Doc).KeywordsDefault(DocType,AnalyseRoutine)
 ]]></Implementation>
 </Method>
 
+<Method name="BuildXsltParams">
+<Description>
+XSLT-parameters voor RenderDoc berekenen. 
+Geeft een $LB() terug.  Bvb:  $LB("pWithLogo=0","pWithBgColors=1")</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>lbXsltParams:%List,pWithLogo:%Boolean=0,pWithBgColors:%Boolean="",pImageColVisible:%String=""</FormalSpec>
+<ReturnType>%List</ReturnType>
+<Implementation><![CDATA[
+	Quit:($G(lbXsltParams)=$LB()) $LB()
+	Quit:($L($G(lbXsltParams))) lbXsltParams
+	
+	;Set pWithLogo=$G(pWithLogo,0)    ; pWithLogo
+	Set pWithBgColors=""              ; pWithBgColors=1
+	Set tmpLB=""
+	Set:($L(pWithLogo)       ) tmpLB=tmpLB_$LB("pWithLogo="_pWithLogo)
+	Set:($L(pWithBgColors)   ) tmpLB=tmpLB_$LB("pWithBgColors="_pWithBgColors)
+	Set:($L(pImageColVisible)) tmpLB=tmpLB_$LB("pImageColVisible="_pImageColVisible)
+	Quit tmpLB
+]]></Implementation>
+</Method>
+
+<Method name="CreateFopTask">
+<Description>
+Create Task-object
+  AnalyseRoutine is een verplichte parameter 
+  Keywords is optioneel. Bij voorkeur ";"-gescheiden 
+  UserID is optioneel. 
+Keywords en UserID worden berekend indien niet gedefinieerd.</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>AnalyseRoutine:%String,Keywords:%String,UserID:%String</FormalSpec>
+<ReturnType>Sys.FOP.Task</ReturnType>
+<Implementation><![CDATA[
+	;New UserID,Task,sc
+	Set:('$D(UserID)) UserID=##class(BL.Sys.FOP.CommonTasks).CurrentUserID()   ; 1007 = WimV 
+	Set Task=##class(BL.Sys.FOP.Interface).NewTask(,,UserID)
+	Set Task.AnalyseRoutine=AnalyseRoutine        ; custom routine to convert FopTask to (TaskSeq + SeqItems)
+	Set:($G(Keywords)="") Keywords=..KeywordsDefault(,AnalyseRoutine)
+	Set Task.KeyWords=Keywords
+	Quit Task
+]]></Implementation>
+</Method>
+
+<Method name="DocSetRenderData">
+<Description>
+De render-data toevoegen aan het Doc. </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Doc:Sys.FOP.emDoc,DataInVia:%String,DataIn,Template:%String,TransformType:%String="PDF",lbPPODKeywords:%List,lbXsltParams:%List</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	;New DataType,sc,Taal,Options,OptionsPDF
+	Set DataType=$G(DataType,"XML")
+	Set sc=..GetRenderInfo(.Template, .TransformType, .lbXsltParams, .Taal, .Options, .OptionsPDF)
+	Do Doc.SetRenderData(.DataInVia, DataIn, DataType, .Template, .TransformType, .lbPPODKeywords, .lbXsltParams, .Taal, .Options, .OptionsPDF)
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GetRenderInfo">
+<Description>
+De render-data ophalen, i.e. invullen in de parameters (als .local doorgeven). </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[&Template:%String,&TransformType:%String,&lbXsltParams:%List,&Taal:%String,&Options:%String,&OptionsPDF:%String]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set Template=$G(Template,..#ADBTemplate)
+	Set TransformType=$S($$$UCase(TransformType)="PS":"PS", 1:"PDF")
+	Set Taal=$G(Taal,"N")
+	Set lbXsltParams=..BuildXsltParams(lbXsltParams)   ; , .pWithLogo,.pWithBgColors)
+	Set Options=""
+	Set OptionsPDF=""
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="DocSetRenderDefs">
+<Description>
+De render-data toevoegen aan het Doc. 
+Alleen gebruiken wanneer de data van het document gedefinieerd is via lbDocs, i.e. xml wordt pas later gegenereerd via method GetFopXML()</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Doc:Sys.FOP.emDoc,lbDocs:%List,Template:%String,TransformType:%String="PDF",lbPPODKeywords:%List,pWithLogo:%Boolean</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	;Set:($L(lbDocs)) lbDataIn=$LB("CLS.MTH.XML",..%ClassName(1),"GetFopXML",lbDocs)
+	Set:($L(lbDocs)) lbDataIn=$LB("BL.MTH.PROXY",..%ClassName(1),"BuildProxy",lbDocs)
+	Set lbXsltParams=..BuildXsltParams(,.pWithLogo,,$$$xslpFromDoc)   ; ,.pWithBgColors,)
+	Quit ..DocSetRenderData(Doc, "DEFS", lbDataIn, .Template, .TransformType, .lbPPODKeywords, .lbXsltParams)
+]]></Implementation>
+</Method>
+
+<Method name="DefaultPDFName">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>OFFNr:%String,BronType:%String="F",Extension:%String="pdf"</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..#DocName_"_"_OFFNr_"_"_$ZD($H,8)_"."_Extension
+]]></Implementation>
+</Method>
+
 <Method name="BuildFileData">
 <Description>
 DocRef kan ofwel OFFNr zijn, ofwel lbDocs (list)
 Target: File, FileWWW, FileWWWUrl, TempFTP, Mail, TempMail</Description>
-<FormalSpec><![CDATA[Target:%String,&FName:%String,&Dir:%String,&FilePath:%String,DocRef:%String]]></FormalSpec>
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[Target:%String,&FName:%String,&Dir:%String,&FilePath:%String,DocRef:%String,BronType:%String="F"]]></FormalSpec>
 <Implementation><![CDATA[
 #define FullPath(%f,%d)   ##class(%File).NormalizeDirectory(%d)_%f
 #define OFFNr(%v)         $LG(%v,1)
+#define BRONTYPE(%v)      $LG(%v,2)
 	  ;d WLIP^vhDBG(97,"BuildFileData Main")
 
 	; First: Get DocNr from parameter: 
@@ -331,6 +406,7 @@
 	Else  If $$IsList^vhLib(DocRef) Do
 	. Set tmpLB=DocRef
 	. Set DocNr=$$$OFFNr(tmpLB)
+	. Set BronType=$$$BRONTYPE(tmpLB)
 	Else  Do
 	. Set DocNr=DocRef
 	
@@ -355,7 +431,7 @@
 	; Set values
 	If (FName="")||(Dir="") Do
 	. Set:(Dir="") Dir=##class(BL.Sys.FOP.CommonTasks).LoggedOnUserPath()   ; "E:\FOP\PDFTest\Factuur"
-	. Set:(FName="") FName=..DefaultPDFName($G(DocNr,"000000"))
+	. Set:(FName="") FName=..DefaultPDFName($G(DocNr,"000000"),BronType)
 	. Set FilePath=$$$FullPath(FName,Dir)
 	Else  Do
 	. Set:(FilePath="") FilePath=$$$FullPath(FName,Dir)
@@ -369,7 +445,7 @@
 	// OUTPUT: FName,Dir,FilePath
 	Set Dir=$$$FOPInetPubDir_$$$SubDir
 	Set FName=##class(%File).GetFilename($G(FilePath))
-	Set:(FName="") FName=..DefaultPDFName(DocNr)
+	Set:(FName="") FName=..DefaultPDFName(DocNr,BronType)
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
 	Quit
 bfdSetFileWWWUrl()
@@ -411,6 +487,47 @@
 	Quit
 ]]></Implementation>
 </Method>
+
+<UDLText name="T">
+<Content><![CDATA[
+/***   PRIVATE METHODS   *** /
+/***   ===============   *** /
+/***   ***/
+]]></Content>
+</UDLText>
+
+<Method name="CreateFopTaskOLD">
+<Description>
+Create Task-object</Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>lbOffertes:%List,TransformType:%String,pWithLogo:%Boolean=0</FormalSpec>
+<Private>1</Private>
+<ReturnType>Sys.FOP.Task</ReturnType>
+<Implementation><![CDATA[
+ /*   * /	
+	;New UserID,Taal,Task,TFType
+	Set UserID=##class(BL.Sys.FOP.CommonTasks).CurrentUserID()   ; 1007 = WimV 
+	Set Taal="N"
+	Set TFType=$S($$$UCase($G(TransformType))="PS":"PS", 1:"PDF")
+	Set Task=##class(BL.Sys.FOP.Interface).NewTask(,,UserID)
+	; Add emDoc + DataDefs
+	Set emDoc=Task.AddMainDoc("XML","",TFType,..#ADBTemplate,.Taal,$G(Options),$G(OptionsPDF))
+	If $IsObject(emDoc) Do
+	. Do emDoc.SetDataDefsLB($LB("CLS.MTH.XML",..%ClassName(1),"GetFopXML",lbOffertes))
+	. Set emDoc.XSLParameters=$$cftXSLParamsLB()
+	Quit Task
+cftXSLParamsLB()
+	Set pWithLogo=$G(pWithLogo,0)     ; pWithLogo
+	Set pWithOMR=""                   ; 
+	Set pWithBgColors=""              ; pWithBgColors=1
+	Set tmpLB=""
+	Set:($L(pWithLogo)    ) tmpLB=tmpLB_$LB("pWithLogo="_pWithLogo)
+	;Set:($L(pWithOMR)     ) tmpLB=tmpLB_$LB("pWithOMR"_pWithOMR)
+	Set:($L(pWithBgColors)) tmpLB=tmpLB_$LB("pWithBgColors="_pWithBgColors)
+	Quit tmpLB
+ /*   */
+]]></Implementation>
+</Method>
 </Class>
-<Checksum value="18659130"/>
+<Checksum value="3063068650"/>
 </Export>