You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by na...@apache.org on 2017/11/20 10:38:01 UTC
[1/2] fineract git commit: FINERACT-554
Repository: fineract
Updated Branches:
refs/heads/develop a3e8c5e5b -> e5dbd4acf
FINERACT-554
Project: http://git-wip-us.apache.org/repos/asf/fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/fineract/commit/f1e6716f
Tree: http://git-wip-us.apache.org/repos/asf/fineract/tree/f1e6716f
Diff: http://git-wip-us.apache.org/repos/asf/fineract/diff/f1e6716f
Branch: refs/heads/develop
Commit: f1e6716f76bd30b007504373f34ba054e9d0bb5c
Parents: d6accae
Author: nikpawar89 <ni...@yahoo.in>
Authored: Sat Nov 11 00:57:51 2017 -0600
Committer: nikpawar89 <ni...@yahoo.in>
Committed: Sat Nov 11 00:57:51 2017 -0600
----------------------------------------------------------------------
.../teller/service/TellerWritePlatformServiceJpaImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/fineract/blob/f1e6716f/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java
index bc1bbcd..76b0371 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java
@@ -440,8 +440,8 @@ public class TellerWritePlatformServiceJpaImpl implements TellerWritePlatformSer
final JournalEntry debitJournalEntry = JournalEntry.createNew(cashierOffice, null, // payment
// detail
- debitAccount, "USD", // FIXME: Take currency code from the
- // transaction
+ debitAccount, cashierTxn.getCurrencyCode(),
+
transactionId, false, // manual entry
cashierTxn.getTxnDate(), JournalEntryType.DEBIT, cashierTxn.getTxnAmount(), cashierTxn.getTxnNote(), // Description
null, null, null, // entity Type, entityId, reference number
@@ -449,8 +449,8 @@ public class TellerWritePlatformServiceJpaImpl implements TellerWritePlatformSer
final JournalEntry creditJournalEntry = JournalEntry.createNew(cashierOffice, null, // payment
// detail
- creditAccount, "USD", // FIXME: Take currency code from the
- // transaction
+ creditAccount, cashierTxn.getCurrencyCode(),
+
transactionId, false, // manual entry
cashierTxn.getTxnDate(), JournalEntryType.CREDIT, cashierTxn.getTxnAmount(), cashierTxn.getTxnNote(), // Description
null, null, null, // entity Type, entityId, reference number
[2/2] fineract git commit: Merge branch 'FINERACT-554' into develop
Posted by na...@apache.org.
Merge branch 'FINERACT-554' into develop
Project: http://git-wip-us.apache.org/repos/asf/fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/fineract/commit/e5dbd4ac
Tree: http://git-wip-us.apache.org/repos/asf/fineract/tree/e5dbd4ac
Diff: http://git-wip-us.apache.org/repos/asf/fineract/diff/e5dbd4ac
Branch: refs/heads/develop
Commit: e5dbd4acfc302c0796e4f39d1f8f213fa55a5d17
Parents: a3e8c5e f1e6716
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Mon Nov 20 16:07:12 2017 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Mon Nov 20 16:07:12 2017 +0530
----------------------------------------------------------------------
.../teller/service/TellerWritePlatformServiceJpaImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------