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

AAIT#69057: Setting 'fin_defaultboekmaand' uitbreiden met boekmaand datum van gereedmelding.

Browse Source 
svn path=/Database/trunk/; revision=54804
This commit is contained in:
Maykel Geerdink
2022-02-02 15:08:58 +00:00
parent 7e9a022e48
commit 6e61f377c8
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
FAC/FAC_PACF.SRC
View File

@@ -14753,17 +14753,17 @@ AS
RETURN(p_prs_kostensoort_key);
END;
FUNCTION try_getrefdatum (p_fin_defaultboekmaand IN NUMBER, p_ckey IN NUMBER, p_okey IN NUMBER, p_bkey IN NUMBER)
FUNCTION try_getrefdatum (p_fin_defaultboekmaand_opdr IN NUMBER, p_fin_defaultboekmaand_cnt IN NUMBER, p_ckey IN NUMBER, p_okey IN NUMBER, p_bkey IN NUMBER, p_fin_factuur_datum IN DATE)
RETURN DATE
IS
refdatum DATE;
BEGIN
refdatum := NULL;
BEGIN
IF p_bkey IS NOT NULL AND p_fin_defaultboekmaand IN (2, 3)
IF p_bkey IS NOT NULL AND p_fin_defaultboekmaand_opdr IN (2, 3)
THEN
SELECT CASE
WHEN p_fin_defaultboekmaand = 2
WHEN p_fin_defaultboekmaand_opdr = 2
THEN
bes_bestelopdr_datum
ELSE
@@ -14772,10 +14772,10 @@ AS
INTO refdatum
FROM bes_bestelopdr bo
WHERE bo.bes_bestelopdr_key = p_bkey;
ELSIF p_okey IS NOT NULL AND p_fin_defaultboekmaand IN (2, 3)
ELSIF p_okey IS NOT NULL AND p_fin_defaultboekmaand_opdr IN (2, 3)
THEN
SELECT CASE
WHEN p_fin_defaultboekmaand = 2
WHEN p_fin_defaultboekmaand_opdr = 2
THEN
mld_opdr_datumbegin
ELSE
@@ -14784,9 +14784,9 @@ AS
INTO refdatum
FROM mld_opdr o
WHERE o.mld_opdr_key = p_okey;
ELSIF p_ckey IS NOT NULL
ELSIF p_ckey IS NOT NULL AND p_fin_defaultboekmaand_cnt = 2
THEN
refdatum := SYSDATE;
refdatum := p_fin_factuur_datum;
END IF;
EXCEPTION
WHEN NO_DATA_FOUND
@@ -15125,10 +15125,11 @@ BEGIN
END IF;
ELSE
c_boekmaand := TO_CHAR(SYSDATE, 'YYYY-MM');
IF (fac.getSetting('fin_defaultboekmaand') IN (2, 3))
IF ((fac.getSetting('fin_defaultboekmaand') IN (2, 3) AND c_mld_opdr_key IS NOT NULL) OR
(fac.getSetting('fin_defaultboekmaand_cnt') = 2 AND c_cnt_contract_key IS NOT NULL))
THEN
BEGIN
c_boekmaand := TO_CHAR(try_getrefdatum(fac.getSetting('fin_defaultboekmaand'), c_cnt_contract_key, c_mld_opdr_key, c_bes_bestelopdr_key), 'YYYY-MM');
c_boekmaand := TO_CHAR(try_getrefdatum(fac.getSetting('fin_defaultboekmaand'), fac.getSetting('fin_defaultboekmaand_cnt'), c_cnt_contract_key, c_mld_opdr_key, c_bes_bestelopdr_key, c_fin_factuur_datum), 'YYYY-MM');
END;
END IF;
END IF;

3
FAC/FAC_SET.SRC
View File

@@ -242,7 +242,8 @@ DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'view_dwf_with_slnkdwf'
DEFINE_SETTING('WGT', 0001, 'WEB_FACTAB', 'wgt_enabled' , 'number' , '0' , 'Is the widget module available {0 | 1} licensed separately')
DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'widgetportal' , 'number' , '0' , 'Use a widgetpage with this key as startpage (key) or the standard page (0)')
DEFINE_SETTING('FAQ', 0001, 'WEB_FACTAB', 'faq_enabled' , 'number' , '0' , 'Is kennisbank available {0 | 1} licensed separately')
DEFINE_SETTING('FIN', 0001, 'WEB_FACTAB', 'fin_defaultboekmaand' , 'number' , '1' , 'How to determine default "boekmaand" for entered invoice: 1=sysdate, 2=orderdate, 3=enddate/finisheddate')
DEFINE_SETTING('FIN', 0001, 'WEB_FACTAB', 'fin_defaultboekmaand' , 'number' , '1' , 'How to determine default "boekmaand" for entered invoice with an order: 1=sysdate, 2=orderdate, 3=enddate')
DEFINE_SETTING('FIN', 0001, 'WEB_FACTAB', 'fin_defaultboekmaand_cnt' , 'number' , '1' , 'How to determine default "boekmaand" for entered invoice with a contract: 1=sysdate, 2=invoicedate')
DEFINE_SETTING('INS', 0001, 'WEB_FACTAB', 'cnd_gebreken_srtdisc_key' , 'number' , '-1' , 'Key of the mld_srtdiscipline of the condition measurement calls')
DEFINE_SETTING('INS', 0001, 'WEB_FACTAB', 'ins_history' , 'string' , '1' , 'historymode for flexproperties {0 | 1}')
DEFINE_SETTING('INS', 0001, 'WEB_FACTAB', 'ins_image_path' , 'string' , NULL , 'path to folder storing ins_srtdeel pictures')