Index: BL/Flow/Offerte/Parser/AbstractParserXML.cls.xml
===================================================================
diff -u -r1393 -r1395
--- BL/Flow/Offerte/Parser/AbstractParserXML.cls.xml	(.../AbstractParserXML.cls.xml)	(revision 1393)
+++ BL/Flow/Offerte/Parser/AbstractParserXML.cls.xml	(.../AbstractParserXML.cls.xml)	(revision 1395)
@@ -24,10 +24,6 @@
 	Do ..ImportXML(DirRead, FileName, DirTemp)
 	// Now convert the generic XML to a proxy object structure
 	
-	// Optional specific post-processing of the proxy
-	// Do ..PostprocessProxy()
-	// Set:..pxOfferte'="" offertes(1)=..pxOfferte
-	
 	If '$IsObject(..pxOfferte) {
 		Set ParserStatus=##class(ParseStatus).%New(100,"Geen offertes in het bestand")  ; geen inhoud
 	}
@@ -50,22 +46,22 @@
 	Set MSMGATEWAY=##Class(TECH.Config.ConfigMgr).Instance().GetString("MSMGATEWAY")
 	Set MSMGATEWAYFOP=##Class(TECH.Config.ConfigMgr).Instance().GetString("MSMGATEWAY_FOP")
 	
-	Do WL^vhDBG("  ImportXML:"_Dir_FileName)
 	Set DirByFOP=$$$ConvertToFop(Dir)
 	Set TempDirByFOP=$$$ConvertToFop(TempDir)
 	// Get the XSLT to use (implemented by specific parsers)
 	Set XSLT=..getXSLT()
 	If $G(XSLT)="" Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", "","Xml wrong filename "_FileName) Quit
 
 	// De XSL Transform on the input-xml 
-	Set sc=##class(BL.Sys.FOP.Interface).TransformXML(XSLT,DirByFOP_FileName,$LB($$$Replace(FileName,".xml",""),TempDirByFOP))
+	Set sc=##class(BL.Sys.FOP.Interface).TransformXML(XSLT, ##class(TECH.Files).AppendFile(DirByFOP,FileName), $LB($$$Replace(FileName,".xml",""), TempDirByFOP) )
 
 	H 5   ; 65   ; Allows the DocBase process to release the file-lock 
-	If $$$ISERR(sc)	Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", sc,"XSLTransform "_Dir_FileName_" XSLT:"_XSLT) Quit
+	If $$$ISERR(sc)	Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", sc,"XSLTransform "_##class(TECH.Files).AppendFile(Dir,FileName)_" XSLT:"_XSLT) Quit
 	; Else 
 
 	// De gegenereerde xml (=output van XSLT) inlezen in Caché 
 	Set sc=..ReadXML(TempDir,FileName)
+	  ;d WL^vhDBG("Result van Read XML : "_$$ParseStatus^vhLib(sc))
 
 	Set:($$$ISOK(sc)) Status=$$DELFILE^vhDEV(TempDir,FileName)   ; Delete the file after succelful processing
 	Quit
@@ -78,21 +74,22 @@
 	Set reader = ##class(%XML.Reader).%New()
 	
 	// Begin processing of the XML input 
-	Set sc=reader.OpenFile(Dir_FileName)
-	If $$$ISERR(sc)	Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", sc,"Openfile: "_Dir_FileName) Quit ""
+	Set FullFileName=##class(TECH.Files).AppendFile(Dir,FileName)
+	Set sc=reader.OpenFile(FullFileName)
+	If $$$ISERR(sc)	Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", sc,"Openfile: "_FullFileName) Quit ""
 
 	Do reader.Correlate("ORDER","BL.Flow.Offerte.pxHoofding") ;Associate a class name with the XML element name
-	If $$$ISERR(sc)	Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", sc,"Correlate: "_Dir_FileName) Quit ""
+	;If $$$ISERR(sc)	Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", sc,"Correlate: "_FullFileName) Quit ""
 
 	Set Count=0
 	For  Quit:'reader.Next(.pxOfferte,.sc)  Do  Quit:$$$ISERR(sc)
-	. If $$$ISERR(sc) Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", sc,"reader.Next: "_Dir_FileName) Quit
+	. If $$$ISERR(sc) Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", sc,"reader.Next: "_FullFileName) Quit
 	. Set Count=Count+1
 	. Set ..pxOfferte=pxOfferte
 	. Set sc=..PostprocessProxy()
 	. If $$$ISOK(sc) Set Offertes(Count)=..pxOfferte
-	. If $$$ISERR(sc) Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", sc,"PostprocessProxy: "_Dir_FileName) Quit
-	Quit:$$$ISERR(sc) ""
+	. If $$$ISERR(sc) Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", sc,"PostprocessProxy: "_FullFileName) Quit
+	Quit:$$$ISERR(sc) sc
 	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: BL/Flow/Offerte/ScanEDIMail.cls.xml
===================================================================
diff -u -r1074 -r1395
--- BL/Flow/Offerte/ScanEDIMail.cls.xml	(.../ScanEDIMail.cls.xml)	(revision 1074)
+++ BL/Flow/Offerte/ScanEDIMail.cls.xml	(.../ScanEDIMail.cls.xml)	(revision 1395)
@@ -45,19 +45,19 @@
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
 	Set blScan=..%New()
-	Set %ClientIP="192.168.1.15"
+	Set %ClientIP="192.168.1.97"
 	Lock +FlowXML2Offerte:1 Else  Quit ; exclusief gebruik
 	
 	If (##class(TECH.Config.ConfigMgr).Instance().GetString("BL.Flow.Offerte.ScanEDIMail_OpslaanInTestFolder"))	{
-	    Set TestPath=##class(TECH.Config.ConfigMgr).Instance().GetString("BL.Flow.Offerte.ScanEDIMail_TestFolderLocatie")
-    	Set DirRead=TestPath_..#SubPath
-	    Set DirArchive=TestPath_..#SubPath_..#ArchiveSubPath
-	    Set DirTemp=TestPath_..#SubPath_..#TempSubPath }
+	    Set PathMSMGATEWAY=##class(TECH.Config.ConfigMgr).Instance().GetString("BL.Flow.Offerte.ScanEDIMail_TestFolderLocatie")
+	}
 	Else {
-		Set MSMGATEWAY=##Class(TECH.Config.ConfigMgr).Instance().GetString("MSMGATEWAY")
-	    Set DirRead=MSMGATEWAY_..#SubPath
-	    Set DirArchive=MSMGATEWAY_..#SubPath_..#ArchiveSubPath
-	    Set DirTemp=MSMGATEWAY_..#SubPath_..#TempSubPath	}
+		Set PathMSMGATEWAY=##Class(TECH.Config.ConfigMgr).Instance().GetString("MSMGATEWAY")
+	}
+	Set BasePath=##class(TECH.Files).AppendFile(PathMSMGATEWAY,..#SubPath)
+	Set DirRead=BasePath
+    Set DirArchive=##class(TECH.Files).AppendFile(BasePath,..#ArchiveSubPath)
+    Set DirTemp=##class(TECH.Files).AppendFile(BasePath,..#TempSubPath)
 	    	
 	Do SCANDIR^vhDEV(DirRead,"*.*",$NA(Local),"") ; Opbouw van local met de bestandsnamen 
 	Set FileName=""
@@ -92,15 +92,15 @@
 		if parser="" Do
 		. Do AddErrorToLog^BL.EC.Common("EDI", "ScanEdiMail","","Er is geen parser voorzien voor het bestand "_FileName)
 		. Set From=$ZU(110)_"@VanHoecke.be"
-		. Set To=$LB("PV@VanHoecke.be")
+		. Set To=$LB("WV@VanHoecke.be")
 		. Set Subject=FileName_": EDI-verwerking mislukt"
 		. Set Body="Er is geen parser voorzien voor het bestand """_FileName_"""."
 		. Set sc=$$SendMiniMail^vhLib(From,To,Subject,Body,0)
 		Else  Do  ; Call parser
 		. Set result = parser.parse(.arOffertes)
 		. if result.HasError() Do
 		. . Set From=$ZU(110)_"@VanHoecke.be"
-		. . Set To=$LB("PV@VanHoecke.be")
+		. . Set To=$LB("WV@VanHoecke.be")
 		. . Set Subject=FileName_": EDI-verwerking mislukt"
 		. . Set Body=result.GetErrorMessage()
 		. . Set sc=$$SendMiniMail^vhLib(From,To,Subject,Body,0)
@@ -148,7 +148,7 @@
 	. Do blFlowOfferte.ControleAll(,"N")
 	. Do blFlowOfferte.SetOfferteStatus("W")
 	. Set Status=blFlowOfferte.Save()
-	. ;d WLIP^vhDBG(195,oOfferte.%Id())
+	.  ;d WL^vhDBG(oOfferte.%Id())
 	. Do:..MailEachOrder blFlowOfferte.Send2OrderVerwerking()
 	. ;Do:Status=1 WL^vhDBG("Flow.Offerte ID:"_oOfferte.%Id())
 	. ;Do:Status'=1 WL^vhDBG("Flow.Offerte saveerror:"_$$ParseStatus^vhLib(Status))
@@ -209,8 +209,9 @@
 	Set Body(1)="~Aantal orders: "_Aantal
 	Set Link=1
 	Set Link(1)="KL\"_..KLNr_"\R"
-	If ..DebugMode Set EMailGroep="jcl"
-	Else  Set EMailGroep="JRO;NBR" ;$$EMailGroep^KLOPV(..KLNr,"ORDVW") ; enkel naar "JRO;NBR" CW 18.05.10
+	Set EMailGroep = ##class(TECH.Config.ConfigMgr).Instance().GetString("ScanEDIMail_EmailGroep") ; JCL EMailGroep in config item
+	;If ..DebugMode Set EMailGroep="jcl"
+	;Else  Set EMailGroep="SCANEDIMAIL" ;$$EMailGroep^KLOPV(..KLNr,"ORDVW") ; enkel naar "JRO;NBR" CW 18.05.10
 	Set MailId=$$SYSTEM^vhMAIL("KL",..KLNr,Titel,EMailGroep,.Body,.Link,"U")
 ]]></Implementation>
 </Method>
@@ -222,7 +223,9 @@
 <FormalSpec>oOfferte:Flow.Offerte.Hoofding,pxAdres:BL.Flow.Offerte.pxAdres</FormalSpec>
 <Implementation><![CDATA[
 	Quit:'$isObject(pxAdres)
-	Set oAdres=oOfferte.GetAdres()
+	// FMA
+	//Set oAdres=oOfferte.GetAdres()
+	Set oAdres=oOfferte.LeveringsAdres
 	Set oAdres.Naam=pxAdres.Naam
 	Set oAdres.PostNummer=pxAdres.PostNummer
 	Set oAdres.Woonplaats=pxAdres.Woonplaats
Index: BL/Flow/Offerte/Parser/bizSFSSERVICES.cls.xml
===================================================================
diff -u -r1386 -r1395
--- BL/Flow/Offerte/Parser/bizSFSSERVICES.cls.xml	(.../bizSFSSERVICES.cls.xml)	(revision 1386)
+++ BL/Flow/Offerte/Parser/bizSFSSERVICES.cls.xml	(.../bizSFSSERVICES.cls.xml)	(revision 1395)
@@ -18,5 +18,10 @@
 <Implementation><![CDATA[	Quit ..#XLSTSFSOrder
 ]]></Implementation>
 </Method>
+
+<Method name="PostprocessProxy">
+<Implementation><![CDATA[ 	Quit $$$OK
+]]></Implementation>
+</Method>
 </Class>
 </Export>