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

AAIT#37456 0 waarde toestaan als (verplicht) opdrachtbedrag

Browse Source 
svn path=/Website/trunk/; revision=32136
This commit is contained in:
Erik Groener
2016-12-22 15:38:26 +00:00
parent 9a4e98e2e8
commit 7c53085a33
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/MLD/mld.inc
View File

@@ -3372,10 +3372,6 @@ mld = {setmeldingstatus:
(mresult.canWrite("WEB_ORDBO2") && myBO2Change) || (mresult.canWrite("WEB_ORDBO2") && myBO2Change) ||
(mresult.canWrite("WEB_MLDORD") && user.isCollega(uitv_key))) && (mresult.canWrite("WEB_MLDORD") && user.isCollega(uitv_key))) &&
!is_planned_action; !is_planned_action;
var kosten_verplicht_afm = ((typeopdr_matchtype != 4 && typeopdr_kosten_verplicht & 2 || (typeopdr_kosten_verplicht == 0 && opdrkosten_verplicht & 2)) ? 1 : 0) == 1;
mresult.canClose = (mresult.canClose && (!kosten_verplicht_afm || t_cost != null) );
mresult.canCopy = (mresult.canWrite("WEB_ORDBOF") && !is_planned_action && !mld_afgerond); mresult.canCopy = (mresult.canWrite("WEB_ORDBOF") && !is_planned_action && !mld_afgerond);
mresult.canVeldChange = (mresult.canWrite("WEB_ORDBOF") || mresult.canVeldChange = (mresult.canWrite("WEB_ORDBOF") ||
(mresult.canWrite("WEB_ORDBO2") && myBO2FieldChange)); (mresult.canWrite("WEB_ORDBO2") && myBO2FieldChange));

3
APPL/MLD/opdr_close_confirm.asp
View File

@@ -44,7 +44,8 @@ if (opdr_key_arr.length == 1)
var mld_opdr = mld.mld_opdr_info(opdr_key_arr[0]); var mld_opdr = mld.mld_opdr_info(opdr_key_arr[0]);
var kosten_verplicht_afm = mld_opdr.typeopdr_matchtype != 4 && (mld_opdr.typeopdr_kosten_verplicht & 2 || (mld_opdr.typeopdr_kosten_verplicht == 0 && mld_opdr.opdrkosten_verplicht & 2)); var kosten_verplicht_afm = mld_opdr.typeopdr_matchtype != 4 && (mld_opdr.typeopdr_kosten_verplicht & 2 || (mld_opdr.typeopdr_kosten_verplicht == 0 && mld_opdr.opdrkosten_verplicht & 2));
var opdr_kosten = mld_opdr.t_cost; var opdr_kosten = mld_opdr.t_cost;
user.auth_required_or_abort(this_opdr.canClose, L("lcl_mld_opdr_kosten_verpl_afm")); // Dan zijn we vlug klaar. // user.auth_required_or_abort(this_opdr.canClose, L("lcl_mld_opdr_kosten_verpl_afm")); // Dan zijn we vlug klaar.
user.auth_required_or_abort(!(kosten_verplicht_afm && opdr_kosten != 0) && this_opdr.canClose, L("lcl_mld_opdr_kosten_verpl_afm")); // Dan zijn we vlug klaar.
var sql = "SELECT o.mld_opdr_einddatum" var sql = "SELECT o.mld_opdr_einddatum"
+ " , o.mld_melding_key" + " , o.mld_melding_key"