FCLT#57347 Gevolgschade nieuw Checkbox-kenmerktype

svn path=/Customer/trunk/; revision=42022
This commit is contained in:
Maarten van der Heide
2019-04-09 12:00:25 +00:00
parent 3fe27fb5ac
commit bc18d7b55e

View File

@@ -19295,13 +19295,13 @@ AS
INTO v_srtkenmerk_key
FROM ins_v_aanwezigsrtkenmerk
WHERE ins_srtkenmerk_upper = UPPER (kw)
AND ins_srtkenmerk_kenmerktype IN ('C', 'D', 'N', 'R', 'S');
AND ins_srtkenmerk_kenmerktype IN ('C', 'D', 'N', 'R', 'S', 'V');
ELSE -- kenmerkwaarde is numeriek (dus key)!
SELECT ins_srtkenmerk_key
INTO v_srtkenmerk_key
FROM ins_v_aanwezigsrtkenmerk
WHERE ins_srtkenmerk_key = fac.safe_to_number (kw)
AND ins_srtkenmerk_kenmerktype IN ('C', 'D', 'N', 'R', 'S');
AND ins_srtkenmerk_kenmerktype IN ('C', 'D', 'N', 'R', 'S', 'V');
END IF;
RETURN v_srtkenmerk_key;
@@ -27067,7 +27067,7 @@ AS
FROM alg_kenmerk k
WHERE k.alg_kenmerk_verwijder IS NULL
AND k.alg_kenmerk_niveau = 'G'
AND k.alg_kenmerk_kenmerktype IN ('C', 'D', 'N', 'R', 'S', 'X', 'B')
AND k.alg_kenmerk_kenmerktype IN ('C', 'D', 'N', 'R', 'S', 'X', 'B', 'V')
ORDER BY 3)) k
LEFT JOIN
(SELECT ok.alg_kenmerk_key, ok.alg_onrgoed_key,
@@ -27648,7 +27648,7 @@ AS
OR (k.ins_kenmerk_niveau = 'G' AND k.ins_srtinstallatie_key = sg.ins_srtgroep_key)
OR (k.ins_kenmerk_niveau = 'D' AND k.ins_srtinstallatie_key = 2101)) -- Rijdend materieel
AND k.ins_srtkenmerk_key = sk.ins_srtkenmerk_key
AND sk.ins_srtkenmerk_kenmerktype IN ('C', 'D', 'N', 'R', 'S', 'X', 'B')
AND sk.ins_srtkenmerk_kenmerktype IN ('C', 'D', 'N', 'R', 'S', 'X', 'B', 'V')
ORDER BY k.ins_kenmerk_volgnummer)) sk
LEFT JOIN
(SELECT sk.ins_srtkenmerk_key, kd.ins_deel_key,