From 74276363dd5ff4bc9c540c55c43f92452e1cd763 Mon Sep 17 00:00:00 2001 From: Maarten van der Heide Date: Thu, 28 Nov 2024 15:30:10 +0000 Subject: [PATCH] NOVA#86590 DAILY/Bijwerken O-kanaal van relaties svn path=/Customer/trunk/; revision=67234 --- NOVA/nova.sql | 192 +++++++++++++++++++++++++++----------------------- 1 file changed, 105 insertions(+), 87 deletions(-) diff --git a/NOVA/nova.sql b/NOVA/nova.sql index eefca93cb..da079ca1d 100644 --- a/NOVA/nova.sql +++ b/NOVA/nova.sql @@ -636,7 +636,7 @@ AS PROCEDURE update_prs2loc; PROCEDURE afmelden_bes; PROCEDURE afmelden_mld; - PROCEDURE insert_kanaal; + PROCEDURE upsert_kanaal; PROCEDURE verwerken_res; -- VOOR res2benq: Verwerkt eerder doorgezette RES! PROCEDURE res2benq; END; @@ -954,7 +954,7 @@ AS END afmelden_bes; -- Automatisch sluiten meldingen waarvoor geldt dat: - -- - Daaronder precies één (= /1) via API2 afgemelde 'TOPdesk (intern)'- + -- - Daaronder precies ��n (= /1) via API2 afgemelde 'TOPdesk (intern)'- -- opdracht. -- NB. In andere gevallen moet melding maar handmatig worden gesloten. PROCEDURE afmelden_mld @@ -1002,8 +1002,8 @@ AS fac.writelog ('AFMELDEN_MLD', 'E', v_errormsg, ''); END afmelden_mld; - -- Automatisch toevoegen O-kanaal (prs_bedrijfadres) voor nieuwe relaties. - PROCEDURE insert_kanaal + -- Automatisch bijwerken O-kanaal (prs_bedrijfadres) van relaties. + PROCEDURE upsert_kanaal AS v_errormsg VARCHAR2 (1000); oracle_err_num NUMBER; @@ -1013,16 +1013,27 @@ AS -- Bepalen nieuwe relaties nog zonder O-kanaal. CURSOR c1 IS - SELECT b.prs_bedrijf_key, b.prs_bedrijf_email - FROM prs_v_aanwezigbedrijf b - WHERE b.prs_bedrijf_intern IS NULL - AND b.prs_bedrijf_key NOT IN (3661) -- Benque - AND b.prs_bedrijf_email IS NOT NULL - AND NOT EXISTS + SELECT b.prs_bedrijf_key, b.prs_bedrijf_email, TO_NUMBER (NULL) prs_bedrijfadres_key, NULL prs_bedrijfadres_url + FROM prs_v_aanwezigbedrijf b + WHERE b.prs_bedrijf_intern IS NULL + AND b.prs_bedrijf_key NOT IN (3661) -- Benque + AND b.prs_bedrijf_email IS NOT NULL + AND NOT EXISTS (SELECT 1 FROM prs_bedrijfadres WHERE prs_bedrijfadres_type = 'O' AND prs_bedrijf_key = b.prs_bedrijf_key) + UNION ALL + SELECT b.prs_bedrijf_key, b.prs_bedrijf_email, ba.prs_bedrijfadres_key, ba.prs_bedrijfadres_url + FROM prs_v_aanwezigbedrijf b, + (SELECT * + FROM prs_bedrijfadres + WHERE prs_bedrijfadres_type = 'O' + AND INSTR (UPPER (prs_bedrijfadres_url), 'MAILTO:') = 1) ba + WHERE b.prs_bedrijf_intern IS NULL + AND b.prs_bedrijf_key NOT IN (3661) -- Benque + AND b.prs_bedrijf_key = ba.prs_bedrijf_key + AND 'MAILTO:' || UPPER (b.prs_bedrijf_email) != UPPER (ba.prs_bedrijfadres_url) ORDER BY 1; BEGIN v_count := 0; @@ -1033,32 +1044,39 @@ AS SET prs_bedrijf_uitvoerende = 1 WHERE prs_bedrijf_key = rec.prs_bedrijf_key; - INSERT INTO prs_bedrijfadres (prs_bedrijf_key, - prs_bedrijfadres_type, - prs_bedrijfadres_url, - prs_bedrijfadres_ordermode, - prs_bedrijfadres_xsl, - prs_bedrijfadres_attachfile, - prs_bedrijfadres_flexfiles) - VALUES (rec.prs_bedrijf_key, - 'O', - 'mailto:' || rec.prs_bedrijf_email, - 0, - 'xsl/NOVA.xsl', - 'Algemene-Inkoopvoorwaarden-FSR-V4.0.pdf', - 1); + IF rec.prs_bedrijfadres_key IS NULL + THEN + INSERT INTO prs_bedrijfadres (prs_bedrijf_key, + prs_bedrijfadres_type, + prs_bedrijfadres_url, + prs_bedrijfadres_ordermode, + prs_bedrijfadres_xsl, + prs_bedrijfadres_attachfile, + prs_bedrijfadres_flexfiles) + VALUES (rec.prs_bedrijf_key, + 'O', + 'mailto:' || rec.prs_bedrijf_email, + 0, + 'xsl/NOVA.xsl', + 'Algemene-Inkoopvoorwaarden-FSR-V4.0.pdf', + 1); + ELSE + UPDATE prs_bedrijfadres + SET prs_bedrijfadres_url = 'mailto:' || TRIM (rec.prs_bedrijf_email) + WHERE prs_bedrijfadres_key = rec.prs_bedrijfadres_key; + END IF; v_count := v_count + 1; END LOOP; - fac.writelog ('INSERT_KANAAL', 'S', 'Relaties/#gekanaliseerd: ' || TO_CHAR (v_count), ''); + fac.writelog ('UPSERT_KANAAL', 'S', 'Relaties/#gekanaliseerd: ' || TO_CHAR (v_count), ''); EXCEPTION WHEN OTHERS THEN oracle_err_num := SQLCODE; oracle_err_mes := SUBSTR (SQLERRM, 1, 100); v_errormsg := v_errormsg || ' ORACLE (error ' || oracle_err_num || '/' || oracle_err_mes || ')'; - fac.writelog ('INSERT_KANAAL', 'E', v_errormsg, ''); - END insert_kanaal; + fac.writelog ('UPSERT_KANAAL', 'E', v_errormsg, ''); + END upsert_kanaal; -- Automatisch verwerken ruimte-reserveringen (roomservice-reserveringen -- hebben geen BO-status) die eerder (= voorgaande dag) zijn doogezet naar @@ -1291,10 +1309,10 @@ BEGIN -- Automatisch sluiten MLD (zoals helder gespecificeerd)! nova.afmelden_mld; - -- Automatisch toevoegen O-kanaal voor nieuwe relaties! - nova.insert_kanaal; + -- Automatisch bijwerken O-kanaal van relaties! + nova.upsert_kanaal; - -- Automatisch na 5 werkdagen doorzetten RES met Appèl-catering naar Benque + -- Automatisch na 5 werkdagen doorzetten RES met App�l-catering naar Benque -- en de volgende dag pas verwerken van de bovenliggende ruimte-reservering -- (roomservice-reserveringen hebben geen BO-status)! -- LET OP: De procedure 'verwerken_res' moet draaien VOOR 'res2benq'! @@ -1734,40 +1752,40 @@ BEGIN -- Controleer kritische veldwaarden -- Overige werkzaamheden - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_mjop, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_hv_algemeen, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_aanp_gebter, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_inventaris, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_mjop, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_hv_algemeen, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_aanp_gebter, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_inventaris, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; -- Projecten - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_bouwkosten, '.', ''), ',', '.'), '€', '')) IS NOT NULL - OR fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_vaste_inr, '.', ''), ',', '.'), '€', '')) IS NOT NULL - OR fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_advieskosten, '.', ''), ',', '.'), '€', '')) IS NOT NULL - OR fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_losse_inv, '.', ''), ',', '.'), '€', '')) IS NOT NULL - OR fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_bijkomende_kosten, '.', ''), ',', '.'), '€', '')) IS NOT NULL - OR fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_onvoorzien, '.', ''), ',', '.'), '€', '')) IS NOT NULL + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_bouwkosten, '.', ''), ',', '.'), '�', '')) IS NOT NULL + OR fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_vaste_inr, '.', ''), ',', '.'), '�', '')) IS NOT NULL + OR fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_advieskosten, '.', ''), ',', '.'), '�', '')) IS NOT NULL + OR fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_losse_inv, '.', ''), ',', '.'), '�', '')) IS NOT NULL + OR fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_bijkomende_kosten, '.', ''), ',', '.'), '�', '')) IS NOT NULL + OR fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_onvoorzien, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; -- Investeringen - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_terrein, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_inr_terreinen40k, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_nieuwbouw, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gebouwen_aankoop, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_verbouwingen40k, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh8j25k, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh10j25k, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh15j25k, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh20j25k, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh25j25k, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh30j25k, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh40j25k, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_lesinv3k, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_overige_inv3k, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_computerapp3k, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_software3k, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; - IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_transportmid5k, '.', ''), ',', '.'), '€', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_terrein, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_inr_terreinen40k, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_nieuwbouw, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gebouwen_aankoop, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_verbouwingen40k, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh8j25k, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh10j25k, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh15j25k, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh20j25k, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh25j25k, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh30j25k, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh40j25k, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_lesinv3k, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_overige_inv3k, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_computerapp3k, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_software3k, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; + IF fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_transportmid5k, '.', ''), ',', '.'), '�', '')) IS NOT NULL THEN v_count_tst := v_count_tst + 1; END IF; IF v_count_tst = 0 THEN @@ -1824,40 +1842,40 @@ BEGIN VALUES (TRIM (v_gebouw), TRIM (v_nrs), TRIM (v_omschrijving), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_mjop, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_hv_algemeen, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_aanp_gebter, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_inventaris, '.', ''), ',', '.'), '€', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_mjop, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_hv_algemeen, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_aanp_gebter, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_inventaris, '.', ''), ',', '.'), '�', '')), TRIM (v_noodzaak), TRIM (v_vervuitbrvern), TRIM (v_leverancier), TRIM (v_maand), TRIM (v_contactpers), TRIM (v_toelichting), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_bouwkosten, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_vaste_inr, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_advieskosten, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_losse_inv, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_bijkomende_kosten, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_onvoorzien, '.', ''), ',', '.'), '€', '')), - --fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_totaal, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_terrein, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_inr_terreinen40k, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_nieuwbouw, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gebouwen_aankoop, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_verbouwingen40k, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh8j25k, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh10j25k, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh15j25k, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh20j25k, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh25j25k, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh30j25k, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh40j25k, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_lesinv3k, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_overige_inv3k, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_computerapp3k, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_software3k, '.', ''), ',', '.'), '€', '')), - fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_transportmid5k, '.', ''), ',', '.'), '€', ''))); + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_bouwkosten, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_vaste_inr, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_advieskosten, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_losse_inv, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_bijkomende_kosten, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_onvoorzien, '.', ''), ',', '.'), '�', '')), + --fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_totaal, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_terrein, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_inr_terreinen40k, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_nieuwbouw, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gebouwen_aankoop, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_verbouwingen40k, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh8j25k, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh10j25k, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh15j25k, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh20j25k, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh25j25k, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh30j25k, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_gr_onderh40j25k, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_lesinv3k, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_overige_inv3k, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_computerapp3k, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_software3k, '.', ''), ',', '.'), '�', '')), + fac.safe_to_number (REPLACE (REPLACE (REPLACE (v_transportmid5k, '.', ''), ',', '.'), '�', ''))); v_count_imp := v_count_imp + 1; EXCEPTION WHEN OTHERS @@ -2041,7 +2059,7 @@ BEGIN RETURNING mld_melding_key INTO v_melding_key; - fac.trackaction ('MLDNEW', v_melding_key, NULL, SYSDATE, 'Geïmporteerd vanuit HV-sjabloon'); + fac.trackaction ('MLDNEW', v_melding_key, NULL, SYSDATE, 'Ge�mporteerd vanuit HV-sjabloon'); IF rec.stdmelding_key = 102 THEN @@ -2495,7 +2513,7 @@ BEGIN RETURNING mld_melding_key INTO v_melding_key; - fac.trackaction ('MLDNEW', v_melding_key, NULL, SYSDATE, 'Geïmporteerd vanuit INK-sjabloon'); + fac.trackaction ('MLDNEW', v_melding_key, NULL, SYSDATE, 'Ge�mporteerd vanuit INK-sjabloon'); -- Moet bestaan! v_errormsg := 'Fout toevoegen investeringsrubriek';