From b2c920963a0b7b73861094f0285a5c0eb16bfe6e Mon Sep 17 00:00:00 2001
From: Jos Groot Lipman <jos.grootlipman@aareon.nl>
Date: Tue, 20 Dec 2022 14:26:10 +0000
Subject: [PATCH] BLCC#75155 Behandelteams ook meenemen in vakgroepscope van
 opdracht-autorisaties

svn path=/Database/trunk/; revision=58409
---
 FIN/FIN_PAC.SRC | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/FIN/FIN_PAC.SRC b/FIN/FIN_PAC.SRC
index 68d5047b..105bc79c 100644
--- a/FIN/FIN_PAC.SRC
+++ b/FIN/FIN_PAC.SRC
@@ -563,7 +563,7 @@ AS
             -- controleer op basis van mld_typeopdr_factuur
             BEGIN
                SELECT o.mld_opdr_kosten,
-                      sm.mld_ins_discipline_key,
+                      o.mld_opdr_discipline_key,
                       top.mld_typeopdr_factuur,
                       o.mld_statusopdr_key
                  INTO opdrachtkosten,
@@ -572,10 +572,8 @@ AS
                       opdrstatus
                  FROM mld_opdr o,
                       mld_melding m,
-                      mld_typeopdr top,
-                      mld_stdmelding sm
+                      mld_typeopdr top
                 WHERE     o.mld_melding_key = m.mld_melding_key
-                      AND m.mld_stdmelding_key = sm.mld_stdmelding_key
                       AND o.mld_typeopdr_key = top.mld_typeopdr_key
                       --AND top.mld_typeopdr_uren NOT IN (3, 4, 5)     -- bij interne uren geen facturen
                       AND top.mld_typeopdr_factuur <> 0                -- dan willen we ook geen factuur
@@ -605,7 +603,7 @@ AS
                    mld_opdr o,
                    mld_stdmelding stdm,
                    mld_melding m
-             WHERE     md.ins_discipline_key = stdm.mld_ins_discipline_key
+             WHERE     md.ins_discipline_key = o.mld_opdr_discipline_key
                    AND o.mld_melding_key = m.mld_melding_key
                    AND m.mld_stdmelding_key = stdm.mld_stdmelding_key
                    AND mld_opdr_key = o_key;
@@ -746,12 +744,9 @@ AS
               INTO   factuurappr
               FROM   mld_disc_params p
              WHERE   p.mld_ins_discipline_key =
-                        (SELECT   sm.mld_ins_discipline_key
-                           FROM   mld_opdr o, mld_melding m, mld_typeopdr top, mld_stdmelding sm
-                          WHERE       o.mld_melding_key = m.mld_melding_key
-                                  AND m.mld_stdmelding_key = sm.mld_stdmelding_key
-                                  AND o.mld_typeopdr_key = top.mld_typeopdr_key
-                                  AND mld_opdr_key = o_key);
+                        (SELECT   o.mld_opdr_discipline_key
+                           FROM   mld_opdr o
+                          WHERE   mld_opdr_key = o_key);
          ELSE
             factuurappr := 0;
       END CASE;