Skip to content

Commit 91b2211

Browse files
committed
FINERACT-2457: Share transaction chronological validation incorrectly blocks new transactions based on rejected/reversed transactions
1 parent 3a6f805 commit 91b2211

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/serialization/ShareAccountDataSerializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ public Map<String, Object> validateAndApplyAddtionalShares(JsonCommand jsonComma
708708
boolean isTransactionBeforeExistingTransactions = false;
709709
Set<ShareAccountTransaction> transactions = account.getShareAccountTransactions();
710710
for (ShareAccountTransaction transaction : transactions) {
711-
if (!transaction.isChargeTransaction()) {
711+
if (!transaction.isChargeTransaction() && transaction.isActive()) {
712712
LocalDate transactionDate = transaction.getPurchasedDate();
713713
if (DateUtils.isBefore(requestedDate, transactionDate)) {
714714
isTransactionBeforeExistingTransactions = true;
@@ -1020,7 +1020,7 @@ public Map<String, Object> validateAndClose(JsonCommand jsonCommand, ShareAccoun
10201020
boolean isTransactionBeforeExistingTransactions = false;
10211021
Set<ShareAccountTransaction> transactions = account.getShareAccountTransactions();
10221022
for (ShareAccountTransaction transaction : transactions) {
1023-
if (!transaction.isChargeTransaction()) {
1023+
if (!transaction.isChargeTransaction() && transaction.isActive()) {
10241024
LocalDate transactionDate = transaction.getPurchasedDate();
10251025
if (DateUtils.isBefore(closedDate, transactionDate)) {
10261026
isTransactionBeforeExistingTransactions = true;

0 commit comments

Comments
 (0)