From 2290886e8da03e4fa1d517840cfeb44e0cc96eef Mon Sep 17 00:00:00 2001 From: Adam Saghy Date: Mon, 18 Jul 2022 09:59:34 +0200 Subject: [PATCH] Activation date cannot be earlier than the submitted on date --- .../org/apache/fineract/portfolio/client/domain/Client.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java index bec334a53..c092ef970 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java @@ -258,12 +258,12 @@ public final class Client extends AbstractPersistableCustom { } LocalDate submittedOnDate = DateUtils.getBusinessLocalDate(); - if (active && submittedOnDate.isAfter(activationDate)) { - submittedOnDate = activationDate; - } if (command.hasParameter(ClientApiConstants.submittedOnDateParamName)) { submittedOnDate = command.localDateValueOfParameterNamed(ClientApiConstants.submittedOnDateParamName); } + if (active && submittedOnDate.isAfter(activationDate)) { + submittedOnDate = activationDate; + } final Long savingsAccountId = null; return new Client(currentUser, status, clientOffice, clientParentGroup, accountNo, firstname, middlename, lastname, fullname, activationDate, officeJoiningDate, externalId, mobileNo, emailAddress, staff, submittedOnDate, savingsProductId,