From f3e127478caa38d4d689f204bfde29ca30345610 Mon Sep 17 00:00:00 2001 From: Sander Schepers Date: Thu, 15 Oct 2020 11:36:08 +0000 Subject: [PATCH] VEST#63484 Werkplekbudgetten svn path=/Customer/trunk/; revision=48488 --- VEST/vest.sql | 524 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 368 insertions(+), 156 deletions(-) diff --git a/VEST/vest.sql b/VEST/vest.sql index d77ef6259..37901251b 100644 --- a/VEST/vest.sql +++ b/VEST/vest.sql @@ -691,152 +691,298 @@ CREATE OR REPLACE VIEW vest_v_wpl_pstatus h2w_definitief, totaal_concept, totaal_definitief, - restbudget + restbudget, + budget_verval ) AS - SELECT p.prs_perslid_key, - p.prs_perslid_voornaam, - p.prs_perslid_naam, - p.prs_perslid_tussenvoegsel, - p.prs_perslid_voorletters, - p.prs_perslid_email, - p.prs_perslid_telefoonnr, - p.prs_perslid_mobiel, - p.prs_perslid_oslogin, - k.prs_kostenplaats_omschrijving, - a.prs_afdeling_naam, - f.prs_srtperslid_omschrijving, - b.budget, - b.extra_budget, - COALESCE (b.budget, 0) + COALESCE (b.extra_budget, 0) - AS totaal_budget, - (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) - FROM mld_kenmerkmelding kmm, - mld_kenmerk km, - mld_melding m, - mld_srtkenmerk sk - WHERE m.mld_melding_key = kmm.mld_melding_key - AND km.mld_kenmerk_key = kmm.mld_kenmerk_key - AND p.prs_perslid_key = m.prs_perslid_key_voor - AND km.mld_srtkenmerk_key = sk.mld_srtkenmerk_key - AND sk.mld_srtkenmerk_key = 237 -- Kenmerksoort totaal declaratie - AND m.mld_stdmelding_key = 361 -- Declaratieformulier - AND m.mld_melding_status IN (0, 2, 3, 4)) - AS declaratie_concept, - (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) - FROM mld_kenmerkmelding kmm, - mld_kenmerk km, - mld_melding m, - mld_srtkenmerk sk - WHERE m.mld_melding_key = kmm.mld_melding_key - AND km.mld_kenmerk_key = kmm.mld_kenmerk_key - AND p.prs_perslid_key = m.prs_perslid_key_voor - AND km.mld_srtkenmerk_key = sk.mld_srtkenmerk_key - AND sk.mld_srtkenmerk_key = 237 -- Kenmerksoort totaal declaratie - AND m.mld_stdmelding_key = 361 -- Declaratieformulier - AND m.mld_melding_status IN (5, 6)) - AS declaratie_definitief, - (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) - FROM mld_kenmerkmelding kmm, - mld_kenmerk km, - mld_melding m, - mld_srtkenmerk sk - WHERE m.mld_melding_key = kmm.mld_melding_key - AND km.mld_kenmerk_key = kmm.mld_kenmerk_key - AND p.prs_perslid_key = m.prs_perslid_key_voor - AND km.mld_srtkenmerk_key = sk.mld_srtkenmerk_key - AND sk.mld_srtkenmerk_key = 237 -- Kenmerksoort totaal declaratie - AND m.mld_stdmelding_key = 362 -- H2W - AND m.mld_melding_status IN (0, 2, 3, 4)) - AS h2w_concept, - (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) - FROM mld_kenmerkmelding kmm, - mld_kenmerk km, - mld_melding m, - mld_srtkenmerk sk - WHERE m.mld_melding_key = kmm.mld_melding_key - AND km.mld_kenmerk_key = kmm.mld_kenmerk_key - AND p.prs_perslid_key = m.prs_perslid_key_voor - AND km.mld_srtkenmerk_key = sk.mld_srtkenmerk_key - AND sk.mld_srtkenmerk_key = 237 -- Kenmerksoort totaal declaratie - AND m.mld_stdmelding_key = 362 -- H2W - AND m.mld_melding_status IN (5, 6)) - AS h2w_definitief, - (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) - FROM mld_kenmerkmelding kmm, - mld_kenmerk km, - mld_melding m, - mld_srtkenmerk sk - WHERE m.mld_melding_key = kmm.mld_melding_key - AND km.mld_kenmerk_key = kmm.mld_kenmerk_key - AND p.prs_perslid_key = m.prs_perslid_key_voor - AND km.mld_srtkenmerk_key = sk.mld_srtkenmerk_key - AND sk.mld_srtkenmerk_key = 237 -- Kenmerksoort totaal declaratie - AND m.mld_melding_status IN (0, 2, 3, 4)) - AS totaal_concept, - (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) - FROM mld_kenmerkmelding kmm, - mld_kenmerk km, - mld_melding m, - mld_srtkenmerk sk - WHERE m.mld_melding_key = kmm.mld_melding_key - AND km.mld_kenmerk_key = kmm.mld_kenmerk_key - AND p.prs_perslid_key = m.prs_perslid_key_voor - AND km.mld_srtkenmerk_key = sk.mld_srtkenmerk_key - AND sk.mld_srtkenmerk_key = 237 -- Kenmerksoort totaal declaratie - AND m.mld_melding_status IN (5, 6)) - AS totaal_definitief, - COALESCE (b.budget, 0) - COALESCE (b.extra_budget, 0) - - (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) - FROM mld_kenmerkmelding kmm, - mld_kenmerk km, - mld_melding m, - mld_srtkenmerk sk - WHERE m.mld_melding_key = kmm.mld_melding_key - AND km.mld_kenmerk_key = kmm.mld_kenmerk_key - AND p.prs_perslid_key = m.prs_perslid_key_voor - AND km.mld_srtkenmerk_key = sk.mld_srtkenmerk_key - AND sk.mld_srtkenmerk_key = 237 -- Kenmerksoort totaal declaratie - AND m.mld_melding_status IN (0, 2, 3, 4, 5, 6)) - AS restbudget - FROM (SELECT pa.prs_perslid_key, - (SELECT fac.safe_to_number (ud.fac_usrdata_prijs) - FROM prs_kenmerklink kml, - prs_kenmerk km, - fac_kenmerkdomein kd, - fac_usrdata ud - WHERE prs_link_key = pa.prs_perslid_key - AND kml.prs_kenmerk_key = km.prs_kenmerk_key - AND km.fac_kenmerkdomein_key = - kd.fac_kenmerkdomein_key - AND kd.fac_usrtab_key = ud.fac_usrtab_key - AND fac.safe_to_number (kml.prs_kenmerklink_waarde) = - ud.fac_usrdata_key - AND kml.prs_kenmerk_key = 1002) - budget, - (SELECT fac.safe_to_number (ud.fac_usrdata_prijs) - FROM prs_kenmerklink kml, - prs_kenmerk km, - fac_kenmerkdomein kd, - fac_usrdata ud - WHERE prs_link_key = pa.prs_perslid_key - AND kml.prs_kenmerk_key = km.prs_kenmerk_key - AND km.fac_kenmerkdomein_key = - kd.fac_kenmerkdomein_key - AND kd.fac_usrtab_key = ud.fac_usrtab_key - AND fac.safe_to_number (kml.prs_kenmerklink_waarde) = - ud.fac_usrdata_key - AND kml.prs_kenmerk_key = 1003) - extra_budget - FROM prs_v_aanwezigperslid pa) b, - prs_v_aanwezigperslid p, - prs_afdeling a, - prs_srtperslid f, - prs_kostenplaats k - WHERE p.prs_perslid_key = b.prs_perslid_key - AND a.prs_afdeling_key = p.prs_afdeling_key - AND f.prs_srtperslid_key = p.prs_srtperslid_key - AND a.prs_kostenplaats_key = k.prs_kostenplaats_key(+); +SELECT p.prs_perslid_key, + p.prs_perslid_voornaam, + p.prs_perslid_naam, + p.prs_perslid_tussenvoegsel, + p.prs_perslid_voorletters, + p.prs_perslid_email, + p.prs_perslid_telefoonnr, + p.prs_perslid_mobiel, + p.prs_perslid_oslogin, + k.prs_kostenplaats_omschrijving, + a.prs_afdeling_naam, + f.prs_srtperslid_omschrijving, + b.budget, + b.extra_budget, + COALESCE (b.budget, 0) + COALESCE (b.extra_budget, 0) AS totaal_budget, + (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) + FROM mld_kenmerkmelding kmm, + mld_kenmerk km, + mld_melding m, + mld_srtkenmerk sk + WHERE m.mld_melding_key = kmm.mld_melding_key + AND km.mld_kenmerk_key = kmm.mld_kenmerk_key + AND p.prs_perslid_key = m.prs_perslid_key_voor + AND km.mld_srtkenmerk_key = sk.mld_srtkenmerk_key + AND sk.mld_srtkenmerk_key = 237 -- Kenmerksoort totaal declaratie + AND m.mld_stdmelding_key = 361 -- Declaratieformulier + AND m.mld_melding_status IN (0, 2, 3, 4)) + AS declaratie_concept, + (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) + FROM mld_kenmerkmelding kmm, + mld_kenmerk km, + mld_melding m, + mld_srtkenmerk sk + WHERE m.mld_melding_key = kmm.mld_melding_key + AND km.mld_kenmerk_key = kmm.mld_kenmerk_key + AND p.prs_perslid_key = m.prs_perslid_key_voor + AND km.mld_srtkenmerk_key = sk.mld_srtkenmerk_key + AND sk.mld_srtkenmerk_key = 237 -- Kenmerksoort totaal declaratie + AND m.mld_stdmelding_key = 361 -- Declaratieformulier + AND m.mld_melding_status IN (5, 6)) + AS declaratie_definitief, + (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) + FROM mld_kenmerkmelding kmm, + mld_kenmerk km, + mld_melding m, + mld_srtkenmerk sk + WHERE m.mld_melding_key = kmm.mld_melding_key + AND km.mld_kenmerk_key = kmm.mld_kenmerk_key + AND p.prs_perslid_key = m.prs_perslid_key_voor + AND km.mld_srtkenmerk_key = sk.mld_srtkenmerk_key + AND sk.mld_srtkenmerk_key = 237 -- Kenmerksoort totaal declaratie + AND m.mld_stdmelding_key = 362 -- H2W + AND m.mld_melding_status IN (0, 2, 3, 4)) + AS h2w_concept, + (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) + FROM mld_kenmerkmelding kmm, + mld_kenmerk km, + mld_melding m, + mld_srtkenmerk sk + WHERE m.mld_melding_key = kmm.mld_melding_key + AND km.mld_kenmerk_key = kmm.mld_kenmerk_key + AND p.prs_perslid_key = m.prs_perslid_key_voor + AND km.mld_srtkenmerk_key = sk.mld_srtkenmerk_key + AND sk.mld_srtkenmerk_key = 237 -- Kenmerksoort totaal declaratie + AND m.mld_stdmelding_key = 362 -- H2W + AND m.mld_melding_status IN (5, 6)) + AS h2w_definitief, + (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) + FROM mld_kenmerkmelding kmm, + mld_kenmerk km, + mld_melding m, + mld_srtkenmerk sk + WHERE m.mld_melding_key = kmm.mld_melding_key + AND km.mld_kenmerk_key = kmm.mld_kenmerk_key + AND p.prs_perslid_key = m.prs_perslid_key_voor + AND km.mld_srtkenmerk_key = sk.mld_srtkenmerk_key + AND sk.mld_srtkenmerk_key = 237 -- Kenmerksoort totaal declaratie + AND m.mld_melding_status IN (0, 2, 3, 4)) + AS totaal_concept, + (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) + FROM mld_kenmerkmelding kmm, + mld_kenmerk km, + mld_melding m, + mld_srtkenmerk sk + WHERE m.mld_melding_key = kmm.mld_melding_key + AND km.mld_kenmerk_key = kmm.mld_kenmerk_key + AND p.prs_perslid_key = m.prs_perslid_key_voor + AND km.mld_srtkenmerk_key = sk.mld_srtkenmerk_key + AND sk.mld_srtkenmerk_key = 237 -- Kenmerksoort totaal declaratie + AND m.mld_melding_status IN (5, 6)) + AS totaal_definitief, + COALESCE (b.budget, 0) - COALESCE (b.extra_budget, 0) + - (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) + FROM mld_kenmerkmelding kmm, + mld_kenmerk km, + mld_melding m, + mld_srtkenmerk sk + WHERE m.mld_melding_key = kmm.mld_melding_key + AND km.mld_kenmerk_key = kmm.mld_kenmerk_key + AND p.prs_perslid_key = m.prs_perslid_key_voor + AND km.mld_srtkenmerk_key = sk.mld_srtkenmerk_key + AND sk.mld_srtkenmerk_key = 237 -- Kenmerksoort totaal declaratie + AND m.mld_melding_status IN (0, 2, 3, 4, 5, 6)) + AS restbudget, + b.budget_verval + FROM ( SELECT prs_perslid_key, + budget, + extra_budget, + SUM (mld_kenmerkmelding_waarde) AS budget_verval + FROM (SELECT prs_perslid_key, + budget, + extra_budget, + mld_kenmerkmelding_waarde, + factuurdatum, + mndverval, + MONTHS_BETWEEN (SYSDATE, + TO_DATE (factuurdatum, 'DD-MM-YYYY')) + mndtussen + FROM (SELECT pbudget.prs_perslid_key, + pbudget.budget, + pbudget.extra_budget, + kmmverv.mld_kenmerkmelding_waarde, + (SELECT MAX (fac_usrdata_volgnr) + FROM fac_usrdata + WHERE fac_usrdata_verwijder IS NULL + AND fac_usrtab_key = 141 + AND fac.safe_to_number ( + fac_usrdata_code) = + kmverv.mld_kenmerk_key) + mndverval, + DECODE ( + kmverv.mld_kenmerk_key, + 281, + (SELECT DISTINCT + fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 301 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = + mverv.mld_melding_key), + 282, + (SELECT DISTINCT + fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 302 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = + mverv.mld_melding_key), + 283, + (SELECT DISTINCT + fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 303 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = + mverv.mld_melding_key), + 284, + (SELECT DISTINCT + fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 304 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = + mverv.mld_melding_key), + 285, + (SELECT DISTINCT + fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 305 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = + mverv.mld_melding_key), + 286, + (SELECT DISTINCT + fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 306 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = + mverv.mld_melding_key), + 287, + (SELECT DISTINCT + fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 307 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = + mverv.mld_melding_key), + 288, + (SELECT DISTINCT + fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 308 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = + mverv.mld_melding_key), + 289, + (SELECT DISTINCT + fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 309 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = + mverv.mld_melding_key), + 290, + (SELECT DISTINCT + fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 310 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = + mverv.mld_melding_key), + 291, + (SELECT DISTINCT + fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 311 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = + mverv.mld_melding_key), + 292, + (SELECT DISTINCT + fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 312 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = + mverv.mld_melding_key), + NULL) + AS factuurdatum + FROM (SELECT pa.prs_perslid_key, + (SELECT fac.safe_to_number ( + ud.fac_usrdata_prijs) + FROM prs_kenmerklink kml, + prs_kenmerk km, + fac_kenmerkdomein kd, + fac_usrdata ud + WHERE prs_link_key = + pa.prs_perslid_key + AND kml.prs_kenmerk_key = + km.prs_kenmerk_key + AND km.fac_kenmerkdomein_key = + kd.fac_kenmerkdomein_key + AND kd.fac_usrtab_key = + ud.fac_usrtab_key + AND fac.safe_to_number(kml.prs_kenmerklink_waarde) = + ud.fac_usrdata_key + AND kml.prs_kenmerk_key = 1001) + budget, + (SELECT fac.safe_to_number ( + ud.fac_usrdata_prijs) + FROM prs_kenmerklink kml, + prs_kenmerk km, + fac_kenmerkdomein kd, + fac_usrdata ud + WHERE prs_link_key = + pa.prs_perslid_key + AND kml.prs_kenmerk_key = + km.prs_kenmerk_key + AND km.fac_kenmerkdomein_key = + kd.fac_kenmerkdomein_key + AND kd.fac_usrtab_key = + ud.fac_usrtab_key + AND fac.safe_to_number(kml.prs_kenmerklink_waarde) = + ud.fac_usrdata_key + AND kml.prs_kenmerk_key = 1002) + extra_budget + FROM prs_v_aanwezigperslid pa) pbudget, + mld_melding mverv, + mld_kenmerkmelding kmmverv, + mld_kenmerk kmverv + WHERE kmmverv.mld_melding_key = + mverv.mld_melding_key + AND kmverv.mld_kenmerk_key = + kmmverv.mld_kenmerk_key + AND kmverv.mld_srtkenmerk_key = 252 + AND mverv.prs_perslid_key_voor = + pbudget.prs_perslid_key)) + WHERE (TO_NUMBER (mndverval) < TO_NUMBER (mndtussen)) + GROUP BY prs_perslid_key, budget, extra_budget) b, + prs_v_aanwezigperslid p, + prs_afdeling a, + prs_srtperslid f, + prs_kostenplaats k + WHERE p.prs_perslid_key = b.prs_perslid_key(+) + AND a.prs_afdeling_key = p.prs_afdeling_key + AND f.prs_srtperslid_key = p.prs_srtperslid_key + AND a.prs_kostenplaats_key = k.prs_kostenplaats_key(+); CREATE OR REPLACE VIEW vest_v_wpl_declaraties ( @@ -897,22 +1043,88 @@ AS 4, x.fac_usrdata_omschr, 5, 'Goedgekeurd', 6, 'Goedgekeurd', - NULL), -- Er is een onderscheid tussen concept en + NULL), -- Er is een onderscheid tussen concept en ingediend via een kenmerk zodra de melding nog niet in behandeling is. (SELECT MAX (fac_tracking_datum) FROM fac_tracking t, fac_srtnotificatie sn WHERE t.fac_srtnotificatie_key = sn.fac_srtnotificatie_key AND sn.fac_srtnotificatie_code = 'MLDAFM' AND t.fac_tracking_refkey = m.mld_melding_key) AS datum_definitief, - (SELECT fac.safe_to_date (fkmm.mld_kenmerkmelding_waarde, - 'dd-mm-yyyy') - FROM mld_kenmerkmelding fkmm, - mld_kenmerk fkm, - mld_srtkenmerk fsk - WHERE fkmm.mld_kenmerk_key = fkm.mld_kenmerk_key - AND fsk.mld_srtkenmerk_key = fkm.mld_srtkenmerk_key - AND fsk.mld_srtkenmerk_key = 262 --factuurdatum - AND fkmm.mld_melding_key = m.mld_melding_key) + DECODE ( + km.mld_kenmerk_key, + 281, + (SELECT DISTINCT fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 301 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = m.mld_melding_key), + 282, + (SELECT DISTINCT fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 302 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = m.mld_melding_key), + 283, + (SELECT DISTINCT fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 303 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = m.mld_melding_key), + 284, + (SELECT DISTINCT fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 304 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = m.mld_melding_key), + 285, + (SELECT DISTINCT fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 305 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = m.mld_melding_key), + 286, + (SELECT DISTINCT fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 306 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = m.mld_melding_key), + 287, + (SELECT DISTINCT fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 307 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = m.mld_melding_key), + 288, + (SELECT DISTINCT fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 308 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = m.mld_melding_key), + 289, + (SELECT DISTINCT fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 309 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = m.mld_melding_key), + 290, + (SELECT DISTINCT fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 310 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = m.mld_melding_key), + 291, + (SELECT DISTINCT fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 311 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = m.mld_melding_key), + 292, + (SELECT DISTINCT fkmm.mld_kenmerkmelding_waarde + FROM mld_kenmerkmelding fkmm + WHERE fkmm.mld_kenmerk_key = 312 + AND fkmm.mld_kenmerkmelding_verwijder IS NULL + AND fkmm.mld_melding_key = m.mld_melding_key), + NULL) AS factuurdatum, p.budget, p.extra_budget, @@ -996,7 +1208,7 @@ AS AND skm.mld_srtkenmerk_key = km.mld_srtkenmerk_key AND m.mld_stdmelding_key IN (361, 362) AND skm.mld_srtkenmerk_key = 241 --srtkenmerk declaratie (hier zijn alle categorieen een afgeleide van) - AND m.mld_melding_status IN (0, 2, 3, 4, 5, 6) --Status 1 bewust niet meegenomen, anders zou dit als bedrag ook (onterecht mee gaan tellen) + AND m.mld_melding_status IN (0, 2, 3, 4, 5, 6) --Status 1 bewust niet meegenomen, anders zou dit als bedrag ook (onterecht) mee gaan tellen AND m.prs_perslid_key_voor = p.perslid_key); CREATE OR REPLACE VIEW vest_v_werkplekbudget @@ -1005,7 +1217,7 @@ CREATE OR REPLACE VIEW vest_v_werkplekbudget restbudget ) AS - SELECT ( ( (perslid_key + 382746) * 12835725) - 51), + SELECT perslid_key, restbudget AS restbudget FROM vest_v_wpl_declaraties GROUP BY perslid_key, restbudget;