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

TWYN#52077 totaaloverzicht niet hetzelfde als overzicht per rubriek

Browse Source 
svn path=/Website/trunk/; revision=36862
This commit is contained in:
Erik Groener
2018-02-07 09:45:59 +00:00
parent 1efdaec61e
commit d62c0c220b
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
APPL/API2/model_bgt_budget.inc
View File

@@ -93,12 +93,20 @@ function model_bgt_budget()
},
"amountmutation": {
"dbs": "bgt_budget_bedrag_mutatie",
"sql": "(BGT.getBudgetMutaties(bgt_budget.bgt_budget_key, 0, NULL, NULL))",
"sql": "(BGT.getBudgetSoortMutatie(NULL, NULL, bgt_budget.prs_kostensoort_key, 0, 'EM', NULL))",
"label": L("bgt_budget_mutaties"),
"typ": "float",
"iscurrency": true,
"total": true
},
"amountreservation": {
"dbs": "bgt_budget_bedrag_reserve",
"sql": "(BGT.getBudgetSoortMutatie(NULL, NULL, bgt_budget.prs_kostensoort_key, 0, 'AR', NULL))",
"label": L("bgt_budget_vnreserve"),
"typ": "float",
"iscurrency": true,
"total": true
},
"amount": {
"dbs": "bgt_budget_bedrag",
"label": L("bgt_budget_bedrag"),

1
APPL/BGT/bgt_budget.asp
View File

@@ -59,6 +59,7 @@ var model_params = {
"costtype",
"amountoriginal",
"amountmutation",
"amountreservation",
"amount",
"vat"
],

16
APPL/BGT/bgt_search_list.asp
View File

@@ -988,9 +988,9 @@ var transitParam = buildTransitParam([]);
rst.addColumn(new Column({caption: L("prs_kostensoort"), content: "onderdeel"}));
if (groupby > 2) // denk ik
{
rst.addColumn(new Column({caption: "Origineel", content: budgetOrigineelShow, fnAmount: budgetOrigineelAmount, datatype: "currency", total: true}));
rst.addColumn(new Column({caption: "Mutatie", content: budgetMutatieShow, fnAmount: budgetMutatieAmount, datatype: "currency", total: true}));
rst.addColumn(new Column({caption: "Van/naar Reserve", content: budgetReserveShow, fnAmount: budgetReserveAmount, datatype: "currency", total: true}));
rst.addColumn(new Column({caption: L("bgt_budget_origineel"), content: budgetOrigineelShow, fnAmount: budgetOrigineelAmount, datatype: "currency", total: true}));
rst.addColumn(new Column({caption: L("bgt_budget_mutaties"), content: budgetMutatieShow, fnAmount: budgetMutatieAmount, datatype: "currency", total: true}));
rst.addColumn(new Column({caption: L("bgt_budget_vnreserve"), content: budgetReserveShow, fnAmount: budgetReserveAmount, datatype: "currency", total: true}));
rst.addColumn(new Column({caption: L("bgt_budget_bedrag"), content: budgetActueelShow, fnAmount: budgetActueelAmount, datatype: "currency", total: true}));
}
if (groupby <= 2)
@@ -1042,14 +1042,8 @@ var transitParam = buildTransitParam([]);
}
if (groupby > 2) // denk ik
{
rst.addColumn(new Column({caption: "Origineel", content: "budget_origineel"}));
rst.addColumn(new Column({caption: "Mutatie", content: "budget_mutatie"}));
rst.addColumn(new Column({caption: L("bgt_budget_bedrag"), content: "budget_actueel"}));
rst.addColumn(new Column({caption: L("bgt_opdrachtentogo"), content: "tecontracteren"}));
rst.addColumn(new Column({caption: L("bgt_facturentogo"), content: "tefactureren"}));
//
rst.addColumn(new Column({caption: "Origineel", content: rs_budget_org}));
rst.addColumn(new Column({caption: "Mutatie", content: rs_budget_mut}));
rst.addColumn(new Column({caption: L("bgt_budget_origineel"), content: rs_budget_org}));
rst.addColumn(new Column({caption: L("bgt_budget_mutaties"), content: rs_budget_mut}));
rst.addColumn(new Column({caption: L("bgt_budget_bedrag"), content: rs_budget_act}));
rst.addColumn(new Column({caption: L("bgt_opdrachtentogo"), content: rs_contracteren}));
rst.addColumn(new Column({caption: L("bgt_facturentogo"), content: rs_factureren}));