midsuit
/
core-jgi
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-316 Inform when the user is not approver of a workflow doc

This commit is contained in:
Juliana Corredor 2012-11-09 12:18:55 -05:00
parent e7aee3e466
commit dfe9752326
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.adempiere.base/src/org/compiere/wf/MWFActivity.java
View File

@ -663,7 +663,9 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
if (user.equals(oldUser)) if (user.equals(oldUser))
{ {
log.info("Loop - " + user.getName()); log.info("Loop - " + user.getName());
return -1; //return (Integer) null;
user=null;
break;
} }
oldUser = user; oldUser = user;
log.fine("User=" + user.getName()); log.fine("User=" + user.getName());
@ -1160,6 +1162,9 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
doc.getC_Currency_ID(), doc.getApprovalAmt(), doc.getC_Currency_ID(), doc.getApprovalAmt(),
doc.getAD_Org_ID(), doc.getAD_Org_ID(),
startAD_User_ID == doc.getDoc_User_ID()); // own doc startAD_User_ID == doc.getDoc_User_ID()); // own doc
if(nextAD_User_ID<=0){
throw new AdempiereException("No exist approval user for this user or for this amount");
}
// same user = approved // same user = approved
autoApproval = startAD_User_ID == nextAD_User_ID; autoApproval = startAD_User_ID == nextAD_User_ID;
if (!autoApproval) if (!autoApproval)