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

Fix [ 1742751 ] Workflow: User Choice is not working

This commit is contained in:
Carlos Ruiz 2008-02-15 06:12:13 +00:00
parent 6aa04a7c39
commit c92fe5dc13
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
base/src/org/compiere/wf/MWFActivity.java
View File

@ -46,6 +46,7 @@ import org.compiere.model.MRefList;
import org.compiere.model.MRole; import org.compiere.model.MRole;
import org.compiere.model.MTable; import org.compiere.model.MTable;
import org.compiere.model.MUser; import org.compiere.model.MUser;
import org.compiere.model.MUserRoles;
import org.compiere.model.PO; import org.compiere.model.PO;
import org.compiere.model.X_AD_WF_Activity; import org.compiere.model.X_AD_WF_Activity;
import org.compiere.print.ReportEngine; import org.compiere.print.ReportEngine;
@ -349,6 +350,8 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
public PO getPO (Trx trx) public PO getPO (Trx trx)
{ {
if (m_po != null) { if (m_po != null) {
if (trx != null)
m_po.set_TrxName(trx.getTrxName());
return m_po; return m_po;
} }
@ -851,7 +854,6 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
if (m_po == null) if (m_po == null)
throw new Exception("Persistent Object not found - AD_Table_ID=" throw new Exception("Persistent Object not found - AD_Table_ID="
+ getAD_Table_ID() + ", Record_ID=" + getRecord_ID()); + getAD_Table_ID() + ", Record_ID=" + getRecord_ID());
m_po.set_TrxName(trx.getTrxName());
boolean success = false; boolean success = false;
String processMsg = null; String processMsg = null;
DocAction doc = null; DocAction doc = null;
@ -1026,10 +1028,28 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable
else // fixed Approver else // fixed Approver
{ {
MWFResponsible resp = getResponsible(); MWFResponsible resp = getResponsible();
autoApproval = resp.getAD_User_ID() == getAD_User_ID(); // MZ Goodwill
// [ 1742751 ] Workflow: User Choice is not working
if (resp.isHuman())
{
autoApproval = resp.getAD_User_ID() == m_process.getAD_User_ID();
if (!autoApproval && resp.getAD_User_ID() != 0) if (!autoApproval && resp.getAD_User_ID() != 0)
setAD_User_ID(resp.getAD_User_ID()); setAD_User_ID(resp.getAD_User_ID());
} }
else if(resp.isRole())
{
MUserRoles[] urs = MUserRoles.getOfRole(getCtx(), resp.getAD_Role_ID());
for (int i = 0; i < urs.length; i++)
{
if(urs[i].getAD_User_ID() == m_process.getAD_User_ID())
{
autoApproval = true;
break;
}
}
}
// end MZ
}
if (autoApproval if (autoApproval
&& doc.processIt(DocAction.ACTION_Approve) && doc.processIt(DocAction.ACTION_Approve)
&& doc.save()) && doc.save())