KFSG#72652 Rap/Doorbelastingvinkje+KFSG#73667 CUST05-notijob/Bugfix

svn path=/Customer/trunk/; revision=56862
This commit is contained in:
Maarten van der Heide
2022-08-15 10:22:19 +00:00
parent 6dd382d629
commit ab69b1333d

View File

@@ -4473,14 +4473,13 @@ AS
rrr.res_reservering_key,
rrr.res_rsv_ruimte_key,
NULL xsender,
DECODE (d.ins_discipline_key, 218, 'Bastiaan.Brandenburg@schiphol.nl', 'FSP@schiphol.nl') xemail,
DECODE (rd.res_discipline_key, 218, 'Bastiaan.Brandenburg@schiphol.nl', 'FSP@schiphol.nl') xemail,
NULL xmobile,
NULL attachments
FROM fac_tracking t,
res_v_aanwezigrsv_ruimte rrr,
res_v_aanwezigrsv_deel rrd,
res_v_aanwezigdeel rd,
res_discipline d,
fac_srtnotificatie sn,
fac_notificatie_job nj
WHERE t.fac_srtnotificatie_key = 88 -- RESNEW
@@ -4488,7 +4487,7 @@ AS
--AND rrr.res_activiteit_key = -1
AND rrr.res_rsv_ruimte_key = rrd.res_rsv_ruimte_key
AND rrd.res_deel_key = rd.res_deel_key
AND d.ins_discipline_key IN (218, 1781) -- GPG/Yask Facility Management
AND rd.res_discipline_key IN (218, 1781) -- GPG/Yask Facility Management
AND sn.fac_srtnotificatie_code = 'CUST05'
AND nj.fac_notificatie_job_view = 'KFSG_V_NOTI_RESOBJ'
AND t.fac_tracking_datum > nj.fac_notificatie_job_lastrun;
@@ -4530,7 +4529,7 @@ AS
AND k.mld_srtkenmerk_key = 961) nr -- Inkoopnummer
WHERE o.mld_opdr_key = ko.mld_opdr_key
AND ko.mld_kenmerk_key = k.mld_kenmerk_key
AND k.mld_srtkenmerk_key = 2321 -- Intern doorbelasten
AND k.mld_srtkenmerk_key = 1821 -- Intern doorbelasten
AND ko.mld_kenmerkopdr_waarde = '1' -- Aangevinkt
AND o.mld_uitvoerende_keys = b.prs_bedrijf_key
AND o.mld_statusopdr_key = os.mld_statusopdr_key