diff --git a/VEST/vest.sql b/VEST/vest.sql index e4c50203a..83a154ae4 100644 --- a/VEST/vest.sql +++ b/VEST/vest.sql @@ -707,9 +707,61 @@ AS 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) + (SELECT fac.safe_to_number (ud.fac_usrdata_prijs) + FROM prs_kenmerklink kml, + prs_kenmerk km, + fac_kenmerkdomein kd, + fac_usrdata ud + WHERE kml.prs_link_key = p.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) --Kenmerk extra_budget + budget, + (SELECT fac.safe_to_number (ud.fac_usrdata_prijs) + FROM prs_kenmerklink kml, + prs_kenmerk km, + fac_kenmerkdomein kd, + fac_usrdata ud + WHERE kml.prs_link_key = p.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) --Kenmerk extra_budget + extra_budget, + COALESCE ( + (SELECT fac.safe_to_number (ud.fac_usrdata_prijs) + FROM prs_kenmerklink kml, + prs_kenmerk km, + fac_kenmerkdomein kd, + fac_usrdata ud + WHERE kml.prs_link_key = p.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), + 0) + + COALESCE ( + (SELECT fac.safe_to_number (ud.fac_usrdata_prijs) + FROM prs_kenmerklink kml, + prs_kenmerk km, + fac_kenmerkdomein kd, + fac_usrdata ud + WHERE kml.prs_link_key = p.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), + 0) AS totaal_budget, (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) FROM mld_kenmerkmelding kmm, @@ -787,7 +839,35 @@ AS AND sk.mld_srtkenmerk_key = 252 -- Kenmerksoort totaal declaratie AND m.mld_melding_status IN (5, 6)) AS totaal_definitief, - COALESCE (b.budget, 0) - COALESCE (b.extra_budget, 0) + COALESCE ( + (SELECT fac.safe_to_number (ud.fac_usrdata_prijs) + FROM prs_kenmerklink kml, + prs_kenmerk km, + fac_kenmerkdomein kd, + fac_usrdata ud + WHERE kml.prs_link_key = p.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), + 0) + + COALESCE ( + (SELECT fac.safe_to_number (ud.fac_usrdata_prijs) + FROM prs_kenmerklink kml, + prs_kenmerk km, + fac_kenmerkdomein kd, + fac_usrdata ud + WHERE kml.prs_link_key = p.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), + 0) - (SELECT COALESCE (SUM (kmm.mld_kenmerkmelding_waarde), 0) FROM mld_kenmerkmelding kmm, mld_kenmerk km,