From e811280dc370d04ecdbe6129ea89f05b5a9ea168 Mon Sep 17 00:00:00 2001 From: Maykel Geerdink Date: Tue, 17 May 2011 06:49:02 +0000 Subject: [PATCH] FSN#19687 svn path=/Customer/trunk/; revision=14791 --- RWSN/rwsn.sql | 12 +++--- SKAF/skaf.sql | 10 +++-- UWVA/uwva.sql | 109 ++++++++++++++++++++++++++++---------------------- VAND/vand.sql | 6 +-- 4 files changed, 76 insertions(+), 61 deletions(-) diff --git a/RWSN/rwsn.sql b/RWSN/rwsn.sql index b8244e969..c7247f531 100644 --- a/RWSN/rwsn.sql +++ b/RWSN/rwsn.sql @@ -1,8 +1,8 @@ -- Script containing customer specific configuration sql statements -- for RWSN: Rijkswaterstaat Nederland -- (c) 2008-2010 SG|Facilitor bv --- $Revision: 115 $ --- $Modtime: 16-05-11 15:30 $ +-- $Revision: 116 $ +-- $Modtime: 17-05-11 8:46 $ -- -- Support: +31 53 4800700 @@ -300,7 +300,7 @@ BEGIN p_applrun, 'I', 'Facilitor IDM_ORG import version ' || currentversion, - '$Revision: 115 $' + '$Revision: 116 $' ); -- How many active records are now present? @@ -1303,7 +1303,7 @@ BEGIN p_applrun, 'I', 'Facilitor IDM_PERS import version ' || currentversion, - '$Revision: 115 $' + '$Revision: 116 $' ); -- -- #Import @@ -7413,7 +7413,7 @@ AS COALESCE ( (SELECT ins_srtdiscipline_prefix || m.mld_melding_key FROM mld_melding m, - mld_stdmeldgin std, + mld_stdmelding std, ins_tab_discipline d, ins_srtdiscipline sd WHERE m.mld_stdmelding_key = std.mld_stdmelding_key @@ -16190,7 +16190,7 @@ AS AND k.res_srtkenmerk_key = sk.res_srtkenmerk_key AND sk.res_srtkenmerk_verwijder IS NULL; -BEGIN adm.systrackscript('$Workfile: rwsn.sql $', '$Revision: 115 $', 0); END; +BEGIN adm.systrackscript('$Workfile: rwsn.sql $', '$Revision: 116 $', 0); END; / BEGIN fac.registercustversion('RWSN', 37); END; / diff --git a/SKAF/skaf.sql b/SKAF/skaf.sql index dbe53606c..eb8a1248c 100644 --- a/SKAF/skaf.sql +++ b/SKAF/skaf.sql @@ -1,7 +1,7 @@ -- Script containing customer specific configuration sql statements for SKAF -- (c) 2009 SG|facilitor bv --- $Revision: 8 $ --- $Modtime: 4-01-11 16:47 $ +-- $Revision: 9 $ +-- $Modtime: 16-05-11 15:33 $ -- -- Support: +31 53 4800710 @@ -1398,10 +1398,12 @@ AS || '/' || o.mld_opdr_bedrijfopdr_volgnr FROM mld_melding m, + mld_stdmelding std, ins_tab_discipline d, ins_srtdiscipline sd WHERE m.mld_melding_key = o.mld_melding_key - AND m.mld_ins_discipline_key = d.ins_discipline_key + AND m.mld_stdmelding_key = std.mld_stdmelding_key + AND std.mld_ins_discipline_key = d.ins_discipline_key AND d.ins_srtdiscipline_key = sd.ins_srtdiscipline_key) ) @@ -2067,7 +2069,7 @@ END; -BEGIN adm.systrackscript('$Workfile: skaf.sql $', '$Revision: 8 $', 0); END; +BEGIN adm.systrackscript('$Workfile: skaf.sql $', '$Revision: 9 $', 0); END; / diff --git a/UWVA/uwva.sql b/UWVA/uwva.sql index 2d0a886c8..00063873a 100644 --- a/UWVA/uwva.sql +++ b/UWVA/uwva.sql @@ -2,8 +2,8 @@ -- Upgraded for version 5i -- -- (c) 2005-2010 SG|Facilitor bv --- $Revision: 420 $ --- $Modtime: 6-05-11 11:04 $ +-- $Revision: 421 $ +-- $Modtime: 16-05-11 9:24 $ -- -- Support: +31 53 4800700 @@ -665,7 +665,7 @@ BEGIN p_applrun, 'I', 'Facilitor KPN import version ' || currentversion, - '$Revision: 420 $'); + '$Revision: 421 $'); -- How many active records are now present? SELECT COUNT ( * ) @@ -1558,13 +1558,15 @@ AS v.ins_discipline_omschrijving, COUNT (*) aantal, MIN (l.alg_locatie_key) FROM mld_melding m, + mld_stdmelding std, alg_locatie l, alg_district d, ins_tab_discipline v, ins_srtdiscipline sv WHERE m.mld_alg_locatie_key = l.alg_locatie_key(+) AND d.alg_district_key(+) = l.alg_district_key - AND m.mld_ins_discipline_key = v.ins_discipline_key + AND m.mld_stdmelding_key = std.mld_stdmelding_key + AND std.mld_ins_discipline_key = v.ins_discipline_key AND sv.ins_srtdiscipline_key = v.ins_srtdiscipline_key AND m.mld_melding_datum > sysdate - 547 GROUP BY TO_CHAR (m.mld_melding_datum, 'YYMM'), @@ -1587,13 +1589,15 @@ AS sv.ins_srtdiscipline_omschrijving, v.ins_discipline_omschrijving, COUNT (*) aantal, MIN (l.alg_locatie_key) FROM mld_melding m, + mld_stdmelding std, alg_locatie l, alg_district d, ins_tab_discipline v, ins_srtdiscipline sv WHERE m.mld_alg_locatie_key = l.alg_locatie_key(+) AND d.alg_district_key(+) = l.alg_district_key - AND m.mld_ins_discipline_key = v.ins_discipline_key + AND m.mld_stdmelding_key = std.mld_stdmelding_key + AND std.mld_ins_discipline_key = v.ins_discipline_key AND sv.ins_srtdiscipline_key = v.ins_srtdiscipline_key AND m.mld_melding_datum > sysdate - 547 GROUP BY TO_CHAR (m.mld_melding_datum, 'YYMM'), @@ -2079,6 +2083,7 @@ SELECT m.mld_melding_key melding, m.mld_melding_omschrijving tekst_melding, l. AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key AND sk.mld_srtkenmerk_upper = 'BSN'), mld_melding m, + mld_stdmelding std, ins_tab_discipline td, alg_locatie l, alg_district d @@ -2089,7 +2094,8 @@ SELECT m.mld_melding_key melding, m.mld_melding_omschrijving tekst_melding, l. AND m.mld_melding_key = m5 AND m.mld_melding_key = m6 AND m.mld_melding_key = m7 - AND m.mld_ins_discipline_key = td.ins_discipline_key + AND m.mld_stdmelding_key = std.mld_stdmelding_key + AND std.mld_ins_discipline_key = td.ins_discipline_key AND td.ins_discipline_omschrijving = 'SBL - SpoBiLo' AND m.mld_alg_locatie_key = l.alg_locatie_key(+) AND l.alg_district_key = d.alg_district_key(+) @@ -7425,7 +7431,7 @@ AS WHERE s.mld_stdmelding_key = m.mld_stdmelding_key AND m.mld_alg_locatie_key = l.alg_locatie_key(+) AND sd.ins_srtdiscipline_key = md.ins_srtdiscipline_key - AND md.ins_discipline_key = m.mld_ins_discipline_key + AND md.ins_discipline_key = s.mld_ins_discipline_key AND l.alg_district_key = d.alg_district_key AND m.mld_melding_key = o.mld_melding_key(+)); @@ -8162,9 +8168,10 @@ AS || b.bes_bestelopdr_id || '";"' || (SELECT sd.ins_srtdiscipline_prefix || m.mld_melding_key || '/' || o.mld_opdr_bedrijfopdr_volgnr - FROM mld_melding m, ins_tab_discipline d, ins_srtdiscipline sd + FROM mld_melding m, mld_stdmelding std, ins_tab_discipline d, ins_srtdiscipline sd WHERE m.mld_melding_key = o.mld_melding_key - AND m.mld_ins_discipline_key = d.ins_discipline_key + AND m.mld_stdmelding_key = std.mld_stdmelding_key + AND std.mld_ins_discipline_key = d.ins_discipline_key AND d.ins_srtdiscipline_key = sd.ins_srtdiscipline_key) || '";"' || c.cnt_contract_nummer_intern @@ -8825,7 +8832,7 @@ AS 0 AS telaat, 0 nogopen FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_melding_status >= 4 AND fac.gettrackingdate ('MLDACP', m.mld_melding_key) <= @@ -8843,7 +8850,7 @@ AS 0 AS telaat, 0 nogopen FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_melding_status = 1 AND fac.gettrackingdate ('MLDREJ', m.mld_melding_key) <= @@ -8861,7 +8868,7 @@ AS COUNT ( * ) AS telaat, 0 nogopen FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_melding_status >= 4 AND fac.gettrackingdate ('MLDACP', m.mld_melding_key) > @@ -8879,7 +8886,7 @@ AS COUNT ( * ) AS telaat, 0 nogopen FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_melding_status = 1 AND fac.gettrackingdate ('MLDREJ', m.mld_melding_key) > @@ -8897,7 +8904,7 @@ AS 0 AS telaat, COUNT ( * ) AS nogopen FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_melding_status < 4 AND m.mld_melding_status > 1 @@ -8944,7 +8951,7 @@ AS 0 nogopen, l.alg_district_key FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s, alg_locatie l - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_alg_locatie_key = l.alg_locatie_key(+) AND m.mld_melding_status = 1 @@ -8965,7 +8972,7 @@ AS 0 nogopen, l.alg_district_key FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s, alg_locatie l - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_alg_locatie_key = l.alg_locatie_key(+) AND m.mld_melding_status >= 4 @@ -8986,7 +8993,7 @@ AS 0 nogopen, l.alg_district_key FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s, alg_locatie l - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_alg_locatie_key = l.alg_locatie_key(+) AND m.mld_melding_status >= 4 @@ -9007,7 +9014,7 @@ AS 0 nogopen, l.alg_district_key FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s, alg_locatie l - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_alg_locatie_key = l.alg_locatie_key(+) AND m.mld_melding_status = 1 @@ -9028,7 +9035,7 @@ AS COUNT ( * ) AS nogopen, l.alg_district_key FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s, alg_locatie l - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_alg_locatie_key = l.alg_locatie_key(+) AND m.mld_melding_status > 1 @@ -9249,7 +9256,7 @@ AS 0 AS afgewezen, 0 nogopen FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_melding_status IN (5, 6) AND fac.gettrackingdate ('MLDAFM', m.mld_melding_key) <= @@ -9268,7 +9275,7 @@ AS 0 AS afgewezen, 0 nogopen FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_melding_status IN (5, 6) AND fac.gettrackingdate ('MLDAFM', m.mld_melding_key) > @@ -9287,7 +9294,7 @@ AS 0 AS afgewezen, COUNT ( * ) AS nogopen FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_melding_status NOT IN (1, 5, 6) GROUP BY ins_discipline_key, @@ -9304,7 +9311,7 @@ AS COUNT ( * ) AS afgewezen, 0 nogopen FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_melding_status = 1 GROUP BY ins_discipline_key, @@ -9355,7 +9362,7 @@ AS 0 AS afgewezen, l.alg_district_key FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s, alg_locatie l - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_alg_locatie_key = l.alg_locatie_key(+) AND m.mld_melding_status IN (5, 6) @@ -9377,7 +9384,7 @@ AS 0 AS afgewezen, l.alg_district_key FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s, alg_locatie l - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_alg_locatie_key = l.alg_locatie_key(+) AND m.mld_melding_status IN (5, 6) @@ -9399,7 +9406,7 @@ AS 0 AS afgewezen, l.alg_district_key FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s, alg_locatie l - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_alg_locatie_key = l.alg_locatie_key(+) AND m.mld_melding_status NOT IN (1, 5, 6) @@ -9419,7 +9426,7 @@ AS COUNT ( * ) AS afgewezen, l.alg_district_key FROM uwva_v_discipline_sla d, mld_melding m, mld_stdmelding s, alg_locatie l - WHERE d.ins_discipline_key = m.mld_ins_discipline_key + WHERE d.ins_discipline_key = s.mld_ins_discipline_key AND m.mld_stdmelding_key = s.mld_stdmelding_key AND m.mld_alg_locatie_key = l.alg_locatie_key(+) AND m.mld_melding_status = 1 @@ -9473,7 +9480,7 @@ AS mld_stdmelding st, alg_locatie l WHERE m.mld_stdmelding_key = st.mld_stdmelding_key - AND m.mld_ins_discipline_key = d.ins_discipline_key + AND st.mld_ins_discipline_key = d.ins_discipline_key AND d.ins_srtdiscipline_key = 3 AND m.mld_alg_locatie_key = l.alg_locatie_key(+) AND m.mld_melding_status >= 4 @@ -9933,7 +9940,7 @@ BEGIN p_applrun, 'I', 'Facilitor BUDGETH import version ' || currentversion, - '$Revision: 420 $' + '$Revision: 421 $' ); FOR rec1 IN c_cursor @@ -10371,6 +10378,7 @@ AS WHERE m.mld_alg_locatie_key = l.alg_locatie_key) plaats FROM mld_melding m, + mld_stdmelding std, mld_discipline md, alg_v_onroerendgoed_gegevens v, alg_locatie l, @@ -10379,7 +10387,8 @@ AS WHERE m.mld_alg_locatie_key = l.alg_locatie_key(+) AND m.mld_alg_onroerendgoed_keys = v.alg_onroerendgoed_keys(+) AND m.prs_perslid_key = p.prs_perslid_key - AND m.mld_ins_discipline_key = md.ins_discipline_key + AND m.mld_stdmelding_key = std.mld_stdmelding_key + AND std.mld_ins_discipline_key = md.ins_discipline_key AND m.mld_melding_status IN (5) AND tr.fac_tracking_refkey = m.mld_melding_key AND tr.fac_srtnotificatie_key IN (SELECT fac_srtnotificatie_key @@ -10495,7 +10504,7 @@ AS AND m.mld_alg_locatie_key = l.alg_locatie_key(+) AND m.fac_activiteit_key IS NULL AND sd.ins_srtdiscipline_key = md.ins_srtdiscipline_key - AND md.ins_discipline_key = m.mld_ins_discipline_key + AND md.ins_discipline_key = std.mld_ins_discipline_key AND sd.ins_srtdiscipline_key = 4 AND m.mld_alg_onroerendgoed_keys = v.alg_onroerendgoed_keys(+) AND m.mld_melding_datum BETWEEN v_datum_van AND v_datum_tot; @@ -11015,10 +11024,11 @@ AS CURSOR copdr -- nu te sluiten opdrachten IS SELECT o.mld_opdr_key, o.mld_melding_key - FROM mld_opdr o, mld_melding m, mld_disc_params mdp + FROM mld_opdr o, mld_melding m, mld_stdmelding std, mld_disc_params mdp WHERE o.mld_statusopdr_key NOT IN (1, 6, 7, 9) -- vervallen/gesloten AND o.mld_melding_key = m.mld_melding_key - AND m.mld_ins_discipline_key = mdp.mld_ins_discipline_key + AND m.mld_stdmelding_key = std.mld_stdmelding_key + AND std.mld_ins_discipline_key = mdp.mld_ins_discipline_key AND mdp.mld_disc_params_noti_dagen IS NOT NULL AND o.mld_opdr_einddatum + mdp.mld_disc_params_noti_dagen + 1 < SYSDATE; @@ -11026,10 +11036,11 @@ AS CURSOR cmld -- nu te sluiten meldingen, maar alleen ZONDER OPEN OPDRACHTEN IS SELECT m.mld_melding_key - FROM mld_melding m, mld_disc_params mdp + FROM mld_melding m, mld_stdmelding std, mld_disc_params mdp WHERE m.mld_melding_status = 4 -- die nog niet al klaar zijn --AND m.mld_melding_status NOT IN (1, 5, 6) - AND m.mld_ins_discipline_key = mdp.mld_ins_discipline_key + AND m.mld_stdmelding_key = std.mld_stdmelding_key + AND std.mld_ins_discipline_key = mdp.mld_ins_discipline_key AND mdp.mld_disc_params_noti_dagen IS NOT NULL AND m.mld_melding_einddatum + mdp.mld_disc_params_noti_dagen @@ -11129,7 +11140,7 @@ BEGIN mld_kenmerk k, mld_srtkenmerk srtk WHERE mld_melding_datum < SYSDATE - 31 - AND M.MLD_INS_DISCIPLINE_KEY = + AND std.MLD_INS_DISCIPLINE_KEY = d.ins_discipline_key AND m.mld_stdmelding_key = std.mld_stdmelding_key @@ -14585,9 +14596,11 @@ AS 'ALG_OPENST_MELDING', (SELECT isd.ins_srtdiscipline_prefix FROM ins_srtdiscipline isd, - ins_tab_discipline ID + ins_tab_discipline ID, + mld_stdmelding std WHERE ID.ins_srtdiscipline_key = isd.ins_srtdiscipline_key - AND m.mld_ins_discipline_key = ID.ins_discipline_key) + AND m.mld_stdmelding_key = std.mld_stdmelding_key + AND std.mld_ins_discipline_key = ID.ins_discipline_key) || TO_CHAR (m.mld_melding_key), m.mld_melding_key, m.mld_alg_locatie_key @@ -25377,7 +25390,7 @@ BEGIN p_applrun, 'W', 'Gebruikerstabel werknemertype is onvolledig', - '$Revision: 420 $' + '$Revision: 421 $' ); END IF; @@ -25398,7 +25411,7 @@ BEGIN 'S', 'Facilitor ABS import versie ' || currentversion, - '$Revision: 420 $' + '$Revision: 421 $' ); -- Aantal potentieel matchbare personen in importbestand @@ -28349,7 +28362,7 @@ BEGIN 'S', 'Facilitor VINDER import versie ' || currentversion, - '$Revision: 420 $' + '$Revision: 421 $' ); -- Zijn de eigen tabellen RegioVinder en PandcodeRegio al aangemaakt? @@ -29749,7 +29762,7 @@ BEGIN p_applrun, 'W', 'Importtabel is leeg!', - currentversion || ', $Revision: 420 $' + currentversion || ', $Revision: 421 $' ); RETURN; END IF; @@ -29767,7 +29780,7 @@ BEGIN p_applrun, 'S', 'Provisioning-tabel (profielen): ' || v_count || ' regels verwijderd', - currentversion || ', $Revision: 420 $' + currentversion || ', $Revision: 421 $' ); -- *** Rol-->Profiel **************************************************************************** @@ -29852,7 +29865,7 @@ BEGIN p_applrun, 'S', 'Provisioning-tabel (profielen): ' || v_count || ' regels toegevoegd', - currentversion || ', $Revision: 420 $' + currentversion || ', $Revision: 421 $' ); EXCEPTION @@ -29917,7 +29930,7 @@ BEGIN p_applrun, 'W', 'Importtabel is leeg!', - currentversion || ', $Revision: 420 $' + currentversion || ', $Revision: 421 $' ); RETURN; END IF; @@ -29935,7 +29948,7 @@ BEGIN p_applrun, 'S', 'Provisioning-tabel (groepen): ' || v_count || ' regels verwijderd', - currentversion || ', $Revision: 420 $' + currentversion || ', $Revision: 421 $' ); -- *** Rol-->Groep **************************************************************************** @@ -30022,7 +30035,7 @@ BEGIN p_applrun, 'S', 'Provisioning-tabel (groepen): ' || v_count || ' regels toegevoegd', - currentversion || ', $Revision: 420 $' + currentversion || ', $Revision: 421 $' ); EXCEPTION @@ -30219,7 +30232,7 @@ AS AND ok.alg_kenmerk_key = 1020 -- LFM AND sn.fac_srtnotificatie_code = 'CUST10'; -BEGIN adm.systrackscript('$Workfile: uwva.sql $', '$Revision: 420 $', 0); END; +BEGIN adm.systrackscript('$Workfile: uwva.sql $', '$Revision: 421 $', 0); END; / BEGIN fac.registercustversion('UWVA', 58); END; / diff --git a/VAND/vand.sql b/VAND/vand.sql index 81c9f8032..6a05bc37a 100644 --- a/VAND/vand.sql +++ b/VAND/vand.sql @@ -1,7 +1,7 @@ -- Script containing customer specific configuration sql statements for VAND (Van Dijk Educatie) -- (c) 2008 Facilitor/Dijkoraad IT bv --- $Revision: 2 $ --- $Modtime: 17-06-10 16:48 $ +-- $Revision: 3 $ +-- $Modtime: 16-05-11 15:36 $ -- -- Support: +31 53 4800700 @@ -86,7 +86,7 @@ AS AND m.mld_alg_onroerendgoed_keys = v.alg_onroerendgoed_keys(+) AND m.prs_perslid_key = p.prs_perslid_key AND a.prs_afdeling_key = p.prs_afdeling_key - AND md.ins_discipline_key = m.mld_ins_discipline_key + AND md.ins_discipline_key = std.mld_ins_discipline_key AND std.mld_stdmelding_key = m.mld_stdmelding_key AND m.mld_melding_status = s.mld_statuses_key AND m.fac_activiteit_key IS NULL