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/branches/v2017.2/; revision=36422
This commit is contained in:
Erik Groener
2017-12-20 12:43:11 +00:00
parent 05647272fd
commit f2c0f39ed0
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
APPL/API2/model_mld_opdr.inc
View File

@@ -365,6 +365,11 @@ function model_mld_opdr()
{ // contract verplaatsen naar ander kostensoort
checkBudgetoverschrijding(obj.id, v_cur_costtype_key, 0, 0); // bedrag van deze kostensoort verwijderen
checkBudgetoverschrijding(-1, v_costtype, obj.amount, obj.vat); // (aangepast) bedrag aan nieuwe kostensoort toevoegen
// facturen krijgen ook nieuwe kostensoort.
var sql = "UPDATE fin_factuur"
+ " SET prs_kostensoort_key = " + v_costtype
+ " WHERE mld_opdr_key = " + key;
Oracle.Execute(sql);
}
else
{

6
APPL/BGT/bgt_search_list.asp
View File

@@ -450,7 +450,7 @@ var transitParam = buildTransitParam([]);
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, 1, NULL)) budget_origineel"
+ " , SUM(BGT.getBudgetOpDatum (sb.bgt_budget_key, 1, SYSDATE)) budget_actueel"
+ " , 0 budget_reserve"
+ " , MAX(BGT.getBudgetSoortMutatie(sb.bgt_kostenrubriek_key, -1, -1, 1, 'EMR', NULL)) budget_mutatie"
+ " , MAX(BGT.getBudgetSoortMutatie(sb.bgt_kostenrubriek_key, -1, -1, 1, 'EM', NULL)) budget_mutatie"
+ " FROM bgt_budget sb"
+ " WHERE sb.bgt_kostenrubriek_key IS NOT NULL"
+ " AND sb.ins_discipline_key = " + bgtdisc_key
@@ -480,8 +480,8 @@ var transitParam = buildTransitParam([]);
+ " , 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) +", 'A', NULL)) budget_reserve"
+ " , SUM(BGT.getBudgetSoortMutatie(b.bgt_kostenrubriek_key, -1, -1, "+ (bgt_inclbtw ? 2 : 0) +", 'EMR', NULL)) budget_mutatie"
+ " , 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
+ (bgtproj_key_arr.length > 0 ? " AND b.bgt_project_key IN (" + bgtproj_key_arr.join(",") + ")" : "")