admin/Database
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TWYN#55098 rapport correspondeert niet met online

Browse Source 
svn path=/Database/trunk/; revision=39603
This commit is contained in:
Erik Groener
2018-11-02 11:33:31 +00:00
parent cc0cc08444
commit 2c8d28ba1c
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
BGT/BGT_PAC.SRC
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
@@ -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

1
FAC/FAC_LCL.SRC
View File

@@ -1426,6 +1426,7 @@ FAC_LCL('lcl_res_facility_bound', 'LET OP: U heeft voorzieningen aangegeven die
, 'NOTE: You indicated facilities outside the reservation time!')
FAC_LCL('lcl_from', 'Van', 'From')
FAC_LCL('lcl_to', 'Tot', 'Until')
FAC_LCL('lcl_through', 't/m', 'through')
FAC_LCL('lcl_delete', 'Verwijderen', 'Delete')
FAC_LCL('lcl_change', 'Wijzigen', 'Edit')
FAC_LCL('lcl_new', 'nieuw', 'new')