diff --git a/base/src/org/compiere/model/MAllocationHdr.java b/base/src/org/compiere/model/MAllocationHdr.java index 0b79397f99..e78ecf8514 100644 --- a/base/src/org/compiere/model/MAllocationHdr.java +++ b/base/src/org/compiere/model/MAllocationHdr.java @@ -556,13 +556,13 @@ public final class MAllocationHdr extends X_C_AllocationHdr implements DocAction if (m_processMsg != null) return false; + setDocAction(DOCACTION_None); + // After Close m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_CLOSE); if (m_processMsg != null) return false; - setDocAction(DOCACTION_None); - return true; } // closeIt diff --git a/base/src/org/compiere/model/MBankStatement.java b/base/src/org/compiere/model/MBankStatement.java index 5e29a788c3..be672499be 100644 --- a/base/src/org/compiere/model/MBankStatement.java +++ b/base/src/org/compiere/model/MBankStatement.java @@ -510,12 +510,12 @@ public class MBankStatement extends X_C_BankStatement implements DocAction if (m_processMsg != null) return false; + setDocAction(DOCACTION_None); + // After Close m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_CLOSE); if (m_processMsg != null) - return false; - - setDocAction(DOCACTION_None); + return false; return true; } // closeIt diff --git a/base/src/org/compiere/model/MCash.java b/base/src/org/compiere/model/MCash.java index ba74971354..90a2a6f582 100644 --- a/base/src/org/compiere/model/MCash.java +++ b/base/src/org/compiere/model/MCash.java @@ -675,12 +675,13 @@ public class MCash extends X_C_Cash implements DocAction m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_CLOSE); if (m_processMsg != null) return false; + + setDocAction(DOCACTION_None); + // After Close m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_CLOSE); if (m_processMsg != null) return false; - - setDocAction(DOCACTION_None); return true; } // closeIt diff --git a/base/src/org/compiere/model/MInOut.java b/base/src/org/compiere/model/MInOut.java index 28cdf730de..3d11b3aed5 100644 --- a/base/src/org/compiere/model/MInOut.java +++ b/base/src/org/compiere/model/MInOut.java @@ -1972,13 +1972,13 @@ public class MInOut extends X_M_InOut implements DocAction if (m_processMsg != null) return false; + setProcessed(true); + setDocAction(DOCACTION_None); + // After Close m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_CLOSE); if (m_processMsg != null) return false; - - setProcessed(true); - setDocAction(DOCACTION_None); return true; } // closeIt diff --git a/base/src/org/compiere/model/MInOutConfirm.java b/base/src/org/compiere/model/MInOutConfirm.java index 8cca0243cc..03d6dfdad4 100644 --- a/base/src/org/compiere/model/MInOutConfirm.java +++ b/base/src/org/compiere/model/MInOutConfirm.java @@ -716,13 +716,14 @@ public class MInOutConfirm extends X_M_InOutConfirm implements DocAction m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_CLOSE); if (m_processMsg != null) return false; + + setDocAction(DOCACTION_None); + // After Close m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_CLOSE); if (m_processMsg != null) return false; - setDocAction(DOCACTION_None); - return true; } // closeIt diff --git a/base/src/org/compiere/model/MInventory.java b/base/src/org/compiere/model/MInventory.java index aa03d0e2b9..36755c1f24 100644 --- a/base/src/org/compiere/model/MInventory.java +++ b/base/src/org/compiere/model/MInventory.java @@ -728,12 +728,12 @@ public class MInventory extends X_M_Inventory implements DocAction m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_CLOSE); if (m_processMsg != null) return false; + + setDocAction(DOCACTION_None); // After Close m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_CLOSE); if (m_processMsg != null) - return false; - - setDocAction(DOCACTION_None); + return false; return true; } // closeIt diff --git a/base/src/org/compiere/model/MInvoice.java b/base/src/org/compiere/model/MInvoice.java index 2dc45391a0..27b872d4a4 100644 --- a/base/src/org/compiere/model/MInvoice.java +++ b/base/src/org/compiere/model/MInvoice.java @@ -2056,13 +2056,13 @@ public class MInvoice extends X_C_Invoice implements DocAction if (m_processMsg != null) return false; + setProcessed(true); + setDocAction(DOCACTION_None); + // After Close m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_CLOSE); if (m_processMsg != null) return false; - - setProcessed(true); - setDocAction(DOCACTION_None); return true; } // closeIt diff --git a/base/src/org/compiere/model/MMovement.java b/base/src/org/compiere/model/MMovement.java index a34b6233e7..482c01995c 100644 --- a/base/src/org/compiere/model/MMovement.java +++ b/base/src/org/compiere/model/MMovement.java @@ -664,13 +664,13 @@ public class MMovement extends X_M_Movement implements DocAction if (m_processMsg != null) return false; + // Close Not delivered Qty + setDocAction(DOCACTION_None); + // After Close m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_CLOSE); if (m_processMsg != null) return false; - - // Close Not delivered Qty - setDocAction(DOCACTION_None); return true; } // closeIt diff --git a/base/src/org/compiere/model/MMovementConfirm.java b/base/src/org/compiere/model/MMovementConfirm.java index 8c4e80ec1c..d3db3be768 100644 --- a/base/src/org/compiere/model/MMovementConfirm.java +++ b/base/src/org/compiere/model/MMovementConfirm.java @@ -564,13 +564,13 @@ public class MMovementConfirm extends X_M_MovementConfirm implements DocAction if (m_processMsg != null) return false; + // Close Not delivered Qty + setDocAction(DOCACTION_None); + // After Close m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_CLOSE); if (m_processMsg != null) return false; - - // Close Not delivered Qty - setDocAction(DOCACTION_None); return true; } // closeIt diff --git a/base/src/org/compiere/model/MOrder.java b/base/src/org/compiere/model/MOrder.java index 41697df8e9..9220b6363d 100644 --- a/base/src/org/compiere/model/MOrder.java +++ b/base/src/org/compiere/model/MOrder.java @@ -2153,13 +2153,13 @@ public class MOrder extends X_C_Order implements DocAction m_processMsg = "Cannot unreserve Stock (close)"; return false; } + + setProcessed(true); + setDocAction(DOCACTION_None); // After Close m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_CLOSE); if (m_processMsg != null) return false; - - setProcessed(true); - setDocAction(DOCACTION_None); return true; } // closeIt diff --git a/base/src/org/eevolution/model/MDDOrder.java b/base/src/org/eevolution/model/MDDOrder.java index 06676512a0..037d05db1d 100644 --- a/base/src/org/eevolution/model/MDDOrder.java +++ b/base/src/org/eevolution/model/MDDOrder.java @@ -1138,13 +1138,13 @@ public class MDDOrder extends X_DD_Order implements DocAction } // Clear Reservations reserveStock(lines); + + setProcessed(true); + setDocAction(DOCACTION_None); // After Close m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_CLOSE); if (m_processMsg != null) return false; - - setProcessed(true); - setDocAction(DOCACTION_None); return true; } // closeIt