YPKN#56600 Effectief een revert van SVN:40826 uit 56050

svn path=/Website/branches/v2018.2/; revision=41009
This commit is contained in:
2019-02-15 14:38:10 +00:00
parent 2fe7ccf4ca
commit 8da0e7f09b

View File

@@ -565,15 +565,12 @@ oRs.close();
+ " || "+ lcl.xsqla('m1.ins_discipline_omschrijving', 'm1.ins_discipline_key')
+ " FROM mld_v_aanwezigdiscipline m1"
+ ", ins_srtdiscipline sd"
+ ", mld_disc_params dp"
+ " WHERE EXISTS (SELECT 'x'"
+ " FROM mld_stdmelding ms"
+ " WHERE m1.ins_discipline_key = ms.mld_ins_discipline_key"
+ " AND ms.mld_stdmelding_verwijder IS NULL)"
+ " AND m1.ins_srtdiscipline_key = sd.ins_srtdiscipline_key(+)"
+ " AND m1.ins_discipline_key IN (" + discsql_aut + ")"
+ " AND dp.mld_ins_discipline_key = m1.ins_discipline_key"
+ " AND BITAND(dp.mld_disc_params_srtgroep, 1) = 1" // Alleen primaire
+ (srtdisc != -1
? " AND m1.ins_discipline_key IN (SELECT ins_discipline_key"
+ " FROM mld_discipline"