From 1e210e11b4687029fe4170758249d18f21365eba Mon Sep 17 00:00:00 2001
From: Jos Groot Lipman <jos.grootlipman@aareon.nl>
Date: Tue, 17 Aug 2021 13:01:49 +0000
Subject: [PATCH] Merge DB40f patches

svn path=/Database/trunk/; revision=52715
---
 BES/BES_PAC.SRC    | 9 +++++++++
 CNT/CNT_PAC.SRC    | 9 +++++++++
 FAC/FAC_LCL.SRC    | 1 +
 _UP/DB40eto40f.sql | 8 ++++++--
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/BES/BES_PAC.SRC b/BES/BES_PAC.SRC
index 3a8b2bb3..d90ff848 100644
--- a/BES/BES_PAC.SRC
+++ b/BES/BES_PAC.SRC
@@ -2261,6 +2261,15 @@ AS
                    FROM bes_bestelopdr_item
                   WHERE bes_bestelopdr_key = p_bes_opdr_key);
 
+        FOR ref_contract IN (SELECT cnt_contract_key
+                               FROM cnt_contract
+                              WHERE bes_bestelopdr_key = p_bes_opdr_key
+                            )
+        LOOP
+            -- Verwijder contracten die aan deze bestelopdracht zitten.
+            cnt.remove(ref_contract.cnt_contract_key);
+        END LOOP;
+
         DELETE FROM bes_bestelopdr
          WHERE bes_bestelopdr_key = p_bes_opdr_key;
 
diff --git a/CNT/CNT_PAC.SRC b/CNT/CNT_PAC.SRC
index 8a3bc303..f284c7df 100644
--- a/CNT/CNT_PAC.SRC
+++ b/CNT/CNT_PAC.SRC
@@ -553,6 +553,15 @@ CREATE OR REPLACE PACKAGE BODY cnt AS
            flx.deleteflexbijlage (ref_bijlagen.fac_bijlagen_key);
        END LOOP;
 
+       FOR ref_mldopdr IN (SELECT mld_opdr_key
+                             FROM mld_opdr
+                            WHERE cnt_contract_key = p_contract_key
+                           )
+       LOOP
+           -- Verwijder melding-opdrachten die aan dit contract zitten.
+           mld.remove_opdr(ref_mldopdr.mld_opdr_key);
+       END LOOP;
+
        DELETE FROM cnt_contract
         WHERE cnt_contract_key = p_contract_key;
 
diff --git a/FAC/FAC_LCL.SRC b/FAC/FAC_LCL.SRC
index bfc9d4b1..710e2182 100644
--- a/FAC/FAC_LCL.SRC
+++ b/FAC/FAC_LCL.SRC
@@ -4099,6 +4099,7 @@ FAC_LCL('lcl_menu_fac_aut_edit_groep', 'Autorisatiegroepen', 'Authorisation grou
 FAC_LCL('lcl_menu_fac_aut_functie', 'Autorisatiefuncties', 'Authorisation functions')
 FAC_LCL('lcl_menu_fac_aut_groep', 'Autorisatiegroeprechten', 'Authorisation group rights')
 FAC_LCL('lcl_menu_fac_aut_perslid', 'Autorisatie personen', 'Authorisation persons')
+FAC_LCL('lcl_facmgt_overig', 'Overig', 'Misc.')
 FAC_LCL('lcl_menu_fac_rapportages', 'Rapportages', 'Reports')
 FAC_LCL('lcl_menu_fac_graphs', 'Grafieken', 'Graphs')
 FAC_LCL('lcl_menu_fac_vrije_dagen', 'Vrije dagen', 'Non-working days')
diff --git a/_UP/DB40eto40f.sql b/_UP/DB40eto40f.sql
index 571f7270..e1a09427 100644
--- a/_UP/DB40eto40f.sql
+++ b/_UP/DB40eto40f.sql
@@ -12,10 +12,14 @@ DEFINE dbuser   = '*'
 SET ECHO ON
 SET DEFINE ON
 COLUMN fcltlogfile NEW_VALUE fcltlogfile NOPRINT;
-WHENEVER SQLERROR EXIT;
-SELECT adm.scriptspoolfile('&dbuser', '&thisfile') AS fcltlogfile FROM DUAL;
+COLUMN fcltcusterr NEW_VALUE fcltcusterr NOPRINT;
 WHENEVER SQLERROR CONTINUE;
+SELECT adm.getscriptspoolfile('&thisfile') AS fcltlogfile FROM DUAL;
 SPOOL &fcltlogfile
+WHENEVER SQLERROR EXIT;
+SELECT adm.checkscriptcust('&dbuser') AS fcltcusterr FROM DUAL;
+WHENEVER SQLERROR CONTINUE;
+PROMPT &fcltcusterr
 SET DEFINE OFF
 
 ------ payload begin ------