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

YKPN#88810 Uitschakelen van het kunnen boeken van facturen op een contract

Browse Source 
svn path=/Database/trunk/; revision=71137
This commit is contained in:
Erik Groener
2025-12-03 14:35:03 +00:00
parent c308e8efd6
commit 1d62bb6a5f
2 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
FAC/FAC_PACF.SRC
View File

@@ -20274,31 +20274,32 @@ AS
, fac_imp_csv_col30 VERDIEPINGCODE
, fac_imp_csv_col31 RUIMTECODE
, fac_imp_csv_col32 VERLENGEN
, fac_imp_csv_col33 flex_01
, fac_imp_csv_col34 flex_02
, fac_imp_csv_col35 flex_03
, fac_imp_csv_col36 flex_04
, fac_imp_csv_col37 flex_05
, fac_imp_csv_col38 flex_06
, fac_imp_csv_col39 flex_07
, fac_imp_csv_col40 flex_08
, fac_imp_csv_col41 flex_09
, fac_imp_csv_col42 flex_10
, fac_imp_csv_col43 flex_11
, fac_imp_csv_col44 flex_12
, fac_imp_csv_col45 flex_13
, fac_imp_csv_col46 flex_14
, fac_imp_csv_col47 flex_15
, fac_imp_csv_col48 flex_16
, fac_imp_csv_col49 flex_17
, fac_imp_csv_col50 flex_18
, fac_imp_csv_col51 flex_19
, fac_imp_csv_col52 flex_20
, fac_imp_csv_col53 flex_21
, fac_imp_csv_col54 flex_22
, fac_imp_csv_col55 flex_23
, fac_imp_csv_col56 flex_24
, fac_imp_csv_col57 flex_25
, fac_imp_csv_col33 FACTUURBOEKEN
, fac_imp_csv_col34 flex_01
, fac_imp_csv_col35 flex_02
, fac_imp_csv_col36 flex_03
, fac_imp_csv_col37 flex_04
, fac_imp_csv_col38 flex_05
, fac_imp_csv_col39 flex_06
, fac_imp_csv_col40 flex_07
, fac_imp_csv_col41 flex_08
, fac_imp_csv_col42 flex_09
, fac_imp_csv_col43 flex_10
, fac_imp_csv_col44 flex_11
, fac_imp_csv_col45 flex_12
, fac_imp_csv_col46 flex_13
, fac_imp_csv_col47 flex_14
, fac_imp_csv_col48 flex_15
, fac_imp_csv_col49 flex_16
, fac_imp_csv_col50 flex_17
, fac_imp_csv_col51 flex_18
, fac_imp_csv_col52 flex_19
, fac_imp_csv_col53 flex_20
, fac_imp_csv_col54 flex_21
, fac_imp_csv_col55 flex_22
, fac_imp_csv_col56 flex_23
, fac_imp_csv_col57 flex_24
, fac_imp_csv_col58 flex_25
FROM fac_imp_csv
WHERE fac_imp_csv_index > 1
AND fac_import_key = p_import_key;
@@ -20347,6 +20348,7 @@ AS
v_verdiepingcode alg_verdieping.alg_verdieping_volgnr%TYPE; --NUMBER(3)
v_ruimtecode alg_ruimte.alg_ruimte_nr%TYPE; --VARCHAR2(20)
v_verlengen cnt_contract.cnt_contract_verlenging%TYPE; --NUMBER(1)
v_factuurboeken cnt_disc_params.cnt_disc_params_factuurboeken%TYPE; --NUMBER(1)
v_cnt_kenmerk_01 fac_imp_cnt.flex1%TYPE; --VARCHAR2(255);
v_cnt_kenmerk_02 fac_imp_cnt.flex2%TYPE; --VARCHAR2(255);
@@ -20380,7 +20382,7 @@ AS
|| 'OPZEGDATUM;EINDDATUM;SOORT_CONTACTPARTIJ;BEDRIJFSNAAM;CONTACTNAAM;'
|| 'KOSTENPLAATSCODE;KOSTENSOORTCODE;CONTRACTBEDRAG;TERMIJNBEDRAG;UURTARIEF;'
|| 'KORTING;LOCATIECODE;TERREINCODE;GEBOUWCODE;VERDIEPINGCODE;'
|| 'RUIMTECODE;VERLENGEN';
|| 'RUIMTECODE;VERLENGEN;FACTUURBOEKEN';
v_header_csv VARCHAR2(500);
v_flex_naam_01 fac_imp_cnt.flex1%TYPE;
@@ -20519,14 +20521,14 @@ BEGIN
fac_imp_csv_col16 ||';'|| fac_imp_csv_col17 ||';'|| fac_imp_csv_col18 ||';'|| fac_imp_csv_col19 ||';'|| fac_imp_csv_col20 ||';'||
fac_imp_csv_col21 ||';'|| fac_imp_csv_col22 ||';'|| fac_imp_csv_col23 ||';'|| fac_imp_csv_col24 ||';'|| fac_imp_csv_col25 ||';'||
fac_imp_csv_col26 ||';'|| fac_imp_csv_col27 ||';'|| fac_imp_csv_col28 ||';'|| fac_imp_csv_col29 ||';'|| fac_imp_csv_col30 ||';'||
fac_imp_csv_col31 ||';'|| fac_imp_csv_col32
fac_imp_csv_col31 ||';'|| fac_imp_csv_col32 ||';'|| fac_imp_csv_col33
), ' ', '')
, fac_imp_csv_col33, fac_imp_csv_col34, fac_imp_csv_col35, fac_imp_csv_col36, fac_imp_csv_col37
, fac_imp_csv_col38, fac_imp_csv_col39, fac_imp_csv_col40, fac_imp_csv_col41, fac_imp_csv_col42
, fac_imp_csv_col43, fac_imp_csv_col44, fac_imp_csv_col45, fac_imp_csv_col46, fac_imp_csv_col47
, fac_imp_csv_col48, fac_imp_csv_col49, fac_imp_csv_col50, fac_imp_csv_col51, fac_imp_csv_col52
, fac_imp_csv_col53, fac_imp_csv_col54, fac_imp_csv_col55, fac_imp_csv_col56, fac_imp_csv_col57
INTO v_header_csv -- standaard header
, fac_imp_csv_col34, fac_imp_csv_col35, fac_imp_csv_col36, fac_imp_csv_col37, fac_imp_csv_col38
, fac_imp_csv_col39, fac_imp_csv_col40, fac_imp_csv_col41, fac_imp_csv_col42, fac_imp_csv_col43
, fac_imp_csv_col44, fac_imp_csv_col45, fac_imp_csv_col46, fac_imp_csv_col47, fac_imp_csv_col48
, fac_imp_csv_col49, fac_imp_csv_col50, fac_imp_csv_col51, fac_imp_csv_col52, fac_imp_csv_col53
, fac_imp_csv_col54, fac_imp_csv_col55, fac_imp_csv_col56, fac_imp_csv_col57, fac_imp_csv_col58
INTO v_header_csv -- standaard header
, v_flex_naam_01, v_flex_naam_02, v_flex_naam_03, v_flex_naam_04, v_flex_naam_05 -- kenmerk kolom namen
, v_flex_naam_06, v_flex_naam_07, v_flex_naam_08, v_flex_naam_09, v_flex_naam_10
, v_flex_naam_11, v_flex_naam_12, v_flex_naam_13, v_flex_naam_14, v_flex_naam_15
@@ -20963,6 +20965,17 @@ BEGIN
v_ongeldig := 1;
END IF;
-- CSV-kolom AG: Controle op geldige waarde voor factuurboeken
v_factuurboeken := fac.safe_to_number(rec.factuurboeken);
IF v_factuurboeken NOT IN (0,1)
THEN
fac.imp_writelog( p_import_key, 'W'
, v_aanduiding || 'Factuurboeken - Ongeldige waarde'
, rec.fac_imp_csv_index || ' - ' || rec.factuurboeken || ', Regel wordt overgeslagen'
);
v_ongeldig := 1;
END IF;
-- De flexkenmerkwaarden
v_cnt_kenmerk_01 := kenmerk_waarde(p_import_key, rec.fac_imp_csv_index, v_aanduiding, v_flex_naam_01, rec.flex_01);
v_cnt_kenmerk_02 := kenmerk_waarde(p_import_key, rec.fac_imp_csv_index, v_aanduiding, v_flex_naam_02, rec.flex_02);
@@ -21034,6 +21047,7 @@ BEGIN
, verdiepingcode
, ruimtecode
, verlengen
, factuurboeken
, flex1, flex2, flex3, flex4, flex5
, flex6, flex7, flex8, flex9, flex10
, flex11, flex12, flex13, flex14, flex15
@@ -21072,6 +21086,7 @@ BEGIN
, v_verdiepingcode
, v_ruimtecode
, v_verlengen
, v_factuurboeken
, v_cnt_kenmerk_01, v_cnt_kenmerk_02, v_cnt_kenmerk_03, v_cnt_kenmerk_04, v_cnt_kenmerk_05
, v_cnt_kenmerk_06, v_cnt_kenmerk_07, v_cnt_kenmerk_08, v_cnt_kenmerk_09, v_cnt_kenmerk_10
, v_cnt_kenmerk_11, v_cnt_kenmerk_12, v_cnt_kenmerk_13, v_cnt_kenmerk_14, v_cnt_kenmerk_15
@@ -21162,6 +21177,7 @@ AS
, i.verdiepingcode
, i.ruimtecode
, i.verlengen
, i.factuurboeken
, disc.ins_discipline_key
, mntl.cnt_contract_key mantel_key
, d.prs_dienst_key
@@ -21262,6 +21278,7 @@ AS
, a.verdiepingcode
, a.ruimtecode
, a.verlengen
, a.factuurboeken
, a.flex1 cnt_kenmerkwaarde1
, a.flex2 cnt_kenmerkwaarde2
, a.flex3 cnt_kenmerkwaarde3
@@ -21863,10 +21880,15 @@ BEGIN
v_cnt_discipline_key := rec.ins_discipline_key;
END IF;
-- Nu de contractsoort bekend is kunnen ook de overige gegevens bij het contractsoort worden toegevoegd.
UPDATE cnt_disc_params
SET cnt_disc_params_factuurboeken = rec.factuurboeken
WHERE cnt_ins_discipline_key = v_cnt_discipline_key;
-- Contactpersoon (als meegegeven): bepalen/toevoegen bij bedrijf.
IF (rec.contact_naam IS NOT NULL AND rec.prs_contactpersoon_key IS NULL)
THEN
-- Misschien is de contractsoort tijdens import al toegevoegd?
-- Misschien is de contractpersoon tijdens import al toegevoegd?
-- (dan was 'ie er voor de cursor nog niet.)
BEGIN
v_errormsg := 'Fout bij bepalen contactpersoon';

4
FAC/FAC_VIEEXP.SRC
View File

@@ -585,10 +585,12 @@ SELECT c.cnt_contract_nummer_intern ContractNr
ELSE NULL
END ruimtecode --AE_ruimtecode
, c.cnt_contract_verlenging Verlengen --AF_verlengen
, m.cnt_disc_params_factuurboeken Factuurboeken --AG_factuurboeken
FROM cnt_contract c
, (SELECT mm.cnt_contract_key
, mm.cnt_contract_nummer_intern
, mm.cnt_contract_versie
, md.cnt_disc_params_factuurboeken
FROM cnt_contract mm
, cnt_disc_params md
WHERE mm.ins_discipline_key = md.cnt_ins_discipline_key
@@ -624,6 +626,8 @@ SELECT c.cnt_contract_nummer_intern ContractNr
AND a.prs_afdeling_verwijder IS NULL
AND b.prs_perslid_email IS NOT NULL
AND k.prs_kostenplaats_verwijder IS NULL
AND p.cnt_alg_plaats_code = g.alg_type(+)
AND p.cnt_alg_plaats_key = g.alg_onroerendgoed_keys(+)
ORDER BY c.cnt_contract_nummer_intern
, c.cnt_contract_versie
;