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