FSN#42427: Afhandeling na afmelden wijzigen via setting mld_afrond_canremark

svn path=/Website/trunk/; revision=35381
This commit is contained in:
Jos Groot Lipman
2017-09-20 11:53:30 +00:00
parent 092e8d94c0
commit d5361046a0

View File

@@ -254,14 +254,16 @@ function mld_list (pautfunction, params)
? ", di.alg_district_omschrijving"
: "");
if (S("fac_reserved_number1") == 1)
if (S("mld_num_prefix_mode") == 1) // kostenplaats of afdeling
{
sqln += ", (SELECT prs_afdeling_naam"
+ " FROM prs_afdeling d"
+ " WHERE p.prs_afdeling_key = d.prs_afdeling_key) prs_afdeling_naam";
sqln += ", COALESCE((SELECT prs_kostenplaats_nr"
+ " FROM prs_kostenplaats k"
+ " WHERE m.prs_kostenplaats_key = k.prs_kostenplaats_key),"
+ " (SELECT prs_afdeling_naam"
+ " FROM prs_afdeling d"
+ " WHERE p.prs_afdeling_key = d.prs_afdeling_key)) mld_prefix";
}
sqln += ", sd.ins_srtdiscipline_prefix"
+ ", sd.ins_srtdiscipline_alg"
+ ", sd.ins_srtdiscipline_ins"
@@ -581,8 +583,8 @@ function mld_list (pautfunction, params)
function fncolKey(oRs)
{
var tekst = oRs("ins_srtdiscipline_prefix").Value + oRs("mld_melding_key").Value;
if (S("fac_reserved_number1") == 1)
tekst = oRs("prs_afdeling_naam") + "#" + tekst;
if (S("mld_num_prefix_mode") > 0 && oRs("mld_prefix").Value)
tekst = oRs("mld_prefix").Value + "#" + tekst;
if (oRs("mld_melding_parentkey").Value)
tekst += L("lcl_mld_references")+oRs("mld_melding_parentkey").Value;