TWYN#55098 rapport correspondeert niet met online

svn path=/Database/branches/DB34/; revision=39650
This commit is contained in:
Erik Groener
2018-11-05 15:08:59 +00:00
parent 802415e785
commit 207bed080b

View File

@@ -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;
@@ -406,7 +406,7 @@ AS
INTO v_bedrag
FROM fin_factuur
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 ((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