Repository: incubator-fineract Updated Branches: refs/heads/develop 08c553f9f -> fe6e1e88f
Edit share account is not working because of merge Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/fe6e1e88 Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/fe6e1e88 Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/fe6e1e88 Branch: refs/heads/develop Commit: fe6e1e88fe503a5c83e4b1f45a1489ea8e0dd1a6 Parents: 08c553f Author: Nazeer Hussain Shaik <[email protected]> Authored: Thu Apr 14 13:45:14 2016 +0530 Committer: Nazeer Hussain Shaik <[email protected]> Committed: Thu Apr 14 13:45:14 2016 +0530 ---------------------------------------------------------------------- .../portfolio/shareaccounts/domain/ShareAccount.java | 8 ++++---- .../shareaccounts/domain/ShareAccountTransaction.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/fe6e1e88/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccount.java ---------------------------------------------------------------------- diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccount.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccount.java index 36facf6..9cd21cf 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccount.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccount.java @@ -354,10 +354,10 @@ public class ShareAccount extends AbstractPersistable<Long> { } public void updateRequestedShares(ShareAccountTransaction purchased) { - if (!this.shareAccountTransactions.isEmpty()) { - Iterator<ShareAccountTransaction> iter = this.shareAccountTransactions.iterator(); - ShareAccountTransaction existing = iter.next(); - existing.update(purchased.getPurchasedDate(), purchased.getTotalShares(), purchased.getPurchasePrice()); + for(ShareAccountTransaction transaction: this.shareAccountTransactions) { + if(!transaction.isChargeTransaction() && transaction.getId().equals(purchased.getId())) { + transaction.update(purchased.getPurchasedDate(), purchased.getTotalShares(), purchased.getPurchasePrice()); + } } } http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/fe6e1e88/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountTransaction.java ---------------------------------------------------------------------- diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountTransaction.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountTransaction.java index 384e94f..662b2cd 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountTransaction.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/domain/ShareAccountTransaction.java @@ -112,7 +112,7 @@ public class ShareAccountTransaction extends AbstractPersistable<Long> { final Integer status = PurchasedSharesStatusType.APPROVED.getValue() ; final Integer type = PurchasedSharesStatusType.CHARGE_PAYMENT.getValue() ; BigDecimal amount = charge.percentageOrAmount() ; - BigDecimal chargeAmount = amount ; + BigDecimal chargeAmount = null ; return new ShareAccountTransaction(transactionDate, totalShares, unitPrice, status, type, amount, chargeAmount) ; }
