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

IDEMPIERE-2377: Add "Prepare" Document Action to all document type (#653) 

* IDEMPIERE-2377: Add "Prepare" Document Action to all document type

* IDEMPIERE-2377: Adding Prepare action on prepared docs and removeing redundent actions
Co-authored-by: carg67@gmail.com
This commit is contained in:
Deepak Pansheriya 2021-05-11 16:54:20 +05:30 committed by GitHub
parent da3dc2c472
commit 4439a74c52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
org.adempiere.base/src/org/compiere/process/DocumentEngine.java
View File

@ -965,17 +965,17 @@ public class DocumentEngine implements DocAction
options[index++] = DocumentEngine.ACTION_Prepare; options[index++] = DocumentEngine.ACTION_Prepare;
options[index++] = DocumentEngine.ACTION_Void; options[index++] = DocumentEngine.ACTION_Void;
} }
// Draft/Invalid .. DR/IN // Draft/In Process/Invalid .. DR/IP/IN
else if (docStatus.equals(DocumentEngine.STATUS_Drafted) else if (docStatus.equals(DocumentEngine.STATUS_Drafted)
|| docStatus.equals(DocumentEngine.STATUS_InProgress)
|| docStatus.equals(DocumentEngine.STATUS_Invalid)) || docStatus.equals(DocumentEngine.STATUS_Invalid))
{ {
options[index++] = DocumentEngine.ACTION_Complete; options[index++] = DocumentEngine.ACTION_Complete;
// options[index++] = DocumentEngine.ACTION_Prepare; options[index++] = DocumentEngine.ACTION_Prepare;
options[index++] = DocumentEngine.ACTION_Void; options[index++] = DocumentEngine.ACTION_Void;
} }
// In Process .. IP // Approved .. AP
else if (docStatus.equals(DocumentEngine.STATUS_InProgress) else if (docStatus.equals(DocumentEngine.STATUS_Approved))
|| docStatus.equals(DocumentEngine.STATUS_Approved))
{ {
options[index++] = DocumentEngine.ACTION_Complete; options[index++] = DocumentEngine.ACTION_Complete;
options[index++] = DocumentEngine.ACTION_Void; options[index++] = DocumentEngine.ACTION_Void;
@ -1010,7 +1010,6 @@ public class DocumentEngine implements DocAction
|| docStatus.equals(DocumentEngine.STATUS_InProgress) || docStatus.equals(DocumentEngine.STATUS_InProgress)
|| docStatus.equals(DocumentEngine.STATUS_Invalid)) || docStatus.equals(DocumentEngine.STATUS_Invalid))
{ {
options[index++] = DocumentEngine.ACTION_Prepare;
// Draft Sales Order Quote/Proposal - Process // Draft Sales Order Quote/Proposal - Process
if ("Y".equals(isSOTrx) if ("Y".equals(isSOTrx)
&& ("OB".equals(orderType) || "ON".equals(orderType))) && ("OB".equals(orderType) || "ON".equals(orderType)))
@ -1148,7 +1147,6 @@ public class DocumentEngine implements DocAction
|| docStatus.equals(DocumentEngine.STATUS_InProgress) || docStatus.equals(DocumentEngine.STATUS_InProgress)
|| docStatus.equals(DocumentEngine.STATUS_Invalid)) || docStatus.equals(DocumentEngine.STATUS_Invalid))
{ {
options[index++] = DocumentEngine.ACTION_Prepare;
options[index++] = DocumentEngine.ACTION_Close; options[index++] = DocumentEngine.ACTION_Close;
} }
// Complete .. CO // Complete .. CO
@ -1163,15 +1161,8 @@ public class DocumentEngine implements DocAction
*/ */
else if (AD_Table_ID == MProduction.Table_ID) else if (AD_Table_ID == MProduction.Table_ID)
{ {
// Draft .. DR/IP/IN
if (docStatus.equals(DocumentEngine.STATUS_Drafted)
|| docStatus.equals(DocumentEngine.STATUS_InProgress)
|| docStatus.equals(DocumentEngine.STATUS_Invalid))
{
options[index++] = DocumentEngine.ACTION_Prepare;
}
// Complete .. CO // Complete .. CO
else if (docStatus.equals(DocumentEngine.STATUS_Completed)) if (docStatus.equals(DocumentEngine.STATUS_Completed))
{ {
if (periodOpen) { if (periodOpen) {
options[index++] = DocumentEngine.ACTION_Reverse_Correct; options[index++] = DocumentEngine.ACTION_Reverse_Correct;
@ -1189,7 +1180,6 @@ public class DocumentEngine implements DocAction
|| docStatus.equals(DocumentEngine.STATUS_InProgress) || docStatus.equals(DocumentEngine.STATUS_InProgress)
|| docStatus.equals(DocumentEngine.STATUS_Invalid)) || docStatus.equals(DocumentEngine.STATUS_Invalid))
{ {
options[index++] = DocumentEngine.ACTION_Prepare;
options[index++] = DocumentEngine.ACTION_Close; options[index++] = DocumentEngine.ACTION_Close;
} }
// Complete .. CO // Complete .. CO
@ -1208,7 +1198,6 @@ public class DocumentEngine implements DocAction
|| docStatus.equals(DocumentEngine.STATUS_InProgress) || docStatus.equals(DocumentEngine.STATUS_InProgress)
|| docStatus.equals(DocumentEngine.STATUS_Invalid)) || docStatus.equals(DocumentEngine.STATUS_Invalid))
{ {
options[index++] = DocumentEngine.ACTION_Prepare;
options[index++] = DocumentEngine.ACTION_Close; options[index++] = DocumentEngine.ACTION_Close;
} }
// Complete .. CO // Complete .. CO
@ -1227,7 +1216,6 @@ public class DocumentEngine implements DocAction
|| docStatus.equals(DocumentEngine.STATUS_InProgress) || docStatus.equals(DocumentEngine.STATUS_InProgress)
|| docStatus.equals(DocumentEngine.STATUS_Invalid)) || docStatus.equals(DocumentEngine.STATUS_Invalid))
{ {
options[index++] = DocumentEngine.ACTION_Prepare;
options[index++] = DocumentEngine.ACTION_Close; options[index++] = DocumentEngine.ACTION_Close;
} }
// Complete .. CO // Complete .. CO