diff --git a/APPL/MLD/mld.inc b/APPL/MLD/mld.inc index c6f3934ca8..14c8097f94 100644 --- a/APPL/MLD/mld.inc +++ b/APPL/MLD/mld.inc @@ -3372,10 +3372,6 @@ mld = {setmeldingstatus: (mresult.canWrite("WEB_ORDBO2") && myBO2Change) || (mresult.canWrite("WEB_MLDORD") && user.isCollega(uitv_key))) && !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.canVeldChange = (mresult.canWrite("WEB_ORDBOF") || (mresult.canWrite("WEB_ORDBO2") && myBO2FieldChange)); diff --git a/APPL/MLD/opdr_close_confirm.asp b/APPL/MLD/opdr_close_confirm.asp index 1a470d2e71..cb230b054f 100644 --- a/APPL/MLD/opdr_close_confirm.asp +++ b/APPL/MLD/opdr_close_confirm.asp @@ -44,7 +44,8 @@ if (opdr_key_arr.length == 1) 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 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" + " , o.mld_melding_key"