codinux
/
fints4k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed order of opening and closing balance

This commit is contained in:
dankito 2024-09-05 23:31:02 +02:00
parent 70c1082531
commit cb34c86665
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fints4k/src/commonMain/kotlin/net/codinux/banking/fints/mapper/FinTsModelMapper.kt
View File

@ -116,9 +116,12 @@ open class FinTsModelMapper {
transaction.bookingDate, transaction.valueDate,
transaction.otherPartyName, transaction.otherPartyBankCode, transaction.otherPartyAccountId,
transaction.postingText, transaction.statementNumber, transaction.sheetNumber,
transaction.postingText,
transaction.openingBalance, transaction.closingBalance,
transaction.statementNumber, transaction.sheetNumber,
transaction.customerReference, transaction.bankReference, transaction.furtherInformation,
transaction.endToEndReference, transaction.mandateReference, transaction.creditorIdentifier, transaction.originatorsIdentificationCode,

9
fints4k/src/commonMain/kotlin/net/codinux/banking/fints/model/AccountTransaction.kt
View File

@ -29,6 +29,10 @@ open class AccountTransaction(
* Buchungstext, z. B. DAUERAUFTRAG, BARGELDAUSZAHLUNG, ONLINE-UEBERWEISUNG, FOLGELASTSCHRIFT, ...
*/
val postingText: String?,
val openingBalance: Money?,
val closingBalance: Money?,
/**
* Auszugsnummer
*/
@ -38,9 +42,6 @@ open class AccountTransaction(
*/
val sheetNumber: Int?,
val openingBalance: Money?,
val closingBalance: Money?,
/**
* Kundenreferenz.
*/
@ -115,7 +116,7 @@ open class AccountTransaction(
constructor(account: AccountData, amount: Money, unparsedReference: String, bookingDate: LocalDate, valueDate: LocalDate, otherPartyName: String?, otherPartyBankCode: String?, otherPartyAccountId: String?, postingText: String? = null)
: this(account, amount, unparsedReference, bookingDate, valueDate, otherPartyName, otherPartyBankCode, otherPartyAccountId, postingText,
0, null, null, null,
null, null, 0, null,
null, null, null, null, null, null, null, null, null, null, null,
"", null, null, "", null, false)

5
fints4k/src/commonMain/kotlin/net/codinux/banking/fints/transactions/Mt940AccountTransactionsParser.kt
View File

@ -60,12 +60,13 @@ open class Mt940AccountTransactionsParser(
transaction.information?.otherPartyAccountId,
transaction.information?.postingText,
statement.statementNumber,
statement.sheetNumber,
Money(mapAmount(statement.openingBalance), currency),
Money(mapAmount(statement.closingBalance), currency),
statement.statementNumber,
statement.sheetNumber,
// :60: customer reference: Wenn „KREF+“ eingestellt ist, dann erfolgt die Angabe der Referenznummer in Tag :86: .
transaction.information?.customerReference ?: transaction.statementLine.customerReference,
transaction.statementLine.bankReference,

7
fints4k/src/commonMain/kotlin/net/dankito/banking/client/model/AccountTransaction.kt
View File

@ -20,12 +20,13 @@ open class AccountTransaction(
val otherPartyAccountId: String?,
val postingText: String?,
val statementNumber: Int,
val sheetNumber: Int?,
val openingBalance: Money?,
val closingBalance: Money?,
val statementNumber: Int,
val sheetNumber: Int?,
val customerReference: String?,
val bankReference: String?,
val furtherInformation: String?,
@ -51,7 +52,7 @@ open class AccountTransaction(
constructor(amount: Money, unparsedReference: String, bookingDate: LocalDate, valueDate: LocalDate, otherPartyName: String?, otherPartyBankCode: String?, otherPartyAccountId: String?, postingText: String?)
: this(amount, unparsedReference, bookingDate, valueDate, otherPartyName, otherPartyBankCode, otherPartyAccountId, postingText,
0, null, null, null,
null, null, 0, null,
null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null)