MIFOSX-262: slight changes to anuruddha's commit to use joda date classes over java.util.

mifosng-provider/src/main/java/org/mifosplatform/organisation/office/domain/Office.java

@@ -141,6 +141,14 @@ public class Office extends AbstractPersistable<Long> {
         return actualChanges;
     }
 
+    public boolean isOpeningDateBefore(final LocalDate baseDate) {
+        return getOpeningLocalDate().isBefore(baseDate);
+    }
+
+    public boolean isOpeningDateAfter(final LocalDate activationLocalDate) {
+        return getOpeningLocalDate().isAfter(activationLocalDate);
+    }
+
     private LocalDate getOpeningLocalDate() {
         LocalDate openingLocalDate = null;
         if (this.openingDate != null) {
@@ -217,8 +225,4 @@ public class Office extends AbstractPersistable<Long> {
 
         return match;
     }
-    
-    public boolean isBefore(final Date baseDate) {
-          return this.openingDate.before(baseDate);
-    }
 }

mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/domain/Client.java

@@ -357,18 +357,17 @@ public final class Client extends AbstractPersistable<Long> {
             baseDataValidator.reset().parameter("lastname").value(this.lastname).notBlank().notExceedingLengthOf(50);
         }
 
-        if(this.activationDate!=null)
+        if (this.activationDate != null) {
-        {
+            if (office.isOpeningDateAfter(getActivationLocalDate())) {
-            if(!office.isBefore(this.activationDate)){
+                final String defaultUserMessage = "Client activation date cannot be a date before the office opening date.";
-                final String defaultUserMessage = "Client activation date cannot be a date before the Office activation date";
+                final ApiParameterError error = ApiParameterError.parameterError(
-                final ApiParameterError error = ApiParameterError.parameterError("error.msg.clients.activationDate.cannot.be.before.Office.activatoin.date",
+                        "error.msg.clients.activationDate.cannot.be.before.office.activation.date", defaultUserMessage, "activationDate",
-                        defaultUserMessage, "activationDate", this.activationDate);
+                        getActivationLocalDate());
                 dataValidationErrors.add(error);
             }
 
         }
-        if (!dataValidationErrors.isEmpty()) { throw new PlatformApiDataValidationException("validation.msg.validation.errors.exist",
+        if (!dataValidationErrors.isEmpty()) { throw new PlatformApiDataValidationException(dataValidationErrors); }
-                "Validation errors exist.", dataValidationErrors); }
     }
 
     private void deriveDisplayName() {