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

SCHG#85828 Aanpassing transportkenmerken voor CNT in rapport en import

Browse Source 
svn path=/Database/trunk/; revision=67049
This commit is contained in:
Erik Groener
2024-11-15 11:01:59 +00:00
parent 709892b347
commit 89fc0f90a0
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
FAC/FAC_PACF.SRC
View File

@@ -18237,8 +18237,6 @@ BEGIN
flexmodule := 'RES';
ELSIF rec.bes_discipline IS NOT NULL THEN
flexmodule := 'BES';
ELSIF rec.cnt_discipline IS NOT NULL THEN
flexmodule := 'CNT';
ELSIF rec.ins_discipline IS NOT NULL THEN
flexmodule := 'INS';
ELSE
@@ -18950,11 +18948,14 @@ BEGIN
v_discipline_key := NULL;
v_errormsg := 'Fout bij bepalen contractsoort ' || rec.cnt_discipline;
SELECT ins_discipline_key
INTO v_discipline_key
FROM cnt_discipline
WHERE ins_discipline_verwijder IS NULL
AND ins_discipline_omschrijving = rec.cnt_discipline;
IF (rec.cnt_discipline IS NOT NULL OR rec.cnt_discipline != '')
THEN
SELECT ins_discipline_key
INTO v_discipline_key
FROM cnt_discipline
WHERE ins_discipline_verwijder IS NULL
AND ins_discipline_omschrijving = rec.cnt_discipline;
END IF;
v_desc := rec.srtkenmerk_omschrijving || ' (' || rec.cnt_discipline || ')';
-- Bestaat dit kenmerk al?
@@ -18963,9 +18964,12 @@ BEGIN
INTO v_count, v_kenmerk_key
FROM cnt_kenmerk
WHERE cnt_srtkenmerk_key = v_srtkenmerk_key
AND cnt_srtcontract_key = v_discipline_key
AND (cnt_kenmerk_omschrijving = rec.kenmerk_omschr
OR (rec.kenmerk_omschr IS NULL AND cnt_kenmerk_omschrijving IS NULL));
AND ( (cnt_srtcontract_key = v_discipline_key)
OR (v_discipline_key IS NULL AND cnt_srtcontract_key IS NULL)
)
AND ( (cnt_kenmerk_omschrijving = rec.kenmerk_omschr)
OR (rec.kenmerk_omschr IS NULL AND cnt_kenmerk_omschrijving IS NULL)
);
IF (v_count = 0)
THEN

2
FAC/FAC_VIE.SRC
View File

@@ -2150,7 +2150,7 @@ AS
WHERE km.cnt_srtkenmerk_key = kms.cnt_srtkenmerk_key
AND kms.fac_kenmerkdomein_key = kmd.fac_kenmerkdomein_key(+)
AND kmd.fac_usrtab_key = fut.fac_usrtab_key(+)
AND km.cnt_srtcontract_key = cd.ins_discipline_key
AND km.cnt_srtcontract_key = cd.ins_discipline_key(+)
AND km.cnt_kenmerk_verwijder IS NULL
AND kms.cnt_srtkenmerk_verwijder IS NULL
AND kmd.fac_kenmerkdomein_verwijder IS NULL