From 1007636a8e5621a12cbafcb484d1f2fd00013759 Mon Sep 17 00:00:00 2001 From: dankito Date: Tue, 23 Jun 2020 17:52:53 +0200 Subject: [PATCH] Added currency to constructor overload --- .../net/dankito/banking/search/LuceneRemitteeSearcherTest.kt | 4 ++-- .../java/net/dankito/banking/ui/model/AccountTransaction.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/persistence/LuceneBankingPersistence/src/test/kotlin/net/dankito/banking/search/LuceneRemitteeSearcherTest.kt b/persistence/LuceneBankingPersistence/src/test/kotlin/net/dankito/banking/search/LuceneRemitteeSearcherTest.kt index 6a606c4d..d3681437 100644 --- a/persistence/LuceneBankingPersistence/src/test/kotlin/net/dankito/banking/search/LuceneRemitteeSearcherTest.kt +++ b/persistence/LuceneBankingPersistence/src/test/kotlin/net/dankito/banking/search/LuceneRemitteeSearcherTest.kt @@ -35,7 +35,7 @@ class LuceneRemitteeSearcherTest { private val Amount = BigDecimal.valueOf(123.45) - private val bankAccountMock = BankAccount(mock(Customer::class.java), "", "", null, null) + private val bankAccountMock = BankAccount(mock(Customer::class.java), "", "", null, null, "") private val dateFormat = SimpleDateFormat("dd.MM.yyyy") @@ -211,7 +211,7 @@ class LuceneRemitteeSearcherTest { otherPartyName: String = randomString(), otherPartyBankCode: String = randomString(), otherPartyAccountId: String = randomString(), usage: String = randomString()): AccountTransaction { - return AccountTransaction(bankAccount, amount, usage, bookingDate, otherPartyName, otherPartyBankCode, otherPartyAccountId, null, bookingDate) + return AccountTransaction(bankAccount, amount, "EUR", usage, bookingDate, otherPartyName, otherPartyBankCode, otherPartyAccountId, null, bookingDate) } private fun randomString(): String { diff --git a/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/AccountTransaction.kt b/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/AccountTransaction.kt index f92de7e8..171e63b5 100644 --- a/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/AccountTransaction.kt +++ b/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/model/AccountTransaction.kt @@ -54,10 +54,10 @@ open class AccountTransaction( } - constructor(bankAccount: BankAccount, amount: BigDecimal, unparsedUsage: String, bookingDate: Date, + constructor(bankAccount: BankAccount, amount: BigDecimal, currency: String, unparsedUsage: String, bookingDate: Date, otherPartyName: String?, otherPartyBankCode: String?, otherPartyAccountId: String?, bookingText: String?, valueDate: Date) - : this(bankAccount, amount, "EUR", unparsedUsage, bookingDate, + : this(bankAccount, amount, currency, unparsedUsage, bookingDate, otherPartyName, otherPartyBankCode, otherPartyAccountId, bookingText, valueDate, 0, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, "", "", null, null, "", null)