SUTF#51690 bij versturen van opdrachten verkeerde vakgroep email als verzendadres

svn path=/Website/branches/v2017.2/; revision=36455
This commit is contained in:
Ruud Lipper
2017-12-28 11:51:34 +00:00
parent 3c0cccc11a
commit 29d7df3bad

View File

@@ -305,21 +305,37 @@ function bestandenlijstALL(pmodule, pniveau, pkey)
var mail_disc = null;
if (pmodule == "MLD")
{
var sql_v = "SELECT ins_discipline_email"
+ " , ins_discipline_email"
+ " , 3"
+ " FROM ins_tab_discipline d"
var sql_v = "SELECT ins_discipline_email"
+ " , ins_discipline_email"
+ " , 3";
if (pniveau== "M")
{
sql_v += " FROM ins_tab_discipline d"
+ " , mld_stdmelding s"
+ " , mld_melding m"
+ " WHERE d.ins_discipline_email IS NOT NULL"
+ " AND d.ins_discipline_key = s.mld_ins_discipline_key"
+ " AND s.mld_stdmelding_key = m.mld_stdmelding_key"
+ " AND m.mld_melding_key = " + pkey;
var oRs_v = Oracle.Execute(sql_v);
if (!oRs_v.eof)
mail_disc = oRs_v("ins_discipline_email").Value;
oRs_v.Close();
}
}
else if (pniveau== "O")
{
sql_v += " FROM ins_tab_discipline d"
+ " , mld_stdmelding s"
+ " , mld_melding m"
+ " , mld_opdr o"
+ " WHERE d.ins_discipline_email IS NOT NULL"
+ " AND d.ins_discipline_key = s.mld_ins_discipline_key"
+ " AND s.mld_stdmelding_key = m.mld_stdmelding_key"
+ " AND m.mld_melding_key = o.mld_melding_key"
+ " AND o.mld_opdr_key = " + pkey;
}
var oRs_v = Oracle.Execute(sql_v);
if (!oRs_v.eof)
mail_disc = oRs_v("ins_discipline_email").Value;
oRs_v.Close();
}
if (mailfrom && (S("replyaddress") || mail_disc))
{