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

MDUX#38433: Aanpassing procedure vrije bestellingen.

Browse Source 
svn path=/Website/trunk/; revision=32571
This commit is contained in:
Maykel Geerdink
2017-01-26 14:26:50 +00:00
parent 03c1cacb33
commit a86429bcb4
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/FAC/fac_fiattering_list.asp
View File

@@ -11,7 +11,8 @@
Requires: WEB_ORDOAP autorisatie
Ik moet fiatteren als:
BES) bes_bestelling_status == 2 AND
BES) bes_disc_info.disc_params_fiatflow == 0 && bes_bestelling_status == 2
bes_disc_info.disc_params_fiatflow == 1 && bes_bestelling_status == 4 AND
A1) bes_bestelling_fiat_user IS NULL AND
ik ben NVL(kostenplaatsverantwoordelijke, kostenplaatsgroepverantwoordelijke)
A2) of: bes_bestelling_fiat_user IS NOT NULL AND

21
APPL/FAC/fac_fiattering_list.inc
View File

@@ -16,9 +16,19 @@ function getSqlFiatBes(fiatstatus, prsKeys, params)
+ " , SUM(bi.bes_bestelling_item_prijs * bi.bes_bestelling_item_aantal) bestelling_bedrag"
+ " FROM bes_bestelling b"
+ " , bes_bestelling_item bi"
+ " , bes_srtdeel bsd"
+ " , bes_srtgroep bsg"
+ " , bes_disc_params bdp"
+ " WHERE b.bes_bestelling_key = bi.bes_bestelling_key"
+ " AND bi.bes_srtdeel_key = bsd.bes_srtdeel_key"
+ " AND bsd.bes_srtgroep_key = bsg.bes_srtgroep_key"
+ " AND bsg.ins_discipline_key = bdp.bes_ins_discipline_key"
+ (fiatstatus == "open"
? " AND b.bes_bestelling_status = 2" // Te fiatteren
? " AND b.bes_bestelling_status = CASE"
+ " WHEN bdp.bes_disc_params_fiatflow = 0"
+ " THEN 2"
+ " ELSE 4"
+ " END" // Te fiatteren
: (fiatstatus == "close"
? " AND b.bes_bestelling_status != 2" // Gefiatteerd
: " AND b.bes_bestelling_status = 1")) // Afgewezen
@@ -75,6 +85,7 @@ function getSqlFiatBes(fiatstatus, prsKeys, params)
+ " , bes_srtdeel sd"
+ " , bes_srtgroep sg"
+ " , ins_tab_discipline td"
+ " , bes_disc_params dp"
+ " , prs_kostenplaats k"
+ " , " + fac.getVSqlVerantwoordelijk(prsKeys) + "ver"
+ (fiatstatus != "open"
@@ -91,14 +102,18 @@ function getSqlFiatBes(fiatstatus, prsKeys, params)
+ " AND sd.bes_srtdeel_key = bi.bes_srtdeel_key"
+ " AND sd.bes_srtgroep_key = sg.bes_srtgroep_key"
+ " AND sg.ins_discipline_key = td.ins_discipline_key"
+ " AND td.ins_discipline_key = dp.bes_ins_discipline_key"
+ " AND p.prs_perslid_key = b.prs_perslid_key"
+ " AND b.prs_kostenplaats_key = k.prs_kostenplaats_key"
+ " AND k.prs_kostenplaats_key = ver.prs_kostenplaats_key(+)"
+ " AND b.mld_adres_key_lev = m.mld_adres_key" // Afleveradres is altijd verplicht
+ " AND m.alg_locatie_key = l.alg_locatie_key(+)"
+ (fiatstatus == "open"
? " AND b.bes_bestelling_status IN (2, 3)" // nieuw, eerste keer gefiatteerd
+ " AND b.bes_bestelling_status = 2"
? " AND b.bes_bestelling_status = CASE"
+ " WHEN dp.bes_disc_params_fiatflow = 0"
+ " THEN 2"
+ " ELSE 4"
+ " END"
/* A1 */ + " AND ((bes_bestelling_fiat_user IS NULL AND"
+ " prs.getkpverantwoordelijke (b.prs_kostenplaats_key, " + S("prs_approvemethod") + ", " + exclude_fiatter + ") IN (" + prsKeys + ")" + ")"
/* A2 */ + " OR (bes_bestelling_fiat_user IS NOT NULL AND"