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

TWYN#54974 cijfers kloppen niet: budgetmutatie als gevolg van toevoegen contract pas op hook_post_post ivm evt fout in opslaan mlp_opdr.

Browse Source 
svn path=/Website/branches/v2018.1/; revision=39420
This commit is contained in:
Erik Groener
2018-10-17 08:16:14 +00:00
parent b872a215a1
commit b01a405b8d
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
APPL/API2/model_mld_opdr.inc
View File

@@ -147,6 +147,7 @@ function model_mld_opdr()
"dbs": "mld_uitvoerende_keys",
"label": L("lcl_ord_company"),
"typ": "key",
"required": true,
"foreign": bgt_company_foreign(),
"showtransit": true
},
@@ -286,10 +287,13 @@ function model_mld_opdr()
obj._is_clone = getQParamInt("scf_clone", 0);
var mld_opdr_id = (obj._is_clone == 1 ? getQParamInt("id", -1) : obj.id);
var btw_data = {};
if (obj.id > -1 || obj.ordernr_sort)
if (obj.id > -1)
{
fld.ordernr.hidden_fld = false;
fld.ordernr.readonly = true;
}
if (obj._is_clone)
{
fld.company.hidden_fld = true;
}
if (mld_opdr_id > -1)
@@ -458,7 +462,11 @@ obj._is_clone=2 --> nieuwe sub-opdracht
oRs.Close();
// Nieuw contract, dus volgnummer is altijd uniek hierbinnen.
}
}
this.hook_post_post = function(params, obj, key)
{
var v_costtype = (typeof obj.costtype == "object" ? obj.costtype.id : obj.costtype);
var v_budget = getBudget(v_costtype);
if (obj.additional == 0)
{

1
APPL/BGT/bgt_budget.js
View File

@@ -30,6 +30,7 @@ function init_budget()
var v_budgetcostcategory = typeof budgetcostcategory_key == "undefined" ? -1 : budgetcostcategory_key;
var v_costtypegroup = typeof costtypegroup_key == "undefined" ? -1 : costtypegroup_key;
var v_costtype = typeof costtype_key == "undefined" ? -1 : costtype_key;
var v_company = typeof company_key == "undefined" ? -1 : company_key;
// Overrules voor de multiedit modal
if (typeof budgetrubriek_overrule != "undefined" && budgetrubriek_overrule != -1) v_budgetcostcategory = budgetrubriek_overrule;

2
APPL/SCF/scaffolding.inc
View File

@@ -282,7 +282,7 @@ function scf_ROFIELDTR(model, fld, val, key, params)
ROFIELDTR("fldcurrency", field.label, txt, params);
else
{
if (!field.hidden_fld)
if (!field.hidden_fld || (field.hidden_fld && field.showtransit))
{
if (field.typ == "memo" && !field.secret)
{