Index: BL/Flow/Offerte/Parser/AbstractParserXML.cls.xml
===================================================================
diff -u -r1404 -r1683
--- BL/Flow/Offerte/Parser/AbstractParserXML.cls.xml	(.../AbstractParserXML.cls.xml)	(revision 1404)
+++ BL/Flow/Offerte/Parser/AbstractParserXML.cls.xml	(.../AbstractParserXML.cls.xml)	(revision 1683)
@@ -71,27 +71,24 @@
 <Method name="ReadXML">
 <FormalSpec>Dir,FileName</FormalSpec>
 <Implementation><![CDATA[
+	set sc=$$$OK
+	
 	Set reader = ##class(%XML.Reader).%New()
-	  d WLIP^vhDBG(97,"Read xml")
 	
 	// Begin processing of the XML input 
 	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 ""
+	If $$$ISERR(sc)	Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", sc,"Openfile: "_FullFileName) Quit sc
 
 	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: "_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: "_FullFileName) Quit
-	. Set Count=Count+1
+	. If $$$ISERR(sc) Set Info = "reader.Next: "_FullFileName Quit
 	. 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: "_FullFileName) Quit
-	Quit:$$$ISERR(sc) sc
-	Quit $$$OK
+	. If $$$ISERR(sc) Set Info = "PostprocessProxy: "_FullFileName Quit
+	if $$$ISERR(sc) Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", sc,$get(Info))
+	Quit sc
 ]]></Implementation>
 </Method>
 
Index: vhDeploy/JCL/D20110714x0947.cls.xml
===================================================================
diff -u
--- vhDeploy/JCL/D20110714x0947.cls.xml	(revision 0)
+++ vhDeploy/JCL/D20110714x0947.cls.xml	(revision 1683)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhDeploy.JCL.D20110714x0947">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>svn.Deploy</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Parameter name="Omschrijving">
+<Default>Instellen config item BL.Flow.Offerte.ScanEDIMail_MailErrorNaar</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	If ##class(TECH.Config.ConfigMgr).Instance().GetOmgeving()["DEV" {
+		Set LokaleDefaultMail=##class(TECH.Config.ConfigMgr).Instance().GetString("TECH.Error.impl.ErrorHandler_DefaultMailAddress")
+		
+		Set Sleutel="BL.Flow.Offerte.ScanEDIMail_MailErrorNaar"
+		Do:('(##class(TECH.Config.ConfigMgr).Instance().BestaatSleutel(Sleutel))) ##class(TECH.Config.ConfigMgr).Instance().SetString(Sleutel,LokaleDefaultMail)
+	}
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: BL/Flow/Offerte/ScanEDIMail.cls.xml
===================================================================
diff -u -r1671 -r1683
--- BL/Flow/Offerte/ScanEDIMail.cls.xml	(.../ScanEDIMail.cls.xml)	(revision 1671)
+++ BL/Flow/Offerte/ScanEDIMail.cls.xml	(.../ScanEDIMail.cls.xml)	(revision 1683)
@@ -31,11 +31,6 @@
 <InitialExpression>0</InitialExpression>
 </Property>
 
-<Property name="MailEachOrder">
-<Type>%Boolean</Type>
-<InitialExpression>1</InitialExpression>
-</Property>
-
 <Property name="Parser">
 <Type>BL.Flow.Offerte.Parser.AbstractParser</Type>
 </Property>
@@ -90,22 +85,17 @@
 <Method name="ProcessFile">
 <FormalSpec>DirRead,FileName,DirTemp,DirArchive</FormalSpec>
 <Implementation><![CDATA[
+	
 	// Create a parser
-	Set ..MailEachOrder = 0
 	Set parser = ##class(BL.Flow.Offerte.Parser.AbstractParser).createParser(DirRead,FileName,DirTemp)
 	if $$$Not($IsObject(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("ICT_ImportEDIerrors@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 ..Parser=parser
 	. Set result = parser.parse(.arOffertes)
 	. if result.HasError() Do
-	. . Set From=$ZU(110)_"@VanHoecke.be"
-	. . Set To=$LB("ICT_ImportEDIerrors@vanhoecke.be")
+	. . Set From=$$$SystemMail("ScanEDIMail")
+	. . Set To=$LB(##class(TECH.Config.ConfigMgr).Instance().GetString("BL.Flow.Offerte.ScanEDIMail_MailErrorNaar"))
 	. . Set Subject=FileName_": EDI-verwerking mislukt"
 	. . Set Body=result.GetErrorMessage()
 	. . Set sc=$$SendMiniMail^vhLib(From,To,Subject,Body,0)
@@ -129,15 +119,15 @@
 <Implementation><![CDATA[
 	#define TrimXML(%v)   $TR($$$Trim(%v),$C(0),"")
 	
+	set listOfferteIDs = ##class(%ListOfDataTypes).%New()
+	
 	 ;d WL^vhDBG("Conversie van proxyclass gestart")
-	Set vnr="",OrderCnt=0
+	Set vnr=""
 	For  set vnr=$O(Offertes(vnr)) Quit:vnr=""  Do
-	. Set OrderCnt=OrderCnt+1
 	. Set ..pxOfferte=Offertes(vnr)
 	. $$$blFlowOfferte
 	. Set blFlowOfferte=%blFlowOfferte  ;Kill %blFlowOfferte
 	. Set (..KLNr,KlantNr)=..pxOfferte.KlantID ; de XML kan rechtstreeks de klant nr definieren
-	. ;Set KlantNr=..DefineKlant()
 	. If 'KlantNr Do  Quit
 	. Do blFlowOfferte.Create(KlantNr,"EDI")
 	. Set oOfferte=blFlowOfferte.oOfferte
@@ -163,14 +153,12 @@
 	. Do blFlowOfferte.ControleAll(,"N")
 	. Do blFlowOfferte.SetOfferteStatus("W")
 	. Set Status=blFlowOfferte.Save()
-	.  ;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))
-	. If Status'=1 Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", Status,"Opslaan Flow.Offerte"_$$ObjToText^vhLib(blFlowOfferte.oOfferte))
+	. if Status do listOfferteIDs.Insert(oOfferte.%Id())
+	. else  Do AddErrorToLog^BL.EC.Common("EDI", "XML2Offerte", Status,"Opslaan Flow.Offerte"_$$ObjToText^vhLib(blFlowOfferte.oOfferte))
 	. Kill %blFlowOfferte
-	Do ..Mail2OrderVerwerking(OrderCnt)
 	
+	Do ..Mail2OrderVerwerking(listOfferteIDs)
+	
 	Quit
 ]]></Implementation>
 </Method>
@@ -226,16 +214,16 @@
 </Method>
 
 <Method name="Mail2OrderVerwerking">
-<FormalSpec>Aantal</FormalSpec>
-<ProcedureBlock>0</ProcedureBlock>
+<FormalSpec>listOfferteIDs:%ListOfDataTypes</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	$$$InitOldLocals
-	New KLNr,Titel,Body,Link
+	;$$$InitOldLocals
+	;New KLNr,Titel,Body,Link
 	Set Titel="Import EDI "_..KLNr
-	Set Body(1)="~Aantal orders: "_Aantal
+	Set Body(1)="~Aantal orders: "_listOfferteIDs.Size
 	Set Link=1
 	Set Link(1)="KL\"_..KLNr_"\R"
-	Set:Aantal=1 Link(2)="FLOWOFF\"_oOfferte.%Id()_"\I"
+	if listOfferteIDs.Size = 1 Set Link(2)="FLOWOFF\"_listOfferteIDs.GetAt(1)_"\I"
 	Set EMailGroep=$$EMailGroep^KLOPV(..KLNr,"SCANEDIMAIL")
 	Set MailId=$$SYSTEM^vhMAIL("KL",..KLNr,Titel,EMailGroep,.Body,.Link,"U")
 ]]></Implementation>