From 7b8157861fe233e7adac69495766da080a29b7c5 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 15 Oct 2018 11:19:03 +0200 Subject: [PATCH] IDEMPIERE-3599 allow DocActions to be selected in a more flexible way / Allow adding Reactivate on Closed --- org.adempiere.base/src/org/compiere/process/DocAction.java | 2 +- .../src/org/compiere/process/DocumentEngine.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/process/DocAction.java b/org.adempiere.base/src/org/compiere/process/DocAction.java index 5b0a238be3..9f1ccd6c2f 100644 --- a/org.adempiere.base/src/org/compiere/process/DocAction.java +++ b/org.adempiere.base/src/org/compiere/process/DocAction.java @@ -61,7 +61,7 @@ public interface DocAction /** Invalidate = IN */ public static final String ACTION_Invalidate = "IN"; /** ReOpen = OP */ - public static final String ACTION_ReOpen = "OP"; + // public static final String ACTION_ReOpen = "OP"; /** Drafted = DR */ public static final String STATUS_Drafted = "DR"; diff --git a/org.adempiere.base/src/org/compiere/process/DocumentEngine.java b/org.adempiere.base/src/org/compiere/process/DocumentEngine.java index e86b21c651..4773229560 100644 --- a/org.adempiere.base/src/org/compiere/process/DocumentEngine.java +++ b/org.adempiere.base/src/org/compiere/process/DocumentEngine.java @@ -692,7 +692,7 @@ public class DocumentEngine implements DocAction ACTION_Post, ACTION_Void}; if (isClosed()) - return new String[] {ACTION_Post, ACTION_ReOpen}; + return new String[] {ACTION_Post, ACTION_ReActivate}; if (isReversed() || isVoided()) return new String[] {ACTION_Post}; @@ -965,11 +965,13 @@ public class DocumentEngine implements DocAction options[index++] = DocumentEngine.ACTION_Void; options[index++] = DocumentEngine.ACTION_Prepare; } + /* IDEMPIERE-3599 - commented to allow adding options to these terminal status // Closed, Voided, REversed .. CL/VO/RE else if (docStatus.equals(DocumentEngine.STATUS_Closed) || docStatus.equals(DocumentEngine.STATUS_Voided) || docStatus.equals(DocumentEngine.STATUS_Reversed)) return 0; + */ /******************** * Order