diff --git a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java index 68860f5b92..6f538b3158 100644 --- a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java +++ b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java @@ -85,7 +85,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable /** * */ - private static final long serialVersionUID = 8180781075902940080L; + private static final long serialVersionUID = -9119089506977887142L; private static final String CURRENT_WORKFLOW_PROCESS_INFO_ATTR = "Workflow.ProcessInfo"; @@ -2171,4 +2171,12 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable return where; } + public String getProcessMsg() { + + if (m_process == null) + return null; + + return m_process.getProcessMsg(); + } + } // MWFActivity diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java index 763722a1d1..059d04f8c5 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/wf/WWFActivity.java @@ -673,11 +673,14 @@ public class WWFActivity extends ADForm implements EventListener m_activity.setUserChoice(AD_User_ID, value, dt, textMsg); MWFProcess wfpr = new MWFProcess(m_activity.getCtx(), m_activity.getAD_WF_Process_ID(), m_activity.get_TrxName()); wfpr.checkCloseActivities(m_activity.get_TrxName()); + + if (!Util.isEmpty(m_activity.getProcessMsg(), true)) + Dialog.error(m_WindowNo, m_activity.getProcessMsg()); } catch (Exception e) { log.log(Level.SEVERE, node.getName(), e); - Dialog.error(m_WindowNo, "Error", e.toString()); + Dialog.error(m_WindowNo, "Error", e.getLocalizedMessage() != null ? e.getLocalizedMessage() : e.getMessage()); trx.rollback(); trx.close(); return; @@ -693,6 +696,9 @@ public class WWFActivity extends ADForm implements EventListener m_activity.setUserConfirmation(AD_User_ID, textMsg); MWFProcess wfpr = new MWFProcess(m_activity.getCtx(), m_activity.getAD_WF_Process_ID(), m_activity.get_TrxName()); wfpr.checkCloseActivities(m_activity.get_TrxName()); + + if (!Util.isEmpty(m_activity.getProcessMsg(), true)) + Dialog.error(m_WindowNo, m_activity.getProcessMsg()); } catch (Exception e) {