[fineract] branch develop updated: Activation date cannot be earlier than the submitted on date

[arnold]

This is an automated email from the ASF dual-hosted git repository.

arnold pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new 2290886e8 Activation date cannot be earlier than the submitted on date
2290886e8 is described below

commit 2290886e8da03e4fa1d517840cfeb44e0cc96eef
Author: Adam Saghy <adamsa...@gmail.com>
AuthorDate: Mon Jul 18 09:59:34 2022 +0200

    Activation date cannot be earlier than the submitted on date
---
 .../java/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,