admin/Database
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WOMA#73350 kostenplaats kan ook per taak overruled worden

Browse Source 
svn path=/Database/trunk/; revision=56625
This commit is contained in:
Peter Feij
2022-07-19 13:47:10 +00:00
parent ea1069866b
commit eea36cb99f
5 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
FAC/FAC_PACX.SRC
View File

@@ -3929,21 +3929,22 @@ AS
WHERE ins_srtcontrole_key = p_key
AND isc.ctr_discipline_key = cdp.ctr_ins_discipline_key;
-- check for effective exceptions and use those
-- check for effective exceptions and use those if overruled
IF p_deel_key IS NOT NULL
THEN
BEGIN
SELECT ins_srtcontroledl_xcp_key,
ins_srtcontroledl_xcp_periode,
ins_srtcontroledl_xcp_eenheid,
ins_srtcontroledl_xcp_bits,
ins_srtcontroledl_xcp_groep,
ins_srtcontroledl_xcp_eind,
ins_srtcontroledl_xcp_kosten,
ins_srtcontroledl_xcp_kosten2,
ins_srtcontroledl_xcp_kosten3,
ins_srtcontroledl_xcp_uren,
ins_srtcontroledl_xcp_materia
COALESCE(ins_srtcontroledl_xcp_periode, v_srtcontrole_periode),
COALESCE(ins_srtcontroledl_xcp_eenheid, v_srtcontrole_eenheid),
COALESCE(ins_srtcontroledl_xcp_bits, v_srtcontrole_bits),
COALESCE(ins_srtcontroledl_xcp_groep, v_srtcontrole_groep),
COALESCE(ins_srtcontroledl_xcp_eind, v_srtcontrole_eind)
COALESCE(ins_srtcontroledl_xcp_kosten, v_srtcontrole_kosten),
COALESCE(ins_srtcontroledl_xcp_kosten2, v_srtcontrole_kosten2),
COALESCE(ins_srtcontroledl_xcp_kosten3, v_srtcontrole_kosten3),
COALESCE(ins_srtcontroledl_xcp_uren, v_srtcontrole_uren),
COALESCE(ins_srtcontroledl_xcp_materia, v_srtcontrole_materiaal),
COALESCE(prs_kostenplaats_key, v_kostenplaats_key)
INTO v_srtcontroledl_xcp_key,
v_srtcontrole_periode,
v_srtcontrole_eenheid,
@@ -3954,7 +3955,8 @@ AS
v_srtcontrole_kosten2,
v_srtcontrole_kosten3,
v_srtcontrole_uren,
v_srtcontrole_materiaal
v_srtcontrole_materiaal,
v_kostenplaats_key
FROM ins_srtcontroledl_xcp
WHERE ins_deel_key = p_deel_key AND ins_srtcontrole_key = p_key;
EXCEPTION