From b1e5cbaf866211c75c44ac8def388c7be5a01c22 Mon Sep 17 00:00:00 2001
From: Nirus2000 <webmaster@nirus-online.de>
Date: Thu, 4 Apr 2024 10:15:54 +0200
Subject: [PATCH] Improve Credit Suisse AG PDF-Importer

Format source to standard eclipse format
Improve regulare expressions
Remove obsolet source
---
 .../CreditSuisseAGExtractorTest.java          |  12 +-
 .../datatransfer/pdf/BankSLMPDFExtractor.java |   2 +-
 .../pdf/CreditSuisseAGPDFExtractor.java       | 555 ++++++++++--------
 3 files changed, 314 insertions(+), 255 deletions(-)

diff --git a/name.abuchen.portfolio.tests/src/name/abuchen/portfolio/datatransfer/pdf/creditsuisseag/CreditSuisseAGExtractorTest.java b/name.abuchen.portfolio.tests/src/name/abuchen/portfolio/datatransfer/pdf/creditsuisseag/CreditSuisseAGExtractorTest.java
index 463f1037b2..d634a40d6c 100644
--- a/name.abuchen.portfolio.tests/src/name/abuchen/portfolio/datatransfer/pdf/creditsuisseag/CreditSuisseAGExtractorTest.java
+++ b/name.abuchen.portfolio.tests/src/name/abuchen/portfolio/datatransfer/pdf/creditsuisseag/CreditSuisseAGExtractorTest.java
@@ -48,7 +48,7 @@ public void testWertpapierKauf01()
         Security security = results.stream().filter(SecurityItem.class::isInstance).findFirst()
                         .orElseThrow(IllegalArgumentException::new).getSecurity();
         assertThat(security.getIsin(), is("US46284V1017"));
-        assertNull(security.getWkn());
+        assertThat(security.getWkn(), is("26754105"));
         assertNull(security.getTickerSymbol());
         assertThat(security.getName(), is("Registered Shs Iron Mountain Inc"));
         assertThat(security.getCurrencyCode(), is(CurrencyUnit.USD));
@@ -112,7 +112,7 @@ public void testWertpapierKauf02()
         Security security = results.stream().filter(SecurityItem.class::isInstance).findFirst()
                         .orElseThrow(IllegalArgumentException::new).getSecurity();
         assertThat(security.getIsin(), is("XS1055787680"));
-        assertNull(security.getWkn());
+        assertThat(security.getWkn(), is("24160639"));
         assertNull(security.getTickerSymbol());
         assertThat(security.getName(), is("6.25 % Fixed Rate Notes Norddeutsche"));
         assertThat(security.getCurrencyCode(), is(CurrencyUnit.USD));
@@ -176,7 +176,7 @@ public void testWertpapierVerkauf01()
         Security security = results.stream().filter(SecurityItem.class::isInstance).findFirst()
                         .orElseThrow(IllegalArgumentException::new).getSecurity();
         assertThat(security.getIsin(), is("GB00B03MLX29"));
-        assertNull(security.getWkn());
+        assertThat(security.getWkn(), is("1987674"));
         assertNull(security.getTickerSymbol());
         assertThat(security.getName(), is("Akt. -A- Royal Dutch Shell PLC"));
         assertThat(security.getCurrencyCode(), is(CurrencyUnit.EUR));
@@ -220,7 +220,7 @@ public void testWertpapierVerkauf02()
         Security security = results.stream().filter(SecurityItem.class::isInstance).findFirst()
                         .orElseThrow(IllegalArgumentException::new).getSecurity();
         assertThat(security.getIsin(), is("US88163VAD10"));
-        assertNull(security.getWkn());
+        assertThat(security.getWkn(), is("2429251"));
         assertNull(security.getTickerSymbol());
         assertThat(security.getName(), is("6.15 % Notes Teva Pharmaceutical Finance"));
         assertThat(security.getCurrencyCode(), is(CurrencyUnit.USD));
@@ -283,7 +283,7 @@ public void testDividende01()
         Security security = results.stream().filter(SecurityItem.class::isInstance).findFirst()
                         .orElseThrow(IllegalArgumentException::new).getSecurity();
         assertThat(security.getIsin(), is("XS1055787680"));
-        assertNull(security.getWkn());
+        assertThat(security.getWkn(), is("24160639"));
         assertNull(security.getTickerSymbol());
         assertThat(security.getName(), is("6.25 % FIXED RATE NOTES NORDDEUTSCHE"));
         assertThat(security.getCurrencyCode(), is(CurrencyUnit.USD));
@@ -326,7 +326,7 @@ public void testDividende02()
         Security security = results.stream().filter(SecurityItem.class::isInstance).findFirst()
                         .orElseThrow(IllegalArgumentException::new).getSecurity();
         assertThat(security.getIsin(), is("US46284V1017"));
-        assertNull(security.getWkn());
+        assertThat(security.getWkn(), is("26754105"));
         assertNull(security.getTickerSymbol());
         assertThat(security.getName(), is("REGISTERED SHS IRON MOUNTAIN INC"));
         assertThat(security.getCurrencyCode(), is(CurrencyUnit.USD));
diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/BankSLMPDFExtractor.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/BankSLMPDFExtractor.java
index 176ddebdc1..f9c8b32b48 100644
--- a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/BankSLMPDFExtractor.java
+++ b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/BankSLMPDFExtractor.java
@@ -95,7 +95,7 @@ private void addBuySellTransaction()
                         // @formatter:on
                         .section("shares") //
                         .find("Wir haben.*")
-                        .match("^(?<shares>[\\.',\\d]+) .*$") //
+                        .match("^(?<shares>[\\.'\\d]+) .*$") //
                         .assign((t, v) -> t.setShares(asShares(v.get("shares"))))
 
                         // @formatter:off
diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/CreditSuisseAGPDFExtractor.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/CreditSuisseAGPDFExtractor.java
index 56fbf0bce0..b18af70f7e 100644
--- a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/CreditSuisseAGPDFExtractor.java
+++ b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/pdf/CreditSuisseAGPDFExtractor.java
@@ -40,102 +40,124 @@ private void addBuySellTransaction()
         this.addDocumentTyp(type);
 
         Transaction<BuySellEntry> pdfTransaction = new Transaction<>();
-        pdfTransaction.subject(() -> {
-            BuySellEntry entry = new BuySellEntry();
-            entry.setType(PortfolioTransaction.Type.BUY);
-            return entry;
-        });
 
         Block firstRelevantLine = new Block("^Ihr (Kauf|Verkauf) .*$");
         type.addBlock(firstRelevantLine);
         firstRelevantLine.set(pdfTransaction);
 
-        pdfTransaction
-                // Is type --> "Verkauf" change from BUY to SELL
-                .section("type").optional()
-                .match("^Ihr (?<type>(Kauf|Verkauf)) .*$")
-                .assign((t, v) -> {
-                    if ("Verkauf".equals(v.get("type")))
-                        t.setType(PortfolioTransaction.Type.SELL);
-                })
-
-                // 900 Registered Shs Iron Mountain Inc USD 0.01
-                // Valor 26754105, IRM, ISIN US46284V1017
-                // Kurswert USD 27,270.00
-                .section("name", "isin", "currency").optional()
-                .match("^(?<shares>[\\.,\\d]+) (?<name>.*) [\\w]{3} [\\.,\\d]+$")
-                .match("^.* ISIN (?<isin>[\\w]{12})$")
-                .match("^Kurswert (?<currency>[\\w]{3}) [\\.,\\d]+$")
-                .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v)))
-
-                // USD 200,000 6.25 % Fixed Rate Notes Norddeutsche
-                // Landesbank Girozentrale 2014-10.4.24 Reg-S
-                // Subord.
-                // Valor 24160639, NDKH, ISIN XS1055787680
-                // Kurswert USD 183,000.00
-                .section("name", "isin", "currency").optional()
-                .match("^[\\w]{3} [\\.,\\d]+ (?<name>.*)$")
-                .match("^.* ISIN (?<isin>[\\w]{12})$")
-                .match("^Kurswert (?<currency>[\\w]{3}) [\\.,\\d]+$")
-                .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v)))
-
-                .oneOf(
-                                // USD 200,000 6.25 % Fixed Rate Notes Norddeutsche
-                                section -> section
-                                        .attributes("shares")
-                                        .match("^[\\w]{3} (?<shares>[\\.,\\d]+) [\\.,\\d]+ % (?<name>.*)$")
-                                        .assign((t, v) -> {
-                                            // Percentage quotation, workaround for bonds
-                                            BigDecimal shares = asExchangeRate(v.get("shares"));
-                                            t.setShares(Values.Share.factorize(shares.doubleValue() / 100));
-                                        })
-                                ,
-                                // 900 Registered Shs Iron Mountain Inc USD 0.01
-                                section -> section
-                                        .attributes("shares")
-                                        .match("^(?<shares>[\\.,\\d]+) .*$")
-                                        .assign((t, v) -> t.setShares(asShares(v.get("shares"))))
-                        )
-
-                // Ausführungszeit
-                // 103 14800075391312 18:32:46 XNYS USD 30.30
-                .section("time").optional()
-                .find("Ausf.hrungszeit")
-                .match("^.* (?<time>[\\d]{2}:[\\d]{2}:[\\d]{2}) [\\w]{3,4} .*$")
-                .assign((t, v) -> type.getCurrentContext().put("time", v.get("time")))
-
-                // Datum 08.06.2020
-                .section("date")
-                .match("^Datum (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4})$")
-                .assign((t, v) -> {
-                    if (type.getCurrentContext().get("time") != null)
-                        t.setDate(asDate(v.get("date"), type.getCurrentContext().get("time")));
-                    else
-                        t.setDate(asDate(v.get("date")));
-                })
-
-                // Belastung USD 27,734.70
-                // Gutschrift EUR 28,744.30
-                .section("currency", "amount")
-                .match("^(Belastung|Gutschrift) (?<currency>[\\w]{3}) (?<amount>[\\.,\\d]+)$")
-                .assign((t, v) -> {
-                    t.setCurrencyCode(asCurrencyCode(v.get("currency")));
-                    t.setAmount(asAmount(v.get("amount")));
-                })
-
-                // If we have the "Internet-Vergünstigung",
-                // we add up it from the amount and reset it.
-                // The "Internet discount" is then posted as a fee refund.
-
-                // Internet-Vergünstigung USD - 41.81
-                // Internet-Vergünstigung USD 44.69
-                .section("feeRefund", "currency").optional()
-                .match("^Internet\\-Verg.nstigung (?<currency>[\\w]{3}) (\\- )?(?<feeRefund>[\\.,\\d]+)$")
-                .assign((t, v) -> {
-                    t.setAmount(t.getPortfolioTransaction().getAmount() + asAmount(v.get("feeRefund")));
-                })
-
-                .wrap(BuySellEntryItem::new);
+        pdfTransaction //
+
+                        .subject(() -> {
+                            BuySellEntry portfolioTransaction = new BuySellEntry();
+                            portfolioTransaction.setType(PortfolioTransaction.Type.BUY);
+                            return portfolioTransaction;
+                        })
+
+                        // Is type --> "Verkauf" change from BUY to SELL
+                        .section("type").optional() //
+                        .match("^Ihr (?<type>(Kauf|Verkauf)) .*$") //
+                        .assign((t, v) -> {
+                            if ("Verkauf".equals(v.get("type")))
+                                t.setType(PortfolioTransaction.Type.SELL);
+                        })
+
+                        .oneOf( //
+                                        // @formatter:off
+                                        // 900 Registered Shs Iron Mountain Inc USD 0.01
+                                        // Valor 26754105, IRM, ISIN US46284V1017
+                                        // zum Kurs von USD 30.30
+                                        // @formatter:on
+                                        section -> section //
+                                                        .attributes("name", "wkn", "isin", "currency") //
+                                                        .match("^[\\.,\\d]+ (?<name>.*) [\\w]{3} [\\.,\\d]+$") //
+                                                        .match("^Valor (?<wkn>[A-Z0-9]{5,9}),.* ISIN (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9])$") //
+                                                        .match("^zum Kurs von (?<currency>[\\w]{3}) [\\.,\\d]+$") //
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))),
+                                        // @formatter:off
+                                        // USD 200,000 6.25 % Fixed Rate Notes Norddeutsche
+                                        // Landesbank Girozentrale 2014-10.4.24 Reg-S
+                                        // Subord.
+                                        // Valor 24160639, NDKH, ISIN XS1055787680
+                                        // Kurswert USD 183,000.00
+                                        // @formatter:on
+                                        section -> section //
+                                                        .attributes("name", "wkn", "isin", "currency") //
+                                                        .match("^[\\w]{3} [\\.,\\d]+ (?<name>.*)$") //
+                                                        .match("^Valor (?<wkn>[A-Z0-9]{5,9}),.* ISIN (?<isin>[\\w]{12})$") //
+                                                        .match("^Kurswert (?<currency>[\\w]{3}) [\\.,\\d]+$") //
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))))
+
+                        .oneOf( //
+                                        // @formatter:off
+                                        // USD 200,000 6.25 % Fixed Rate Notes Norddeutsche
+                                        // @formatter:on
+                                        section -> section //
+                                                        .attributes("shares") //
+                                                        .match("^[\\w]{3} (?<shares>[\\.,\\d]+) [\\.,\\d]+ %.*$") //
+                                                        .assign((t, v) -> {
+                                                            // @formatter:off
+                                                            // Percentage quotation, workaround for bonds
+                                                            // @formatter:on
+                                                            BigDecimal shares = asExchangeRate(v.get("shares"));
+                                                            t.setShares(Values.Share.factorize(shares.doubleValue() / 100));
+                                                        }),
+                                        // @formatter:off
+                                        // 900 Registered Shs Iron Mountain Inc USD 0.01
+                                        // @formatter:on
+                                        section -> section //
+                                                        .attributes("shares") //
+                                                        .match("^(?<shares>[\\.,\\d]+) (?<name>.*) [\\w]{3} [\\.,\\d]+$")
+                                                        .assign((t, v) -> t.setShares(asShares(v.get("shares")))))
+
+                        // @formatter:off
+                        // Ausführungszeit
+                        // 103 14800075391312 18:32:46 XNYS USD 30.30
+                        // @formatter:on
+                        .section("time").optional() //
+                        .find("Ausf.hrungszeit") //
+                        .match("^.* (?<time>[\\d]{2}:[\\d]{2}:[\\d]{2}) [\\w]{3,4} .*$") //
+                        .assign((t, v) -> type.getCurrentContext().put("time", v.get("time")))
+
+                        // @formatter:off
+                        // Datum 08.06.2020
+                        // @formatter:on
+                        .section("date") //
+                        .match("^Datum (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4})$") //
+                        .assign((t, v) -> {
+                            if (type.getCurrentContext().get("time") != null)
+                                t.setDate(asDate(v.get("date"), type.getCurrentContext().get("time")));
+                            else
+                                t.setDate(asDate(v.get("date")));
+                        })
+
+                        // @formatter:off
+                        // Belastung USD 27,734.70
+                        // Gutschrift EUR 28,744.30
+                        // @formatter:on
+                        .section("currency", "amount") //
+                        .match("^(Belastung|Gutschrift) (?<currency>[\\w]{3}) (?<amount>[\\.,\\d]+)$") //
+                        .assign((t, v) -> {
+                            t.setCurrencyCode(asCurrencyCode(v.get("currency")));
+                            t.setAmount(asAmount(v.get("amount")));
+                        })
+
+                        // @formatter:off
+                        // If we have the "Internet-Vergünstigung",
+                        // we add up it from the amount and reset it.
+                        // The "Internet discount" is then posted as a fee refund.
+                        // @formatter:on
+
+                        // @formatter:off
+                        // Internet-Vergünstigung USD - 41.81
+                        // Internet-Vergünstigung USD 44.69
+                        // @formatter:on
+                        .section("feeRefund", "currency").optional() //
+                        .match("^Internet\\-Verg.nstigung (?<currency>[\\w]{3}) (\\- )?(?<feeRefund>[\\.,\\d]+)$") //
+                        .assign((t, v) -> {
+                            t.setAmount(t.getPortfolioTransaction().getAmount() + asAmount(v.get("feeRefund")));
+                        })
+
+                        .wrap(BuySellEntryItem::new);
 
         addTaxesSectionsTransaction(pdfTransaction, type);
         addFeesSectionsTransaction(pdfTransaction, type);
@@ -147,78 +169,95 @@ private void addDividendeTransaction()
         DocumentType type = new DocumentType("Ertragsabrechnung");
         this.addDocumentTyp(type);
 
-        Block block = new Block("^Ertragsabrechnung .*$");
-        type.addBlock(block);
-        Transaction<AccountTransaction> pdfTransaction = new Transaction<AccountTransaction>().subject(() -> {
-            AccountTransaction entry = new AccountTransaction();
-            entry.setType(AccountTransaction.Type.DIVIDENDS);
-            return entry;
-        });
-
-        pdfTransaction
-                // 900 REGISTERED SHS IRON MOUNTAIN INC
-                // Valor 26754105, IRM, ISIN US46284V1017
-                // Bruttoertrag USD 556.65
-                .section("name", "isin", "currency").optional()
-                .match("^[\\.,\\d]+ (?<name>.*)$")
-                .match("^.* ISIN (?<isin>[\\w]{12})$")
-                .match("^Bruttoertrag (?<currency>[\\w]{3}) [\\.,\\d]+$")
-                .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v)))
-
-                // USD 200,000 6.25 % FIXED RATE NOTES NORDDEUTSCHE
-                // LANDESBANK GIROZENTRALE 2014-10.4.24 REG-S
-                // SUBORD.
-                // Valor 24160639, NDKH, ISIN XS1055787680
-                // Bruttoertrag USD 6,250.00
-                .section("name", "isin", "currency").optional()
-                .match("^[\\w]{3} [\\.,\\d]+ (?<name>.*)$")
-                .match("^.* ISIN (?<isin>[\\w]{12})$")
-                .match("^Bruttoertrag (?<currency>[\\w]{3}) [\\.,\\d]+$")
-                .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v)))
-
-                .oneOf(
-                                // USD 200,000 6.25 % Fixed Rate Notes Norddeutsche
-                                section -> section
-                                        .attributes("shares")
-                                        .match("^[\\w]{3} (?<shares>[\\.,\\d]+) [\\.,\\d]+ % (?<name>.*)$")
-                                        .assign((t, v) -> {
-                                            // Percentage quotation, workaround for bonds
-                                            BigDecimal shares = asExchangeRate(v.get("shares"));
-                                            t.setShares(Values.Share.factorize(shares.doubleValue() / 100));
-                                        })
-                                ,
-                                // 900 Registered Shs Iron Mountain Inc USD 0.01
-                                section -> section
-                                        .attributes("shares")
-                                        .match("^(?<shares>[\\.,\\d]+) .*$")
-                                        .assign((t, v) -> t.setShares(asShares(v.get("shares"))))
-                        )
-
-                // Valuta 12.04.2021
-                .section("date")
-                .match("^Valuta (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4})$")
-                .assign((t, v) -> t.setDateTime(asDate(v.get("date"))))
-
-                // Bruttoertrag USD 6,250.00
-                .section("currency", "amount")
-                .match("^Gutschrift (?<currency>[\\w]{3}) (?<amount>[\\.,\\d]+)$")
-                .assign((t, v) -> {
-                    t.setCurrencyCode(asCurrencyCode(v.get("currency")));
-                    t.setAmount(asAmount(v.get("amount")));
-                })
-
-                // Semesterzinsen
-                // Quartalsdividende
-                .section("note").optional()
-                .match("^(?<note>(Semesterzinsen|Quartalsdividende))$")
-                .assign((t, v) -> t.setNote(trim(v.get("note"))))
-
-                .wrap(TransactionItem::new);
+        Transaction<AccountTransaction> pdfTransaction = new Transaction<>();
+        
+        Block firstRelevantLine = new Block("^Ertragsabrechnung .*$");
+        type.addBlock(firstRelevantLine);
+        firstRelevantLine.set(pdfTransaction);
+
+        pdfTransaction //
+
+                        .subject(() -> {
+                            AccountTransaction accountTransaction = new AccountTransaction();
+                            accountTransaction.setType(AccountTransaction.Type.DIVIDENDS);
+                            return accountTransaction;
+                        })
+
+                        .oneOf( //
+                                        // @formatter:off
+                                        // 900 REGISTERED SHS IRON MOUNTAIN INC
+                                        // Valor 26754105, IRM, ISIN US46284V1017
+                                        // Dividende USD 0.6185
+                                        // @formatter:on
+                                        section -> section //
+                                                        .attributes("name", "wkn", "isin", "currency") //
+                                                        .match("^[\\.,\\d]+ (?<name>.*)$") //
+                                                        .match("^Valor (?<wkn>[A-Z0-9]{5,9}),.* ISIN (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9])$") //
+                                                        .match("^Dividende (?<currency>[\\w]{3}) [\\.,\\d]+$") //
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))),
+                                        // @formatter:off
+                                        // USD 200,000 6.25 % FIXED RATE NOTES NORDDEUTSCHE
+                                        // LANDESBANK GIROZENTRALE 2014-10.4.24 REG-S
+                                        // SUBORD.
+                                        // Valor 24160639, NDKH, ISIN XS1055787680
+                                        // @formatter:on
+                                        section -> section //
+                                                        .attributes("currency", "name", "wkn", "isin") //
+                                                        .match("^(?<currency>[\\w]{3}) [\\.,\\d]+ (?<name>.*)$") //
+                                                        .match("^Valor (?<wkn>[A-Z0-9]{5,9}),.* ISIN (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9])$") //
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))))
+
+                        .oneOf( //
+                                        // @formatter:off
+                                        // USD 200,000 6.25 % Fixed Rate Notes Norddeutsche
+                                        // @formatter:on
+                                        section -> section //
+                                                        .attributes("shares") //
+                                                        .match("^[\\w]{3} (?<shares>[\\.,\\d]+) [\\.,\\d]+ %.*$") //
+                                                        .assign((t, v) -> {
+                                                            // @formatter:off
+                                                            // Percentage quotation, workaround for bonds
+                                                            // @formatter:on
+                                                            BigDecimal shares = asExchangeRate(v.get("shares"));
+                                                            t.setShares(Values.Share.factorize(shares.doubleValue() / 100));
+                                                        }),
+                                        // @formatter:off
+                                        // 900 Registered Shs Iron Mountain Inc USD 0.01
+                                        // @formatter:on
+                                        section -> section //
+                                                        .attributes("shares") //
+                                                        .match("^(?<shares>[\\.,\\d]+) .*$") //
+                                                        .assign((t, v) -> t.setShares(asShares(v.get("shares")))))
+
+                        // @formatter:off
+                        // Valuta 12.04.2021
+                        // @formatter:on
+                        .section("date") //
+                        .match("^Valuta (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4})$") //
+                        .assign((t, v) -> t.setDateTime(asDate(v.get("date"))))
+
+                        // @formatter:off
+                        // Bruttoertrag USD 6,250.00
+                        // @formatter:on
+                        .section("currency", "amount") //
+                        .match("^Gutschrift (?<currency>[\\w]{3}) (?<amount>[\\.,\\d]+)$") //
+                        .assign((t, v) -> {
+                            t.setCurrencyCode(asCurrencyCode(v.get("currency")));
+                            t.setAmount(asAmount(v.get("amount")));
+                        })
+
+                        // @formatter:off
+                        // Semesterzinsen
+                        // Quartalsdividende
+                        // @formatter:on
+                        .section("note").optional() //
+                        .match("^(?<note>(Semesterzinsen|Quartalsdividende))$") //
+                        .assign((t, v) -> t.setNote(trim(v.get("note"))))
+
+                        .wrap(TransactionItem::new);
 
         addTaxesSectionsTransaction(pdfTransaction, type);
         addFeesSectionsTransaction(pdfTransaction, type);
-
-        block.set(pdfTransaction);
     }
 
     private void addFeeReturnBlock(DocumentType type)
@@ -227,102 +266,122 @@ private void addFeeReturnBlock(DocumentType type)
         type.addBlock(block);
         block.set(new Transaction<AccountTransaction>()
 
-                .subject(() -> {
-                    AccountTransaction t = new AccountTransaction();
-                    t.setType(AccountTransaction.Type.FEES_REFUND);
-                    return t;
-                })
-
-                // 900 Registered Shs Iron Mountain Inc USD 0.01
-                // Valor 26754105, IRM, ISIN US46284V1017
-                // Kurswert USD 27,270.00
-                .section("name", "currency", "isin").optional()
-                .match("^[\\.,\\d]+ (?<name>.*) [\\w]{3} [\\.,\\d]+$")
-                .match("^.* ISIN (?<isin>[\\w]{12})$")
-                .match("^Kurswert (?<currency>[\\w]{3}) [\\.,\\d]+$")
-                .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v)))
-
-                // USD 200,000 6.25 % Fixed Rate Notes Norddeutsche
-                // Landesbank Girozentrale 2014-10.4.24 Reg-S
-                // Subord.
-                // Valor 24160639, NDKH, ISIN XS1055787680
-                // Kurswert USD 183,000.00
-                .section("name", "isin", "currency").optional()
-                .match("^[\\w]{3} [\\.,\\d]+ (?<name>.*)$")
-                .match("^.* ISIN (?<isin>[\\w]{12})$")
-                .match("^Kurswert (?<currency>[\\w]{3}) [\\.,\\d]+$")
-                .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v)))
-
-                .oneOf(
-                                // USD 200,000 6.25 % Fixed Rate Notes Norddeutsche
-                                section -> section
-                                        .attributes("shares")
-                                        .match("^[\\w]{3} (?<shares>[\\.,\\d]+) [\\.,\\d]+ % (?<name>.*)$")
-                                        .assign((t, v) -> {
-                                            // Percentage quotation, workaround for bonds
-                                            BigDecimal shares = asExchangeRate(v.get("shares"));
-                                            t.setShares(Values.Share.factorize(shares.doubleValue() / 100));
-                                        })
-                                ,
-                                // 900 Registered Shs Iron Mountain Inc USD 0.01
-                                section -> section
-                                        .attributes("shares")
-                                        .match("^(?<shares>[\\.,\\d]+) .*$")
-                                        .assign((t, v) -> t.setShares(asShares(v.get("shares"))))
-                        )
-
-                // Datum 08.06.2020
-                .section("date")
-                .match("^Datum (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4})$")
-                .assign((t, v) -> t.setDateTime(asDate(v.get("date"))))
-
-                // Internet-Vergünstigung USD - 41.81
-                // Internet-Vergünstigung USD 44.69
-                .section("currency", "amount").optional()
-                .match("^Internet-Verg.nstigung (?<currency>[\\w]{3}) (-\\ )?(?<amount>[\\.,\\d]+)$")
-                .assign((t, v) -> {
-                    t.setCurrencyCode(asCurrencyCode(v.get("currency")));
-                    t.setAmount(asAmount(v.get("amount")));
-                })
-
-                .wrap(t -> {
-                    if (t.getCurrencyCode() != null && t.getAmount() != 0)
-                        return new TransactionItem(t);
-                    return null;
-                }));
+                        .subject(() -> {
+                            AccountTransaction accountTransaction = new AccountTransaction();
+                            accountTransaction.setType(AccountTransaction.Type.FEES_REFUND);
+                            return accountTransaction;
+                        })
+
+                        .oneOf( //
+                                        // @formatter:off
+                                        // 900 Registered Shs Iron Mountain Inc USD 0.01
+                                        // Valor 26754105, IRM, ISIN US46284V1017
+                                        // zum Kurs von USD 30.30
+                                        // @formatter:on
+                                        section -> section //
+                                                        .attributes("name", "wkn", "isin", "currency") //
+                                                        .match("^[\\.,\\d]+ (?<name>.*) [\\w]{3} [\\.,\\d]+$") //
+                                                        .match("^Valor (?<wkn>[A-Z0-9]{5,9}),.* ISIN (?<isin>[A-Z]{2}[A-Z0-9]{9}[0-9])$") //
+                                                        .match("^zum Kurs von (?<currency>[\\w]{3}) [\\.,\\d]+$") //
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))),
+                                        // @formatter:off
+                                        // USD 200,000 6.25 % Fixed Rate Notes Norddeutsche
+                                        // Landesbank Girozentrale 2014-10.4.24 Reg-S
+                                        // Subord.
+                                        // Valor 24160639, NDKH, ISIN XS1055787680
+                                        // Kurswert USD 183,000.00
+                                        // @formatter:on
+                                        section -> section //
+                                                        .attributes("name", "wkn", "isin", "currency") //
+                                                        .match("^[\\w]{3} [\\.,\\d]+ (?<name>.*)$") //
+                                                        .match("^Valor (?<wkn>[A-Z0-9]{5,9}),.* ISIN (?<isin>[\\w]{12})$") //
+                                                        .match("^Kurswert (?<currency>[\\w]{3}) [\\.,\\d]+$") //
+                                                        .assign((t, v) -> t.setSecurity(getOrCreateSecurity(v))))
+
+                        .oneOf( //
+                                        // @formatter:off
+                                        // USD 200,000 6.25 % Fixed Rate Notes Norddeutsche
+                                        // @formatter:on
+                                        section -> section //
+                                                        .attributes("shares") //
+                                                        .match("^[\\w]{3} (?<shares>[\\.,\\d]+) [\\.,\\d]+ % (?<name>.*)$") //
+                                                        .assign((t, v) -> {
+                                                            // @formatter:off
+                                                            // Percentage quotation, workaround for bonds
+                                                            // @formatter:on
+                                                            BigDecimal shares = asExchangeRate(v.get("shares"));
+                                                            t.setShares(Values.Share.factorize(shares.doubleValue() / 100));
+                                                        }),
+                                        // @formatter:off
+                                        // 900 Registered Shs Iron Mountain Inc USD 0.01
+                                        // @formatter:on
+                                        section -> section //
+                                                        .attributes("shares") //
+                                                        .match("^(?<shares>[\\.,\\d]+) (?<name>.*) [\\w]{3} [\\.,\\d]+$")
+                                                        .assign((t, v) -> t.setShares(asShares(v.get("shares")))))
+
+                        // @formatter:off
+                        // Datum 08.06.2020
+                        // @formatter:on
+                        .section("date") //
+                        .match("^Datum (?<date>[\\d]{2}\\.[\\d]{2}\\.[\\d]{4})$") //
+                        .assign((t, v) -> t.setDateTime(asDate(v.get("date"))))
+
+                        // @formatter:off
+                        // Internet-Vergünstigung USD - 41.81
+                        // Internet-Vergünstigung USD 44.69
+                        // @formatter:on
+                        .section("currency", "amount").optional() //
+                        .match("^Internet-Verg.nstigung (?<currency>[\\w]{3}) (-\\ )?(?<amount>[\\.,\\d]+)$") //
+                        .assign((t, v) -> {
+                            t.setCurrencyCode(asCurrencyCode(v.get("currency")));
+                            t.setAmount(asAmount(v.get("amount")));
+                        })
+
+                        .wrap(t -> {
+                            if (t.getCurrencyCode() != null && t.getAmount() != 0)
+                                return new TransactionItem(t);
+                            return null;
+                        }));
     }
 
     private <T extends Transaction<?>> void addTaxesSectionsTransaction(T transaction, DocumentType type)
     {
-        transaction
-                // Eidgenössische Umsatzabgabe USD 40.91
-                .section("currency", "tax").optional()
-                .match("^Eidgen.ssische Umsatzabgabe (?<currency>[\\w]{3}) (\\- )?(?<tax>[\\.,\\d]+)$")
-                .assign((t, v) -> processTaxEntries(t, v, type))
-
-                // Quellensteuer USD - 167.00
-                .section("currency", "withHoldingTax").optional()
-                .match("^Quellensteuer (?<currency>[\\w]{3}) (\\- )?(?<withHoldingTax>[\\.,\\d]+)$")
-                .assign((t, v) -> processWithHoldingTaxEntries(t, v, "withHoldingTax", type));
+        transaction //
+        
+                        // @formatter:off
+                        // Eidgenössische Umsatzabgabe USD 40.91
+                        // @formatter:on
+                        .section("currency", "tax").optional() //
+                        .match("^Eidgen.ssische Umsatzabgabe (?<currency>[\\w]{3}) (\\- )?(?<tax>[\\.,\\d]+)$") //
+                        .assign((t, v) -> processTaxEntries(t, v, type))
+
+                        // @formatter:off
+                        // Quellensteuer USD - 167.00
+                        // @formatter:on
+                        .section("currency", "withHoldingTax").optional() //
+                        .match("^Quellensteuer (?<currency>[\\w]{3}) (\\- )?(?<withHoldingTax>[\\.,\\d]+)$") //
+                        .assign((t, v) -> processWithHoldingTaxEntries(t, v, "withHoldingTax", type));
     }
 
     private <T extends Transaction<?>> void addFeesSectionsTransaction(T transaction, DocumentType type)
     {
-        transaction
-                // Kommission Schweiz/Ausland USD 463.60
-                .section("currency", "fee").optional()
-                .match("^Kommission Schweiz\\/Ausland (?<currency>[\\w]{3}) (\\- )?(?<fee>[\\.,\\d]+)$")
-                .assign((t, v) -> processFeeEntries(t, v, type))
-
-                // Kommission Schweiz USD 1,413.65
-                .section("currency", "fee").optional()
-                .match("^Kommission Schweiz (?<currency>[\\w]{3}) (\\- )?(?<fee>[\\.,\\d]+)$")
-                .assign((t, v) -> processFeeEntries(t, v, type))
-
-                // Kosten und Abgaben Ausland USD 2.00
-                .section("currency", "fee").optional()
-                .match("^Kosten und Abgaben (?<currency>[\\w]{3}) (\\- )?(?<fee>[\\.,\\d]+)$")
-                .assign((t, v) -> processFeeEntries(t, v, type));
+        transaction //
+        
+                        // @formatter:off
+                        // Kommission Schweiz/Ausland USD 463.60
+                        // Kommission Schweiz USD 1,413.65
+                        // @formatter:on
+                        .section("currency", "fee").optional() //
+                        .match("^Kommission .* (?<currency>[\\w]{3}) (\\- )?(?<fee>[\\.,\\d]+)$") //
+                        .assign((t, v) -> processFeeEntries(t, v, type))
+
+                        // @formatter:off
+                        // Kosten und Abgaben Ausland USD 2.00
+                        // @formatter:on
+                        .section("currency", "fee").optional() //
+                        .match("^Kosten und Abgaben (?<currency>[\\w]{3}) (\\- )?(?<fee>[\\.,\\d]+)$") //
+                        .assign((t, v) -> processFeeEntries(t, v, type));
     }
 
     @Override