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

FSN#39826: Goedkeuringsniveaus werken niet (icm fiattering?).

Browse Source 
svn path=/Website/trunk/; revision=33140
This commit is contained in:
Maykel Geerdink
2017-03-14 14:34:34 +00:00
parent 8ba653abc1
commit ffee659a3b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
APPL/MLD/mld.inc
View File

@@ -3455,24 +3455,24 @@ mld = {setmeldingstatus:
mresult.canChange = (mresult.canWrite("WEB_ORDBOF")); mresult.canChange = (mresult.canWrite("WEB_ORDBOF"));
mresult.canChangeUrole = "bo"; mresult.canChangeUrole = "bo";
mresult.canGoedkeur = mresult.canWrite("WEB_ORDGOE") && !is_planned_action && // Heb ik de rechten om goed te keuren op dit niveau 1? mresult.canGoedkeur = mresult.canWrite("WEB_ORDGOE") && !is_planned_action && // Heb ik de rechten om goed te keuren op dit niveau 1?
((((S("mld_opdr_approval_all") == 0 && t_cost >= bestellimiet) || (S("mld_opdr_approval_all") == 1 && t_cost <= bestellimiet2)) && (((S("mld_opdr_approval_all") == 0 && t_cost >= bestellimiet) ||
opdr_approved <= bestellimiet) || (S("mld_opdr_approval_all") == 1 && t_cost <= bestellimiet2)) &&
(t_cost >= gvs && opdr_approved < 0)); ((!refiat && opdr_approved <= bestellimiet) || (refiat && t_cost >= gvs && opdr_approved < 0)));
mresult.canGoedkeur2 = mresult.canWrite("WEB_ORDGO2") && !is_planned_action && mresult.canGoedkeur2 = mresult.canWrite("WEB_ORDGO2") && !is_planned_action &&
// Setting mld_opdr_approval_all is // Setting mld_opdr_approval_all is
// 0: Het approved bedrag is eigen bestellimiet of vorige goedkeur niveau rechten heb ik al (dan direct niveau hoger) // 0: Het approved bedrag is eigen bestellimiet of vorige goedkeur niveau rechten heb ik al (dan direct niveau hoger)
// 1: Het approved bedrag is kleiner of gelijk aan eigen bestellimiet // 1: Het approved bedrag is kleiner of gelijk aan eigen bestellimiet
((S("mld_opdr_approval_all") == 0 && t_cost >= bestellimiet2 && (opdr_approved == bestellimiet2 || mresult.canGoedkeur)) || ((S("mld_opdr_approval_all") == 0 && t_cost >= bestellimiet2 && (opdr_approved == bestellimiet2 || mresult.canGoedkeur)) ||
(S("mld_opdr_approval_all") == 1 && t_cost <= bestellimiet3 && opdr_approved <= bestellimiet2)); (S("mld_opdr_approval_all") == 1 && t_cost <= bestellimiet3 && ((!refiat && opdr_approved <= bestellimiet2) || (refiat && t_cost >= gvs && opdr_approved < 0))));
mresult.canGoedkeur3 = mresult.canWrite("WEB_ORDGO3") && !is_planned_action && mresult.canGoedkeur3 = mresult.canWrite("WEB_ORDGO3") && !is_planned_action &&
((S("mld_opdr_approval_all") == 0 && t_cost >= bestellimiet3 && (opdr_approved == bestellimiet3 || mresult.canGoedkeur2)) || ((S("mld_opdr_approval_all") == 0 && t_cost >= bestellimiet3 && (opdr_approved == bestellimiet3 || mresult.canGoedkeur2)) ||
(S("mld_opdr_approval_all") == 1 && t_cost <= bestellimiet4 && opdr_approved <= bestellimiet3)); (S("mld_opdr_approval_all") == 1 && t_cost <= bestellimiet4 && (!refiat && opdr_approved <= bestellimiet3 || (refiat && t_cost >= gvs && opdr_approved < 0))));
mresult.canGoedkeur4 = mresult.canWrite("WEB_ORDGO4") && !is_planned_action && mresult.canGoedkeur4 = mresult.canWrite("WEB_ORDGO4") && !is_planned_action &&
((S("mld_opdr_approval_all") == 0 && t_cost >= bestellimiet4 && (opdr_approved == bestellimiet4 || mresult.canGoedkeur3)) || ((S("mld_opdr_approval_all") == 0 && t_cost >= bestellimiet4 && (opdr_approved == bestellimiet4 || mresult.canGoedkeur3)) ||
(S("mld_opdr_approval_all") == 1 && t_cost <= bestellimiet5 && opdr_approved <= bestellimiet4)); (S("mld_opdr_approval_all") == 1 && t_cost <= bestellimiet5 && (!refiat && opdr_approved <= bestellimiet4 || (refiat && t_cost >= gvs && opdr_approved < 0))));
mresult.canGoedkeur5 = mresult.canWrite("WEB_ORDGO5") && !is_planned_action && mresult.canGoedkeur5 = mresult.canWrite("WEB_ORDGO5") && !is_planned_action &&
((S("mld_opdr_approval_all") == 0 && t_cost >= bestellimiet5 && (opdr_approved >= bestellimiet5 || mresult.canGoedkeur4)) || ((S("mld_opdr_approval_all") == 0 && t_cost >= bestellimiet5 && (opdr_approved >= bestellimiet5 || mresult.canGoedkeur4)) ||
(S("mld_opdr_approval_all") == 1 && t_cost > bestellimiet5 && opdr_approved <= bestellimiet5)) && (S("mld_opdr_approval_all") == 1 && t_cost > bestellimiet5 && (!refiat && opdr_approved <= bestellimiet5 || (refiat && t_cost >= gvs && opdr_approved < 0)))) &&
t_cost > opdr_approved; t_cost > opdr_approved;
mresult.canReject = (mresult.canGoedkeur || mresult.canReject = (mresult.canGoedkeur ||
mresult.canGoedkeur2 || mresult.canGoedkeur2 ||