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

TWYN#55098 rapport correspondeert niet met online

Browse Source 
svn path=/Website/branches/v2018.1/; revision=39604
This commit is contained in:
Erik Groener
2018-11-02 11:36:12 +00:00
parent c72c54fbc1
commit 72c1b20519
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
APPL/BGT/bgt_search_list.asp
View File

@@ -159,6 +159,7 @@ var transitParam = buildTransitParam([]);
<body id="listbody">
<%
// zoiets moet het dan gaan worden. Vast nog wat verfijnder. UNIONs met reserve e.d. nodig?
v_sysdate = new Date(); // hiervan wordt later einde deze dag (23:59) van gemaakt.
if (groupby == 1) // facturen
{
// hier heeft elke factuur precies 1 regel
@@ -304,8 +305,8 @@ var transitParam = buildTransitParam([]);
+ " , p.kostensoort onderdeel"
+ " , p.scode rcode"
+ " , p.scode sortcode"
+ " , MAX(BGT.getBudgetOpDatum(b.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) + ", NULL)) budget_origineel"
+ " , MAX(BGT.getBudgetOpDatum(b.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) + ", SYSDATE)) budget_actueel"
+ " , MAX(BGT.getBudgetOpDatum(b.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) + ", NULL)) budget_origineel"
+ " , MAX(BGT.getBudgetOpDatum(b.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) + ", " + v_sysdate.endToSQL() + ")) budget_actueel"
+ " , MAX(BGT.getBudgetSoortMutatie(p.bgt_kostenrubriek_key, p.prs_kostensoortgrp_key, p.prs_kostensoort_key, "+ (bgt_inclbtw ? 2 : 0) + ", 'AR', NULL)) budget_reserve"
+ " , MAX(BGT.getBudgetSoortMutatie(p.bgt_kostenrubriek_key, p.prs_kostensoortgrp_key, p.prs_kostensoort_key, "+ (bgt_inclbtw ? 2 : 0) + ", 'EM', NULL)) budget_mutatie"
+ " FROM bgt_v_project_full p"
@@ -349,8 +350,8 @@ var transitParam = buildTransitParam([]);
+ " , bd.budget_mutatie"
+ " FROM bgt_v_project_full pr"
+ " , (SELECT sb.prs_kostensoortgrp_key"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) + ", NULL)) budget_origineel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) + ", SYSDATE)) budget_actueel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) + ", NULL)) budget_origineel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) + ", " + v_sysdate.endToSQL() + ")) budget_actueel"
+ " , MAX(BGT.getBudgetSoortMutatie(NULL, sb.prs_kostensoortgrp_key, -1, "+ (bgt_inclbtw ? 2 : 0) + ", 'AR', NULL)) budget_reserve"
+ " , MAX(BGT.getBudgetSoortMutatie(NULL, sb.prs_kostensoortgrp_key, -1, "+ (bgt_inclbtw ? 2 : 0) + ", 'EM', NULL)) budget_mutatie"
+ " FROM bgt_budget sb"
@@ -379,9 +380,9 @@ var transitParam = buildTransitParam([]);
+ " , bd.budget_mutatie"
+ " FROM bgt_v_project_full pr"
+ " , (SELECT sb.bgt_kostenrubriek_key"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) + ", NULL)) budget_origineel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) + ", SYSDATE)) budget_actueel"
+ " , MAX(BGT.getBudgetSoortMutatie(sb.bgt_kostenrubriek_key, NULL, NULL, "+ (bgt_inclbtw ? 2 : 0) + ", 'AR', NULL)) budget_reserve"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) + ", NULL)) budget_origineel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) + ", " + v_sysdate.endToSQL() + ")) budget_actueel"
+ " , MAX(BGT.getBudgetSoortMutatie(sb.bgt_kostenrubriek_key, NULL, NULL, "+ (bgt_inclbtw ? 2 : 0) + ", 'AR', NULL)) budget_reserve"
+ " , MAX(BGT.getBudgetSoortMutatie(sb.bgt_kostenrubriek_key, NULL, NULL, "+ (bgt_inclbtw ? 2 : 0) + ", 'EM', NULL)) budget_mutatie"
+ " FROM bgt_budget sb"
+ " WHERE sb.prs_kostensoortgrp_key IS NULL "
@@ -415,8 +416,8 @@ var transitParam = buildTransitParam([]);
+ " FROM bgt_v_project_full pr"
+ " , (SELECT sb.bgt_project_key"
+ " , sb.bgt_kostenrubriek_key"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, 0, NULL)) budget_origineel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, 0, SYSDATE)) budget_actueel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, 0, NULL)) budget_origineel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, 0, " + v_sysdate.endToSQL() + ")) budget_actueel"
+ " , MAX(BGT.getBudgetSoortMutatie(sb.bgt_kostenrubriek_key, -1, -1, 0, 'AR', NULL)) budget_reserve"
+ " , MAX(BGT.getBudgetSoortMutatie(sb.bgt_kostenrubriek_key, -1, -1, 0, 'EM', NULL)) budget_mutatie"
+ " FROM bgt_budget sb"
@@ -450,8 +451,8 @@ var transitParam = buildTransitParam([]);
+ " FROM bgt_v_project_full pr"
+ " , (SELECT sb.bgt_project_key"
+ " , sb.bgt_kostenrubriek_key"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, 1, NULL)) budget_origineel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, 1, SYSDATE)) budget_actueel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, 1, NULL)) budget_origineel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, 1, " + v_sysdate.endToSQL() + ")) budget_actueel"
+ " , MAX(BGT.getBudgetSoortMutatie(sb.bgt_kostenrubriek_key, -1, -1, 1, '', NULL)) budget_reserve"
+ " , MAX(BGT.getBudgetSoortMutatie(sb.bgt_kostenrubriek_key, -1, -1, 1, 'EM', NULL)) budget_mutatie"
+ " FROM bgt_budget sb"
@@ -477,13 +478,13 @@ var transitParam = buildTransitParam([]);
var sql1 = "SELECT db.project"
+ " , db.subproject deelproject"
+ " , sb.bgt_project_key"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) +", NULL)) budget_origineel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) +", SYSDATE)) budget_actueel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) +", NULL)) budget_origineel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, "+ (bgt_inclbtw ? 2 : 0) +", " + v_sysdate.endToSQL() + ")) budget_actueel"
+ " , MAX(mb.budget_reserve) budget_reserve"
+ " , MAX(mb.budget_mutatie) budget_mutatie"
+ " FROM bgt_budget sb"
+ " , ( SELECT b.bgt_project_key"
+ " , SUM(BGT.getBudgetSoortMutatie(b.bgt_kostenrubriek_key, -1, -1, "+ (bgt_inclbtw ? 2 : 0) +", 'AR', NULL)) budget_reserve"
+ " , SUM(BGT.getBudgetSoortMutatie(b.bgt_kostenrubriek_key, -1, -1, "+ (bgt_inclbtw ? 2 : 0) +", 'AR', NULL)) budget_reserve"
+ " , SUM(BGT.getBudgetSoortMutatie(b.bgt_kostenrubriek_key, -1, -1, "+ (bgt_inclbtw ? 2 : 0) +", 'EM', NULL)) budget_mutatie"
+ " FROM bgt_budget b"
+ " WHERE b.ins_discipline_key = " + bgtdisc_key

2
APPL/FAC/fac_usrrap_search.asp
View File

@@ -144,7 +144,7 @@ var fac_usrrap = usrrap.fac_usrrap_info(usrrap_key);
}
if (fac_usrrap.vraageinddatum)
{
var calendar_params = {label: L("lcl_to"), volgnr: 2, required: !S("bgt_enabled")};
var calendar_params = {label: L("lcl_through"), volgnr: 2, required: !S("bgt_enabled")};
if (S("bgt_enabled"))
{
calendar_params.datum = new Date();