NYBU#31287 keys kenmerksoorten refunds aanpassen

svn path=/Customer/trunk/; revision=25067
This commit is contained in:
Peter Koerhuis
2015-04-30 15:43:21 +00:00
parent d5856ced56
commit 8157d3132b

View File

@@ -2522,12 +2522,12 @@ AS
-- cnt_srtkenmerk Verhuurbare ruimte 102
-- cnt_srtkenmerk P-number 341
-- cnt_srtkenmerk Maak allonge(s) 681
-- cnt_srtkenmerk Refund omschrijving (BTW hoog) 773
-- cnt_srtkenmerk Refund bedrag (BTW hoog) 774
-- cnt_srtkenmerk Refund omschrijving (BTW laag) 775
-- cnt_srtkenmerk Refund bedrag (BTW laag) 776
-- cnt_srtkenmerk Refund omschrijving (geen BTW) 777
-- cnt_srtkenmerk Refund bedrag (geen BTW) 778
-- cnt_srtkenmerk Refund omschrijving (BTW hoog) 722
-- cnt_srtkenmerk Refund bedrag (incl BTW hoog) 723
-- cnt_srtkenmerk Refund omschrijving (BTW laag) 724
-- cnt_srtkenmerk Refund bedrag (incl BTW laag) 725
-- cnt_srtkenmerk Refund omschrijving (geen BTW) 726
-- cnt_srtkenmerk Refund bedrag (geen BTW) 727
-- fac_usrtab CODA_BTW 42
-- fac_usrtab CODA_OMS 43
CREATE OR REPLACE PROCEDURE nybu_bereken_factuurregels (
@@ -2647,8 +2647,8 @@ AS
AND kcb.cnt_contract_key = c.cnt_contract_key
AND kco.cnt_kenmerk_key = ko.cnt_kenmerk_key
AND kcb.cnt_kenmerk_key = kb.cnt_kenmerk_key
AND ko.cnt_kenmerk_key IN (SELECT cnt_kenmerk_key FROM cnt_kenmerk WHERE cnt_srtkenmerk_key = 773)
AND kb.cnt_kenmerk_key IN (SELECT cnt_kenmerk_key FROM cnt_kenmerk WHERE cnt_srtkenmerk_key = 774)
AND ko.cnt_kenmerk_key IN (SELECT cnt_kenmerk_key FROM cnt_kenmerk WHERE cnt_srtkenmerk_key = 722)
AND kb.cnt_kenmerk_key IN (SELECT cnt_kenmerk_key FROM cnt_kenmerk WHERE cnt_srtkenmerk_key = 723)
UNION ALL
SELECT c.cnt_contract_key,
kco.cnt_kenmerkcontract_waarde omschrijving,
@@ -2670,8 +2670,8 @@ AS
AND kcb.cnt_contract_key = c.cnt_contract_key
AND kco.cnt_kenmerk_key = ko.cnt_kenmerk_key
AND kcb.cnt_kenmerk_key = kb.cnt_kenmerk_key
AND ko.cnt_kenmerk_key IN (SELECT cnt_kenmerk_key FROM cnt_kenmerk WHERE cnt_srtkenmerk_key = 775)
AND kb.cnt_kenmerk_key IN (SELECT cnt_kenmerk_key FROM cnt_kenmerk WHERE cnt_srtkenmerk_key = 776)
AND ko.cnt_kenmerk_key IN (SELECT cnt_kenmerk_key FROM cnt_kenmerk WHERE cnt_srtkenmerk_key = 724)
AND kb.cnt_kenmerk_key IN (SELECT cnt_kenmerk_key FROM cnt_kenmerk WHERE cnt_srtkenmerk_key = 725)
UNION ALL
SELECT c.cnt_contract_key,
kco.cnt_kenmerkcontract_waarde omschrijving,
@@ -2693,8 +2693,8 @@ AS
AND kcb.cnt_contract_key = c.cnt_contract_key
AND kco.cnt_kenmerk_key = ko.cnt_kenmerk_key
AND kcb.cnt_kenmerk_key = kb.cnt_kenmerk_key
AND ko.cnt_kenmerk_key IN (SELECT cnt_kenmerk_key FROM cnt_kenmerk WHERE cnt_srtkenmerk_key = 777)
AND kb.cnt_kenmerk_key IN (SELECT cnt_kenmerk_key FROM cnt_kenmerk WHERE cnt_srtkenmerk_key = 778) ),
AND ko.cnt_kenmerk_key IN (SELECT cnt_kenmerk_key FROM cnt_kenmerk WHERE cnt_srtkenmerk_key = 726)
AND kb.cnt_kenmerk_key IN (SELECT cnt_kenmerk_key FROM cnt_kenmerk WHERE cnt_srtkenmerk_key = 727) ),
contracten AS
(SELECT c.cnt_contract_key,
c.ins_discipline_key,