TWYN#55098 rapport correspondeert niet met online

svn path=/Database/branches/DB34/; revision=39650

BGT/BGT_PAC.SRC

@@ -101,7 +101,7 @@ AS
    FUNCTION getBudgetMutaties ( p_budget_key IN NUMBER
                               , p_btw IN NUMBER
                               , p_datum_van DATE DEFAULT NULL
-                              , p_datum_tot DATE DEFAULT NULL
+                              , p_datum_tot DATE DEFAULT NULL  -- eigenlijk: tot-en-met
                               ) RETURN NUMBER
    IS
       v_bedrag_mut  NUMBER;
@@ -118,7 +118,7 @@ AS
                    FROM bgt_budgetmutatie
                   WHERE bgt_budget_key_van = p_budget_key
                     AND ((p_datum_van IS NOT NULL AND bgt_budgetmutatie_datum >= p_datum_van) OR p_datum_van IS NULL)
-                    AND ((p_datum_tot IS NOT NULL AND bgt_budgetmutatie_datum <  p_datum_tot) OR p_datum_tot IS NULL)
+                    AND ((p_datum_tot IS NOT NULL AND bgt_budgetmutatie_datum <= p_datum_tot) OR p_datum_tot IS NULL)
                  UNION
                  SELECT CASE WHEN p_btw=0 THEN SUM(bgt_budget_bedrag_naar)
                              WHEN p_btw=1 THEN SUM(bgt_budget_btwbedrag_naar)
@@ -127,7 +127,7 @@ AS
                    FROM bgt_budgetmutatie
                   WHERE bgt_budget_key_naar = p_budget_key
                     AND ((p_datum_van IS NOT NULL AND bgt_budgetmutatie_datum >= p_datum_van) OR p_datum_van IS NULL)
-                    AND ((p_datum_tot IS NOT NULL AND bgt_budgetmutatie_datum <  p_datum_tot) OR p_datum_tot IS NULL)
+                    AND ((p_datum_tot IS NOT NULL AND bgt_budgetmutatie_datum <= p_datum_tot) OR p_datum_tot IS NULL)
                 ) mut;
       EXCEPTION
          WHEN NO_DATA_FOUND THEN
@@ -151,9 +151,9 @@ AS
                      WHEN p_btw=1 THEN COALESCE(bgt_budget_btwbedrag, 0)
                      WHEN p_btw=2 THEN COALESCE(bgt_budget_bedrag, 0) + COALESCE(bgt_budget_btwbedrag, 0)
                 END huidig_budget
-              , CASE WHEN p_btw=0 THEN BGT.getBudgetMutaties(bgt_budget_key, 0, p_datum+1, NULL)
-                     WHEN p_btw=1 THEN BGT.getBudgetMutaties(bgt_budget_key, 1, p_datum+1, NULL)
-                     WHEN p_btw=2 THEN BGT.getBudgetMutaties(bgt_budget_key, 0, p_datum+1, NULL) + BGT.getBudgetMutaties(bgt_budget_key, 1, p_datum+1, NULL)
+              , CASE WHEN p_btw=0 THEN BGT.getBudgetMutaties(bgt_budget_key, 0, p_datum, NULL)
+                     WHEN p_btw=1 THEN BGT.getBudgetMutaties(bgt_budget_key, 1, p_datum, NULL)
+                     WHEN p_btw=2 THEN BGT.getBudgetMutaties(bgt_budget_key, 0, p_datum, NULL) + BGT.getBudgetMutaties(bgt_budget_key, 1, p_datum, NULL)
                 END mutaties
            INTO v_huidig_budget
               , v_mutatie
@@ -186,7 +186,7 @@ AS
                        , b.prs_kostensoortgrp_key
                        , b.prs_kostensoort_key
                        , b.bgt_budget_isreserve
-                       , m.bgt_budgetmutatie_datum
+                       , TRUNC(m.bgt_budgetmutatie_datum)  bgt_budgetmutatie_datum
                        , CASE WHEN p_btw=0 THEN COALESCE(m.bgt_budget_bedrag_van, 0)
                               WHEN p_btw=1 THEN COALESCE(m.bgt_budget_btwbedrag_van, 0)
                               WHEN p_btw=2 THEN COALESCE(m.bgt_budget_bedrag_van, 0) + COALESCE(m.bgt_budget_btwbedrag_van, 0)
@@ -200,7 +200,7 @@ AS
                        , b.prs_kostensoortgrp_key
                        , b.prs_kostensoort_key
                        , b.bgt_budget_isreserve
-                       , m.bgt_budgetmutatie_datum
+                       , TRUNC(m.bgt_budgetmutatie_datum)  bgt_budgetmutatie_datum
                        , CASE WHEN p_btw=0 THEN COALESCE(m.bgt_budget_bedrag_naar, 0)
                               WHEN p_btw=1 THEN COALESCE(m.bgt_budget_btwbedrag_naar, 0)
                               WHEN p_btw=2 THEN COALESCE(m.bgt_budget_bedrag_naar, 0) + COALESCE(m.bgt_budget_btwbedrag_naar, 0)
@@ -317,7 +317,7 @@ AS
                              , p_btw IN NUMBER
                              , p_status NUMBER DEFAULT 3
                              , p_datum_van DATE DEFAULT NULL
-                             , p_datum_tot DATE DEFAULT NULL
+                             , p_datum_tot DATE DEFAULT NULL  -- eigenlijk: tot-en-met
                              ) RETURN NUMBER
    IS
       v_bedrag  NUMBER;
@@ -338,7 +338,7 @@ AS
                 OR (p_status = 3 AND mld_statusopdr_key = mld_statusopdr_key)
                 )
             AND ((p_datum_van IS NOT NULL AND mld_opdr_datumbegin >= p_datum_van) OR p_datum_van IS NULL)
-            AND ((p_datum_tot IS NOT NULL AND mld_opdr_datumbegin <  p_datum_tot) OR p_datum_tot IS NULL);
+            AND ((p_datum_tot IS NOT NULL AND mld_opdr_datumbegin <= p_datum_tot) OR p_datum_tot IS NULL);
       EXCEPTION
          WHEN NO_DATA_FOUND THEN
             v_bedrag := NULL;
@@ -391,7 +391,7 @@ AS
    FUNCTION getGefactureerd ( p_mld_opdr_key IN NUMBER
                             , p_btw IN NUMBER
                             , p_datum_van DATE DEFAULT NULL
-                            , p_datum_tot DATE DEFAULT NULL
+                            , p_datum_tot DATE DEFAULT NULL  -- eigenlijk: tot-en-met
                             ) RETURN NUMBER
    IS
       v_bedrag  NUMBER;
@@ -405,8 +405,8 @@ AS
                 END facturen
            INTO v_bedrag
            FROM fin_factuur
-          WHERE ((p_datum_van IS NOT NULL AND fin_factuur_datum >= p_datum_van) OR p_datum_van IS NULL)
-            AND ((p_datum_tot IS NOT NULL AND fin_factuur_datum <  p_datum_tot) OR p_datum_tot IS NULL)
+          WHERE ((p_datum_van IS NOT NULL AND fin_factuur_advies >= p_datum_van) OR p_datum_van IS NULL)
+            AND ((p_datum_tot IS NOT NULL AND fin_factuur_advies <= p_datum_tot) OR p_datum_tot IS NULL)
             AND mld_opdr_key = p_mld_opdr_key;
       EXCEPTION
          WHEN NO_DATA_FOUND THEN

FAC/FAC_PACX.SRC

@@ -7950,9 +7950,11 @@ AS
       ctx                 DBMS_XMLGEN.ctxhandle;
       l_str_pos           INTEGER;
       l_str_pos2          INTEGER;
+      l_str_pos3          INTEGER;
       l_user_key          NUMBER;
       l_date1             VARCHAR2 (20);
-      l_date2             VARCHAR2 (20);
+      l_date2             VARCHAR2 (4000); -- extra lang omdat hij heel even l_extra_where ook bevat
+      l_extra_where       VARCHAR2 (4000);
       l_sql_str           VARCHAR2 (4000);
       l_cursor            SYS_REFCURSOR;
    BEGIN
@@ -7965,6 +7967,8 @@ AS
            FROM fac_usrrap
           WHERE fac_usrrap_key = p_key;
 
+         -- p_where is: user_key + "#" + dt1 + "#" + dt2
+         --         or: user_key + "#" + dt1 + "#" + dt2 + "#" + whereclause
          l_str_pos :=
             INSTR (p_where,
                    '#',
@@ -7979,23 +7983,50 @@ AS
          l_date1 :=
             SUBSTR (p_where, l_str_pos + 1, l_str_pos2 - l_str_pos - 1);
          l_date2 := SUBSTR (p_where, l_str_pos2 + 1);
+
+         l_extra_where := '';
+         l_str_pos3 :=
+            INSTR (p_where,
+                   '#',
+                   1,
+                   3);                                   -- 3nd occurence of #
+        IF (l_str_pos3 > 0) THEN
+            l_extra_where  := SUBSTR (p_where, l_str_pos3 + 1);
+            l_date2 := SUBSTR (l_date2, 1, INSTR (l_date2, '#') - 1); -- Dan moet hier het where-clause stuk ook af
+        END IF;
+
          -- All these reports are defined as
          -- proc_name (user_key IN NUMBER, p_datum_van IN VARCHAR2, p_datum_tot IN VARCHAR2, p_cursor OUT t_cursor);
-         l_sql_str :=
-               'BEGIN '
-            || proc_name
-            || '('
-            || l_user_key
-            || ', '''
-            || l_date1
-            || ''', '''
-            || l_date2
-            || ''', '
-            || ':l_outcursor'
-            || '); END;';
-
-         --DBMS_OUTPUT.put_line (l_sql_str);
-         EXECUTE IMMEDIATE l_sql_str USING l_cursor;
+         -- or proc_name (user_key IN NUMBER, p_datum_van IN VARCHAR2, p_datum_tot IN VARCHAR2, p_cursor OUT t_cursor, p_where IN VARCHAR2);
+         if (l_extra_where IS NOT NULL)
+         THEN
+             l_sql_str :=
+                   'BEGIN '
+                || proc_name
+                || '('
+                || '  :l_user_key'
+                || ', :l_date1'
+                || ', :l_date2'
+                || ', :l_outcursor'
+                || ', :l_extrawhere '
+                || '); END;';
+             EXECUTE IMMEDIATE l_sql_str USING l_user_key, l_date1, l_date2, l_cursor, l_extra_where;
+         ELSE
+             l_sql_str :=
+                   'BEGIN '
+                || proc_name
+                || '('
+                || l_user_key
+                || ', '''
+                || l_date1
+                || ''', '''
+                || l_date2
+                || ''', '
+                || ':l_outcursor'
+                || '); END;';
+             -- DBMS_OUTPUT.put_line ('l_sql_str: ' || l_sql_str);
+             EXECUTE IMMEDIATE l_sql_str USING l_cursor;
+         END IF;
 
          createopentagattributes ('rapport',
                                   'view',

FCLT.NMK

@@ -27,6 +27,7 @@
 ##             -for precompiling only-
 ##        WRAP.EXE (from 10.2.x) for Oracle, renamed to WRAP10.EXE
 ##
+
 ##        SED.EXE
 ##             GNU sed version 4.2
 ##             Copyright (C) 2003 Free Software Foundation, Inc.
@@ -62,7 +63,7 @@ PROJEXE=z:\Project\FACILITOR\BUILD
 ##
 CURRENTVERSION=33
 NEXTVERSION=34
-FILEVERSION=
+FILEVERSION=a
 NEXTCAREVERSION=34
 NEXTROOT=DB$(NEXTVERSION)$(FILEVERSION)
 CURRENTUPDATE=DB$(CURRENTVERSION)to$(NEXTVERSION)