DENB#56634 K2F/Niet factureren nul-bedragen

svn path=/Customer/trunk/; revision=41089
This commit is contained in:
Maarten van der Heide
2019-02-21 09:42:25 +00:00
parent a9b15badc3
commit 4ad6419292

View File

@@ -2334,7 +2334,7 @@ AS
ON l.alg_locatie_key = fcl.alg_onrgoed_key ON l.alg_locatie_key = fcl.alg_onrgoed_key
AND fcl.alg_kenmerk_key = 1020 -- FCL AND fcl.alg_kenmerk_key = 1020 -- FCL
WHERE l.alg_locatie_key IN (49, 56, 70, 71, 441, 442, 443, 444) -- BBS-locaties WHERE l.alg_locatie_key IN (49, 56, 70, 71, 441, 442, 443, 444) -- BBS-locaties
AND COALESCE (x.verw_prijs, x.prijs) != 0; ;
-- Actueel: BBS-reserveringen lopende maand! -- Actueel: BBS-reserveringen lopende maand!
CREATE OR REPLACE VIEW denb_v_rap_actual_bbs_res CREATE OR REPLACE VIEW denb_v_rap_actual_bbs_res
@@ -2374,6 +2374,7 @@ AS
FROM denb_v_bbs_res_all FROM denb_v_bbs_res_all
WHERE reslev > TRUNC (SYSDATE, 'mm') WHERE reslev > TRUNC (SYSDATE, 'mm')
AND res_status_bo_key != 6 -- Niet AV! AND res_status_bo_key != 6 -- Niet AV!
AND COALESCE (bedrag, 0) != 0
GROUP BY sortering, GROUP BY sortering,
res_rsv_ruimte_key, res_rsv_ruimte_key,
NULL, NULL,
@@ -2426,6 +2427,7 @@ AS
WHERE reslev > TO_DATE ('01-07-2018' , 'dd-mm-yyyy') WHERE reslev > TO_DATE ('01-07-2018' , 'dd-mm-yyyy')
AND reslev < TRUNC (SYSDATE, 'mm') AND reslev < TRUNC (SYSDATE, 'mm')
AND res_status_bo_key != 6 -- Niet AV! AND res_status_bo_key != 6 -- Niet AV!
AND COALESCE (bedrag, 0) != 0
GROUP BY sortering, GROUP BY sortering,
res_rsv_ruimte_key, res_rsv_ruimte_key,
NULL, NULL,
@@ -2487,6 +2489,7 @@ AS
FROM denb_v_bbs_res_all FROM denb_v_bbs_res_all
WHERE resver > TRUNC (ADD_MONTHS (SYSDATE, -24), 'yyyy') -- Huidige jaar en 2 voorgaande jaren! WHERE resver > TRUNC (ADD_MONTHS (SYSDATE, -24), 'yyyy') -- Huidige jaar en 2 voorgaande jaren!
AND res_status_bo_key = 6 -- AV! AND res_status_bo_key = 6 -- AV!
AND COALESCE (bedrag, 0) != 0
GROUP BY TO_CHAR (TRUNC (resver, 'mm') - 1, 'yyyy-mm') || TO_CHAR (SUBSTR (res_rsv_ruimte_ordernr, 1, INSTR (res_rsv_ruimte_ordernr, '|') - 1), 'FM00000009') || sortering, GROUP BY TO_CHAR (TRUNC (resver, 'mm') - 1, 'yyyy-mm') || TO_CHAR (SUBSTR (res_rsv_ruimte_ordernr, 1, INSTR (res_rsv_ruimte_ordernr, '|') - 1), 'FM00000009') || sortering,
TO_CHAR (TRUNC (resver, 'mm') - 1, 'yyyy-mm'), TO_CHAR (TRUNC (resver, 'mm') - 1, 'yyyy-mm'),
res_rsv_ruimte_key, res_rsv_ruimte_key,
@@ -2589,7 +2592,7 @@ AS
WHERE reslev > TO_DATE ('01-07-2018', 'dd-mm-yyyy') WHERE reslev > TO_DATE ('01-07-2018', 'dd-mm-yyyy')
AND reslev < TRUNC (SYSDATE, 'mm') AND reslev < TRUNC (SYSDATE, 'mm')
AND res_status_bo_key != 6 -- Niet AV! AND res_status_bo_key != 6 -- Niet AV!
AND sortering NOT LIKE '%R1' -- Skip Korting-regels! --AND sortering NOT LIKE '%R1' -- Skip Korting-regels!
UNION ALL -- Extra R-regel voor losse voorzieningen! UNION ALL -- Extra R-regel voor losse voorzieningen!
SELECT DISTINCT '[' || v.debiteurennummer || '] ' aanduiding, SELECT DISTINCT '[' || v.debiteurennummer || '] ' aanduiding,
SUBSTR (v.sortering, 1, 17) || 'R' sortering, SUBSTR (v.sortering, 1, 17) || 'R' sortering,