From 6221898e61c3e78774cb4da9965641b2fe46e228 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Thu, 13 Jun 2013 07:20:49 +0000 Subject: [PATCH] DOD Recert: Disposition date is now correctly calculated with taken from last disposition action date. * TC 8-2 multi stage disposition now works as expected git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/DODRECERT@50978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../action/RMActionExecuterAbstractBase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java index 6623bf9dc0..b5bf2d39ef 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/RMActionExecuterAbstractBase.java @@ -496,7 +496,8 @@ public abstract class RMActionExecuterAbstractBase extends ActionExecuterAbstra // Get the period properties value QName periodProperty = nextDispositionActionDefinition.getPeriodProperty(); - if (periodProperty != null) + if (periodProperty != null && + RecordsManagementModel.PROP_DISPOSITION_AS_OF.equals(periodProperty) == false) { // doesn't matter if the period property isn't set ... the asOfDate will get updated later // when the value of the period property is set