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

KFHT#37609: Overzicht fiatteringsverzoeken.

Browse Source 
svn path=/Website/trunk/; revision=32716
This commit is contained in:
Maykel Geerdink
2017-02-06 12:31:45 +00:00
parent ad769fe31d
commit 990f37f92c
2 changed files with 75 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/FAC/fac_fiattering_list.asp
View File

@@ -489,7 +489,7 @@ FCLTHeader.Requires({ plugins: ["jQuery"], js: ["jquery-ui.js"] });
case "CNT": return L("lcl_cnt_contract"); break;
case "MLD":
case "GOED": return L("lcl_shared_order") + "<br>" + safe.html(oRs("type").Value); break;
case "OFFERTE": return safe.html(oRs("type").Value) + "<br>" + safe.html(oRs("uitvoerende").Value); break;
case "OFFERTE": return safe.html(oRs("type").Value); break;
case "FIN":
case "FIN2": return L("lcl_fin_factuur_type") + "<br>" + safe.html(oRs("type").Value); break;
default: INTERNAL_ERROR;
@@ -571,12 +571,14 @@ FCLTHeader.Requires({ plugins: ["jQuery"], js: ["jquery-ui.js"] });
rst.addColumn(new Column({caption: L("lcl_rfo_requestor"), content: "prs_perslid_naam_full", hasActions: true }));
rst.addColumn(new Column({caption: L("lcl_rfo_total_sum"), content: prepareTotal, datatype: "currency"}));
rst.addColumn(new Column({caption: L("lcl_rfo_type"), content: prepareModule}));
rst.addColumn(new Column({caption: L("lcl_handler"), content: "uitvoerende"}));
rst.addColumn(new Column({caption: L("lcl_rfo_category"), content: "categorie"}));
rst.addColumn(new Column({caption: L("lcl_bes_RFO_status"), content: fncolStatus}));
if (user.hasCollegas())
rst.addColumn(new Column({caption: L("lcl_bes_approver"), content: fncolfiatteur}));
rst.addColumn(new Column({caption: L("lcl_location"), content: "locatie"}));
rst.addColumn(new Column({caption: L("lcl_bld_terra"), content: fncolGebouwTerrein, combine: true}));
rst.addColumn(new Column({caption: L("lcl_descr"), content: "omschrijving"}));
rst.addAction({action: "fac_edit", caption: L("lcl_details"), isDefault: true});
rst.addAction({action: "fac_approve", caption: L("lcl_approve"), enabler: "eApprove", multi: true, multiOnce: true});

10
APPL/FAC/fac_fiattering_list.inc
View File

@@ -78,6 +78,7 @@ function getSqlFiatBes(fiatstatus, prsKeys, params)
+ " , l.alg_locatie_omschrijving || ' (' || l.alg_locatie_code || ')' locatie"
+ " , NULL gebouw"
+ " , NULL terrein"
+ " , NULL omschrijving"
+ " FROM prs_v_perslid_fullnames_all p"
+ " , bes_bestelling b"
+ " , " + v_sql_bestelling_bedrag + " prijs"
@@ -320,6 +321,7 @@ function getSqlFiatCnt(fiatstatus, prsKeys, params)
+ " ELSE NULL"
+ " END gebouw"
+ " , NULL terrein"
+ " , c.cnt_contract_omschrijving omschrijving"
+ " FROM prs_v_perslid_fullnames_all p"
+ " , cnt_v_aanwezigcontract c"
+ " , ins_tab_discipline td"
@@ -423,6 +425,7 @@ function getSqlFiatMld(fiatstatus, prsKeys, params)
+ " END locatie"
+ " , g.alg_gebouw_code || ' ' || g.alg_gebouw_naam gebouw"
+ " , t.alg_terreinsector_code || ' ' || alg_terreinsector_naam terrein")
+ " , m.mld_melding_omschrijving omschrijving"
+ " FROM mld_melding m"
+ " , mld_stdmelding sm"
+ " , mld_opdr op"
@@ -507,7 +510,9 @@ function getSqlGoedkeurMld(fiatstatus, prsKeys, params)
+ " , ' ' fiatteur" // dat kunnen er meerdere met WEB_ORDGOE zijn
+ " , NULL bes_bestelling_parentkey"
+ " , sd.ins_srtdiscipline_prefix prefix"
+ " , NULL uitvoerende"
+ " , COALESCE((SELECT b.prs_bedrijf_naam FROM prs_bedrijf b WHERE b.prs_bedrijf_key = op.mld_uitvoerende_keys),"
+ " COALESCE((SELECT " + S("prs_pers_string") + " FROM prs_perslid p WHERE p.prs_perslid_key = op.mld_uitvoerende_keys),"
+ " '')) uitvoerende"
+ " , CASE "
+ " WHEN l.alg_locatie_key IS NULL"
+ " THEN NULL"
@@ -515,6 +520,7 @@ function getSqlGoedkeurMld(fiatstatus, prsKeys, params)
+ " END locatie"
+ " , g.alg_gebouw_code || ' ' || g.alg_gebouw_naam gebouw"
+ " , t.alg_terreinsector_code || ' ' || alg_terreinsector_naam terrein"
+ " , op.mld_opdr_omschrijving omschrijving"
+ " FROM mld_melding m"
+ " , mld_disc_params mdp"
+ " , mld_stdmelding sm"
@@ -660,6 +666,7 @@ function getSqlAccAfwOff(params)
+ " END locatie"
+ " , g.alg_gebouw_code || ' ' || g.alg_gebouw_naam gebouw"
+ " , t.alg_terreinsector_code || ' ' || alg_terreinsector_naam terrein"
+ " , o.mld_opdr_omschrijving omschrijving"
+ " FROM mld_melding m"
+ " , mld_stdmelding sm"
+ " , mld_opdr o"
@@ -781,6 +788,7 @@ function getSqlFiatFin(fiatstatus, prsKeys, params)
+ " THEN t.alg_terreinsector_code || ' ' || alg_terreinsector_naam"
+ " ELSE NULL" // f.bes_bestelopdr_key IS NOT NULL en f.cnt_contract_key IS NOT NULL
+ " END terrein"
+ " , NULL omschrijving"
+ " FROM (SELECT prs.getkpverantwoordelijke(prs_kostenplaats_key, " + S("prs_approvemethod") + ", -1) budgethouder,"
+ " f.* FROM (select fin.getfactuurkostenplaats(f.fin_factuur_key) prs_kostenplaats_key, f.* from fin_factuur f) f) f"
+ " , prs_v_perslid_fullnames_all pf"