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

FSN#39055 BCS/2000 functionaliteit in FACILITOR - customization

Browse Source 
svn path=/Website/trunk/; revision=35239
This commit is contained in:
Erik Groener
2017-09-07 11:29:41 +00:00
parent f59c3ba529
commit ca71113f7e
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/API2/model_bgt_budget.inc
View File

@@ -209,8 +209,9 @@ function model_bgt_budget()
delete fld.amountmutation;
}
%>
<script>
<script type="text/javascript">
var cur_mode = "budget_edit"; // Laat alleen de kostensoorten zien waaraan nog geen budget gekoppeld is.
var btw_data = <%=JSON.stringify(btw_data)%>;
<% if (obj.budgetdiscipline) { %> var budgetdiscipline = "<%=obj.budgetdiscipline.id%>"; <% } %>
<% if (obj.budgetproject) { %> var budgetproject = "<%=obj.budgetproject.id%>"; <% } %>
</script>

4
APPL/API2/model_fin_factuur.inc
View File

@@ -194,7 +194,7 @@ function model_fin_factuur()
}
%>
<script>
<script type="text/javascript">
var btw_data = <%=JSON.stringify(btw_data)%>;
</script>
<%
@@ -212,7 +212,7 @@ function model_fin_factuur()
else
{
%>
<script>
<script type="text/javascript">
var cur_mode = "<%=mode%>"; // = "edit"
<% if (obj.budgetdiscipline) { %> var budgetdiscipline = "<%=obj.budgetdiscipline.id%>"; <% } %>
<% if (obj.budgetproject) { %> var budgetproject = "<%=obj.budgetproject.id%>"; <% } %>

3
APPL/API2/model_mld_opdr.inc
View File

@@ -240,7 +240,8 @@ function model_mld_opdr()
}
%>
<script>
<script type="text/javascript">
var btw_data = <%=JSON.stringify(btw_data)%>;
<% if (obj.budgetdiscipline) { %> var budgetdiscipline = "<%=obj.budgetdiscipline.id%>"; <% } %>
<% if (obj.budgetproject) { %> var budgetproject = "<%=obj.budgetproject.id%>"; <% } %>
<% if (obj.budgetcostcategory) { %> var budgetcostcategory = "<%=obj.budgetcostcategory.id%>"; <% } %>

26
APPL/BGT/bgt_search_list.asp
View File

@@ -158,19 +158,25 @@ var transitParam = buildTransitParam([]);
<body id="listbody">
<%
var mutatie_sql = " (SELECT mutatie.bgt_budget_key"
+ " , SUM(mutatie.bedrag_van) bedrag_van"
+ " , SUM(mutatie.bedrag_naar) bedrag_naar"
+ " , SUM(mutatie.bedrag_van) bedrag_van"
+ " , SUM(mutatie.bedrag_naar) bedrag_naar"
+ " , SUM(mutatie.btwbedrag_van) btwbedrag_van"
+ " , SUM(mutatie.btwbedrag_naar) btwbedrag_naar"
+ " FROM (SELECT m1.bgt_budget_key_van bgt_budget_key"
+ " , SUM(COALESCE(m1.bgt_budget_bedrag_van,0)) bedrag_van"
+ " , SUM(COALESCE(m1.bgt_budget_bedrag_van,0)) bedrag_van"
+ " , SUM(COALESCE(m1.bgt_budget_btwbedrag_van,0)) btwbedrag_van"
+ " , 0 bedrag_naar"
+ " , 0 btwbedrag_naar"
+ " FROM bgt_budgetmutatie m1"
+ " GROUP BY m1.bgt_budget_key_van"
+ " UNION"
+ " SELECT m2.bgt_budget_key_naar bgt_budget_key"
+ " , 0 bedrag_van"
+ " , SUM(COALESCE(m2.bgt_budget_bedrag_naar,0)) bedrag_naar"
+ " FROM bgt_budgetmutatie m2"
+ " GROUP BY m2.bgt_budget_key_naar"
+ " SELECT m2.bgt_budget_key_naar bgt_budget_key"
+ " , 0 bedrag_van"
+ " , 0 btwbedrag_van"
+ " , SUM(COALESCE(m2.bgt_budget_bedrag_naar,0)) bedrag_naar"
+ " , SUM(COALESCE(m2.bgt_budget_btwbedrag_naar,0)) btwbedrag_naar"
+ " FROM bgt_budgetmutatie m2"
+ " GROUP BY m2.bgt_budget_key_naar"
+ ") mutatie"
+ " GROUP BY mutatie.bgt_budget_key"
+ " ) mut";
@@ -426,7 +432,7 @@ var transitParam = buildTransitParam([]);
+ " -3 bgt_kostenrubriek_key,"
+ " 0 budget_reserve,"
+ " SUM(COALESCE(bud.bgt_budget_btwbedrag, 0)) budget_actueel,"
+ " SUM(COALESCE(mut.bedrag_naar, 0) + COALESCE(mut.bedrag_van, 0)) budget_mutatie"
+ " SUM(COALESCE(mut.btwbedrag_naar, 0) + COALESCE(mut.btwbedrag_van, 0)) budget_mutatie"
+ " FROM bgt_budget bud,"
+ " bgt_project pr,"
+ " ins_tab_discipline id,"
@@ -482,7 +488,7 @@ var transitParam = buildTransitParam([]);
+ " ksg.prs_kostensoortgrp_key,"
+ " ks.prs_kostensoort_key,"
+ " SUM(COALESCE(o.mld_opdr_kosten, 0)) gecontracteerd,"
+ " SUM(COALESCE(o.mld_opdr_kosten, 0) *0.21) gecontracteerdbtw" // TODO!
+ " SUM(COALESCE(o.mld_opdr_kosten_btw, 0)) gecontracteerdbtw"
+ " FROM mld_opdr o," /* zonder de facturen, anders wordt verdubbeld */
+ " prs_kostensoort ks,"
+ " prs_kostensoortgrp ksg,"