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

MARX#56163: Afmelden op mld_opdr lukt niet in Mareon na accepteren.

Browse Source 
svn path=/Website/branches/v2018.2/; revision=40752
This commit is contained in:
Maykel Geerdink
2019-01-31 10:14:52 +00:00
parent 72f70bfb4b
commit b033f3e007
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/MLD/mld.inc
View File

@@ -4177,9 +4177,10 @@ mld = {setmeldingstatus:
(mresult.canWrite("WEB_ORDBO2") && myBO2Change) ||
(mresult.canWrite("WEB_MLDORD") && user.isCollega(mld_opdr.uitvoerende_key))) &&
!is_planned_action;
mresult.canOnderbreken = (mld_opdr.typeopdr_sequential&1)==1 && mresult.canCloseRights && mld_opdr.opdr_status == 8 && mld_opdr.halted!=1;
mresult.canHervatten = mresult.canCloseRights && mld_opdr.opdr_status == 8 && mld_opdr.halted==1; /* && (sequential&1)==1 would be logical but halted will do */
mresult.canClose = mresult.canCloseRights; // Afmelden is onafhankelijk van Onderbreken of Hervatten (XXXX#56163);
mresult.canOnderbreken = (mld_opdr.typeopdr_sequential&1) == 1 && mresult.canCloseRights && mld_opdr.opdr_status == 8 && mld_opdr.halted!=1;
mresult.canHervatten = mresult.canCloseRights && mld_opdr.opdr_status == 8 && mld_opdr.halted==1; /* && (mld_opdr.typeopdr_sequential & 1) == 1 would be logical but halted will do */
mresult.canClose = mresult.canCloseRights &&
(!mresult.canHervatten || (mresult.canHervatten && (mld_opdr.typeopdr_sequential & 4) == 4));
mresult.canCopy = (mresult.canWrite("WEB_ORDBOF") && !is_planned_action && !mld_opdr.mld_afgerond);
mresult.canVeldChange = (mresult.canWrite("WEB_ORDBOF") ||
(mresult.canWrite("WEB_ORDBO2") && myBO2FieldChange));