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

BSSC#55692 Facturatieproces+BSSC#61120 Rap/Alleen reserveringen in Definitief-status

Browse Source 
svn path=/Customer/trunk/; revision=45665
This commit is contained in:
Maarten van der Heide
2020-02-03 15:02:16 +00:00
parent 7a6b856033
commit 9c704f6dca
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
BSSC/bssc.sql
View File

@@ -521,6 +521,7 @@ AS -- Catering gesorteerd per datum/res_id
res_disc_params dp, res_disc_params dp,
prs_bedrijf b prs_bedrijf b
WHERE rrr.res_rsv_ruimte_dirtlevel = 0 WHERE rrr.res_rsv_ruimte_dirtlevel = 0
AND rrr.res_status_fo_key = 2 -- BSSC#61120: Alleen FO-status=Definitief!
AND rrr.res_ruimte_opstel_key = rro.res_ruimte_opstel_key(+) AND rrr.res_ruimte_opstel_key = rro.res_ruimte_opstel_key(+)
AND rro.res_ruimte_key = rar1.res_ruimte_key(+) AND rro.res_ruimte_key = rar1.res_ruimte_key(+)
AND rro.res_ruimte_key = rar2.res_ruimte_key(+) AND rro.res_ruimte_key = rar2.res_ruimte_key(+)
@@ -650,7 +651,7 @@ AS
'CHV' || TRIM (x.cnt_contract_nummer) po_nr, -- Regulier 'CHV' || TRIM (x.cnt_contract_nummer) po_nr, -- Regulier
'CHV' || TRIM (x.cnt_contract_nummer) cnt_contract_nummer, -- PO 'CHV' || TRIM (x.cnt_contract_nummer) cnt_contract_nummer, -- PO
'0000' || TO_CHAR (x.ins_discipline_key) sortering, -- Sorteren op (eigen) discipline_key; 8 posities! '0000' || TO_CHAR (x.ins_discipline_key) sortering, -- Sorteren op (eigen) discipline_key; 8 posities!
'CHV - ' || TRIM (SUBSTR (tar.fac_usrdata_omschr, 1, INSTR (tar.fac_usrdata_omschr, '-') - 1)) regel, -- Huur 'CHV - ' || TRIM (SUBSTR (tar.fac_usrdata_omschr, 1, INSTR (tar.fac_usrdata_omschr, ' ') - 1)) regel, -- Huur
TO_CHAR (SYSDATE, 'dd-mm-yyyy') factuurdatum, TO_CHAR (SYSDATE + 30, 'dd-mm-yyyy') vervaldatum, TO_CHAR (SYSDATE, 'dd-mm-yyyy') factuurdatum, TO_CHAR (SYSDATE + 30, 'dd-mm-yyyy') vervaldatum,
x.cnt_contract_key, x.cnt_contract_nummer_intern, x.cnt_contract_versie, x.lv, x.cnt_contract_key, x.cnt_contract_nummer_intern, x.cnt_contract_versie, x.lv,
--x.cnt_contract_korting, -- Korting % --x.cnt_contract_korting, -- Korting %
@@ -812,7 +813,7 @@ AS
'CHV' || TRIM (x.cnt_contract_nummer) po_nr, -- Regulier 'CHV' || TRIM (x.cnt_contract_nummer) po_nr, -- Regulier
'CHV' || TRIM (x.cnt_contract_nummer) cnt_contract_nummer, -- PO 'CHV' || TRIM (x.cnt_contract_nummer) cnt_contract_nummer, -- PO
'0000' || TO_CHAR (x.ins_discipline_key) sortering, -- Sorteren op (eigen) discipline_key; 8 posities! '0000' || TO_CHAR (x.ins_discipline_key) sortering, -- Sorteren op (eigen) discipline_key; 8 posities!
'CHV - ' || TRIM (SUBSTR (tar.fac_usrdata_omschr, 1, INSTR (tar.fac_usrdata_omschr, '-') - 1)) regel, -- Huur 'CHV - ' || TRIM (SUBSTR (tar.fac_usrdata_omschr, 1, INSTR (tar.fac_usrdata_omschr, ' ') - 1)) regel, -- Huur
TO_CHAR (SYSDATE, 'dd-mm-yyyy') factuurdatum, TO_CHAR (SYSDATE + 30, 'dd-mm-yyyy') vervaldatum, TO_CHAR (SYSDATE, 'dd-mm-yyyy') factuurdatum, TO_CHAR (SYSDATE + 30, 'dd-mm-yyyy') vervaldatum,
x.cnt_contract_key, x.cnt_contract_nummer_intern, x.cnt_contract_versie, x.lv, x.cnt_contract_key, x.cnt_contract_nummer_intern, x.cnt_contract_versie, x.lv,
--x.cnt_contract_korting, -- Korting % --x.cnt_contract_korting, -- Korting %
@@ -979,7 +980,7 @@ AS
'CHV' || TRIM (x.cnt_contract_nummer) po_nr, -- Regulier 'CHV' || TRIM (x.cnt_contract_nummer) po_nr, -- Regulier
'CHV' || TRIM (x.cnt_contract_nummer) cnt_contract_nummer, -- PO 'CHV' || TRIM (x.cnt_contract_nummer) cnt_contract_nummer, -- PO
SUBSTR ('0' || TO_CHAR (x.cnt_kenmerk_key), -4) || TO_CHAR (x.ins_discipline_key) sortering, -- Sorteren op (eigen) discipline_key; 8 posities! SUBSTR ('0' || TO_CHAR (x.cnt_kenmerk_key), -4) || TO_CHAR (x.ins_discipline_key) sortering, -- Sorteren op (eigen) discipline_key; 8 posities!
'CHV - ' || TRIM (SUBSTR (tar.fac_usrdata_omschr, 1, INSTR (tar.fac_usrdata_omschr, '-') - 1)) regel, -- ICT/Facilitair/Service/Schoonmaak 'CHV - ' || TRIM (SUBSTR (tar.fac_usrdata_omschr, 1, INSTR (tar.fac_usrdata_omschr, ' ') - 1)) regel, -- ICT/Facilitair/Service/Schoonmaak
TO_CHAR (SYSDATE, 'dd-mm-yyyy') factuurdatum, TO_CHAR (SYSDATE + 30, 'dd-mm-yyyy') vervaldatum, TO_CHAR (SYSDATE, 'dd-mm-yyyy') factuurdatum, TO_CHAR (SYSDATE + 30, 'dd-mm-yyyy') vervaldatum,
x.cnt_contract_key, x.cnt_contract_nummer_intern, x.cnt_contract_versie, x.lv, x.cnt_contract_key, x.cnt_contract_nummer_intern, x.cnt_contract_versie, x.lv,
--x.cnt_contract_korting, -- Korting % --x.cnt_contract_korting, -- Korting %
@@ -1135,7 +1136,7 @@ AS
'CHV' || TRIM (x.cnt_contract_nummer) po_nr, -- Regulier 'CHV' || TRIM (x.cnt_contract_nummer) po_nr, -- Regulier
'CHV' || TRIM (x.cnt_contract_nummer) cnt_contract_nummer, -- PO 'CHV' || TRIM (x.cnt_contract_nummer) cnt_contract_nummer, -- PO
SUBSTR ('0' || TO_CHAR (x.cnt_kenmerk_key), -4) || TO_CHAR (x.ins_discipline_key) sortering, -- Sorteren op (eigen) discipline_key; 8 posities! SUBSTR ('0' || TO_CHAR (x.cnt_kenmerk_key), -4) || TO_CHAR (x.ins_discipline_key) sortering, -- Sorteren op (eigen) discipline_key; 8 posities!
'CHV - ' || TRIM (SUBSTR (tar.fac_usrdata_omschr, 1, INSTR (tar.fac_usrdata_omschr, '-') - 1)) regel, -- ICT/Facilitair/Service/Schoonmaak 'CHV - ' || TRIM (SUBSTR (tar.fac_usrdata_omschr, 1, INSTR (tar.fac_usrdata_omschr, ' ') - 1)) regel, -- ICT/Facilitair/Service/Schoonmaak
TO_CHAR (SYSDATE, 'dd-mm-yyyy') factuurdatum, TO_CHAR (SYSDATE + 30, 'dd-mm-yyyy') vervaldatum, TO_CHAR (SYSDATE, 'dd-mm-yyyy') factuurdatum, TO_CHAR (SYSDATE + 30, 'dd-mm-yyyy') vervaldatum,
x.cnt_contract_key, x.cnt_contract_nummer_intern, x.cnt_contract_versie, x.lv, x.cnt_contract_key, x.cnt_contract_nummer_intern, x.cnt_contract_versie, x.lv,
--x.cnt_contract_korting, -- Korting % --x.cnt_contract_korting, -- Korting %
@@ -1684,7 +1685,7 @@ AS
DECODE (cd.ins_discipline_key, 2004, 'CMD', 2005, 'CMD', 'CHV') || TRIM (c.cnt_contract_nummer) po_nr, -- Correctie DECODE (cd.ins_discipline_key, 2004, 'CMD', 2005, 'CMD', 'CHV') || TRIM (c.cnt_contract_nummer) po_nr, -- Correctie
DECODE (cd.ins_discipline_key, 2004, 'CMD', 2005, 'CMD', 'CHV') || TRIM (c.cnt_contract_nummer) cnt_contract_nummer, -- PO DECODE (cd.ins_discipline_key, 2004, 'CMD', 2005, 'CMD', 'CHV') || TRIM (c.cnt_contract_nummer) cnt_contract_nummer, -- PO
'9999' || SUBSTR ('999' || fr.sortering, -4) sortering, -- Correctieregels onderaan (in dezelfde volgorde als de "echte" regels); 8 posities! '9999' || SUBSTR ('999' || fr.sortering, -4) sortering, -- Correctieregels onderaan (in dezelfde volgorde als de "echte" regels); 8 posities!
'Correctie ' || fr.factuurregel || ' ' || pv.periode_van || ' - ' || pt.periode_tot regel, -- Zou consistent moeten zijn met contract! DECODE (cd.ins_discipline_key, 2004, 'CMD - ', 2005, 'CMD - ', 'CHV - ') || 'Correctie ' || fr.factuurregel || ' ' || pv.periode_van || ' - ' || pt.periode_tot regel, -- Zou consistent moeten zijn met contract!
TO_CHAR (SYSDATE, 'dd-mm-yyyy') factuurdatum, TO_CHAR (SYSDATE + 30, 'dd-mm-yyyy') vervaldatum, TO_CHAR (SYSDATE, 'dd-mm-yyyy') factuurdatum, TO_CHAR (SYSDATE + 30, 'dd-mm-yyyy') vervaldatum,
c.cnt_contract_key, c.cnt_contract_nummer_intern, c.cnt_contract_versie, c.cnt_contract_looptijd_tot lv, c.cnt_contract_key, c.cnt_contract_nummer_intern, c.cnt_contract_versie, c.cnt_contract_looptijd_tot lv,
--x.cnt_contract_korting, -- Korting % --x.cnt_contract_korting, -- Korting %
@@ -1823,7 +1824,7 @@ AS
'CHV' || TRIM (x.cnt_contract_nummer) po_nr, -- Regulier 'CHV' || TRIM (x.cnt_contract_nummer) po_nr, -- Regulier
'CHV' || TRIM (x.cnt_contract_nummer) cnt_contract_nummer, -- PO 'CHV' || TRIM (x.cnt_contract_nummer) cnt_contract_nummer, -- PO
'9999' || TO_CHAR (x.ins_discipline_key) sortering, -- Sorteren op (eigen) discipline_key; 8 posities! '9999' || TO_CHAR (x.ins_discipline_key) sortering, -- Sorteren op (eigen) discipline_key; 8 posities!
COALESCE (ks.prs_kostensoort_refcode, ks.prs_kostensoort_opmerking) regel, -- Borg CHV 'CHV - ' || COALESCE (ks.prs_kostensoort_refcode, ks.prs_kostensoort_opmerking) regel, -- Borg CHV
TO_CHAR (SYSDATE, 'dd-mm-yyyy') factuurdatum, TO_CHAR (SYSDATE + 30, 'dd-mm-yyyy') vervaldatum, TO_CHAR (SYSDATE, 'dd-mm-yyyy') factuurdatum, TO_CHAR (SYSDATE + 30, 'dd-mm-yyyy') vervaldatum,
x.cnt_contract_key, x.cnt_contract_nummer_intern, x.cnt_contract_versie, x.lv, x.cnt_contract_key, x.cnt_contract_nummer_intern, x.cnt_contract_versie, x.lv,
--x.cnt_contract_korting, -- Korting % --x.cnt_contract_korting, -- Korting %