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

FSN#39054 Budgetcontrole uitbreiding: BGT module - savepoint

Browse Source 
svn path=/Website/trunk/; revision=33486
This commit is contained in:
Peter Feij
2017-04-13 15:11:40 +00:00
parent 6dbf3c8640
commit 5a757d4378
2 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
APPL/API2/model_bgt_budget.inc
View File

@@ -11,6 +11,7 @@
Notes:
*/
%>
<!-- #include file="../mgt/mgt_tools.inc" -->
<%
function model_bgt_budget()
@@ -39,12 +40,8 @@ function model_bgt_budget()
"typ": "key",
"required": true,
"insertonly": true,
"foreign": {
"tbl": "ins_tab_discipline",
"key": "ins_discipline_key",
"desc": "ins_discipline_omschrijving",
"where": "ins_discipline_module = 'BGT' AND ins_discipline_verwijder IS NULL"
}
"foreign": bgt_budgetdiscipline_foreign(),
"emptyoption": null
},
"budgetproject": {
"dbs": "bgt_project_key",
@@ -52,35 +49,24 @@ function model_bgt_budget()
"typ": "key",
"required": true,
"insertonly": true,
"foreign": {
"tbl": "bgt_project",
"key": "bgt_project_key",
"desc": "bgt_project_omschrijving"
}
"foreign": bgt_budgetproject_foreign(),
"emptyoption": null
},
"budgetcostcategory": {
"dbs": "bgt_kostenrubriek_key",
"label": L("bgt_kostenrubriek_oms"),
"typ": "key",
"required": true,
"required": false,
"insertonly": true,
"foreign": {
"tbl": "bgt_kostenrubriek",
"key": "bgt_kostenrubriek_key",
"desc": "bgt_kostenrubriek_oms"
}
"foreign": bgt_budgetcostcategory_foreign()
},
"costtypegroup": {
"dbs": "prs_kostensoortgrp_key",
"label": L("prs_kostensoortgrp_key"),
"typ": "key",
"required": true,
"required": false,
"insertonly": true,
"foreign": {
"tbl": "prs_kostensoortgrp",
"key": "prs_kostensoortgrp_key",
"desc": "prs_kostensoortgrp_oms"
},
"foreign": bgt_costtypegroup_foreign(),
"LOVinit": "",
"filter": "exact"
},
@@ -88,13 +74,9 @@ function model_bgt_budget()
"dbs": "prs_kostensoort_key",
"label": L("prs_kostensoort_key"),
"typ": "key",
"required": true,
"required": false,
"insertonly": true,
"foreign": {
"tbl": "prs_kostensoort",
"key": "prs_kostensoort_key",
"desc": "prs_kostensoort_opmerking"
}
"foreign": bgt_costtype_foreign()
},
"amount": {
"dbs": "bgt_budget_bedrag",
@@ -115,13 +97,14 @@ function model_bgt_budget()
"contingency": {
"dbs": "bgt_budget_isreserve",
"label": L("bgt_budget_isreserve"),
"typ": "check0"
"typ": "check0",
"defaultvalue": 1
},
"begin": {
"dbs": "bgt_budget_begin",
"label": L("bgt_budget_begin"),
"typ": "date",
"required": true
"required": false
},
"end": {
"dbs": "bgt_budget_eind",
@@ -148,13 +131,14 @@ function model_bgt_budget()
"key": "prs_kostenplaats_key",
"desc": "prs_kostenplaats_nr"
}
},
}
/*,
"expirationdate": {
"dbs": "bgt_budget_vervaldatum",
"label": L("bgt_budget_vervaldatum"),
"hidden_fld": true,
"typ": "date"
}
} */
};
this.edit = {
@@ -163,7 +147,7 @@ function model_bgt_budget()
this.list = {
"columns": [
"costcategory",
"budgetcostcategory",
"costtypegroup",
"costtype",
"amount",

32
APPL/MGT/bgt_budget.asp
View File

@@ -1,4 +1,4 @@
<%@language = "javascript" %>
<%@language = "javascript" %>
<!-- #include file="../scf/scaffolding.inc" -->
<!-- #include file="../api2/model_bgt_budget.inc" -->
@@ -11,20 +11,36 @@ scaffolding(this_model,
"search": {
"autosearch": true,
"filters": [
"catalog",
"group",
"cost_category"
]
"budgetdiscipline",
"budgetproject",
"budgetcostcategory",
"costtypegroup",
"costtype"
],
"requires": {
"js": ["../mgt/bgt_budget.js"]
}
},
"list": {
"columns": [
"costcategory",
"budgetproject",
"budgetcostcategory",
"costtypegroup",
"cost_category",
"limit"
"costtype",
"amount",
"vat"
],
"orderby": [
"budgetproject",
"budgetcostcategory",
"costtypegroup",
"costtype"
]
},
"edit":{
"requires": {
"js": ["../mgt/bgt_budget.js"]
},
"modal": true
}
});