From ffee659a3bb9a4a48dfc3a35aff16741b70da4f2 Mon Sep 17 00:00:00 2001 From: Maykel Geerdink Date: Tue, 14 Mar 2017 14:34:34 +0000 Subject: [PATCH] FSN#39826: Goedkeuringsniveaus werken niet (icm fiattering?). svn path=/Website/trunk/; revision=33140 --- APPL/MLD/mld.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/APPL/MLD/mld.inc b/APPL/MLD/mld.inc index fb27642e1d..92390e04bb 100644 --- a/APPL/MLD/mld.inc +++ b/APPL/MLD/mld.inc @@ -3455,24 +3455,24 @@ mld = {setmeldingstatus: mresult.canChange = (mresult.canWrite("WEB_ORDBOF")); mresult.canChangeUrole = "bo"; 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)) && - opdr_approved <= bestellimiet) || - (t_cost >= gvs && opdr_approved < 0)); + (((S("mld_opdr_approval_all") == 0 && t_cost >= bestellimiet) || + (S("mld_opdr_approval_all") == 1 && t_cost <= bestellimiet2)) && + ((!refiat && opdr_approved <= bestellimiet) || (refiat && t_cost >= gvs && opdr_approved < 0))); mresult.canGoedkeur2 = mresult.canWrite("WEB_ORDGO2") && !is_planned_action && // 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) // 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") == 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 && ((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 && ((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 && ((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; mresult.canReject = (mresult.canGoedkeur || mresult.canGoedkeur2 ||