Bump version to 0.8.7

.gitea/workflows/deploy.yaml

@@ -41,6 +41,7 @@ jobs:
         uses: akkuman/gitea-release-action@v1
         with:
           name: Elwig ${{ env.APP_VERSION }}
+          body: "**[Changelog](src/branch/main/CHANGELOG.md#v${{ env.APP_VERSION }})**"
           files: |-
             Setup/bin/x64/Release/Elwig-${{ env.APP_VERSION }}.exe
       - name: Upload to website
@@ -48,7 +49,7 @@ jobs:
         run: |
           $content = [System.IO.File]::ReadAllBytes("Setup/bin/x64/Release/Elwig-${{ env.APP_VERSION }}.exe")
           Invoke-WebRequest `
-            -Uri "https://www.necronda.net/elwig/files/Elwig-${{ env.APP_VERSION }}.exe" `
+            -Uri "https://elwig.at/files/Elwig-${{ env.APP_VERSION }}.exe" `
             -Method PUT `
             -Body $content `
             -Headers @{ Authorization = "${{ secrets.API_AUTHORIZATION }}" } `

.gitea/workflows/test.yaml

@@ -2,6 +2,7 @@ name: Test
 on:
   push:
     branches: ["**"]
+    paths: ["Elwig/**", "Tests/**", "Installer/Files/*.exe"]
 jobs:
   test:
     name: Run tests
@@ -26,4 +27,4 @@ jobs:
         shell: powershell
         run: |
           $env:PATH = "$(pwd)\Installer\Files;" + $env:PATH
-          $(& dotnet test Tests; $a=$lastexitcode) | findstr x*; exit $a
+          $(& dotnet test Tests --filter "FullyQualifiedName!~E2ETests"; $a=$lastexitcode) | findstr x*; exit $a

.gitignore

@@ -6,3 +6,4 @@ bin/
 Tests/Resources/Sql/Create.sql
 *.exe
 !WinziPrint.exe
+*.sqlite3

CHANGELOG.md

@@ -0,0 +1,390 @@
+
+Changelog
+=========
+
+
+[v0.8.7][v0.8.7] (2024-07-22) {#v0.8.7}
+---------------------------------------
+
+### Neue Funktionen {#v0.8.7-features}
+
+* Im Mitglieder-Fenster (`MemberAdminWindow`) muss eine E-Mail-Adresse angegeben werden, wenn E-Mail als Kontaktart angegeben wird. (5a36e84b1f)
+
+### Sonstiges {#v0.8.7-misc}
+
+* Automatisierte Ende-zu-Ende-Tests (`E2ETests`) hinzugefügt. (ddd821e478, 6b48a1090c, dd5049faae, 5b2f617a68, 7246852181)
+* Automatisierte Tests überarbeitet. (44656e0022, 86937485e4, 34178105a7, ffe0ff5508, 01d658f51d)
+* Update-Dialog (`UpdateDialog`) überarbeitet. (62f63ef63d, e9de54415a)
+* Eingebefelder vom Typ _Mehrfachauswahl mit Dropdown_ (`CheckComboBox`) etwas verbessert. (26d75ea3cd, daf83c4bbc)
+* Im Übernahme-Fenster (`DeliveryAdminWindow`) werden nur noch aktive Mitglieder angezeigt. (658a1f4dc1)
+* Abhängigkeiten aktualisiert. (ffef1fd6e4, dd48a24c58)
+* Auto-Update-Funktion überarbeitet. (3ac9536e76)
+
+[v0.8.7]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.7
+
+
+
+
+[v0.8.6][v0.8.6] (2024-07-01) {#v0.8.6}
+---------------------------------------
+
+### Neue Funktionen {#v0.8.6-features}
+
+* Es ist nun möglich benutzerdefinierte Zu-/Abschläge pro Mitglied anzugeben. ([#48][i48], 255bcbe3ad, 6a92eb76a0)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) Menü-Eintrag zum Ansehen von Traubengutschriften (`CreditNote`) hinzugefügt. (bce2eea3ac)
+ 
+### Sonstiges {#v0.8.6-misc}
+
+* Im Rundschreiben-Fenster (`MailWindow`) kann das Datum geändert werden. (7ce8c3cabf)
+* Im Auszahlung-Anpassen-Fenster (`PaymentAdjustmentWindow`):
+  * kann nur noch die aktuellste Saison angepasst werden. (43dddf2c07)
+  * gibt es jetzt eine Statusleiste. (5c76b8ec52)
+* Auf Traubengutschriften (`CreditNote`) wird die Berechnungszeit nicht mehr angeführt, dafür jedoch das Datum der Auszahlungsvariante. (763f0197ca)
+* Im Stammdaten-Fenster (`BaseDataWindow`) sind Strafen bei Unterlieferung lt. GA besser gruppiert. ([#52][i52])
+* Statistiken zu Zu-/Abschlägen im Übersichtsdokument für Auszahlungsvarianten (`PaymentVariantSummary`). ([#49][i49])
+* Knöpfe (und Pfeile) im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) anders angeordnet. (6195363335)
+* Im Auszahlungsvariante-Fenster (`ChartWindow`) sind 73 °Oe standardmäßig ausgewählt. ([#51][i51])
+
+[v0.8.6]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.6
+[i48]: https://git.necronda.net/winzer/elwig/issues/48
+[i49]: https://git.necronda.net/winzer/elwig/issues/49
+[i51]: https://git.necronda.net/winzer/elwig/issues/51
+[i52]: https://git.necronda.net/winzer/elwig/issues/52
+
+
+
+
+[v0.8.5][v0.8.5] (2024-06-17) {#v0.8.5}
+---------------------------------------
+
+### Neue Funktionen {#v0.8.5-features}
+
+* Fenster zum Anpassen der Auszahlung einer Saison (`PaymentAdjustmentWindow`) hinzugefügt. ([#46][i46])
+
+### Behobene Fehler {#v0.8.5-bugfixes}
+
+* Inaktive Mitglieder, die in der letzten Saison geliefert haben, bisher in _Über-/Unterlieferungen_ nicht aufgeschienen. (abf465f821)
+* Inaktive Mitglieder, die in der letzten Saison geliefert haben, haben keine entsprechenden Rundschreiben bekommen. (792c18365e)
+* Falls unter `Stammdaten > Mandant` kein IBAN gesetzt war führte das zu einem Fehler beim Exportieren der Überweisungsdaten. (da9df5cbeb)
+* Falls sich Daten in der Datenbank im Hintergrund geändert haben wurden Daten für Eingebefelder vom Typ _Mehrfachauswahl mit Dropdown_ (`CheckComboBox`) falsch neu geladen. (050e4f5b6f)
+
+### Sonstiges {#v0.8.5-misc}
+
+* Kleine Änderungen im EBICS-/XML-Export. (5cb7d2cbb0, cc0aa6046f, 87467bbe75)
+
+[v0.8.5]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.5
+[i46]: https://git.necronda.net/winzer/elwig/issues/46
+
+
+
+
+[v0.8.4][v0.8.4] (2024-06-13) {#v0.8.4}
+---------------------------------------
+
+### Neue Funktionen {#v0.8.4-features}
+
+* EBICS-Überweisung-Version für EBICS-/XML-Exporte der Überweisungsdaten nun unter `Stammdaten > Parameter > Daten-Export` konfigurierbar. (ab926421b0)
+
+### Behobene Fehler {#v0.8.4-bugfixes}
+
+* Falls beim Schließen des Hauptmenüs ein anderes Fenster im Bearbeiten-/Erstellen-Modus war führte das zu einem Absturz. (70f8276808)
+
+### Sonstiges {#v0.8.4-misc}
+
+* Eingabetyp _Mehrfachauswahl mit Dropdown_ (`CheckComboBox`) überarbeitet. ([#37][i37], 4483eb6a69)
+* Abhängigkeit `Extended.Wpf.Toolkit` endgültig entfernt. ([#37][i37], 4483eb6a69)
+* Automatisierte Tests für österreich-spezifischen EBICS-Standard hinzugefügt. (46551fb142)
+
+[v0.8.4]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.4
+
+
+
+
+[v0.8.3][v0.8.3] (2024-06-11) {#v0.8.3}
+---------------------------------------
+
+### Neue Funktionen {#v0.8.3-features}
+
+* Strafe für Unterlieferung lt. GA kann abhängig von GAs angegeben werden. ([#47][i47])
+* Es ist nun möglich Mitglieder zu löschen. (c12d111c57, 5a4ff26f31)
+* Beim Übertragen der Flächenbindungen an einen Nachfolger (bzw. beim Inaktiv-Setzen) kann nun die gewünschte Saison angegeben werden. ([#45][i45])
+* Es ist nun möglich Saisons anzulegen und zu löschen. ([#44][i44])
+
+### Behobene Fehler {#v0.8.3-bugfixes}
+
+* Beim Auswählen einer Saison mit einer anderen Währung unter `Stammdaten > Saisons` kam es zu einem Absturz. (f756220d75)
+* Abstürze im Rundschreiben-Fenster (`MailWindow`) beim Auswählen von einzelnen Mitgliedern oder nach Flächenbindung. (6e4f3b799d, 5039c1252a)
+* Es nun wieder möglich Zu-/Abschläge bei Lieferungen hinzuzufügen oder zu entfernen. (324a63cf9a, 012352c562)
+
+### Sonstiges {#v0.8.3-misc}
+
+* Eingabetyp _Ganzzahl_ (`IntegerUpDown`) überarbeitet. ([#37](i37), cc4ec6c5db, a531e948c1)
+* Beim Erstellen der Installationsdatei wird der Rückgabewert überprüft (`curl --fail`). (ff375e3caf)
+* URL in vordefinierter `config.ini`-Datei auf `https://elwig.at/` ausgebessert. (293c8967be)
+* Abhängigkeiten aktualisiert. (4e477c38e0, 601ac548fe)
+* Absender bei Anlieferungsbestätigung (`DeliveryConfirmation`) wird nicht mehr immer abgedruckt. (4c9a151f77)
+* In der Zusammenfassung der Auszahlungsvariantendaten (`PaymentVariantSummary`) werden Rebel Zu-/Abschläge angeführt. (08f551a394)
+
+[v0.8.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.3
+[i37]: https://git.necronda.net/winzer/elwig/issues/37
+[i44]: https://git.necronda.net/winzer/elwig/issues/44
+[i45]: https://git.necronda.net/winzer/elwig/issues/45
+[i47]: https://git.necronda.net/winzer/elwig/issues/47
+
+
+
+
+[v0.8.2][v0.8.2] (2024-05-14) {#v0.8.2}
+---------------------------------------
+
+### Neue Funktionen {#v0.8.2-features}
+
+* In der Konfigurationsdatei (`config.ini`) gibt es die Möglichkeit bei Waagen `required = false` hinzuzufügen.
+  So werden Fehlermeldungen der Waagen beim Starten dem Benutzer nicht angezeigt (außer `debug = true` ist in `[general]` gesetzt). (81e18ac553, e3fd705f52)
+
+### Behobene Fehler {#v0.8.2-bugfixes}
+
+* Falls die Saison für das aktuelle Jahr nicht angelegt war führte das zu einem Absturz im Stammdaten-Fenster (`BaseDataWindow`). (f95f0f0ef3)
+* Das Drucken von Dokumenten ist wieder möglich. (2b10e52ab0)
+
+### Sonstiges {#v0.8.2-misc}
+
+* Umstieg von `https://www.necronda.net/elwig/` auf `https://elwig.at/`. (be246d6f06, 5b952c4eb1)
+
+[v0.8.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.2
+
+
+
+
+[v0.8.1][v0.8.1] (2024-05-12) {#v0.8.1}
+---------------------------------------
+
+> [!WARNING]
+> Aufgrund eines Fehlers beim Erstellen der Installationsdatei ist in dieser Version das Drucken von Dokumenten nicht möglich!
+>
+> Es wird empfohlen die nächste Version zu verwenden.
+
+### Neue Funktionen {#v0.8.1-features}
+
+* Übersichtsdokument für Auszahlungsvarianten (`PaymentVariantSummary`). ([#32][i32], 69aa75a50a)
+
+### Behobene Fehle {#v0.8.1-bugfixes}
+
+* Falls in einer neuen Version die Datenbank aktualisiert werden musste, konnte es vorkommen, dass es beim Start zu einem Absturz kam. (6906584ef0)
+* Beim Exportieren der Überweisungsdaten kam es zu einem Absturz. (f123bb44c5)
+
+### Sonstiges {#v0.8.1-misc}
+
+* Das Installationsprogramm ist nun auf deutsch verfügbar. (d102a1cb7a)
+* Menüleiste und Statusleiste im Fenster für Auszahlungsvarianten (`PaymentVaiantWindow`) hinzugefügt. (b03f81d4f2)
+
+[v0.8.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.1
+[i32]: https://git.necronda.net/winzer/elwig/issues/32
+
+
+
+
+[v0.8.0][v0.8.0] (2024-05-01) {#v0.8.0}
+---------------------------------------
+
+### Neue Funktionen {#v0.8.0-features}
+
+* Die Qualitätsstatistik (`WineQualityStatistic`) kann in °KMW angezeigt werden. (869f652afc, 27b5d653e6)
+* Waagen-Schnittstelle vom Typ `Gassner` implementiert. (443e111594)
+* Teile zum Synchronisierung der Datenbank zwischen Zweigstellen implementiert. ([#3][i3])
+* Sorten-/Qualitätsaufschlüsselung im Hauptfenster. (2a4e8d69d0)
+
+### Behobene Fehler {#v0.8.0-bugfixes}
+
+* Beim Anzeigen von Zu-/Abschlägen einer Saison im Stammdaten-Fenster (`BaseDataWindow`) kam es zu einem Absturz. (1419c834ac)
+* Das Laden von einigen Daten im Stammdaten-Fenster (`BaseDataWindow`) war nicht immer konsistent. (1047bc6e8f)
+* Die Einstellungen in `Stammdaten -> Parameter` haben nicht konsistent funktioniert. (9062d55b20)
+
+### Sonstiges {#v0.8.0-misc}
+
+* Rahmenstärke in Dokumenten wider auf 0.5pt gesetzt. (eddea88e77)
+* Mehr automatisierte Tests für Dokumente hinzugefügt. (66898714bb, b8851fb241, 5c3cf41d3d, 657910ff48, 12eb53cb44, 80e91ad776)
+* `SeasonFinishWindow` und `TestWindow` entfernt. (a9f38a3ccb)
+* Abhängigkeiten aktualisiert. (c6905bbb42, 21fe5bc094, fd17d294b9, 35e5a1dfff)
+* Beim Überprüfen auf Updates bekommt der Nutzer nun auch eine Rückmeldung, wenn es keine Updates gibt. (c360e6b6a7)
+
+[v0.8.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.0
+[i3]: https://git.necronda.net/winzer/elwig/issues/3
+
+
+
+
+[v0.7.2][v0.7.2] (2024-03-28) {#v0.7.2}
+---------------------------------------
+
+### Neue Funktionen {#v0.7.2-features}
+
+* Flächenbindungen können vom Vorgänger übernommen bzw. beim Inaktiv-Setzen storniert werden. ([#41][i41])
+* Für diverse Funktionen wurden Tastenkürzel hinzugefügt (in den Menüleisten oder beim Drüberfahren mit der Maus genauer ersichtlich; z.B. Speichern/Neu/Löschen/Zurücksetzen/Abbrechen/Bearbeiten). ([#31][i31])
+* Die Mitgliederliste ist nun auch als PDF/Ausdruck und Excel-Liste verfügbar. ([#36][i36])
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`):
+  * kann nach mehr Dingen gefiltert werden (Handwiegung, Handlese, gebunden/ungebunden, brutto/netto). ([#12][i12], cf2ec3bdc4)
+  * werden verwendete Zu-/Abschläge zusätzlich in der Tabelle angezeigt. (b31b5f6164)
+  * können gefilterte Lieferungen nun auch als Excel-Liste exportiert werden. ([#13][i13])
+  * gibt es ab jetzt ein Übersichtsdokument/Qualitätsstatistik für gefilterte Lieferungen (`WineQualityStatistic`). ([#30][i30], d011c69812, d501cfaf72)
+* Einige Optionen zum PDF-Speichern/-Ausdrucken überarbeitet. (b2f52072f8)
+
+### Behobene Fehler {#v0.7.2-bugfixes}
+
+* Falls beim Starten des Programms die Datenbank-Version "zu neu" war, wurde nur ein Fehler angezeigt und kein Auto-Update versucht. (87da56b7a9)
+* Falls ein Element einer Liste ausgewählt wurde, das nicht in der Liste existierte führte dies zu einem Absturz. (afc143e1e4)
+
+### Sonstiges {#v0.7.2-misc}
+
+* Das Gesamte Programm ist nun schneller und wird nach längerer Benutzung nicht mehr langsamer (`AppDbContext` Lifecycle). ([#43][i43])
+* Excel-Exports überarbeitet (Datumswerte, Wahr-/Falsch-Werte). (9d80c5913f, c6e83ffff4, 5795c5e8ba)
+* Rahmenstärke in Dokumenten wider auf 0.05pt gesetzt. (9aa6cba1ff)
+
+[v0.7.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.7.2
+[i12]: https://git.necronda.net/winzer/elwig/issues/12
+[i13]: https://git.necronda.net/winzer/elwig/issues/13
+[i30]: https://git.necronda.net/winzer/elwig/issues/30
+[i31]: https://git.necronda.net/winzer/elwig/issues/31
+[i36]: https://git.necronda.net/winzer/elwig/issues/36
+[i41]: https://git.necronda.net/winzer/elwig/issues/41
+[i43]: https://git.necronda.net/winzer/elwig/issues/43
+
+
+
+
+[v0.7.1][v0.7.1] (2024-03-11) {#v0.7.1}
+---------------------------------------
+
+### Neue Funktionen {#v0.7.1-features}
+
+* Für Auszahlungsvarianten kann ein Rebel-Zu-/Abschlag festgelegt werden. ([#40][i40])
+* Im Rundschreiben-Fenster (`MailWindow`) gibt es ab jetzt die Möglichkeit den Ort anzupassen. (34ebc8fa34, a5df03aa2c)
+
+### Behobene Fehler {#v0.7.1-bugfixes}
+
+* Falls im Rundschreiben-Fenster (`MailWindow`) der Ausdruck nach PLZ und Ort sortiert werden sollte, wurden Rechnungsadressen nicht beachtet. (746d0f10de)
+
+### Sonstiges {#v0.7.1-misc}
+
+* Im Mitglieder-Fenster (`MemberAdminWindow`) wurde die Möglichkeit zum Verfassen von Rundschreiben entfernt. (61c8d1ee97)
+* Das Erzeugen von PDF-Dokumenten wurde verbessert. (c70772b47d, 6a5507060a, c0f4a484ab)
+
+[v0.7.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.7.1
+[i40]: https://git.necronda.net/winzer/elwig/issues/40
+
+
+
+
+[v0.7.0][v0.7.0] (2024-03-06) {#v0.7.0}
+---------------------------------------
+
+> [!NOTE]
+> Das Attribut "Bio" wird ab dieser Version automatisch entfernt und als Bewirtschaftungsart "Bio" verwendet.
+> Sämtliche Lieferungen und Auszahlungsvarianten werden automatisch aktualisiert.
+
+### Neue Funktionen {#v0.7.0-features}
+
+* Das Attribut "Bio" wird nun als Bewirtschaftungsart "Bio" verwendet. ([#34][i34], 25a0722f96, 8031654e86, 7181d744fc, cc72a8365e)
+* Im Übernahme-Fenster (`DeliveryAdminWindow`) wurde eine Abklingzeit von 1 Sekunde zum Wiegen-Knopf hinzugefügt. (efe91192bc)
+* Im Übernahme-/Lieferungen-Fenster (`DeliveryAdminWindow`) und im Mitglieder-Fenster (`MemberAdminWindow`) wurde ein Knopf hinzugefügt,
+  mit dem man zum entsprechenden Mitglied (bzw. Vorgänger) springen kann. (665e16d78f)
+* Ein Rundschreiben-Fenster (`MailWindow`) wurde hinzugefügt. ([#15][i15], cc5396711d, 060acc56c3, a275385b5c, 37e10136f4, 376af72700)
+* Eine automatische Update Funktion wurde hinzugefügt. Diese überprüft regelmäßig, ob eine neuere Version von Elwig verfügbar ist. ([#8][i8], a5a6915db1, 271e085fdf)
+
+### Behobene Fehler {#v0.7.0-bugfixes}
+
+* Falls in einer Auszahlungsvariante ein unbekanntes Attribut verwendet wurde, kam es zu einem Absturz. ([#39][i39])
+* Falls für ein Mitglied kein IBAN hinterlegt war, kam es beim Exportieren der Traubengutschriften zu einem Absturz. (958fbaae50)
+* Waagen-Schnittstelle für Badner Waage war Fehlerhaft. (092c5788a4)
+* Falls Flächenbindungen von Mitgliedern keine Bewirtschaftungsart gesetzt haben sollten, kam es beim Erstellen des Stammdatenblattes (`MemberDataSheet`) zum Absturz. (3324a9a238)
+* Telefonnummern und E-Mail-Adressen können wieder beliebig hinzugefügt und gelöscht werden. (e9f6f22bc8, 3a0f2e9556)
+
+### Sonstiges {#v0.7.0-misc}
+
+* Beim Schließen des Hauptfensters wird der Nutzer gefragt, ob er alle anderen Fenster auch schließen möchte. (96c9890b90)
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) und auf Lieferscheinen (`DeliveryNote`) wird neben _(nicht) gerebelt_ nun auch _brutto/netto_ angegeben. (049927f90c)
+* Falls man die Lieferungen eines einzelnen Mitglieds ansieht, werden nun standardmäßig nur die Lieferungen der aktuellen Saison angezeigt. (5a6317fcdb)
+* Im Stammdaten-Fenster (`BaseDataWindow`) unter Attributen findet sich nun ein kurzer Erklärtext. (e6cab7993f)
+* Die Installationsdatei erkennt nun die Elwig-Version wieder richtig. ([#35][i35])
+* Am Mitglieds-Stammdatenblatt (`MemberDataSheet`) werden die Flächenbindungen ab jetzt immer frühestens auf der zweiten Seite abgedruckt. (4673877d36)
+* Beim automatischen Aktualisieren der Datenbank werden Fremdschlüssel validiert. (d897e44f3b, 3b94875a7f, 614e0010fd, 92c3ed991b)
+* Nachnamen von Mitgliedern in Großschreibung werden ab jetzt mit `ẞ` statt mit `ß` geschrieben. (ccb83911b1)
+* Dokumente können nun parallel erstellt werden. ([#19][i19], 9139557cc4, ac4026571e, e9d0eec3bd, 77cf47e154, 5a488369be)
+* Die Popup-Fenster sind modernisiert worden. ([#16][i16])
+* Grunstücksnummern bei Flächenbindungen werden bei der Eingabe nicht mehr validiert. (ea6621ee57)
+* Abhängigkeiten aktualisiert. (d944aabc06)
+
+[v0.7.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.7.0
+[i8]: https://git.necronda.net/winzer/elwig/issues/8
+[i15]: https://git.necronda.net/winzer/elwig/issues/15
+[i16]: https://git.necronda.net/winzer/elwig/issues/16
+[i19]: https://git.necronda.net/winzer/elwig/issues/19
+[i34]: https://git.necronda.net/winzer/elwig/issues/34
+[i35]: https://git.necronda.net/winzer/elwig/issues/35
+[i39]: https://git.necronda.net/winzer/elwig/issues/39
+
+
+
+
+[v0.6.8][v0.6.8] (2024-02-22) {#v0.6.8}
+---------------------------------------
+
+### Neue Funktionen {#v0.6.8-features}
+
+* Waagen-Schnittstelle vom Typ `Schember-Async` implementiert. (10b78dfb72, c0ff852f5e, ae7fdef2ea)
+
+[v0.6.8]: https://git.necronda.net/winzer/elwig/releases/tag/v0.6.8
+
+
+
+
+[v0.6.7][v0.6.7] (2024-02-21) {#v0.6.7}
+---------------------------------------
+
+### Sonstiges {#v0.6.7-misc}
+
+* WG Weinland und WG Baden nun registierte Mandanten. (583d5b4e3e)
+* Im Mitglieds-Stammdatenblatt (`MemberDataSheet`) werden Flächenbindungen nun immer für das momentane Jahr angezeigt (nicht die neueste angelegte Saison). (8732141e6b)
+* Umstrukturierung der internen Waagen-Schnittstellen-Implementation. (3f2b5b684c, 7ff069d068, 99ca12b276)
+
+[v0.6.7]: https://git.necronda.net/winzer/elwig/releases/tag/v0.6.7
+
+
+
+
+[v0.6.6][v0.6.6] (2024-02-18) {#v0.6.6}
+---------------------------------------
+
+### Sonstiges {#v0.6.6-misc}
+
+* Automatisierte Tests für Waagen-Schnittstellen hinzugefügt. (f13fb3aaf0, f4eb6456be, 7f4cfdc1b5)
+* Im Übernahme-Fenster (`DeliveryAdminWindow`) wird die Saison ab jetzt ausschließlich über die Jahreszahl bestimmt. (3c0fea30f5)
+
+[v0.6.6]: https://git.necronda.net/winzer/elwig/releases/tag/v0.6.6
+
+
+
+
+[v0.6.5][v0.6.5] (2024-02-15) {#v0.6.5}
+---------------------------------------
+
+### Neue Funktionen {#v0.6.5-features}
+
+* Die Installationsdatei kann ab jetzt automatisch erstellt werden. ([#6][i6], 6d53e35399)
+
+### Behobene Fehler {#v0.6.5-bugfixes}
+
+* Im Mitglieds-Stammdatenblatt (`MemberDataSheet`) fehlte bei Rechnungsadressen der Abstand zwischen PLZ und Ort. (68f1a2c091)
+
+### Sonstiges {#v0.6.5-misc}
+
+* Berechnung der Aufteilung für Bio-Attribute aktualisiert. (0591d91f49, 42eb68d431)
+* Kleine Änderungen im EBICS-/XML-Export. (befe6a753b, 825bd6f304)
+* Automatisierte Tests für EBICS-/XML-Export hinzugefügt. (6fdd72e28b, c07a6b450c, 4daa6deb26)
+* Automatisierte Tests für Dokumente hinzugefügt. (912206f52d, 805f782c83, 1b9064a97c)
+* Anpassungen für PLZ und KG-Nr. in der Datenbank. (11be424c38)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) dürfen Freitextsuchen nun 2 (statt 3) Zeichen lang sein. (59cd69ddaf)
+
+[v0.6.5]: https://git.necronda.net/winzer/elwig/releases/tag/v0.6.5
+[i6]: https://git.necronda.net/winzer/elwig/issues/6
+

Elwig/App.xaml.cs

@@ -31,8 +31,8 @@ namespace Elwig {
         public static readonly string DataPath = @"C:\ProgramData\Elwig\";
         public static readonly string ExePath = @"C:\Program Files\Elwig\";
         public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");
-        public static readonly Config Config = new(DataPath + "config.ini");
 
+        public static Config Config { get; private set; } = new(Path.Combine(DataPath, "config.ini"));
         public static int VersionMajor { get; private set; }
         public static int VersionMinor { get; private set; }
         public static int VersionPatch { get; private set; }
@@ -74,6 +74,11 @@ namespace Elwig {
             CurrentApp = this;
             OverrideCulture();
 
+            var args = Environment.GetCommandLineArgs();
+            if (args.Length >= 2) {
+                Config = new(Path.GetFullPath(args[1]));
+            }
+
             ContextTimer.Tick += (object? sender, EventArgs evt) => {
                 if (CurrentLastWrite > LastChanged) {
                     LastChanged = CurrentLastWrite;
@@ -159,7 +164,9 @@ namespace Elwig {
                     list.Add(Scale.FromConfig(s));
                 } catch (Exception e) {
                     list.Add(new InvalidScale(s.Id));
-                    MessageBox.Show($"Unable to create scale {s.Id}:\n\n{e.Message}", "Scale Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                    if (s.Required)
+                        MessageBox.Show($"Unable to create scale {s.Id}:\n\n{e.Message}", "Scale Error",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             }
             Scales = list;
@@ -220,7 +227,7 @@ namespace Elwig {
             }
         }
 
-        public static async Task CheckForUpdates(bool showSuccess = false) {
+        public static async Task CheckForUpdates(bool showAlert = false) {
             if (Config.UpdateUrl == null) return;
             var latest = await Utils.GetLatestInstallerUrl(Config.UpdateUrl);
             if (latest != null && new Version(latest.Value.Version) > new Version(Version)) {
@@ -231,9 +238,14 @@ namespace Elwig {
                         Current.Shutdown();
                     }
                 });
-            } else if (showSuccess) {
-                MessageBox.Show("Elwig ist auf dem aktuellsten Stand!", "Nach Updates suchen",
-                    MessageBoxButton.OK, MessageBoxImage.Information);
+            } else if (showAlert) {
+                if (latest == null) {
+                    MessageBox.Show("Informationen konnten nicht abgerufen werden!", "Nach Updates suchen",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
+                } else {
+                    MessageBox.Show($"Elwig ist auf dem aktuellsten Stand! (Version: {latest.Value.Version})", "Nach Updates suchen",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+                }
             }
         }
 
@@ -294,6 +306,10 @@ namespace Elwig {
             return FocusWindow<PaymentVariantsWindow>(() => new(year), w => w.Year == year);
         }
 
+        public static PaymentAdjustmentWindow FocusPaymentAdjustment(int year) {
+            return FocusWindow<PaymentAdjustmentWindow>(() => new(year), w => w.Year == year);
+        }
+
         public static ChartWindow FocusChartWindow(int year, int avnr) {
             return FocusWindow<ChartWindow>(() => new(year, avnr), w => w.Year == year && w.AvNr == avnr);
         }

Elwig/Controls/CheckComboBox.cs

@@ -0,0 +1,160 @@
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Controls {
+    public class CheckComboBox : ListBox {
+
+        public new static readonly DependencyProperty SelectedItemsProperty = DependencyProperty.Register(nameof(SelectedItems), typeof(IList), typeof(CheckComboBox), new FrameworkPropertyMetadata(new ObservableCollection<object>(), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedItemsChangedCallback));
+        public new IList SelectedItems {
+            get => (IList)GetValue(SelectedItemsProperty);
+            set => SetValue(SelectedItemsProperty, value);
+        }
+
+        public static readonly DependencyProperty DelimiterProperty = DependencyProperty.Register(nameof(Delimiter), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata(", "));
+        public string Delimiter {
+            get => (string)GetValue(DelimiterProperty);
+            set => SetValue(DelimiterProperty, value);
+        }
+
+        public static readonly DependencyProperty AllItemsSelectedContentProperty = DependencyProperty.Register(nameof(AllItemsSelectedContent), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata("All"));
+        public string AllItemsSelectedContent {
+            get => (string)GetValue(AllItemsSelectedContentProperty);
+            set => SetValue(AllItemsSelectedContentProperty, value);
+        }
+
+        public static readonly DependencyProperty IsSelectAllActiveProperty = DependencyProperty.Register(nameof(IsSelectAllActive), typeof(bool), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
+        public bool IsSelectAllActive {
+            get => (bool)GetValue(IsSelectAllActiveProperty);
+            set => SetValue(IsSelectAllActiveProperty, value);
+        }
+
+        public static readonly DependencyProperty SelectAllContentProperty = DependencyProperty.Register(nameof(SelectAllContent), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata("All"));
+        public string SelectAllContent {
+            get => (string)GetValue(SelectAllContentProperty);
+            set => SetValue(SelectAllContentProperty, value);
+        }
+
+        public static readonly DependencyProperty AllItemsSelectedProperty = DependencyProperty.Register(nameof(AllItemsSelected), typeof(bool?), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
+        public bool? AllItemsSelected {
+            get => (bool?)GetValue(AllItemsSelectedProperty);
+            set => SetValue(AllItemsSelectedProperty, value);
+        }
+
+        public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(nameof(IsDropDownOpen), typeof(bool), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
+        public bool IsDropDownOpen {
+            get => (bool)GetValue(IsDropDownOpenProperty);
+            set => SetValue(IsDropDownOpenProperty, value);
+        }
+
+        public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register(nameof(MaxDropDownHeight), typeof(double), typeof(CheckComboBox), new FrameworkPropertyMetadata(ComboBox.MaxDropDownHeightProperty.DefaultMetadata.DefaultValue));
+        public double MaxDropDownHeight {
+            get => (double)GetValue(MaxDropDownHeightProperty);
+            set => SetValue(MaxDropDownHeightProperty, value);
+        }
+
+        public new static readonly RoutedEvent SelectionChangedEvent = EventManager.RegisterRoutedEvent(nameof(SelectionChanged), RoutingStrategy.Bubble, typeof(SelectionChangedEventHandler), typeof(CheckComboBox));
+        public new event SelectionChangedEventHandler SelectionChanged {
+            add => AddHandler(SelectionChangedEvent, value);
+            remove => RemoveHandler(SelectionChangedEvent, value);
+        }
+
+        static CheckComboBox() {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(CheckComboBox), new FrameworkPropertyMetadata(typeof(CheckComboBox)));
+        }
+
+        private bool _viewHandled;
+        private bool _modelHandled;
+        private TextBlock _textBox;
+
+        public CheckComboBox() {
+            SelectionMode = SelectionMode.Multiple;
+        }
+
+        public override void OnApplyTemplate() {
+            _textBox = (GetTemplateChild("TextBox") as TextBlock)!;
+            var button = GetTemplateChild("Button") as Button;
+            button!.Click += Button_MouseDown;
+            var item = GetTemplateChild("SelectAllItem") as ListBoxItem;
+            item!.PreviewMouseDown += SelectAllItem_MouseDown;
+            if (SelectedItems is INotifyCollectionChanged collection) {
+                collection.CollectionChanged += (s, e) => { SelectItems(); };
+            }
+            IsEnabledChanged += OnIsEnabledChanged;
+            base.SelectionChanged += OnSelectionChanged;
+            base.OnApplyTemplate();
+        }
+
+        private static void OnSelectedItemsChangedCallback(DependencyObject sender, DependencyPropertyChangedEventArgs e) {
+            if (sender is CheckComboBox ccb)
+                ccb.OnSelectedItemsChanged();
+        }
+
+        private void OnSelectedItemsChanged() {
+            if (SelectedItems is INotifyCollectionChanged collection) {
+                collection.CollectionChanged += (s, e) => { SelectItems(); };
+            }
+            SelectItems();
+        }
+
+        private void Button_MouseDown(object sender, RoutedEventArgs evt) {
+            IsDropDownOpen = !IsDropDownOpen;
+        }
+
+        private void SelectAllItem_MouseDown(object sender, RoutedEventArgs evt) {
+            if (AllItemsSelected == false) {
+                SelectAll();
+            } else {
+                UnselectAll();
+            }
+            evt.Handled = true;
+        }
+
+        private void OnSelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            SelectItemsReverse();
+            var dmp = DisplayMemberPath != null && DisplayMemberPath != "" ? DisplayMemberPath : null;
+            if (SelectedItems.Count == ItemsSource.Cast<object>().Count() && AllItemsSelectedContent != null) {
+                _textBox.Text = AllItemsSelectedContent;
+                AllItemsSelected = true;
+            } else if (SelectedItems.Count == 0) {
+                _textBox.Text = "";
+                AllItemsSelected = false;
+            } else {
+                _textBox.Text = string.Join(Delimiter,
+                    dmp == null ? SelectedItems.Cast<object>() :
+                    SelectedItems.Cast<object>()
+                        .Select(i => i.GetType().GetProperty(dmp)?.GetValue(i))
+                );
+                AllItemsSelected = null;
+            }
+            RaiseEvent(new SelectionChangedEventArgs(SelectionChangedEvent, evt.RemovedItems, evt.AddedItems));
+        }
+
+        private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs evt) {
+            if (!IsEnabled) IsDropDownOpen = false;
+        }
+
+        private void SelectItems() {
+            if (_viewHandled || _modelHandled)
+                return;
+            _viewHandled = true;
+            base.SelectedItems.Clear();
+            foreach (var item in SelectedItems)
+                base.SelectedItems.Add(item);
+            _viewHandled = false;
+        }
+
+        private void SelectItemsReverse() {
+            if (_modelHandled || _viewHandled)
+                return;
+            _modelHandled = true;
+            SelectedItems.Clear();
+            foreach (var item in base.SelectedItems)
+                SelectedItems.Add(item);
+            _modelHandled = false;
+        }
+    }
+}

Elwig/Controls/CheckComboBox.xaml

@@ -0,0 +1,118 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ctrl="clr-namespace:Elwig.Controls">
+    <ctrl:VisibilityConverter x:Key="VisibilityConverter"/>
+    <Style TargetType="ctrl:CheckComboBox" BasedOn="{StaticResource {x:Type ListBox}}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ctrl:CheckComboBox">
+                    <Grid Style="{x:Null}">
+                        <Button x:Name="Button" ClickMode="Press" BorderThickness="1"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                IsEnabled="{Binding IsEnabled, RelativeSource={RelativeSource TemplatedParent}}">
+                            <Button.Style>
+                                <Style TargetType="{x:Type Button}">
+                                    <Setter Property="Background" Value="White"/>
+                                    <Setter Property="Template">
+                                        <Setter.Value>
+                                            <ControlTemplate TargetType="{x:Type Button}">
+                                                <Border Background="{TemplateBinding Background}" SnapsToDevicePixels="True"
+                                                        BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1">
+                                                    <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+                                                </Border>
+                                            </ControlTemplate>
+                                        </Setter.Value>
+                                    </Setter>
+                                </Style>
+                            </Button.Style>
+                            <Path x:Name="IconDropdown" Data="M 0,0 L 3,3 L 6,0" Stroke="#FF606060" StrokeThickness="1" Margin="0,0,5,0"
+                                  HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                        </Button>
+                        <TextBlock x:Name="TextBox" Style="{x:Null}" Margin="6,0,18,0" IsHitTestVisible="False"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                        <Popup x:Name="Popup" Placement="Bottom" Focusable="True"
+                               IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                               PopupAnimation="Slide" AllowsTransparency="True">
+                            <Popup.Style>
+                                <Style TargetType="{x:Type Popup}">
+                                    <Setter Property="StaysOpen" Value="False"/>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding IsMouseOver, ElementName=Button}" Value="True">
+                                            <Setter Property="StaysOpen" Value="True"/>
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding IsMouseOver, ElementName=Border}" Value="True">
+                                            <Setter Property="StaysOpen" Value="True"/>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Popup.Style>
+                            <Border x:Name="Border" Style="{x:Null}" BorderThickness="1" BorderBrush="Gray" Background="White" SnapsToDevicePixels="True"
+                                    MinWidth="{TemplateBinding ActualWidth}"
+                                    MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                <DockPanel>
+                                    <ListBoxItem x:Name="SelectAllItem" Padding="2,1,2,1" DockPanel.Dock="Top"
+                                                 Visibility="{TemplateBinding IsSelectAllActive, Converter={StaticResource VisibilityConverter}}">
+                                        <StackPanel Orientation="Horizontal">
+                                            <CheckBox VerticalAlignment="Center" Margin="0,0,5,0" IsThreeState="True"
+                                                      IsChecked="{Binding AllItemsSelected, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"/>
+                                            <TextBlock Text="{TemplateBinding SelectAllContent}" VerticalAlignment="Center" Margin="0" SnapsToDevicePixels="True"/>
+                                        </StackPanel>
+                                    </ListBoxItem>
+                                    <ScrollViewer Style="{x:Null}">
+                                        <StackPanel Style="{x:Null}" IsItemsHost="True" SnapsToDevicePixels="True"
+                                                    KeyboardNavigation.DirectionalNavigation="Contained"/>
+                                    </ScrollViewer>
+                                </DockPanel>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="IconDropdown" Property="Stroke" Value="#FFA0A0A0"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="IconDropdown" Property="Stroke" Value="Black"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemContainerStyle">
+            <Setter.Value>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="ListBoxItem">
+                                <Border BorderBrush="{TemplateBinding BorderBrush}" 
+                                        BorderThickness="{TemplateBinding BorderThickness}" 
+                                        Background="{TemplateBinding Background}"
+                                        Padding="2,1,2,1">
+                                    <StackPanel Orientation="Horizontal">
+                                        <CheckBox VerticalAlignment="Center" Margin="0,0,5,0"
+                                                  IsChecked="{Binding IsSelected, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=ListBoxItem}}"/>
+                                        <ContentPresenter VerticalAlignment="Center" Margin="0" SnapsToDevicePixels="True"/>
+                                    </StackPanel>
+                                </Border>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                    <Setter Property="BorderThickness" Value="1"/>
+                    <Style.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="#FF70C0E7"/>
+                            <Setter Property="Background" Value="#FFE5F3FB"/>
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Foreground" Value="Gray"/>
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="#FF7EB4EA"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+</ResourceDictionary>

Elwig/Controls/IntegerUpDown.cs

@@ -0,0 +1,106 @@
+using System;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace Elwig.Controls {
+    public class IntegerUpDown : TextBox {
+
+        public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(nameof(Minimum), typeof(int?), typeof(IntegerUpDown), new FrameworkPropertyMetadata(null));
+        public int? Minimum {
+            get => (int?)GetValue(MinimumProperty);
+            set => SetValue(MinimumProperty, value);
+        }
+
+        public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(nameof(Maximum), typeof(int?), typeof(IntegerUpDown), new FrameworkPropertyMetadata(null));
+        public int? Maximum {
+            get => (int?)GetValue(MaximumProperty);
+            set => SetValue(MaximumProperty, value);
+        }
+
+        public int? Value {
+            get => int.TryParse(Text, out var res) ? res : null;
+            set => Text = $"{value}";
+        }
+
+        static IntegerUpDown() {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(IntegerUpDown), new FrameworkPropertyMetadata(typeof(IntegerUpDown)));
+        }
+
+        public IntegerUpDown() {
+            TextChanged += IntegerUpDown_TextChanged;
+            LostFocus += IntegerUpDown_LostFocus;
+            KeyUp += IntegerUpDown_KeyUp;
+        }
+
+        public override void OnApplyTemplate() {
+            var incButton = GetTemplateChild("IncrementButton") as RepeatButton;
+            var decButton = GetTemplateChild("DecrementButton") as RepeatButton;
+            incButton!.Click += IncrementButton_Click;
+            decButton!.Click += DecrementButton_Click;
+            base.OnApplyTemplate();
+        }
+
+        private void IntegerUpDown_TextChanged(object sender, TextChangedEventArgs evt) {
+            var idx = CaretIndex;
+            Text = new string(Text.Where(char.IsAsciiDigit).Take(4).ToArray());
+            CaretIndex = idx;
+            evt.Handled = !(Value >= Minimum && Value <= Maximum);
+            if (idx >= 4) {
+                if (Value < Minimum) {
+                    Value = Minimum;
+                } else if (Value > Maximum) {
+                    Value = Maximum;
+                }
+                CaretIndex = 4;
+            }
+        }
+
+        private void IntegerUpDown_LostFocus(object sender, RoutedEventArgs evt) {
+            if (Value < Minimum) {
+                Value = Minimum;
+            } else if (Value > Maximum) {
+                Value = Maximum;
+            }
+        }
+
+        private void IncrementButton_Click(object sender, RoutedEventArgs evt) {
+            Value = Math.Min((Value ?? 0) + 1, Maximum ?? int.MaxValue);
+        }
+
+        private void DecrementButton_Click(object sender, RoutedEventArgs evt) {
+            Value = Math.Max((Value ?? 0) - 1, Minimum ?? int.MinValue);
+        }
+
+        private void IntegerUpDown_KeyUp(object sender, KeyEventArgs evt) {
+            switch (evt.Key) {
+                case Key.Up:
+                case Key.Add:
+                case Key.OemPlus:
+                    Value = Math.Min((Value ?? 0) + 1, Maximum ?? int.MaxValue);
+                    evt.Handled = true;
+                    CaretIndex = 4;
+                    break;
+                case Key.Down:
+                case Key.Subtract:
+                case Key.OemMinus:
+                    Value = Math.Max((Value ?? 0) - 1, Minimum ?? int.MinValue);
+                    evt.Handled = true;
+                    CaretIndex = 4;
+                    break;
+                case Key.PageUp:
+                    Value = Math.Min((Value ?? 0) + 10, Maximum ?? int.MaxValue);
+                    evt.Handled = true;
+                    CaretIndex = 4;
+                    break;
+                case Key.PageDown:
+                    Value = Math.Max((Value ?? 0) - 10, Minimum ?? int.MinValue);
+                    evt.Handled = true;
+                    CaretIndex = 4;
+                    break;
+            }
+        }
+    }
+}

Elwig/Controls/IntegerUpDown.xaml

@@ -0,0 +1,52 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ctrl="clr-namespace:Elwig.Controls">
+    <Style TargetType="ctrl:IntegerUpDown" BasedOn="{StaticResource {x:Type TextBox}}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ctrl:IntegerUpDown">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="18"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Border x:Name="Border" BorderThickness="1,1,0,1"
+                                BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                SnapsToDevicePixels="True" Grid.RowSpan="2">
+                            <ScrollViewer x:Name="PART_ContentHost" VerticalAlignment="Center"/>
+                        </Border>
+
+                        <RepeatButton x:Name="IncrementButton" Padding="0" Height="Auto" Width="Auto" BorderThickness="1,1,1,1"
+                                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Row="0" Grid.Column="1">
+                            <Path x:Name="IconIncrement" Data="M 0,4 L 4,0 L 8,4 Z" Fill="#FF444444"
+                                  HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </RepeatButton>
+                        <RepeatButton x:Name="DecrementButton" Padding="0" Height="Auto" Width="Auto"  BorderThickness="1,0,1,1"
+                                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Row="1" Grid.Column="1">
+                            <Path x:Name="IconDecrement" Data="M 0,0 L 4,4 L 8,0 Z" Fill="#FF444444"
+                                  HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </RepeatButton>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="LightGray"/>
+                            <Setter TargetName="IconIncrement" Property="Fill" Value="#FF888888"/>
+                            <Setter TargetName="IconDecrement" Property="Fill" Value="#FF888888"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="TextAlignment" Value="Right"/>
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Foreground" Value="Gray"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+</ResourceDictionary>

Elwig/Controls/UnitConverter.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Elwig.Controls {
+    public class UnitConverter : DependencyObject, IValueConverter {
+
+        public static readonly DependencyProperty UnitProperty = DependencyProperty.Register(nameof(Unit), typeof(string), typeof(UnitConverter), new FrameworkPropertyMetadata(null));
+        public string Unit {
+            get => (string)GetValue(UnitProperty);
+            set => SetValue(UnitProperty, value);
+        }
+
+        public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register(nameof(Precision), typeof(byte), typeof(UnitConverter), new FrameworkPropertyMetadata((byte)0));
+        public byte Precision {
+            get => (byte)GetValue(PrecisionProperty);
+            set => SetValue(PrecisionProperty, value);
+        }
+
+        public object? Convert(object? value, Type targetType, object parameter, CultureInfo culture) {
+            if (value == null) {
+                return null;
+            }
+
+            var fmt = $"{{0:N{Precision}}}";
+            var unit = $"{(Unit != null ? " " : "")}{Unit}";
+            if (value is int i) {
+                return $"{string.Format(fmt, i)}{unit}";
+            } else if (value is decimal d) {
+                return $"{string.Format(fmt, d)}{unit}";
+            }
+
+            return Binding.DoNothing;
+        }
+
+        public object? ConvertBack(object? value, Type targetType, object parameter, CultureInfo culture) {
+            throw new NotImplementedException();
+        }
+    }
+}

Elwig/Controls/UnitTextBox.cs

@@ -4,7 +4,7 @@ using System.Windows.Controls;
 namespace Elwig.Controls {
     public class UnitTextBox : TextBox {
 
-        public static readonly DependencyProperty UnitProperty = DependencyProperty.Register("Unit", typeof(string), typeof(UnitTextBox), new FrameworkPropertyMetadata(""));
+        public static readonly DependencyProperty UnitProperty = DependencyProperty.Register(nameof(Unit), typeof(string), typeof(UnitTextBox), new FrameworkPropertyMetadata(""));
         public string Unit {
             get => (string)GetValue(UnitProperty);
             set => SetValue(UnitProperty, value);

Elwig/Controls/UnitTextBox.xaml

@@ -5,7 +5,8 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ctrl:UnitTextBox">
-                    <Border BorderThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                    <Border x:Name="Border"
+                            BorderThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                             BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
                             SnapsToDevicePixels="True">
                         <Grid>
@@ -22,9 +23,19 @@
                                        FontSize="10" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="3"/>
                         </Grid>
                     </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="LightGray"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
         <Setter Property="TextAlignment" Value="Right"/>
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Foreground" Value="Gray"/>
+            </Trigger>
+        </Style.Triggers>
     </Style>
 </ResourceDictionary>

Elwig/Controls/VisibilityConverter.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Windows;
+using System.Windows.Data;
+using System.Globalization;
+
+namespace Elwig.Controls {
+    public class VisibilityConverter : IValueConverter {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
+            return (bool)value ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
+            return (Visibility)value == Visibility.Visible;
+        }
+    }
+}

Elwig/Dialogs/AbwertenDialog.xaml

@@ -4,10 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Dialogs"
-        mc:Ignorable="d"
-        ResizeMode="NoResize"
-        ShowInTaskbar="False"
-        Topmost="True"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
         WindowStartupLocation="CenterOwner"
         FocusManager.FocusedElement="{Binding ElementName=WeightInput}"
         Title="Teillieferung abwerten" Height="190" Width="400">

Elwig/Dialogs/AreaComDialog.xaml

@@ -0,0 +1,74 @@
+<Window x:Class="Elwig.Dialogs.AreaComDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Dialogs"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
+        Title="Flächenbindungen übertragen" Height="230" Width="450">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <TextBlock x:Name="QuestionBlock1" TextAlignment="Center" Margin="0,10,0,0"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Sollen die aktiven Flächenbindungen des angegebenen Vorgängers<LineBreak/>
+            übernommen werden? (<Run Text="{Binding AreaComNum}"/> FB, <Run Text="{Binding Area}"/> m²)
+        </TextBlock>
+        <TextBlock x:Name="QuestionBlock2" TextAlignment="Center" Margin="0,10,0,0" Visibility="Hidden"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Sollen die aktiven Flächenbindungen gekündigt werden? (<Run Text="{Binding AreaComNum}"/> FB, <Run Text="{Binding Area}"/> m²)
+        </TextBlock>
+
+        <Label x:Name="SeasonLabel" Content="Saison:" Margin="0,50,100,0"
+               HorizontalAlignment="Center" VerticalAlignment="Top"/>
+        <ctrl:IntegerUpDown x:Name="SeasonInput" Width="56" Height="25" Margin="0,50,0,0" FontSize="14"
+                            Minimum="1900" Maximum="9999"
+                            HorizontalAlignment="Center" VerticalAlignment="Top"
+                            TextChanged="SeasonInput_TextChanged"/>
+
+        <TextBlock x:Name="DescBlock1" Margin="0,85,0,0" TextAlignment="Center"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Die Flächenbindungen beim <Bold>Vorgänger</Bold> sind bis inkl. Saison <Bold><Run x:Name="CancelSeason1"/></Bold> gültig,<LineBreak/>
+            und werden beim <Bold>Nachfolger</Bold> ab inkl. Saison <Bold><Run x:Name="TransferSeason"/></Bold> übernommen.
+        </TextBlock>
+        <TextBlock x:Name="DescBlock2" Margin="0,70,0,0" TextAlignment="Center" Visibility="Hidden"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Die Flächenbindungen sind bis inklusive Saison <Bold><Run x:Name="CancelSeason2"/></Bold> gültig.
+        </TextBlock>
+
+        <TextBlock x:Name="InfoBlock" Margin="0,0,0,75" TextAlignment="Center"
+                   HorizontalAlignment="Center" VerticalAlignment="Bottom">
+            Falls die Flächenbindungen später an ein neues Mitglied<LineBreak/>
+            übertragen werden sollen bitte <Italic>Nein</Italic> auswählen!
+        </TextBlock>
+        <TextBlock Text="Die Änderungen werden erst beim Speichern übernommen!"
+                   HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,50"/>
+
+        <Button x:Name="ConfirmButton" Content="Ja" Margin="10,10,115,10" Grid.Column="1"
+                Click="ConfirmButton_Click"/>
+        <Button x:Name="CancelButton" Content="Nein" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/>
+    </Grid>
+</Window>

Elwig/Dialogs/AreaComDialog.xaml.cs

@@ -0,0 +1,52 @@
+using Elwig.Helpers;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Dialogs {
+    public partial class AreaComDialog : Window {
+
+        public int CancelSeason { get; set; }
+        public int SuccessorSeason => CancelSeason + 1;
+
+        public string AreaComNum { get; set; }
+        public string Area { get; set; }
+
+        public AreaComDialog(string name, int areaComNum, int area) {
+            CancelSeason = Utils.FollowingSeason - 1;
+            AreaComNum = $"{areaComNum:N0}";
+            Area = $"{area:N0}";
+            InitializeComponent();
+            SeasonInput.Text = $"{CancelSeason}";
+            Title = $"Aktive Flächenbindungen kündigen - {name}";
+            QuestionBlock1.Visibility = Visibility.Hidden;
+            QuestionBlock2.Visibility = Visibility.Visible;
+            DescBlock1.Visibility = Visibility.Hidden;
+            DescBlock2.Visibility = Visibility.Visible;
+            Height = 240;
+            SeasonInput.Margin = new(0, 40, 0, 0);
+            SeasonLabel.Margin = new(0, 40, 100, 0);
+        }
+
+        public AreaComDialog(string name, string successorName, int areaComNum, int area) {
+            CancelSeason = Utils.FollowingSeason - 1;
+            AreaComNum = $"{areaComNum:N0}";
+            Area = $"{area:N0}";
+            InitializeComponent();
+            SeasonInput.Text = $"{CancelSeason}";
+            Title = $"Aktive Flächenbindungen übertragen - {name} - {successorName}";
+            InfoBlock.Visibility = Visibility.Hidden;
+        }
+
+        private void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            CancelSeason = (int)SeasonInput.Value!;
+            CancelSeason1.Text = $"{CancelSeason}";
+            CancelSeason2.Text = $"{CancelSeason}";
+            TransferSeason.Text = $"{SuccessorSeason}";
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            DialogResult = true;
+            Close();
+        }
+    }
+}

Elwig/Dialogs/DeleteMemberDialog.xaml

@@ -0,0 +1,64 @@
+<Window x:Class="Elwig.Dialogs.DeleteMemberDialog"
+        AutomationProperties.AutomationId="DeleteMemberDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Dialogs"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
+        Title="Mitglied löschen" Height="280" Width="400">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="CheckBox">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <TextBlock TextAlignment="Center" Margin="10,10,10,10" VerticalAlignment="Top">
+            Bei Bestätigung wird das Mitglied samt zugehöriger Daten<LineBreak/>
+            <Bold>unwiderruflich gelöscht!</Bold> Wenn möglich sollte stattdessen<LineBreak/>
+            der Status des Mitglieds auf <Italic>Inaktiv</Italic> gesetzt werden!
+        </TextBlock>
+
+        <Label Content="Name u. MgNr. wiederholen:" Margin="10,60,10,10" HorizontalAlignment="Center"/>
+        <TextBox x:Name="NameInput" Margin="10,85,10,10"
+                 TextChanged="NameInput_TextChanged"/>
+
+        <Label Content="Beim Löschen müssen folgende Daten auch gelöscht werden:" Margin="10,120,10,10"/>
+        <CheckBox x:Name="AreaComInput" Content="Flächenbindungen" Margin="40,145,0,0"
+                  Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                  IsChecked="{Binding DeleteAreaComs}"/>
+        <CheckBox x:Name="DeliveryInput" Content="Lieferungen" Margin="40,165,0,0"
+                  Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                  IsChecked="{Binding DeleteDeliveries}"/>
+        <CheckBox x:Name="PaymentInput" Content="Auszahlungsdaten" Margin="40,185,0,0"
+                  Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                  IsChecked="{Binding DeletePaymentData}"/>
+
+        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1" IsEnabled="False"
+                Click="ConfirmButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/>
+    </Grid>
+</Window>

Elwig/Dialogs/DeleteMemberDialog.xaml.cs

@@ -0,0 +1,66 @@
+using Elwig.Helpers;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Dialogs {
+    public partial class DeleteMemberDialog : Window {
+
+        protected string[] NameParts;
+
+        public bool DeleteAreaComs { get; set; }
+        public bool DeleteDeliveries { get; set; }
+        public bool DeletePaymentData { get; set; }
+
+        public DeleteMemberDialog(int mgnr, string name, int numAreaComs, int numDeliveries, int numCredits) {
+            NameParts = name.ToLower().Split(' ').Where(p => p.Length > 0).Append($"{mgnr}").ToArray();
+            InitializeComponent();
+            Title += " - " + name;
+            AreaComInput.IsEnabled = numAreaComs != 0;
+            AreaComInput.Content += $" ({numAreaComs:N0})";
+            DeliveryInput.IsEnabled = numDeliveries != 0;
+            DeliveryInput.Content += $" ({numDeliveries:N0})";
+            PaymentInput.IsEnabled = numCredits != 0;
+            PaymentInput.Content += $" ({numCredits:N0})";
+        }
+
+        private void NameInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            Update();
+        }
+
+        private void CheckBox_Changed(object sender, RoutedEventArgs evt) {
+            Update();
+        }
+
+        private static void UpdateCheckBox(CheckBox cb) {
+            if (cb.IsEnabled && cb.IsChecked != true) {
+                ControlUtils.SetInputInvalid(cb);
+            } else {
+                ControlUtils.ClearInputState(cb);
+            }
+        }
+
+        private void Update() {
+            var t = NameInput.Text.ToLower().Split(' ');
+            var nameValid = NameParts.All(t.Contains);
+            UpdateCheckBox(AreaComInput);
+            UpdateCheckBox(DeliveryInput);
+            UpdateCheckBox(PaymentInput);
+            if (!nameValid) {
+                ControlUtils.SetInputInvalid(NameInput);
+            } else {
+                ControlUtils.ClearInputState(NameInput);
+            }
+            ConfirmButton.IsEnabled =
+                (!AreaComInput.IsEnabled || DeleteAreaComs) &&
+                (!DeliveryInput.IsEnabled || DeleteDeliveries) &&
+                (!PaymentInput.IsEnabled || DeletePaymentData) &&
+                nameValid;
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            DialogResult = true;
+            Close();
+        }
+    }
+}

Elwig/Dialogs/DeliveryExtractionDialog.xaml

@@ -4,10 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Dialogs"
-        mc:Ignorable="d"
-        ResizeMode="NoResize"
-        ShowInTaskbar="False"
-        Topmost="True"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
         WindowStartupLocation="CenterOwner"
         FocusManager.FocusedElement="{Binding ElementName=WeightInput}"
         Title="Teillieferung extrahieren" Height="210" Width="380">

Elwig/Dialogs/LinearPriceIncreaseDialog.xaml

@@ -4,10 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Dialogs"
-        mc:Ignorable="d"
-        ResizeMode="NoResize"
-        ShowInTaskbar="False"
-        Topmost="True"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
         WindowStartupLocation="CenterOwner"
         FocusManager.FocusedElement="{Binding ElementName=PriceInput}"
         Title="Linear wachsen" Height="140" Width="270">

Elwig/Dialogs/ManualWeighingDialog.xaml

@@ -4,10 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Dialogs"
-        mc:Ignorable="d"
-        ResizeMode="NoResize"
-        ShowInTaskbar="False"
-        Topmost="True"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
         WindowStartupLocation="CenterOwner"
         FocusManager.FocusedElement="{Binding ElementName=WeightInput}"
         Title="Handwiegung" Height="170" Width="400">

Elwig/Dialogs/NewSeasonDialog.xaml

@@ -0,0 +1,69 @@
+<Window x:Class="Elwig.Dialogs.NewSeasonDialog"
+        AutomationProperties.AutomationId="NewSeasonDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Dialogs"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
+        Title="Saison anlegen" Height="180" Width="400">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="ComboBox">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="CheckBox">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Label Content="Währung:" Margin="10,10,10,10"/>
+        <ComboBox x:Name="CurrencyInput" Width="150" Margin="130,10,10,10"
+                  ItemsSource="{Binding Currencies}">
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="{Binding Code}" Width="30"/>
+                        <TextBlock Text="- "/>
+                        <TextBlock Text="{Binding Name}"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
+
+        <Label Content="Nachkommastellen:" Margin="10,40,10,10"/>
+        <ComboBox x:Name="PrecisionInput" Width="50" Margin="130,40,10,10">
+            <ComboBoxItem>2</ComboBoxItem>
+            <ComboBoxItem>3</ComboBoxItem>
+            <ComboBoxItem IsSelected="True">4</ComboBoxItem>
+            <ComboBoxItem>5</ComboBoxItem>
+            <ComboBoxItem>6</ComboBoxItem>
+            <ComboBoxItem>7</ComboBoxItem>
+            <ComboBoxItem>8</ComboBoxItem>
+        </ComboBox>
+
+        <CheckBox x:Name="CopyModifiersInput" Content="Zu-/Abschläge der letzten Saison übernehmen"
+                  Margin="15,75,10,10" IsChecked="{Binding CopyModifiers}"/>
+
+        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1" IsDefault="True"
+                Click="ConfirmButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/>
+    </Grid>
+</Window>

Elwig/Dialogs/NewSeasonDialog.xaml.cs

@@ -0,0 +1,30 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using System.Collections.Generic;
+using System.Windows;
+
+namespace Elwig.Dialogs {
+    public partial class NewSeasonDialog : Window {
+
+        public IEnumerable<Currency> Currencies { get; set; }
+        public int Year { get; set; }
+
+        public string CurrencyCode => (CurrencyInput.SelectedItem as Currency)!.Code;
+        public byte Precision => (byte)(PrecisionInput.SelectedIndex + 2);
+        public bool CopyModifiers { get; set; }
+
+        public NewSeasonDialog(Season? s, IEnumerable<Currency> currencies) {
+            Currencies = currencies;
+            CopyModifiers = s != null;
+            InitializeComponent();
+            CopyModifiersInput.IsEnabled = s != null;
+            ControlUtils.SelectItemWithPk(CurrencyInput, s?.CurrencyCode ?? "EUR");
+            PrecisionInput.SelectedIndex = (s?.Precision ?? 4) - 2;
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            DialogResult = true;
+            Close();
+        }
+    }
+}

Elwig/Dialogs/UpdateDialog.xaml

@@ -3,16 +3,15 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        ResizeMode="NoResize"
-        ShowInTaskbar="False"
-        Topmost="True"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
         WindowStartupLocation="CenterOwner"
-        Title="Neues Update verfügbar - Elwig" Height="180" Width="400">
+        Title="Neues Update verfügbar - Elwig" Height="190" Width="400"
+        Closed="OnClosed">
     <Grid>
-        <TextBlock x:Name="Description" FontSize="14" Margin="0,0,0,30"
+        <TextBlock x:Name="Description" FontSize="14" Margin="0,0,0,40"
                    HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center">
-            Version <Run x:Name="VersionText" FontWeight="Bold">0.0.0</Run> von Elwig ist verfügbar!<LineBreak/>
+            Version <Run x:Name="VersionText" FontWeight="Bold">0.0.0</Run> von Elwig ist verfügbar!
+            (<Hyperlink NavigateUri="https://elwig.at/changelog" RequestNavigate="Hyperlink_RequestNavigate">Änderungen</Hyperlink>)<LineBreak/>
             Soll das Update heruntergeladen und<LineBreak/>
             installiert werden? (ca. <Run x:Name="SizeText">100</Run> MB)<LineBreak/>
             <Run FontWeight="Bold">Achtung</Run>: Elwig wird dabei geschlossen!
@@ -22,12 +21,12 @@
                      HorizontalAlignment="Center" VerticalAlignment="Center"
                      Height="27" Width="300" SnapsToDevicePixels="True"/>
 
-        <Button x:Name="InstallButton" Content="Installieren" Margin="10,10,115,10"
-                FontSize="14" HorizontalAlignment="Right" VerticalAlignment="Bottom"
+        <Button x:Name="InstallButton" Content="Installieren" Margin="10,10,115,20"
+                FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Bottom"
                 Width="100" Height="27"
                 Click="InstallButton_Click"/>
-        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" IsCancel="True" IsDefault="True"
-                FontSize="14" HorizontalAlignment="Right" VerticalAlignment="Bottom"
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="115,10,10,20" IsCancel="True"
+                FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Bottom"
                 Width="100" Height="27"/>
     </Grid>
 </Window>

Elwig/Dialogs/UpdateDialog.xaml.cs

@@ -3,8 +3,10 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Navigation;
 
 namespace Elwig.Dialogs {
     public partial class UpdateDialog : Window {
@@ -12,36 +14,54 @@ namespace Elwig.Dialogs {
         public string Version { get; private set; }
         public string Url { get; private set; }
 
+        private readonly CancellationTokenSource Cancellation;
+
         public UpdateDialog(string version, string url, long size) {
             Version = version;
             Url = url;
+            Cancellation = new();
             InitializeComponent();
             VersionText.Text = version;
             SizeText.Text = $"{size / 1024 / 1024}";
         }
 
+        private void OnClosed(object sender, EventArgs evt) {
+            Cancellation.Cancel();
+        }
+
         private async void InstallButton_Click(object sender, RoutedEventArgs evt) {
             Description.Visibility = Visibility.Hidden;
             ProgressBar.Visibility = Visibility.Visible;
             InstallButton.IsEnabled = false;
             await Install();
-            DialogResult = true;
             Close();
         }
 
         public async Task Install() {
             var fileName = Path.Combine(App.TempPath, $"Elwig-{Version}.exe");
-            {
+            try {
                 using var stream = new FileStream(fileName, FileMode.Create);
                 using var client = new HttpClient() {
                     Timeout = TimeSpan.FromSeconds(5),
                 };
                 await client.DownloadAsync(Url, stream, new Progress<double>(p => {
                     ProgressBar.Value = p * 100.0;
-                }));
+                }), Cancellation.Token);
+            } catch (OperationCanceledException) {
+                File.Delete(fileName);
+                return;
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
-
             Process.Start(fileName);
+            DialogResult = true;
+        }
+
+        private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e) {
+            Process.Start(new ProcessStartInfo {
+                FileName = e.Uri.ToString(),
+                UseShellExecute = true,
+            });
         }
     }
 }

Elwig/Documents/CreditNote.cs

@@ -1,6 +1,7 @@
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -18,7 +19,9 @@ namespace Elwig.Documents {
         public string MemberModifier;
         public IEnumerable<(string Name, int Kg, decimal Amount)>? MemberUnderDeliveries;
         public decimal MemberTotalUnderDelivery;
-        public decimal MemberAutoBusinessShares;
+        public int MemberAutoBusinessShares;
+        public decimal MemberAutoBusinessSharesAmount;
+        public PaymentCustom? CustomPayment;
 
         public CreditNote(
             AppDbContext ctx,
@@ -27,6 +30,7 @@ namespace Elwig.Documents {
             bool considerContractPenalties,
             bool considerTotalPenalty,
             bool considerAutoBusinessShares,
+            bool considerCustomModifiers,
             Dictionary<string, UnderDelivery>? underDeliveries = null
         ) :
             base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.Name)} – {p.Variant.Name}", p.Member) {
@@ -45,8 +49,8 @@ namespace Elwig.Documents {
             Aside = Aside.Replace("</table>", "") +
                 $"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
                 $"<tr><th>TG-Nr.</th><td>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : "-")}</td></tr>" +
+                $"<tr><th>Datum</th><td>{p.Variant.Date:dd.MM.yyyy}</td></tr>" +
                 $"<tr><th>Überw. am</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
-                $"<tr><th>Datum/Zeit</th><td>{p.Credit?.ModifiedTimestamp:dd.MM.yyyy} / {p.Credit?.ModifiedTimestamp:HH:mm}</td></tr>" +
                 $"</tbody></table>";
             Text = App.Client.TextCreditNote;
             DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : p.MgNr);
@@ -56,9 +60,9 @@ namespace Elwig.Documents {
             if (considerTotalPenalty) {
                 var total = data.Rows.SelectMany(r => r.Buckets).Sum(b => b.Value);
                 var totalUnderDelivery = total - p.Member.BusinessShares * season.MinKgPerBusinessShare;
-                MemberTotalUnderDelivery = totalUnderDelivery < 0 ? totalUnderDelivery * (season.PenaltyPerKg ?? 0) - (season.PenaltyAmount ?? 0) : 0;
+                MemberTotalUnderDelivery = totalUnderDelivery < 0 ? totalUnderDelivery * (season.PenaltyPerKg ?? 0) - (season.PenaltyAmount ?? 0) - (season.PenaltyPerBsAmount * Math.Floor(-(decimal)totalUnderDelivery / season.MinKgPerBusinessShare) ?? 0) : 0;
                 if (total == 0)
-                    MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0);
+                    MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0) + (season.PenaltyPerBsNone * p.Member.BusinessShares ?? 0);
             }
             if (considerAutoBusinessShares) {
                 var fromDate = $"{season.Year}-01-01";
@@ -66,7 +70,8 @@ namespace Elwig.Documents {
                 MemberAutoBusinessShares = ctx.MemberHistory
                     .Where(h => h.MgNr == p.Member.MgNr && h.Type == "auto")
                     .Where(h => h.DateString.CompareTo(fromDate) >= 0 && h.DateString.CompareTo(toDate) <= 0)
-                    .Sum(h => h.BusinessShares) * (-season.BusinessShareValue ?? 0);
+                    .Sum(h => h.BusinessShares);
+                MemberAutoBusinessSharesAmount = MemberAutoBusinessShares * (-season.BusinessShareValue ?? 0);
             }
             if (considerContractPenalties) {
                 var varieties = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);
@@ -83,5 +88,8 @@ namespace Elwig.Documents {
                     .Where(u => u.Item3 != 0)
                     .ToList();
             }
+            if (considerCustomModifiers) {
+                CustomPayment = ctx.CustomPayments.Find(p.Year, p.MgNr);
+            }
         }
     }}

Elwig/Documents/CreditNote.cshtml

@@ -153,9 +153,13 @@
                 @Raw(FormatRow("Unterlieferung (GA)", Model.MemberTotalUnderDelivery, add: true));
                 penalty += Model.MemberTotalUnderDelivery;
             }
-            @if (Model.MemberAutoBusinessShares != 0) {
-                @Raw(FormatRow("Autom. Nachz. von GA", Model.MemberAutoBusinessShares, add: true));
-                penalty += Model.MemberAutoBusinessShares;
+            @if (Model.MemberAutoBusinessSharesAmount != 0) {
+                @Raw(FormatRow($"Autom. Nachz. von GA ({Model.MemberAutoBusinessShares})", Model.MemberAutoBusinessSharesAmount, add: true));
+                penalty += Model.MemberAutoBusinessSharesAmount;
+            }
+            @if (Model.CustomPayment != null) {
+                @Raw(FormatRow(Model.CustomPayment.Comment ?? (Model.CustomPayment.Amount < 0 ? "Weitere Abzüge" : "Weitere Zuschläge"), Model.CustomPayment.Amount, add: true));
+                penalty += Model.CustomPayment.Amount;
             }
 
             @if (Model.Credit == null) {
@@ -163,7 +167,7 @@
             } else {
                 var diff = Model.Credit.Modifiers - penalty;
                 if (diff != 0) {
-                    @Raw(FormatRow(diff < 0 ? "Weitere Abzüge" : "Weitere Zuschläge", diff, add: true))
+                    @Raw(FormatRow(diff < 0 ? "Sonstige Abzüge" : "Sonstige Zuschläge", diff, add: true))
                 }
                 if (Model.Credit.PrevModifiers != null && Model.Credit.PrevModifiers != 0) {
                     @Raw(FormatRow("Bereits berücksichtigte Abzüge", -Model.Credit.PrevModifiers, add: true))

Elwig/Documents/DeliveryConfirmation.cs

@@ -20,7 +20,6 @@ namespace Elwig.Documents {
             Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("invalid season");
             ShowDateAndLocation = true;
             UseBillingAddress = true;
-            IncludeSender = true;
             DocumentId = $"Anl.-Best. {Season.Year}/{m.MgNr}";
             Data = data;
             MemberBuckets = ctx.GetMemberBuckets(Season.Year, m.MgNr).GetAwaiter().GetResult();

Elwig/Documents/Document.cs

@@ -30,7 +30,7 @@ namespace Elwig.Documents {
         public string Author;
         public string Header;
         public string Footer;
-        public DateTime Date;
+        public DateOnly Date;
 
         public Document(string title) {
             var c = App.Client;
@@ -47,7 +47,7 @@ namespace Elwig.Documents {
                     .Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine()
                 .Item("BIC", c.Bic).Item("IBAN", c.Iban)
                 .ToString();
-            Date = DateTime.Today;
+            Date = DateOnly.FromDateTime(Utils.Today);
         }
 
         ~Document() {

Elwig/Documents/PaymentVariantSummary.cs

@@ -1,6 +1,8 @@
-using Elwig.Helpers.Billing;
+using Elwig.Helpers;
+using Elwig.Helpers.Billing;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Elwig.Documents {
@@ -15,6 +17,8 @@ namespace Elwig.Documents {
         public int MemberNum;
         public int DeliveryNum;
         public int DeliveryPartNum;
+        public List<ModifierStat> ModifierStat;
+        public Dictionary<string, Modifier> Modifiers;
 
         public PaymentVariantSummary(PaymentVar v, PaymentVariantSummaryData data) :
             base($"{Name} {v.Year} - {v.Name}") {
@@ -25,6 +29,8 @@ namespace Elwig.Documents {
             MemberNum = v.Credits.Count;
             DeliveryNum = v.DeliveryPartPayments.DistinctBy(p => p.DeliveryPart.Delivery).Count();
             DeliveryPartNum = v.DeliveryPartPayments.Count;
+            ModifierStat = AppDbContext.GetModifierStats(v.Year, v.AvNr).GetAwaiter().GetResult();
+            Modifiers = v.Season.Modifiers.ToDictionary(m => m.ModId);
         }
     }
 }

Elwig/Documents/PaymentVariantSummary.cshtml

@@ -49,17 +49,29 @@
                 <td class="center">@(Model.BillingData.ConsiderContractPenalties ? "Ja" : "Nein")</td>
             </tr>
             <tr>
-                <th>Datum:</th>
-                <td colspan="3">@($"{Model.Variant.Date:dd.MM.yyyy}")</td>
+                <th style="overflow: visible;">Nto./bto.-Zuschl:</th>
+                <td colspan="3" class="center">
+                    @($"{Utils.GetSign(Model.BillingData.NetWeightModifier)}{Math.Abs(Model.BillingData.NetWeightModifier) * 100:N2}") % /
+                    @($"{Utils.GetSign(Model.BillingData.GrossWeightModifier)}{Math.Abs(Model.BillingData.GrossWeightModifier) * 100:N2}") %
+                </td>
                 <th colspan="2" class="lborder">Strafen bei Unterlieferungen (GA):</th>
                 <td class="center">@(Model.BillingData.ConsiderTotalPenalty ? "Ja" : "Nein")</td>
             </tr>
             <tr>
-                <th>Überw.:</th>
-                <td colspan="3">@($"{Model.Variant.TransferDate:dd.MM.yyyy}")</td>
+                <th style="overflow: visible;">Datum/Überw.:</th>
+                <td colspan="3" class="center">
+                    @($"{Model.Variant.Date:dd.MM.yyyy}") /
+                    @($"{Model.Variant.TransferDate:dd.MM.yyyy}")
+                </td>
                 <th colspan="2" class="lborder">Automatische Nachzeichnung der GA:</th>
                 <td class="center">@(Model.BillingData.ConsiderAutoBusinessShares ? "Ja" : "Nein")</td>
             </tr>
+            <tr>
+                <th>Berechnung:</th>
+                <td colspan="3" class="center">@($"{Model.Variant.CalcTime:dd.MM.yyyy, HH:mm:ss}")</td>
+                <th colspan="2" class="lborder">Benutzerdef. Zu-/Abschläge pro Mitglied:</th>
+                <td class="center">@(Model.BillingData.ConsiderCustomModifiers ? "Ja" : "Nein")</td>
+            </tr>
             <tr class="sectionheading">
                 <th colspan="4">Beträge</th>
                 <th colspan="3" class="lborder">Statistik</th>
@@ -155,6 +167,48 @@
             </tr>
         </tbody>
     </table>
+    <table class="payment-variant border">
+        <colgroup>
+            <col style="width: 35mm;"/>
+            <col style="width: 30mm;"/>
+            <col style="width: 25mm;"/>
+            <col style="width: 25mm;"/>
+            <col style="width: 25mm;"/>
+            <col style="width: 25mm;"/>
+        </colgroup>
+        <thead>
+            <tr class="sectionheading">
+                <th colspan="6">Statistik Zu-/Abschläge</th>
+            </tr>
+            <tr>
+                <th rowspan="2">Name</th>
+                <th rowspan="2">Zu-/Abschlag</th>
+                <th>Lieferungen</th>
+                <th>Minimum</th>
+                <th>Maximum</th>
+                <th>Betrag</th>
+            </tr>
+            <tr>
+                <th>[#]</th>
+                <th>[@Model.CurrencySymbol]</th>
+                <th>[@Model.CurrencySymbol]</th>
+                <th>[@Model.CurrencySymbol]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var m in Model.ModifierStat) {
+                var mod = Model.Modifiers[m.ModId];
+                <tr>
+                    <th>@mod.Name</th>
+                    <td class="number">@mod.ValueStr</td>
+                    <td class="number">@($"{m.Count:N0}")</td>
+                    <td class="number">@($"{m.Min:N2}")</td>
+                    <td class="number">@($"{m.Max:N2}")</td>
+                    <td class="number">@($"{m.Sum:N2}")</td>
+                </tr>
+            }
+        </tbody>
+    </table>
     <table class="payment-variant-data">
         <colgroup>
             <col style="width: 30mm;"/>

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.8.1</Version>
+    <Version>0.8.7</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -25,17 +25,16 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.6.0" />
-    <PackageReference Include="LinqKit" Version="1.2.5" />
-    <PackageReference Include="MailKit" Version="4.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.29" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
+    <PackageReference Include="LinqKit" Version="1.3.0" />
+    <PackageReference Include="MailKit" Version="4.7.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.32" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2478.35" />
-    <PackageReference Include="NJsonSchema" Version="11.0.0" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2592.51" />
+    <PackageReference Include="NJsonSchema" Version="11.0.2" />
     <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.0.31" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.36" />
     <PackageReference Include="System.IO.Ports" Version="8.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
   </ItemGroup>

Elwig/Helpers/AppDbContext.cs

@@ -19,6 +19,7 @@ namespace Elwig.Helpers {
     public record struct UnderDelivery(int Weight, int Diff);
     public record struct MemberBucket(string Name, int Area, int Obligation, int Right, int Delivery, int DeliveryStrict, int Payment);
     public record struct MemberStat(string Variety, string Discr, int Weight);
+    public record struct ModifierStat(string ModId, string Name, int Count, decimal? Min, decimal? Max, decimal Sum);
 
     public class AppDbContext : DbContext {
 
@@ -57,6 +58,7 @@ namespace Elwig.Helpers {
         public DbSet<PaymentVar> PaymentVariants { get; private set; }
         public DbSet<PaymentMember> MemberPayments { get; private set; }
         public DbSet<PaymentDeliveryPart> PaymentDeliveryParts { get; private set; }
+        public DbSet<PaymentCustom> CustomPayments { get; private set; }
         public DbSet<Credit> Credits { get; private set; }
 
         public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; }
@@ -96,15 +98,15 @@ namespace Elwig.Helpers {
             SavedChanges += OnSavedChanges;
         }
 
-        public static SqliteConnection Connect() {
-            var cnx = new SqliteConnection(ConnectionString);
+        public static SqliteConnection Connect(string? connectionString = null) {
+            var cnx = new SqliteConnection(connectionString ?? ConnectionString);
             cnx.CreateFunction<string, string?, bool?>("REGEXP", (pattern, value) => value == null ? null : Regex.Match(value, pattern).Success, true);
             cnx.Open();
             return cnx;
         }
 
-        public static async Task<SqliteConnection> ConnectAsync() {
-            var cnx = new SqliteConnection(ConnectionString);
+        public static async Task<SqliteConnection> ConnectAsync(string? connectionString = null) {
+            var cnx = new SqliteConnection(connectionString ?? ConnectionString);
             cnx.CreateFunction<string, string?, bool?>("REGEXP", (pattern, value) => value == null ? null : Regex.Match(value, pattern).Success, true);
             await cnx.OpenAsync();
             return cnx;
@@ -241,23 +243,23 @@ namespace Elwig.Helpers {
                 .LastAsync();
         }
 
-        public void UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> modifiers) {
+        public void UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> oldModifiers, IEnumerable<Modifier> newModifiers) {
             foreach (var m in Modifiers.Where(m => m.Year == part.Year)) {
-                var mod = part.PartModifiers.Where(pa => pa.ModId == m.ModId).FirstOrDefault();
-                if (modifiers.Contains(m)) {
-                    var dpm = new DeliveryPartModifier {
-                        Year = part.Year,
-                        DId = part.DId,
-                        DPNr = part.DPNr,
-                        ModId = m.ModId,
-                    };
-                    if (mod == null) {
-                        Add(dpm);
+                var mod = new DeliveryPartModifier {
+                    Year = part.Year,
+                    DId = part.DId,
+                    DPNr = part.DPNr,
+                    ModId = m.ModId,
+                };
+                var old = oldModifiers.Where(pa => pa.ModId == m.ModId).FirstOrDefault();
+                if (newModifiers.Any(md => md.ModId == m.ModId)) {
+                    if (old == null) {
+                        Add(mod);
                     } else {
-                        Update(dpm);
+                        Update(mod);
                     }
                 } else {
-                    if (mod != null) {
+                    if (old != null) {
                         Remove(mod);
                     }
                 }
@@ -436,5 +438,34 @@ namespace Elwig.Helpers {
             if (ownCnx) await cnx.DisposeAsync();
             return list;
         }
+
+        public static async Task<List<ModifierStat>> GetModifierStats(int year, int avnr, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var list = new List<ModifierStat>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT m.modid, m.name, m.count, m.min, m.max, m.sum, s.precision
+                    FROM v_stat_modifier m
+                        JOIN season s ON s.year = m.year
+                    WHERE m.year = {year} AND m.avnr = {avnr}
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var prec = (byte)reader.GetInt16(6);
+                    long? min = reader.IsDBNull(3) ? null : reader.GetInt64(3);
+                    long? max = reader.IsDBNull(4) ? null : reader.GetInt64(4);
+                    var sum = reader.GetInt64(5);
+                    if (min != null && max != null && Math.Abs((long)min) > Math.Abs((long)max))
+                        (min, max) = (max, min);
+                    list.Add(new(reader.GetString(0), reader.GetString(1), reader.GetInt32(2),
+                        min == null ? null : Utils.DecFromDb((long)min, prec),
+                        max == null ? null : Utils.DecFromDb((long)max, prec),
+                        Utils.DecFromDb(sum, prec)));
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            return list;
+        }
     }
 }

Elwig/Helpers/AppDbUpdater.cs

@@ -9,7 +9,7 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 19;
+        public static readonly int RequiredSchemaVersion = 24;
 
         private static int VersionOffset = 0;
 
@@ -17,7 +17,7 @@ namespace Elwig.Helpers {
             using var cnx = AppDbContext.Connect();
 
             var applId = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA application_id") ?? 0;
-            if (applId != 0x454C5747) throw new Exception("Invalid application_id of database");
+            if (applId != 0x454C5747) throw new Exception($"Invalid application_id in database (0x{applId:X08})");
 
             var schemaVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA schema_version") ?? 0;
             VersionOffset = (int)(schemaVers % 100);

Elwig/Helpers/Billing/Billing.cs

@@ -3,6 +3,7 @@ using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -33,15 +34,45 @@ namespace Elwig.Helpers.Billing {
                 """);
         }
 
-        public async Task AutoAdjustBusinessShare() {
+        public async Task AutoAdjustBusinessShares(DateOnly date, int allowanceKg = 0, double allowanceBs = 0, int allowanceKgPerBs = 0, double allowanceRel = 0, int addMinBs = 1) {
+            if (addMinBs < 1) addMinBs = 1;
             using var cnx = await AppDbContext.ConnectAsync();
             await AppDbContext.ExecuteBatch(cnx, $"""
-                INSERT INTO member_history (mgnr, date, business_shares, type)
-                SELECT u.mgnr, '{Utils.Today:yyyy-MM-dd}', u.diff / s.max_kg_per_bs AS bs, 'auto'
+                UPDATE member
+                SET business_shares = member.business_shares - h.business_shares
+                FROM member_history h
+                WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr AND member.active;
+
+                INSERT INTO member_history (mgnr, date, type, business_shares)
+                SELECT u.mgnr,
+                       '{date:yyyy-MM-dd}',
+                       'auto',
+                       CEIL((u.diff - {allowanceKg}.0 - {allowanceKgPerBs}.0 * u.business_shares) / s.max_kg_per_bs
+                            - {allowanceBs.ToString(CultureInfo.InvariantCulture)}
+                            - {allowanceRel.ToString(CultureInfo.InvariantCulture)} * u.business_shares) AS bs
                 FROM v_total_under_delivery u
                     JOIN season s ON s.year = u.year
-                WHERE s.year = {Year} AND bs > 0
-                ON CONFLICT DO NOTHING
+                    JOIN member m ON m.mgnr = u.mgnr
+                WHERE s.year = {Year} AND bs >= {addMinBs} AND m.active
+                ON CONFLICT DO UPDATE
+                SET business_shares = excluded.business_shares;
+
+                UPDATE member
+                SET business_shares = member.business_shares + h.business_shares
+                FROM member_history h
+                WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr;
+                """);
+        }
+
+        public async Task UnAdjustBusinessShares() {
+            using var cnx = await AppDbContext.ConnectAsync();
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                UPDATE member
+                SET business_shares = member.business_shares - h.business_shares
+                FROM member_history h
+                WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr AND member.active;
+
+                DELETE FROM member_history WHERE date = '{Year}-11-30' AND type = 'auto';
                 """);
         }
 

Elwig/Helpers/Billing/BillingData.cs

@@ -41,6 +41,10 @@ namespace Elwig.Helpers.Billing {
             get => GetConsider("consider_auto_business_shares");
             set => SetConsider(value, "consider_auto_business_shares");
         }
+        public bool ConsiderCustomModifiers {
+            get => GetConsider("consider_custom_modifiers");
+            set => SetConsider(value, "consider_custom_modifiers");
+        }
 
         public double NetWeightModifier {
             get => GetWeightModifier("net_weight_modifier", "Rebelzuschlag");

Elwig/Helpers/Billing/BillingVariant.cs

@@ -46,9 +46,10 @@ namespace Elwig.Helpers.Billing {
                            ROUND(p.amount / POW(10, s.precision - 2)) AS net_amount,
                            ROUND(lp.amount / POW(10, s.precision - 2)) AS prev_amount,
                            IIF(m.buchführend, s.vat_normal, s.vat_flatrate) AS vat,
-                           ROUND(IIF({Data.ConsiderContractPenalties}, COALESCE(u.total_penalty, 0), 0) / POW(10, 4 - 2)) +
                            ROUND(IIF({Data.ConsiderTotalPenalty}, COALESCE(b.total_penalty, 0), 0) / POW(10, s.precision - 2)) +
-                           ROUND(IIF({Data.ConsiderAutoBusinessShares}, -COALESCE(a.total_amount, 0), 0) / POW(10, s.precision - 2))
+                           ROUND(IIF({Data.ConsiderContractPenalties}, COALESCE(u.total_penalty, 0), 0) / POW(10, 4 - 2)) +
+                           ROUND(IIF({Data.ConsiderAutoBusinessShares}, -COALESCE(a.total_amount, 0), 0) / POW(10, s.precision - 2)) +
+                           IIF({Data.ConsiderCustomModifiers}, COALESCE(x.amount, 0), 0)
                            AS modifiers,
                            lc.modifiers AS prev_modifiers
                     FROM season s
@@ -65,13 +66,15 @@ namespace Elwig.Helpers.Billing {
                         LEFT JOIN payment_member lp ON (lp.year, lp.avnr, lp.mgnr) = (l.year, l.avnr, m.mgnr)
                         LEFT JOIN payment_member p ON (p.year, p.avnr, p.mgnr) = (v.year, v.avnr, m.mgnr)
                         LEFT JOIN credit lc ON (lc.year, lc.avnr, lc.mgnr) = (l.year, l.avnr, m.mgnr)
-                        LEFT JOIN v_penalty_area_commitments u ON (u.year, u.mgnr) = (s.year, m.mgnr)
                         LEFT JOIN v_penalty_business_shares b ON (b.year, b.mgnr) = (s.year, m.mgnr)
+                        LEFT JOIN v_penalty_area_commitments u ON (u.year, u.mgnr) = (s.year, m.mgnr)
                         LEFT JOIN v_auto_business_shares a ON (a.year, a.mgnr) = (s.year, m.mgnr)
+                        LEFT JOIN payment_custom x ON (x.year, x.mgnr) = (s.year, m.mgnr)
                     WHERE s.year = {Year} AND v.avnr = {AvNr};
-
-                    UPDATE payment_variant SET test_variant = FALSE WHERE (year, avnr) = ({Year}, {AvNr});
                     """);
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                UPDATE payment_variant SET test_variant = FALSE WHERE (year, avnr) = ({Year}, {AvNr});
+                """);
         }
 
         public async Task Revert() {

Elwig/Helpers/ClientParameters.cs

@@ -1,6 +1,7 @@
 using Elwig.Models.Entities;
 using Microsoft.Data.Sqlite;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -66,6 +67,11 @@ namespace Elwig.Helpers {
         public string? TextEmailSubject;
         public string? TextEmailBody;
 
+        public int ExportEbicsVersion;
+        public int ExportEbicsAddress;
+
+        public (int? AllowanceKg, double? AllowanceBs, int? AllowanceKgPerBs, double? AllowancePercent, int? MinBs) AutoAdjustBs;
+
         public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
 
         public ClientParameters(Dictionary<string, string?> parameters) {
@@ -128,6 +134,22 @@ namespace Elwig.Helpers {
                 if (TextEmailSubject == "") TextEmailSubject = null;
                 TextEmailBody = parameters.GetValueOrDefault("TEXT_EMAIL_BODY");
                 if (TextEmailBody == "") TextEmailBody = null;
+
+                ExportEbicsVersion = int.TryParse(parameters.GetValueOrDefault("EXPORT_EBICS_VERSION"), out var v) ? v : 9;
+                switch (parameters.GetValueOrDefault("EXPORT_EBICS_ADDRESS", "FULL")?.ToUpper()) {
+                    case "OMIT": ExportEbicsAddress = 0; break;
+                    case "LINES": ExportEbicsAddress = 1; break;
+                    case "FULL": ExportEbicsAddress = 2; break;
+                }
+
+                var autoAdjust = (parameters.GetValueOrDefault("AUTOADJUST_BUSINESSSHARES") ?? "").Split(';');
+                AutoAdjustBs = autoAdjust.Length == 5 ? (
+                    int.TryParse(autoAdjust[0], out var v1) ? v1 : null,
+                    double.TryParse(autoAdjust[1], out var v2) ? v2 : null,
+                    int.TryParse(autoAdjust[2], out var v3) ? v3 : null,
+                    double.TryParse(autoAdjust[3], out var v4) ? v4 : null,
+                    int.TryParse(autoAdjust[4], out var v5) ? v5 : null
+                    ) : (null, null, null, null, null);
             } catch {
                 throw new KeyNotFoundException();
             }
@@ -155,6 +177,15 @@ namespace Elwig.Helpers {
                 case 1: orderingMemberList = "NAME"; break;
                 case 2: orderingMemberList = "KG"; break;
             }
+            string exportEbicsAddress = "FULL";
+            switch (ExportEbicsAddress) {
+                case 0: exportEbicsAddress = "OMIT"; break;
+                case 1: exportEbicsAddress = "LINES"; break;
+                case 2: exportEbicsAddress = "FULL"; break;
+            }
+            string autoAdjust = $"{AutoAdjustBs.AllowanceKg};{AutoAdjustBs.AllowanceBs?.ToString(CultureInfo.InvariantCulture)};" +
+                                $"{AutoAdjustBs.AllowanceKgPerBs};{AutoAdjustBs.AllowancePercent?.ToString(CultureInfo.InvariantCulture)};" +
+                                $"{AutoAdjustBs.MinBs}";
             return [
                 ("CLIENT_NAME_TOKEN", NameToken),
                 ("CLIENT_NAME_SHORT", NameShort),
@@ -180,7 +211,10 @@ namespace Elwig.Helpers {
                 ("TEXT_DELIVERYCONFIRMATION", TextDeliveryConfirmation),
                 ("TEXT_CREDITNOTE", TextCreditNote),
                 ("TEXT_EMAIL_SUBJECT", TextEmailSubject),
-                ("TEXT_EMAIL_BODY", TextEmailBody)
+                ("TEXT_EMAIL_BODY", TextEmailBody),
+                ("EXPORT_EBICS_VERSION", ExportEbicsVersion.ToString()),
+                ("EXPORT_EBICS_ADDRESS", exportEbicsAddress),
+                ("AUTOADJUST_BUSINESSSHARES", autoAdjust),
             ];
         }
 

Elwig/Helpers/Config.cs

@@ -13,10 +13,11 @@ namespace Elwig.Helpers {
         public string? Empty;
         public string? Filling;
         public string? Limit;
+        public bool Required;
         public string? Log;
         public string? _Log;
 
-        public ScaleConfig(string id, string? type, string? model, string? cnx, string? empty, string? filling, string? limit, string? log) {
+        public ScaleConfig(string id, string? type, string? model, string? cnx, string? empty, string? filling, string? limit, bool? required, string? log) {
             Id = id;
             Type = type;
             Model = model;
@@ -24,6 +25,7 @@ namespace Elwig.Helpers {
             Empty = empty;
             Filling = filling;
             Limit = limit;
+            Required = required ?? true;
             _Log = log;
             Log = log != null ? Path.Combine(App.DataPath, log) : null;
         }
@@ -67,9 +69,9 @@ namespace Elwig.Helpers {
         public void Read() {
             var config = new ConfigurationBuilder().AddIniFile(FileName).Build();
 
-            DatabaseFile = Path.Combine(App.DataPath, config["database:file"] ?? "database.sqlite3");
+            DatabaseFile = Path.Combine(Path.GetDirectoryName(FileName) ?? App.DataPath, config["database:file"] ?? "database.sqlite3");
             var log = config["database:log"];
-            DatabaseLog = log != null ? Path.Combine(App.DataPath, log) : null;
+            DatabaseLog = log != null ? Path.Combine(Path.GetDirectoryName(FileName) ?? App.DataPath, log) : null;
             Branch = config["general:branch"];
             Debug = TrueValues.Contains(config["general:debug"]?.ToLower());
             UpdateUrl = config["update:url"];
@@ -91,7 +93,9 @@ namespace Elwig.Helpers {
             foreach (var s in scales) {
                 ScaleList.Add(new(
                     s, config[$"scale.{s}:type"], config[$"scale.{s}:model"], config[$"scale.{s}:connection"],
-                    config[$"scale.{s}:empty"], config[$"scale.{s}:filling"], config[$"scale.{s}:limit"], config[$"scale.{s}:log"]
+                    config[$"scale.{s}:empty"], config[$"scale.{s}:filling"], config[$"scale.{s}:limit"],
+                    config[$"scale.{s}:required"] != null ? TrueValues.Contains(config[$"scale.{s}:required"]?.ToLower()) : null,
+                    config[$"scale.{s}:log"]
                 ));
             }
         }

Elwig/Helpers/ControlUtils.cs

@@ -102,20 +102,6 @@ namespace Elwig.Helpers {
             selector.SelectedItem = selItem;
         }
 
-        public static void RenewItemsSource(Xceed.Wpf.Toolkit.Primitives.Selector selector, IEnumerable? source, Xceed.Wpf.Toolkit.Primitives.ItemSelectionChangedEventHandler? handler = null) {
-            if (selector.ItemsSource == source)
-                return;
-            var selectedIds = selector.SelectedItems.Cast<object>().Select(i => Utils.GetEntityIdentifier(i)).ToList();
-            if (handler != null && selectedIds != null) selector.ItemSelectionChanged -= handler;
-            selector.ItemsSource = source;
-            if (source != null) {
-                selector.SelectedItems.Clear();
-                foreach (var i in source.Cast<object>().Where(i => selectedIds.Contains(Utils.GetEntityIdentifier(i))))
-                    selector.SelectedItems.Add(i);
-            }
-            if (handler != null && selectedIds != null) selector.ItemSelectionChanged += handler;
-        }
-
         public static void RenewItemsSource(DataGrid dataGrid, IEnumerable? source, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None, bool keepSort = true) {
             if (dataGrid.ItemsSource == source)
                 return;
@@ -148,19 +134,31 @@ namespace Elwig.Helpers {
         public static void RenewItemsSource(ListBox listBox, IEnumerable? source, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None) {
             if (listBox.ItemsSource == source)
                 return;
-            var selectedId = Utils.GetEntityIdentifier(listBox.SelectedItem);
-            object? selItem = null;
-            if (selectedId != 0 && source != null)
-                selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(Utils.GetEntityIdentifier(i)));
-            if (source != null && selItem == null) {
-                if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) {
-                    selItem = source.Cast<object>().FirstOrDefault();
+            if (listBox.SelectionMode == SelectionMode.Single) {
+                var selectedId = Utils.GetEntityIdentifier(listBox.SelectedItem);
+                object? selItem = null;
+                if (selectedId != 0 && source != null)
+                    selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(Utils.GetEntityIdentifier(i)));
+                if (source != null && selItem == null) {
+                    if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) {
+                        selItem = source.Cast<object>().FirstOrDefault();
+                    }
                 }
+                if (handler != null && selItem != null) listBox.SelectionChanged -= handler;
+                listBox.ItemsSource = source;
+                if (handler != null && selItem != null) listBox.SelectionChanged += handler;
+                listBox.SelectedItem = selItem;
+            } else {
+                var selectedIds = listBox.SelectedItems.Cast<object>().Select(Utils.GetEntityIdentifier).ToList();
+                if (handler != null && selectedIds != null) listBox.SelectionChanged -= handler;
+                listBox.ItemsSource = source;
+                if (source != null && selectedIds != null) {
+                    listBox.SelectedItems.Clear();
+                    foreach (var i in source.Cast<object>().Where(i => selectedIds.Contains(Utils.GetEntityIdentifier(i))))
+                        listBox.SelectedItems.Add(i);
+                }
+                if (handler != null && selectedIds != null) listBox.SelectionChanged += handler;
             }
-            if (handler != null && selItem != null) listBox.SelectionChanged -= handler;
-            listBox.ItemsSource = source;
-            if (handler != null && selItem != null) listBox.SelectionChanged += handler;
-            listBox.SelectedItem = selItem;
         }
 
         public static object? GetItemFromSource(IEnumerable source, int? hash) {
@@ -210,15 +208,15 @@ namespace Elwig.Helpers {
             return GetItemsFromSource(source, items.Select(Utils.GetEntityIdentifier));
         }
 
-        public static void SelectItems(Xceed.Wpf.Toolkit.CheckComboBox ccb, IEnumerable<int?>? ids) {
-            ccb.SelectedItems.Clear();
+        public static void SelectItems(ListBox lb, IEnumerable<int?>? ids) {
+            lb.SelectedItems.Clear();
             if (ids == null) return;
             foreach (var id in ids)
-                ccb.SelectedItems.Add(GetItemFromSource(ccb.ItemsSource, id));
+                lb.SelectedItems.Add(GetItemFromSource(lb.ItemsSource, id));
         }
 
-        public static void SelectItems(Xceed.Wpf.Toolkit.CheckComboBox ccb, IEnumerable<object>? items) {
-            SelectItems(ccb, items?.Select(Utils.GetEntityIdentifier));
+        public static void SelectItems(ListBox lb, IEnumerable<object>? items) {
+            SelectItems(lb, items?.Select(Utils.GetEntityIdentifier));
         }
 
         public static int? GetInputHashCode(Control input) {
@@ -226,8 +224,8 @@ namespace Elwig.Helpers {
                 return Utils.GetEntityIdentifier(tb.Text);
             } else if (input is ComboBox sb) {
                 return Utils.GetEntityIdentifier(sb.SelectedItem);
-            } else if (input is Xceed.Wpf.Toolkit.CheckComboBox ccb) {
-                return Utils.GetEntityIdentifier(ccb.SelectedItems);
+            } else if (input is ListBox lb) {
+                return Utils.GetEntityIdentifier(lb.SelectedItems);
             } else if (input is CheckBox cb) {
                 return Utils.GetEntityIdentifier(cb.IsChecked);
             } else if (input is RadioButton rb) {

Elwig/Helpers/Export/Ebics.cs

@@ -9,7 +9,9 @@ using System.Security;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Export {
-    public class Ebics(PaymentVar variant, string filename, int version) : IBankingExporter {
+    public class Ebics(PaymentVar variant, string filename, int version, Ebics.AddressMode mode = Ebics.AddressMode.Full) : IBankingExporter {
+
+        public enum AddressMode { Omit = 0, Lines = 1, Full = 2 }
 
         public static string FileExtension => "xml";
 
@@ -19,6 +21,7 @@ namespace Elwig.Helpers.Export {
         private readonly string Name = variant.Name;
         private readonly int AvNr = variant.AvNr;
         private readonly int Version = version;
+        private readonly AddressMode ShowAddresses = mode;
 
         public void Dispose() {
             GC.SuppressFinalize(this);
@@ -35,8 +38,11 @@ namespace Elwig.Helpers.Export {
         }
 
         public async Task ExportAsync(IEnumerable<Transaction> transactions, IProgress<double>? progress = null) {
-            if (transactions.Any(tx => tx.Amount < 0))
+            if (transactions.Any(tx => tx.Amount < 0)) {
                 throw new ArgumentException("Tranaction amount may not be negative");
+            } else if (App.Client.Iban == null) {
+                throw new ArgumentException("Client IBAN has to be set");
+            }
             progress?.Report(0.0);
             var nbOfTxs = transactions.Count();
             int count = nbOfTxs + 2, i = 0;
@@ -78,11 +84,18 @@ namespace Elwig.Helpers.Export {
                         <Amt><InstdAmt Ccy="{tx.Currency}">{Transaction.FormatAmount(tx.Amount)}</InstdAmt></Amt>
                         <Cdtr>
                          <Nm>{SecurityElement.Escape(a.Name[..Math.Min(140, a.Name.Length)])}</Nm>
-                         <PstlAdr>
-                          <StrtNm>{a1?[..Math.Min(70, a1.Length)]}</StrtNm><BldgNb>{SecurityElement.Escape(a2?[..Math.Min(16, a2.Length)])}</BldgNb>
-                          <PstCd>{a.PostalDest.AtPlz?.Plz}</PstCd><TwnNm>{SecurityElement.Escape(a.PostalDest.AtPlz?.Ort.Name)}</TwnNm>
-                          <Ctry>{a.PostalDest.Country.Alpha2}</Ctry>
-                         </PstlAdr>
+                    """);
+                if (ShowAddresses != AddressMode.Omit) {
+                    var full = ShowAddresses == AddressMode.Full;
+                    await Writer.WriteLineAsync($"""
+                             <PstlAdr>{(full ? "" : $"\r\n      <Ctry>{a.PostalDest.Country.Alpha2}</Ctry>")}
+                              {(full ? $"<StrtNm>{SecurityElement.Escape(a1?[..Math.Min(70, a1.Length)])}</StrtNm> <BldgNb>{SecurityElement.Escape(a2?[..Math.Min(16, a2.Length)])}</BldgNb>" :
+                                       $"<AdrLine>{SecurityElement.Escape(a.Address[..Math.Min(70, a.Address.Length)])}</AdrLine>")}
+                              <{(full ? "PstCd" : "AdrLine")}>{a.PostalDest.AtPlz?.Plz}{(full ? "</PstCd> <TwnNm>" : " ")}{SecurityElement.Escape(a.PostalDest.AtPlz?.Ort.Name)}</{(full ? "TwnNm" : "AdrLine")}>
+                             {(full ? $" <Ctry>{a.PostalDest.Country.Alpha2}</Ctry>\r\n     " : "")}</PstlAdr>
+                        """);
+                }
+                await Writer.WriteLineAsync($"""
                         </Cdtr>
                         <CdtrAcct><Id><IBAN>{tx.Member.Iban!}</IBAN></Id></CdtrAcct>
                         <RmtInf><Ustrd>{SecurityElement.Escape(info)}</Ustrd></RmtInf>

Elwig/Helpers/Utils.cs

@@ -425,8 +425,11 @@ namespace Elwig.Helpers {
         public static async Task<(string Version, string Url, long Size)?> GetLatestInstallerUrl(string url) {
             try {
                 using var client = GetHttpClient(accept: "application/json");
-                var resJson = JsonNode.Parse(await client.GetStringAsync(url));
-                var data = resJson!["data"]![0]!;
+                using var res = await client.GetAsync(url);
+                if (!res.IsSuccessStatusCode)
+                    return null;
+                var resJson = JsonNode.Parse(await res.Content.ReadAsStringAsync());
+                var data = resJson!["data"]!.AsArray()[^1]!;
                 return ((string)data["version"]!, (string)data["url"]!, (long)data["size"]!);
             } catch {
                 return null;

Elwig/Models/Dtos/CreditNoteData.cs

@@ -30,6 +30,7 @@ namespace Elwig.Models.Dtos {
             ("Penalties", "Pönalen FB", "€", 20),
             ("Penalty", "Unterl. GA", "€", 20),
             ("AutoBs", "GA Nachz.", "€", 20),
+            ("Custom", "Weitere", "€", 20),
             ("Others", "Sonstige", "€", 20),
             ("Considered", "Berückstgt.", "€", 20),
             ("Amount", "Betrag", "€", 20),
@@ -55,18 +56,20 @@ namespace Elwig.Models.Dtos {
                        p.plz, o.name AS ort, m.address, m.iban, c.tgnr, s.year, s.precision,
                        p.amount - p.net_amount AS surcharge,
                        c.net_amount, c.prev_net_amount, c.vat, c.vat_amount, c.gross_amount, c.modifiers, c.prev_modifiers, c.amount,
-                       ROUND(COALESCE(u.total_penalty, 0) / POW(10, 4 - 2)) AS fb_penalty,
-                       ROUND(COALESCE(b.total_penalty, 0) / POW(10, s.precision - 2)) AS bs_penalty,
-                       ROUND(COALESCE(a.total_amount, 0) / POW(10, s.precision - 2)) AS auto_bs
+                       ROUND(b.total_penalty / POW(10, s.precision - 2)) AS bs_penalty,
+                       ROUND(u.total_penalty / POW(10, 4 - 2)) AS fb_penalty,
+                       ROUND(-a.total_amount / POW(10, s.precision - 2)) AS auto_bs,
+                       x.amount AS custom_mod
                 FROM credit c
                     LEFT JOIN member m ON m.mgnr = c.mgnr
                     LEFT JOIN payment_member p ON (p.year, p.avnr, p.mgnr) = (c.year, c.avnr, c.mgnr) 
                     LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
                     LEFT JOIN AT_ort o ON o.okz = p.okz
                     LEFT JOIN season s ON s.year = c.year
-                    LEFT JOIN v_penalty_area_commitments u ON (u.year, u.mgnr) = (s.year, m.mgnr)
                     LEFT JOIN v_penalty_business_shares b ON (b.year, b.mgnr) = (s.year, m.mgnr)
+                    LEFT JOIN v_penalty_area_commitments u ON (u.year, u.mgnr) = (s.year, m.mgnr)
                     LEFT JOIN v_auto_business_shares a ON (a.year, a.mgnr) = (s.year, m.mgnr)
+                    LEFT JOIN payment_custom x ON (x.year, x.mgnr) = (s.year, m.mgnr)
                 WHERE c.year = {year} AND c.avnr = {avnr}
                 ORDER BY m.mgnr
                 """).ToListAsync();
@@ -92,6 +95,7 @@ namespace Elwig.Models.Dtos {
         public decimal? Penalties;
         public decimal? Penalty;
         public decimal? AutoBs;
+        public decimal? Custom;
         public decimal? Others;
         public decimal? Considered;
         public decimal Amount;
@@ -118,12 +122,14 @@ namespace Elwig.Models.Dtos {
             }
             decimal mod = (row.Modifiers == null) ? 0 : Utils.DecFromDb((long)row.Modifiers, prec1);
             if (data.ConsiderContractPenalties)
-                Penalties = (row.FbPenalty == null || row.FbPenalty == 0) ? null : Utils.DecFromDb((long)row.FbPenalty, prec1);
+                Penalties = (row.FbPenalty == null) ? null : Utils.DecFromDb((long)row.FbPenalty, prec1);
             if (data.ConsiderTotalPenalty)
-                Penalty = (row.BsPealty == null || row.BsPealty == 0) ? null : Utils.DecFromDb((long)row.BsPealty, prec1);
+                Penalty = (row.BsPenalty == null) ? null : Utils.DecFromDb((long)row.BsPenalty, prec1);
             if (data.ConsiderAutoBusinessShares)
-                AutoBs = (row.AutoBs == null || row.AutoBs == 0) ? null : -Utils.DecFromDb((long)row.AutoBs, prec1);
-            mod -= (Penalties ?? 0) + (Penalty ?? 0) + (AutoBs ?? 0);
+                AutoBs = (row.AutoBs == null) ? null : Utils.DecFromDb((long)row.AutoBs, prec1);
+            if (data.ConsiderCustomModifiers)
+                Custom = (row.CustomMod == null) ? null : Utils.DecFromDb((long)row.CustomMod, prec1);
+            mod -= (Penalties ?? 0) + (Penalty ?? 0) + (AutoBs ?? 0) + (Custom ?? 0);
             Others = (mod == 0) ? null : mod;
             Gross = Utils.DecFromDb(row.GrossAmount, prec1);
             Considered = (row.PrevModifiers == null || row.PrevModifiers == 0) ? null : -Utils.DecFromDb((long)row.PrevModifiers, prec1);
@@ -173,11 +179,13 @@ namespace Elwig.Models.Dtos {
         public long? PrevModifiers { get; set; }
         [Column("amount")]
         public long Amount { get; set; }
+        [Column("bs_penalty")]
+        public long? BsPenalty { get; set; }
         [Column("fb_penalty")]
         public long? FbPenalty { get; set; }
-        [Column("bs_penalty")]
-        public long? BsPealty { get; set; }
         [Column("auto_bs")]
         public long? AutoBs { get; set; }
+        [Column("custom_mod")]
+        public long? CustomMod { get; set; }
     }
 }

Elwig/Models/Dtos/OverUnderDeliveryData.cs

@@ -38,7 +38,7 @@ namespace Elwig.Models.Dtos {
                     LEFT JOIN AT_ort o ON o.okz = p.okz
                     LEFT JOIN season s ON s.year = {year}
                     LEFT JOIN v_delivery d ON d.mgnr = m.mgnr AND d.year = s.year
-                WHERE m.active = 1
+                WHERE m.active = TRUE OR d.weight > 0
                 GROUP BY d.year, m.mgnr
                 ORDER BY 100.0 * sum / max_kg, m.mgnr;
                 """).ToListAsync();

Elwig/Models/Entities/Member.cs

@@ -166,6 +166,9 @@ namespace Elwig.Models.Entities {
         [InverseProperty(nameof(Delivery.Member))]
         public virtual ICollection<Delivery> Deliveries { get; private set; } = null!;
 
+        [InverseProperty(nameof(Credit.Member))]
+        public virtual ICollection<Credit> Credits { get; private set; } = null!;
+
         [InverseProperty(nameof(MemberTelNr.Member))]
         public virtual ICollection<MemberTelNr> TelephoneNumbers { get; private set; } = null!;
 

Elwig/Models/Entities/MemberHistory.cs

@@ -3,7 +3,7 @@ using System;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Elwig.Models.Entities {
-    [Table("member_history"), PrimaryKey("MgNr", "DateString")]
+    [Table("member_history"), PrimaryKey("MgNr", "DateString", "Type")]
     public class MemberHistory {
         [Column("mgnr")]
         public int MgNr { get; set; }
@@ -16,12 +16,12 @@ namespace Elwig.Models.Entities {
             set => value.ToString("yyyy-MM-dd");
         }
 
-        [Column("business_shares")]
-        public int BusinessShares { get; set; }
-
         [Column("type")]
         public required string Type { get; set; }
 
+        [Column("business_shares")]
+        public int BusinessShares { get; set; }
+
         [Column("comment")]
         public string? Comment { get; set; }
 

Elwig/Models/Entities/Modifier.cs

@@ -13,6 +13,9 @@ namespace Elwig.Models.Entities {
         [Column("modid")]
         public required string ModId { get; set; }
 
+        [Column("active")]
+        public bool IsActive { get; set; }
+
         [Column("ordering")]
         public int Ordering { get; set; }
 
@@ -21,7 +24,6 @@ namespace Elwig.Models.Entities {
 
         [Column("abs")]
         public long? AbsValue { get; set; }
-
         [NotMapped]
         public decimal? Abs {
             get => AbsValue != null ? Season.DecFromDb(AbsValue.Value) : null;
@@ -30,19 +32,12 @@ namespace Elwig.Models.Entities {
 
         [Column("rel")]
         public double? RelValue { get; set; }
-
         [NotMapped]
         public decimal? Rel {
             get => (decimal?)RelValue;
             set => RelValue = (double?)value;
         }
 
-        [Column("standard")]
-        public bool IsStandard { get; set; }
-
-        [Column("quick_select")]
-        public bool IsQuickSelect { get; set; }
-
         [ForeignKey("Year")]
         public virtual Season Season { get; private set; } = null!;
 

Elwig/Models/Entities/PaymentCustom.cs

@@ -0,0 +1,31 @@
+using Elwig.Helpers;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models.Entities {
+    [Table("payment_custom"), PrimaryKey("Year", "MgNr")]
+    public class PaymentCustom {
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+
+        [Column("amount")]
+        public long AmountValue { get; set; }
+        [NotMapped]
+        public decimal Amount {
+            get => Utils.DecFromDb(AmountValue, 2);
+            set => AmountValue = Utils.DecToDb(value, 2);
+        }
+
+        [Column("comment")]
+        public string? Comment { get; set; }
+
+        [ForeignKey("Year")]
+        public virtual Season Season { get; private set; } = null!;
+
+        [ForeignKey("MgNr")]
+        public virtual Member Member { get; private set; } = null!;
+    }
+}

Elwig/Models/Entities/PaymentVar.cs

@@ -17,7 +17,6 @@ namespace Elwig.Models.Entities {
 
         [Column("date")]
         public required string DateString { get; set; }
-
         [NotMapped]
         public DateOnly Date {
             get => DateOnly.ParseExact(DateString, "yyyy-MM-dd");
@@ -26,7 +25,6 @@ namespace Elwig.Models.Entities {
 
         [Column("transfer_date")]
         public string? TransferDateString { get; set; }
-
         [NotMapped]
         public DateOnly? TransferDate {
             get => TransferDateString != null ? DateOnly.ParseExact(TransferDateString, "yyyy-MM-dd") : null;
@@ -37,7 +35,9 @@ namespace Elwig.Models.Entities {
         public bool TestVariant { get; set; }
 
         [Column("calc_time")]
-        public int? CalcTime { get; set; }
+        public int? CalcTimeUnix { get; set; }
+        [NotMapped]
+        public DateTime? CalcTime => CalcTimeUnix != null ? DateTimeOffset.FromUnixTimeSeconds((long)CalcTimeUnix).UtcDateTime.ToLocalTime() : null;
 
         [Column("comment")]
         public string? Comment { get; set; }

Elwig/Models/Entities/Season.cs

@@ -55,6 +55,22 @@ namespace Elwig.Models.Entities {
             set => PenaltyNoneValue = value != null ? DecToDb(value.Value) : null;
         }
 
+        [Column("penalty_per_bs_amount")]
+        public long? PenaltyPerBsAmountValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyPerBsAmount {
+            get => PenaltyPerBsAmountValue != null ? DecFromDb(PenaltyPerBsAmountValue.Value) : null;
+            set => PenaltyPerBsAmountValue = value != null ? DecToDb(value.Value) : null;
+        }
+
+        [Column("penalty_per_bs_none")]
+        public long? PenaltyPerBsNoneValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyPerBsNone {
+            get => PenaltyPerBsNoneValue != null ? DecFromDb(PenaltyPerBsNoneValue.Value) : null;
+            set => PenaltyPerBsNoneValue = value != null ? DecToDb(value.Value) : null;
+        }
+
         [Column("bs_value")]
         public long? BusinessShareValueValue { get; set; }
         [NotMapped]

Elwig/Resources/Schemas/PaymentVariantData.json

@@ -12,6 +12,7 @@
       "consider_contract_penalties": {"type": "boolean"},
       "consider_total_penalty": {"type": "boolean"},
       "consider_auto_business_shares": {"type": "boolean"},
+      "consider_custom_modifiers": {"type": "boolean"},
       "net_weight_modifier": {"type": "number"},
       "gross_weight_modifier": {"type": "number"},
       "payment": {"$ref": "#/definitions/payment_1"},

Elwig/Resources/Sql/19-20.sql

@@ -0,0 +1,7 @@
+-- schema version 19 to 20
+
+ALTER TABLE season ADD COLUMN penalty_per_bs_amount INTEGER DEFAULT NULL;
+ALTER TABLE season ADD COLUMN penalty_per_bs_none   INTEGER DEFAULT NULL;
+DROP VIEW v_penalty_business_shares;
+
+UPDATE season SET penalty_none = NULL;

Elwig/Resources/Sql/20-21.sql

@@ -0,0 +1,16 @@
+-- schema version 20 to 21
+
+DROP TABLE member_history;
+CREATE TABLE member_history (
+    mgnr            INTEGER NOT NULL,
+    date            TEXT    NOT NULL CHECK (date REGEXP '^[1-9][0-9]{3}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$') DEFAULT CURRENT_DATE,
+    type            TEXT    NOT NULL CHECK (type REGEXP '^[a-z_]+$'),
+
+    business_shares INTEGER NOT NULL,
+    comment         TEXT DEFAULT NULL,
+
+    CONSTRAINT pk_member_history PRIMARY KEY (mgnr, date, type),
+    CONSTRAINT fk_member_history_member FOREIGN KEY (mgnr) REFERENCES member (mgnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE
+) STRICT;

Elwig/Resources/Sql/21-22.sql

@@ -0,0 +1,45 @@
+-- schema version 21 to 22
+
+CREATE VIEW v_penalty_business_shares AS
+SELECT u.year, u.mgnr,
+       SUM(IIF(u.weight = 0, COALESCE(-s.penalty_none, 0) + COALESCE(-u.business_shares * s.penalty_per_bs_none, 0), 0) +
+           IIF(u.diff < 0, COALESCE(-s.penalty_amount, 0), 0) +
+           COALESCE(u.diff * s.penalty_per_kg, 0) + COALESCE(CEIL(CAST(u.diff AS REAL) / s.min_kg_per_bs) * s.penalty_per_bs_amount, 0)
+       ) AS total_penalty
+FROM v_total_under_delivery u
+    JOIN season s ON u.year = s.year
+    JOIN member m ON m.mgnr = u.mgnr
+WHERE m.active
+GROUP BY u.year, u.mgnr
+HAVING total_penalty < 0
+ORDER BY u.year, u.mgnr;
+
+DROP VIEW v_penalty_area_commitments;
+CREATE VIEW v_penalty_area_commitments AS
+SELECT u.year, u.mgnr,
+       SUM(COALESCE(IIF(u.weight = 0, -t.penalty_none, 0), 0) +
+           COALESCE(IIF(u.diff < 0, -t.penalty_amount, 0), 0) +
+           COALESCE(u.diff * t.penalty_per_kg, 0)
+       ) AS total_penalty
+FROM v_under_delivery u
+   JOIN area_commitment_type t ON t.vtrgid = u.bucket
+GROUP BY year, mgnr
+HAVING total_penalty < 0
+ORDER BY year, mgnr;
+
+-- all values in the table are stored with precision 2!
+CREATE TABLE payment_custom (
+    year    INTEGER NOT NULL,
+    mgnr    INTEGER NOT NULL,
+
+    amount  INTEGER NOT NULL,
+    comment TEXT,
+
+    CONSTRAINT pk_payment_custom PRIMARY KEY (year, mgnr),
+    CONSTRAINT fk_payment_custom_season FOREIGN KEY (year) REFERENCES season (year)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE,
+    CONSTRAINT fk_payment_custom_member FOREIGN KEY (mgnr) REFERENCES member (mgnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE
+) STRICT;

Elwig/Resources/Sql/22-23.sql

@@ -0,0 +1,15 @@
+-- schema version 22 to 23
+
+CREATE VIEW v_stat_modifier AS
+SELECT v.year, v.avnr, m.modid, m.name, m.abs, m.rel,
+       COUNT(*) AS count,
+       MIN(IIF(p.net_amount = 0 AND m.abs IS NULL, NULL, ROUND(COALESCE(d.weight * m.abs, 0) + COALESCE(p.net_amount * m.rel, 0)))) AS min,
+       MAX(IIF(p.net_amount = 0 AND m.abs IS NULL, NULL, ROUND(COALESCE(d.weight * m.abs, 0) + COALESCE(p.net_amount * m.rel, 0)))) AS max,
+       SUM(ROUND(COALESCE(d.weight * m.abs, 0) + COALESCE(p.net_amount * m.rel, 0))) AS sum
+FROM payment_variant v
+    JOIN modifier m ON m.year = v.year
+    JOIN delivery_part d ON d.year = v.year
+    JOIN delivery_part_modifier x ON (x.year, x.did, x.dpnr, x.modid) = (d.year, d.did, d.dpnr, m.modid)
+    LEFT JOIN payment_delivery_part p ON (p.year, p.did, p.dpnr, p.avnr) = (d.year, d.did, d.dpnr, v.avnr)
+GROUP BY v.year, v.avnr, m.modid
+ORDER BY v.year, v.avnr, m.ordering;

Elwig/Resources/Sql/23-24.sql

@@ -0,0 +1,5 @@
+-- schema version 23 to 24
+
+ALTER TABLE modifier DROP COLUMN standard;
+ALTER TABLE modifier DROP COLUMN quick_select;
+ALTER TABLE modifier ADD COLUMN active INTEGER NOT NULL CHECK (active IN (TRUE, FALSE)) DEFAULT TRUE;

Elwig/Themes/Generic.xaml

@@ -1,5 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/Elwig;component/Controls/UnitTextBox.xaml"/>
+        <ResourceDictionary Source="/Elwig;component/Controls/IntegerUpDown.xaml"/>
+        <ResourceDictionary Source="/Elwig;component/Controls/CheckComboBox.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>

Elwig/Windows/AdministrationWindow.cs

@@ -1,4 +1,3 @@
-using Elwig.Controls;
 using Elwig.Helpers;
 using Elwig.Models.Entities;
 using System;
@@ -10,7 +9,6 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Threading;
-using Xceed.Wpf.Toolkit;
 using System.Windows.Input;
 
 namespace Elwig.Windows {
@@ -21,14 +19,14 @@ namespace Elwig.Windows {
 
         private bool _isEditing;
         private bool _isCreating;
-        protected bool IsEditing {
+        public bool IsEditing {
             get { return _isEditing; }
             set {
                 _isEditing = value;
                 LockContext = IsEditing || IsCreating;
             }
         }
-        protected bool IsCreating {
+        public bool IsCreating {
             get { return _isCreating; }
             set {
                 _isCreating = value;
@@ -42,7 +40,7 @@ namespace Elwig.Windows {
         private TextBox[] PlzInputs;
         private ComboBox[] ComboBoxInputs;
         private ComboBox[] PlzOrtInputs;
-        private CheckComboBox[] CheckComboBoxInputs;
+        private ListBox[] ListBoxInputs;
         private CheckBox[] CheckBoxInputs;
         private RadioButton[] RadioButtonInputs;
         private readonly Dictionary<Control, bool> Valid;
@@ -68,7 +66,7 @@ namespace Elwig.Windows {
             TextBoxInputs = [];
             PlzInputs = [];
             ComboBoxInputs = [];
-            CheckComboBoxInputs = [];
+            ListBoxInputs = [];
             PlzOrtInputs = [];
             CheckBoxInputs = [];
             RadioButtonInputs = [];
@@ -97,7 +95,7 @@ namespace Elwig.Windows {
             TextBoxInputs = ControlUtils.FindAllChildren<TextBox>(this, ExemptInputs).ToArray();
             ComboBoxInputs = ControlUtils.FindAllChildren<ComboBox>(this, ExemptInputs).ToArray();
             CheckBoxInputs = ControlUtils.FindAllChildren<CheckBox>(this, ExemptInputs).ToArray();
-            CheckComboBoxInputs = ControlUtils.FindAllChildren<CheckComboBox>(this, ExemptInputs).ToArray();
+            ListBoxInputs = ControlUtils.FindAllChildren<ListBox>(this, ExemptInputs).ToArray();
             RadioButtonInputs = ControlUtils.FindAllChildren<RadioButton>(this, ExemptInputs).ToArray();
             PlzInputs = ControlUtils.FindAllChildren<TextBox>(this).Where(tb => "PLZ".Equals(tb.Tag)).ToArray();
             PlzOrtInputs = PlzInputs.Select(tb => ControlUtils.FindNextSibling<ComboBox>(tb) ?? throw new MissingMemberException()).ToArray();
@@ -105,8 +103,8 @@ namespace Elwig.Windows {
                 Valid[tb] = true;
             foreach (var cb in ComboBoxInputs)
                 cb.SelectionChanged += ComboBox_SelectionChanged;
-            foreach (var cb in CheckComboBoxInputs)
-                cb.ItemSelectionChanged += ComboBox_SelectionChanged;
+            foreach (var lb in ListBoxInputs)
+                lb.SelectionChanged += ComboBox_SelectionChanged;
         }
 
         private void OnClosing(object? sender, CancelEventArgs evt) {
@@ -151,8 +149,8 @@ namespace Elwig.Windows {
                 ControlUtils.ClearInputState(tb);
             foreach (var cb in ComboBoxInputs)
                 ControlUtils.ClearInputState(cb);
-            foreach (var ccb in CheckComboBoxInputs)
-                ControlUtils.ClearInputState(ccb);
+            foreach (var lb in ListBoxInputs)
+                ControlUtils.ClearInputState(lb);
             foreach (var cb in CheckBoxInputs)
                 ControlUtils.ClearInputState(cb);
             foreach (var rb in RadioButtonInputs)
@@ -166,7 +164,7 @@ namespace Elwig.Windows {
                     Valid[input] = false;
                 } else if (input is ComboBox cb && cb.SelectedItem == null && cb.ItemsSource != null) {
                     ControlUtils.SetInputInvalid(input);
-                } else if (input is CheckComboBox ccb && ccb.SelectedItem == null && ccb.ItemsSource != null) {
+                } else if (input is ListBox lb && lb.SelectedItem == null && lb.ItemsSource != null) {
                     ControlUtils.SetInputInvalid(input);
                 } else if (input is CheckBox ckb && ckb.IsChecked != true) {
                     ControlUtils.SetInputInvalid(input);
@@ -190,8 +188,8 @@ namespace Elwig.Windows {
                 tb.IsReadOnly = true;
             foreach (var cb in ComboBoxInputs)
                 cb.IsEnabled = false;
-            foreach (var ccb in CheckComboBoxInputs)
-                ccb.IsEnabled = false;
+            foreach (var lb in ListBoxInputs)
+                lb.IsEnabled = false;
             foreach (var cb in CheckBoxInputs)
                 cb.IsEnabled = false;
             foreach (var rb in RadioButtonInputs)
@@ -203,8 +201,8 @@ namespace Elwig.Windows {
                 tb.IsReadOnly = false;
             foreach (var cb in ComboBoxInputs)
                 cb.IsEnabled = true;
-            foreach (var ccb in CheckComboBoxInputs)
-                ccb.IsEnabled = true;
+            foreach (var lb in ListBoxInputs)
+                lb.IsEnabled = true;
             foreach (var cb in CheckBoxInputs)
                 cb.IsEnabled = true;
             foreach (var rb in RadioButtonInputs)
@@ -224,8 +222,8 @@ namespace Elwig.Windows {
                 OriginalValues[tb] = ControlUtils.GetInputHashCode(tb);
             foreach (var cb in ComboBoxInputs)
                 OriginalValues[cb] = ControlUtils.GetInputHashCode(cb);
-            foreach (var ccb in CheckComboBoxInputs)
-                OriginalValues[ccb] = ControlUtils.GetInputHashCode(ccb);
+            foreach (var lb in ListBoxInputs)
+                OriginalValues[lb] = ControlUtils.GetInputHashCode(lb);
             foreach (var cb in CheckBoxInputs)
                 OriginalValues[cb] = ControlUtils.GetInputHashCode(cb);
             foreach (var rb in RadioButtonInputs)
@@ -277,8 +275,8 @@ namespace Elwig.Windows {
                 tb.Text = "";
             foreach (var cb in ComboBoxInputs)
                 cb.SelectedItem = null;
-            foreach (var ccb in CheckComboBoxInputs)
-                ccb.SelectedItems.Clear();
+            foreach (var lb in ListBoxInputs)
+                lb.SelectedItems.Clear();
             foreach (var cb in CheckBoxInputs)
                 cb.IsChecked = cb.IsThreeState ? null : false;
             foreach (var rb in RadioButtonInputs)
@@ -315,13 +313,13 @@ namespace Elwig.Windows {
                 !IsValid ||
                 TextBoxInputs.Any(InputHasChanged) ||
                 ComboBoxInputs.Any(InputHasChanged) ||
-                CheckComboBoxInputs.Any(InputHasChanged) ||
+                ListBoxInputs.Any(InputHasChanged) ||
                 CheckBoxInputs.Any(InputHasChanged) ||
                 RadioButtonInputs.Any(InputHasChanged)
             ) || IsCreating && (
                 TextBoxInputs.Any(i => InputIsNotDefault(i) || (!i.IsReadOnly && i.Text != "")) ||
                 ComboBoxInputs.Any(i => InputIsNotDefault(i) || (i.IsEnabled && i.SelectedItem != null)) ||
-                CheckComboBoxInputs.Any(i => InputIsNotDefault(i) || i.SelectedItem != null) ||
+                ListBoxInputs.Any(i => InputIsNotDefault(i) || i.SelectedItem != null) ||
                 CheckBoxInputs.Any(InputIsNotDefault) ||
                 RadioButtonInputs.Any(InputIsNotDefault)
             );
@@ -447,8 +445,8 @@ namespace Elwig.Windows {
             bool valid = false;
             if (input is ComboBox cb) {
                 valid = cb.ItemsSource == null || cb.SelectedItem != null || !RequiredInputs.Contains(input);
-            } else if (input is CheckComboBox ccb) {
-                valid = ccb.ItemsSource == null || ccb.SelectedItem != null || !RequiredInputs.Contains(input);
+            } else if (input is ListBox lb) {
+                valid = lb.ItemsSource == null || lb.SelectedItem != null || !RequiredInputs.Contains(input);
             }
             if (valid) {
                 ValidateInput(input, true);

Elwig/Windows/AreaComAdminWindow.xaml

@@ -6,7 +6,6 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
         mc:Ignorable="d"
-        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         Title="Flächenbindungen - Elwig" Height="500" MinHeight="440" Width="920" MinWidth="860"
         Loaded="Window_Loaded">
     <Window.Resources>
@@ -25,14 +24,16 @@
             <Setter Property="Height" Value="25"/>
             <Setter Property="TextWrapping" Value="NoWrap"/>
         </Style>
-        <Style TargetType="ComboBox">
-            <Setter Property="IsEnabled" Value="False"/>
-            <Setter Property="Height" Value="25"/>
-            <Setter Property="FontSize" Value="14"/>
+        <Style TargetType="ctrl:UnitTextBox">
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="IsReadOnly" Value="True"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
         </Style>
-        <Style TargetType="xctk:CheckComboBox">
+        <Style TargetType="ComboBox">
             <Setter Property="IsEnabled" Value="False"/>
             <Setter Property="Height" Value="25"/>
             <Setter Property="FontSize" Value="14"/>

Elwig/Windows/AreaComAdminWindow.xaml.cs

@@ -7,7 +7,6 @@ using Elwig.Models.Entities;
 using System;
 using System.Threading.Tasks;
 using System.Collections.Generic;
-using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Elwig.Windows {
     public partial class AreaComAdminWindow : AdministrationWindow {
@@ -431,7 +430,7 @@ namespace Elwig.Windows {
             RefreshInputs();
         }
 
-        private void AttributesInput_SelectionChanged(object sender, ItemSelectionChangedEventArgs evt) {
+        private void AttributesInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
 
         }
 

Elwig/Windows/BaseDataWindow.xaml

@@ -1,5 +1,6 @@
 <local:AdministrationWindow
         x:Class="Elwig.Windows.BaseDataWindow"
+        AutomationProperties.AutomationId="BaseDataWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -395,11 +396,11 @@
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="205"/>
+                        <RowDefinition Height="180"/>
                         <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
 
-                    <ListBox x:Name="SeasonList" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" Grid.RowSpan="2"
+                    <ListBox x:Name="SeasonList" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,40" Grid.RowSpan="2"
                              SelectionChanged="SeasonList_SelectionChanged">
                         <ListBox.ItemTemplate>
                             <DataTemplate>
@@ -411,11 +412,17 @@
                             </DataTemplate>
                         </ListBox.ItemTemplate>
                     </ListBox>
+                    <Button x:Name="SeasonAddButton" Content="Neu anlegen..." FontSize="12" Height="25" Grid.Row="2"
+                            VerticalAlignment="Bottom" Margin="10,10,40,10" Padding="0,0,0,0"
+                            Click="SeasonAddButton_Click"/>
+                    <Button x:Name="SeasonRemoveButton" Content="&#xE74D;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Height="25" Width="25"
+                            VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="10,10,10,10" Padding="0.5,0,0,0"
+                            Click="SeasonRemoveButton_Click"/>
 
                     <Grid Grid.Column="1" Margin="0,10,0,0">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="130"/>
-                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="120"/>
                             <ColumnDefinition Width="150"/>
                             <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
@@ -440,29 +447,32 @@
                         <TextBox x:Name="SeasonEndInput" Grid.Column="1" Margin="0,130,10,10" Width="78" IsEnabled="False"
                                  HorizontalAlignment="Left"/>
 
-                        <Label Content="Lieferpflicht:" Margin="10,10,0,10" Grid.Column="2"/>
+                        <Label Content="Lieferpflicht/-recht:" Margin="10,10,0,10" Grid.Column="2"/>
                         <ctrl:UnitTextBox x:Name="SeasonMinKgPerBsInput" Unit="kg/GA" TextChanged="SeasonMinMaxKgInput_TextChanged"
                                           Grid.Column="3" Width="80" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-
-                        <Label Content="Lieferrecht:" Margin="10,40,0,10" Grid.Column="2"/>
                         <ctrl:UnitTextBox x:Name="SeasonMaxKgPerBsInput" Unit="kg/GA" TextChanged="SeasonMinMaxKgInput_TextChanged"
-                                          Grid.Column="3" Width="80" Margin="0,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                                          Grid.Column="3" Width="80" Margin="85,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-                        <Label Content="Strafe (pro unterl. kg):" Margin="10,70,0,10" Grid.Column="2"/>
-                        <ctrl:UnitTextBox x:Name="SeasonPenaltyPerKgInput" Unit="€/kg" TextChanged="SeasonPenaltyPerKgInput_TextChanged"
-                                          Grid.Column="3" Width="80" Margin="0,70,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-
-                        <Label Content="Strafe (Unterlieferung):" Margin="10,100,0,10" Grid.Column="2"/>
-                        <ctrl:UnitTextBox x:Name="SeasonPenaltyInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
-                                          Grid.Column="3" Width="68" Margin="0,100,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-
-                        <Label Content="Strafe (Nicht-Lieferung):" Margin="10,130,0,10" Grid.Column="2"/>
-                        <ctrl:UnitTextBox x:Name="SeasonPenaltyNoneInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
-                                          Grid.Column="3" Width="68" Margin="0,130,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-
-                        <Label Content="GA-Wert:" Margin="10,160,0,10" Grid.Column="2"/>
+                        <Label Content="GA-Wert (Nachz.):" Margin="10,40,0,10" Grid.Column="2"/>
                         <ctrl:UnitTextBox x:Name="SeasonBsValueInput" Unit="€/GA" TextChanged="SeasonPenaltyInput_TextChanged"
-                                          Grid.Column="3" Width="85" Margin="0,160,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                                          Grid.Column="3" Width="85" Margin="0,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <GroupBox Header="Strafen bei Unterlieferung lt. GA" Grid.Column="2" Grid.ColumnSpan="2" Margin="0,70,10,0">
+                            <Grid>
+                                <ctrl:UnitTextBox x:Name="SeasonPenaltyPerKgInput" Unit="€/kg" TextChanged="SeasonPenaltyPerKgInput_TextChanged"
+                                                  Width="80" Margin="65,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                                <ctrl:UnitTextBox x:Name="SeasonPenaltyInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
+                                                  Width="68" Margin="150,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                                <ctrl:UnitTextBox x:Name="SeasonPenaltyPerBsInput" Unit="€/GA" TextChanged="SeasonPenaltyPerBsInput_TextChanged"
+                                                  Width="100" Margin="222,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                                <Label Content="Zzgl. bei Nicht-Lieferung:" Margin="10,40,0,10"/>
+                                <ctrl:UnitTextBox x:Name="SeasonPenaltyNoneInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
+                                                  Width="68" Margin="150,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                                <ctrl:UnitTextBox x:Name="SeasonPenaltyPerBsNoneInput" Unit="€/GA" TextChanged="SeasonPenaltyPerBsInput_TextChanged"
+                                                  Width="100" Margin="222,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                            </Grid>
+                        </GroupBox>
                     </Grid>
 
                     <GroupBox Grid.Column="1" Grid.Row="1" Header="Zu-/Abschläge" Margin="0,0,10,10" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
@@ -512,13 +522,17 @@
                             <Label Content="Absolut:" Grid.Column="1" Margin="10,100,10,10"/>
                             <ctrl:UnitTextBox x:Name="SeasonModifierAbsInput" Unit="€/kg" TextChanged="SeasonModifierAbsInput_TextChanged"
                                              Grid.Column="2" Width="86" Margin="0,100,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                            <CheckBox x:Name="SeasonModifierActiveInput" Content="In Übernahme-Fenster anzeigen"
+                                      Grid.Column="1" Grid.ColumnSpan="2" Margin="10,134,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                      Checked="SeasonModifier_Changed" Unchecked="SeasonModifier_Changed"/>
                         </Grid>
                     </GroupBox>
                 </Grid>
             </TabItem>
             <TabItem Header="Parameter">
-                <Grid>
-                    <GroupBox x:Name="ParameterAreaComGroup" Header="Berechnung Flächenbindungen (aktuelle Saison)" Margin="10,10,10,10" VerticalAlignment="Top">
+                <StackPanel>
+                    <GroupBox x:Name="ParameterAreaComGroup" Header="Berechnung Flächenbindungen (aktuelle Saison)" Margin="10,10,10,0" VerticalAlignment="Top">
                         <Grid>
                             <CheckBox x:Name="ParameterAllowAttrIntoLowerInput" Content="Erlauben Lieferungen auch auf (konfigurierte) &quot;schlechtere&quot; Flächenbindungen aufzuteilen"
                                       VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,10,10,10"
@@ -532,7 +546,33 @@
                             </CheckBox>
                         </Grid>
                     </GroupBox>
-                </Grid>
+
+                    <GroupBox Header="Daten-Export" Margin="10,10,10,10">
+                        <Grid>
+                            <Label Content="Version EBICS-Überweisung:" Margin="10,10,10,10"/>
+                            <ComboBox x:Name="ParameterExportEbicsVersion" Margin="180,10,10,10" Width="50"
+                                      HorizontalAlignment="Left">
+                                <ComboBoxItem>3</ComboBoxItem>
+                                <ComboBoxItem>4</ComboBoxItem>
+                                <ComboBoxItem>5</ComboBoxItem>
+                                <ComboBoxItem>6</ComboBoxItem>
+                                <ComboBoxItem>7</ComboBoxItem>
+                                <ComboBoxItem>8</ComboBoxItem>
+                                <ComboBoxItem IsSelected="True">9</ComboBoxItem>
+                                <ComboBoxItem>10</ComboBoxItem>
+                                <ComboBoxItem>11</ComboBoxItem>
+                            </ComboBox>
+
+                            <Label Content="Adressen EBICS-Überweisung:" Margin="10,40,10,10"/>
+                            <ComboBox x:Name="ParameterExportEbicsAddress" Margin="180,40,10,10" Width="150"
+                                      HorizontalAlignment="Left">
+                                <ComboBoxItem>Nicht anführen</ComboBoxItem>
+                                <ComboBoxItem>Adresszeilen</ComboBoxItem>
+                                <ComboBoxItem IsSelected="True">Vollwertig</ComboBoxItem>
+                            </ComboBox>
+                        </Grid>
+                    </GroupBox>
+                </StackPanel>
             </TabItem>
             <TabItem Header="Textelemente">
                 <ScrollViewer VerticalScrollBarVisibility="Visible">

Elwig/Windows/BaseDataWindow.xaml.Mod.cs

@@ -134,11 +134,13 @@ namespace Elwig.Windows {
                 SeasonModifierNameInput.Text = "";
                 SeasonModifierRelInput.Text = "";
                 SeasonModifierAbsInput.Text = "";
+                SeasonModifierActiveInput.IsChecked = false;
             } else {
                 SeasonModifierIdInput.Text = mod.ModId;
                 SeasonModifierNameInput.Text = mod.Name;
                 SeasonModifierRelInput.Text = (mod.Rel * 100)?.ToString() ?? "";
                 SeasonModifierAbsInput.Text = mod.Abs?.ToString() ?? "";
+                SeasonModifierActiveInput.IsChecked = mod.IsActive;
             }
             _modUpdate = false;
         }
@@ -154,6 +156,7 @@ namespace Elwig.Windows {
             mod.Name = SeasonModifierNameInput.Text;
             mod.Rel = decimal.TryParse(SeasonModifierRelInput.Text, out var vRel) ? vRel / 100 : null;
             mod.AbsValue = decimal.TryParse(SeasonModifierAbsInput.Text, out var vAbs) ? Utils.DecToDb(vAbs, s.Precision) : null;
+            mod.IsActive = SeasonModifierActiveInput.IsChecked ?? false;
 
             CollectionViewSource.GetDefaultView(_modList).Refresh();
             UpdateButtons();

Elwig/Windows/BaseDataWindow.xaml.Season.cs

@@ -1,10 +1,14 @@
-using Elwig.Helpers;
+using Elwig.Dialogs;
+using Elwig.Helpers;
 using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 
 namespace Elwig.Windows {
     public partial class BaseDataWindow {
@@ -13,17 +17,23 @@ namespace Elwig.Windows {
         private bool _seasonUpdate = false;
 
         private async Task SeasonsInitEditing(AppDbContext ctx) {
+            SeasonAddButton.IsEnabled = false;
+            SeasonRemoveButton.IsEnabled = false;
             ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons
                 .OrderByDescending(s => s.Year)
                 .Include(s => s.Modifiers)
+                .Include(s => s.Currency)
                 .ToListAsync());
             SeasonList_SelectionChanged(null, null);
         }
 
         private async Task SeasonsFinishEditing(AppDbContext ctx) {
+            SeasonAddButton.IsEnabled = true;
+            SeasonRemoveButton.IsEnabled = true;
             ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons
                 .OrderByDescending(s => s.Year)
                 .Include(s => s.Modifiers)
+                .Include(s => s.Currency)
                 .ToListAsync());
             _seasonChanged = false;
         }
@@ -49,13 +59,17 @@ namespace Elwig.Windows {
                 SeasonPenaltyPerKgInput.Text = s.PenaltyPerKg?.ToString() ?? "";
                 SeasonPenaltyInput.Text = s.PenaltyAmount?.ToString() ?? "";
                 SeasonPenaltyNoneInput.Text = s.PenaltyNone?.ToString() ?? "";
+                SeasonPenaltyPerBsInput.Text = s.PenaltyPerBsAmount?.ToString() ?? "";
+                SeasonPenaltyPerBsNoneInput.Text = s.PenaltyPerBsNone?.ToString() ?? "";
                 SeasonBsValueInput.Text = s.BusinessShareValue?.ToString() ?? "";
 
-                var sym = s.Currency.Symbol ?? "";
+                var sym = s.Currency.Symbol ?? s.Currency.Code;
                 SeasonModifierAbsInput.Unit = $"{sym}/kg";
                 SeasonPenaltyPerKgInput.Unit = $"{sym}/kg";
                 SeasonPenaltyInput.Unit = sym;
                 SeasonPenaltyNoneInput.Unit = sym;
+                SeasonPenaltyPerBsInput.Unit = $"{sym}/GA";
+                SeasonPenaltyPerBsNoneInput.Unit = $"{sym}/GA";
                 SeasonBsValueInput.Unit = $"{sym}/GA";
                 AreaCommitmentTypePenaltyPerKgInput.Unit = $"{sym}/kg";
                 AreaCommitmentTypePenaltyInput.Unit = sym;
@@ -72,6 +86,8 @@ namespace Elwig.Windows {
                 SeasonPenaltyPerKgInput.Text = "";
                 SeasonPenaltyInput.Text = "";
                 SeasonPenaltyNoneInput.Text = "";
+                SeasonPenaltyPerBsInput.Text = "";
+                SeasonPenaltyPerBsNoneInput.Text = "";
                 SeasonBsValueInput.Text = "";
             }
             _seasonUpdate = false;
@@ -94,6 +110,8 @@ namespace Elwig.Windows {
             s.PenaltyPerKg = (SeasonPenaltyPerKgInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerKgInput.Text) : null;
             s.PenaltyAmount = (SeasonPenaltyInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyInput.Text) : null;
             s.PenaltyNone = (SeasonPenaltyNoneInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyNoneInput.Text) : null;
+            s.PenaltyPerBsAmount = (SeasonPenaltyPerBsInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerBsInput.Text) : null;
+            s.PenaltyPerBsNone = (SeasonPenaltyPerBsNoneInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerBsNoneInput.Text) : null;
             s.BusinessShareValue = (SeasonBsValueInput.Text.Length > 0) ? decimal.Parse(SeasonBsValueInput.Text) : null;
 
             UpdateButtons();
@@ -119,5 +137,91 @@ namespace Elwig.Windows {
             InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 4, 2));
             Season_Changed(sender, evt);
         }
+
+        private void SeasonPenaltyPerBsInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            if (SeasonList.SelectedItem is not Season s) return;
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 4, s.Precision));
+            Season_Changed(sender, evt);
+        }
+
+        private async void SeasonAddButton_Click(object sender, RoutedEventArgs evt) {
+            var s = SeasonList.ItemsSource.Cast<Season>().FirstOrDefault();
+            var year = Utils.CurrentYear;
+            if (year == s?.Year) year++;
+
+            List<Currency> currencies;
+            using (var ctx = new AppDbContext()) {
+                currencies = await ctx.Currencies
+                    .OrderBy(c => c.Code)
+                    .ToListAsync();
+            }
+            var d = new NewSeasonDialog(s, currencies);
+            if (d.ShowDialog() == true) {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    using var ctx = new AppDbContext();
+                    ctx.Add(new Season {
+                        Year = year,
+                        CurrencyCode = d.CurrencyCode,
+                        Precision = d.Precision,
+                        MaxKgPerHa = s?.MaxKgPerHa ?? 10000,
+                        VatNormal = s?.VatNormal ?? 0.10,
+                        VatFlatrate = s?.VatFlatrate ?? 0.13,
+                        MinKgPerBusinessShare = s?.MinKgPerBusinessShare ?? 500,
+                        MaxKgPerBusinessShare = s?.MaxKgPerBusinessShare ?? 1000,
+                        PenaltyPerKgValue = s?.PenaltyPerKgValue,
+                        PenaltyAmoutValue = s?.PenaltyAmoutValue,
+                        PenaltyNoneValue = s?.PenaltyNoneValue,
+                        PenaltyPerBsAmountValue = s?.PenaltyPerBsAmountValue,
+                        PenaltyPerBsNoneValue = s?.PenaltyPerBsNoneValue,
+                        BusinessShareValueValue = s?.BusinessShareValueValue,
+                        CalcMode = s?.CalcMode ?? 0,
+                    });
+                    if (s != null && d.CopyModifiers) {
+                        int mult = d.Precision > s.Precision ? (int)Math.Pow(10, d.Precision - s.Precision) : 1;
+                        int div = d.Precision < s.Precision ? (int)Math.Pow(10, s.Precision - d.Precision) : 1;
+                        ctx.AddRange(s.Modifiers.Select(m => new Modifier {
+                            Year = year,
+                            ModId = m.ModId,
+                            Ordering = m.Ordering,
+                            Name = m.Name,
+                            AbsValue = m.AbsValue * mult / div,
+                            RelValue = m.RelValue,
+                            IsActive = m.IsActive,
+                        }));
+                    }
+                    await ctx.SaveChangesAsync();
+                } catch (Exception exc) {
+                    var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                    MessageBox.Show(str, "Saison anlegen", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+                await App.HintContextChange();
+                Mouse.OverrideCursor = null;
+                SeasonList.SelectedIndex = 0;
+            }
+        }
+
+        private async void SeasonRemoveButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonList.SelectedItem is not Season s)
+                return;
+            var r = MessageBox.Show(
+                $"Soll die Saison {s.Year} wirklich unwiderruflich gelöscht werden?",
+                "Saison löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+            if (r == MessageBoxResult.OK) {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    using var ctx = new AppDbContext();
+                    ctx.Remove(s);
+                    await ctx.SaveChangesAsync();
+                } catch (Exception exc) {
+                    var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                    MessageBox.Show(str, "Saison löschen", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+                await App.HintContextChange();
+                Mouse.OverrideCursor = null;
+            }
+        }
     }
 }

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -19,6 +19,7 @@ namespace Elwig.Windows {
                 ClientAddressInput, ClientPlzInput, ClientOrtInput,
             ];
             ExemptInputs = [
+                BranchList, AreaCommitmentTypeList, WineAttributeList, WineCultivationList, SeasonList, SeasonModifierList,
                 ClientNameFull,
                 BranchIdInput, BranchNameInput, BranchPlzInput, BranchOrtInput,
                 BranchAddressInput, BranchPhoneNrInput, BranchFaxNrInput, BranchMobileNrInput,
@@ -31,6 +32,7 @@ namespace Elwig.Windows {
                 SeasonMaxKgPerHaInput, SeasonVatNormalInput, SeasonVatFlatrateInput, SeasonStartInput, SeasonEndInput,
                 SeasonMinKgPerBsInput, SeasonMaxKgPerBsInput, SeasonBsValueInput,
                 SeasonPenaltyPerKgInput, SeasonPenaltyInput, SeasonPenaltyNoneInput,
+                SeasonPenaltyPerBsInput, SeasonPenaltyPerBsNoneInput,
                 SeasonModifierIdInput, SeasonModifierNameInput, SeasonModifierRelInput, SeasonModifierAbsInput,
             ];
             WineAttributeFillLowerInput.Visibility = Visibility.Hidden;
@@ -80,6 +82,8 @@ namespace Elwig.Windows {
             SeasonPenaltyPerKgInput.IsReadOnly = true;
             SeasonPenaltyInput.IsReadOnly = true;
             SeasonPenaltyNoneInput.IsReadOnly = true;
+            SeasonPenaltyPerBsInput.IsReadOnly = true;
+            SeasonPenaltyPerBsNoneInput.IsReadOnly = true;
             SeasonBsValueInput.IsReadOnly = true;
 
             SeasonModifierIdInput.IsReadOnly = true;
@@ -90,6 +94,8 @@ namespace Elwig.Windows {
             ParameterAllowAttrIntoLowerInput.IsEnabled = false;
             ParameterAvoidUnderDeliveriesInput.IsEnabled = false;
             ParameterHonorGebundenInput.IsEnabled = false;
+            ParameterExportEbicsVersion.IsEnabled = false;
+            ParameterExportEbicsAddress.IsEnabled = false;
         }
 
         new protected void UnlockInputs() {
@@ -130,6 +136,8 @@ namespace Elwig.Windows {
             SeasonPenaltyPerKgInput.IsReadOnly = false;
             SeasonPenaltyInput.IsReadOnly = false;
             SeasonPenaltyNoneInput.IsReadOnly = false;
+            SeasonPenaltyPerBsInput.IsReadOnly = false;
+            SeasonPenaltyPerBsNoneInput.IsReadOnly = false;
             SeasonBsValueInput.IsReadOnly = false;
 
             SeasonModifierIdInput.IsReadOnly = false;
@@ -140,6 +148,8 @@ namespace Elwig.Windows {
             ParameterAllowAttrIntoLowerInput.IsEnabled = true;
             ParameterAvoidUnderDeliveriesInput.IsEnabled = true;
             ParameterHonorGebundenInput.IsEnabled = true;
+            ParameterExportEbicsVersion.IsEnabled = true;
+            ParameterExportEbicsAddress.IsEnabled = true;
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs evt) {
@@ -148,10 +158,11 @@ namespace Elwig.Windows {
 
         protected override async Task OnRenewContext(AppDbContext ctx) {
             await base.OnRenewContext(ctx);
-            FillInputs(App.Client, (await ctx.Seasons.FindAsync(Utils.CurrentLastSeason))!);
+            FillInputs(App.Client, await ctx.Seasons.FindAsync(Utils.CurrentLastSeason));
             ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons
                 .OrderByDescending(s => s.Year)
                 .Include(s => s.Modifiers)
+                .Include(s => s.Currency)
                 .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
             var year = (SeasonList.SelectedItem as Season)?.Year;
             ControlUtils.RenewItemsSource(BranchList, await ctx.Branches
@@ -274,7 +285,7 @@ namespace Elwig.Windows {
 
             using var ctx = new AppDbContext();
             ClearInputStates();
-            FillInputs(App.Client, (await ctx.Seasons.FindAsync(Utils.CurrentLastSeason))!);
+            FillInputs(App.Client, await ctx.Seasons.FindAsync(Utils.CurrentLastSeason));
             LockInputs();
         }
 
@@ -294,7 +305,7 @@ namespace Elwig.Windows {
 
             using var ctx = new AppDbContext();
             ClearInputStates();
-            FillInputs(App.Client, (await ctx.Seasons.FindAsync(Utils.CurrentLastSeason))!);
+            FillInputs(App.Client, await ctx.Seasons.FindAsync(Utils.CurrentLastSeason));
             UpdateButtons();
         }
 
@@ -325,14 +336,14 @@ namespace Elwig.Windows {
 
             using (var ctx = new AppDbContext()) {
                 ClearInputStates();
-                FillInputs(App.Client, (await ctx.Seasons.FindAsync(Utils.CurrentLastSeason))!);
+                FillInputs(App.Client, await ctx.Seasons.FindAsync(Utils.CurrentLastSeason));
                 LockInputs();
             }
 
-            await HintContextChange();
+            await App.HintContextChange();
         }
 
-        private void FillInputs(ClientParameters p, Season s) {
+        private void FillInputs(ClientParameters p, Season? s) {
             ClearOriginalValues();
             ClearDefaultValues();
 
@@ -363,9 +374,11 @@ namespace Elwig.Windows {
             TextElementDeliveryConfirmation.Text = p.TextDeliveryConfirmation;
             TextElementCreditNote.Text = p.TextCreditNote;
 
-            ParameterAllowAttrIntoLowerInput.IsChecked = s.Billing_AllowAttrsIntoLower;
-            ParameterAvoidUnderDeliveriesInput.IsChecked = s.Billing_AvoidUnderDeliveries;
-            ParameterHonorGebundenInput.IsChecked = s.Billing_HonorGebunden;
+            ParameterAllowAttrIntoLowerInput.IsChecked = s?.Billing_AllowAttrsIntoLower ?? false;
+            ParameterAvoidUnderDeliveriesInput.IsChecked = s?.Billing_AvoidUnderDeliveries ?? false;
+            ParameterHonorGebundenInput.IsChecked = s?.Billing_HonorGebunden ?? false;
+            ParameterExportEbicsVersion.SelectedIndex = p.ExportEbicsVersion - 3;
+            ParameterExportEbicsAddress.SelectedIndex = p.ExportEbicsAddress;
 
             FinishInputFilling();
         }
@@ -393,6 +406,9 @@ namespace Elwig.Windows {
             p.TextDeliveryConfirmation = TextElementDeliveryConfirmation.Text.Length > 0 ? TextElementDeliveryConfirmation.Text : null;
             p.TextCreditNote = TextElementCreditNote.Text.Length > 0 ? TextElementCreditNote.Text : null;
 
+            p.ExportEbicsVersion = ParameterExportEbicsVersion.SelectedIndex + 3;
+            p.ExportEbicsAddress = ParameterExportEbicsAddress.SelectedIndex;
+
             await p.UpdateValues();
         }
 

Elwig/Windows/ChartWindow.xaml

@@ -6,7 +6,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
-        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
         mc:Ignorable="d"
         Title="Auszahlung - Elwig" Height="700" Width="1500" MinWidth="1000" MinHeight="500"
@@ -70,10 +69,10 @@
             </Grid.ColumnDefinitions>
 
             <Label Content="Für:" Margin="10,-2,0,0" FontSize="14" Grid.Column="0" VerticalAlignment="Center"/>
-            <xctk:CheckComboBox x:Name="VaributeInput" Margin="50,0,0,0" Grid.Column="0" Width="500" Height="25" HorizontalAlignment="Left"
+            <ctrl:CheckComboBox x:Name="VaributeInput" Margin="50,0,0,0" Grid.Column="0" Width="500" Height="25" HorizontalAlignment="Left"
                                 IsSelectAllActive="True" SelectAllContent="Alle Sorten" Delimiter=", " AllItemsSelectedContent="Alle Sorten"
-                                IsEnabled="False" ItemSelectionChanged="VaributeInput_Changed">
-                <xctk:CheckComboBox.ItemTemplate>
+                                IsEnabled="False" SelectionChanged="VaributeInput_Changed">
+                <ctrl:CheckComboBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
                             <TextBlock Text="{Binding Variety.Name}" Width="150"/>
@@ -84,8 +83,8 @@
                             <TextBlock Text="{Binding AssignedAbgewGraphId}" Width="30"/>
                         </StackPanel>
                     </DataTemplate>
-                </xctk:CheckComboBox.ItemTemplate>
-            </xctk:CheckComboBox>
+                </ctrl:CheckComboBox.ItemTemplate>
+            </ctrl:CheckComboBox>
 
             <CheckBox x:Name="AbgewertetInput" Content="Abgewertet" IsEnabled="False" Checked="AbgewertetInput_Changed" Unchecked="AbgewertetInput_Changed"
                       VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,0,0" Grid.Column="1"/>
@@ -139,12 +138,12 @@
 
                     <Label Content="Oechsle:" Margin="10,10,0,0" Grid.Column="0"/>
                     <ctrl:UnitTextBox x:Name="OechsleInput" Unit="°Oe" TextChanged="OechsleInput_TextChanged" IsEnabled="False" LostFocus="OechsleInput_LostFocus"
-                        Grid.Column="1" Width="90" Margin="0,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                                      Grid.Column="1" Width="90" Margin="0,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
 
                     <Label Content="Preis:" Margin="10,40,0,0" Grid.Column="0"/>
                     <ctrl:UnitTextBox x:Name="PriceInput" Unit="€/kg" TextChanged="PriceInput_TextChanged" IsEnabled="False" LostFocus="PriceInput_LostFocus"
-                        Grid.Column="1" Width="90" Margin="0,40,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                                      Grid.Column="1" Width="90" Margin="0,40,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                 </Grid>
             </GroupBox>
 

Elwig/Windows/ChartWindow.xaml.cs

@@ -9,13 +9,9 @@ using Elwig.Controls;
 using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using Elwig.Models.Entities;
-using Microsoft.EntityFrameworkCore.ChangeTracking;
 using ScottPlot.Plottables;
 using ScottPlot;
-using Xceed.Wpf.Toolkit.Primitives;
 using ScottPlot.Control;
-using System.Text.Json;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 
 namespace Elwig.Windows {
     public partial class ChartWindow : ContextWindow {
@@ -196,6 +192,8 @@ namespace Elwig.Windows {
             ControlUtils.SelectItems(VaributeInput, SelectedGraphEntry?.Vaributes ?? []);
 
             InitPlot();
+            ChangeActiveGraph(SelectedGraphEntry?.DataGraph);
+            OechsleInput.Text = "73";
             OechslePricePlot.IsEnabled = true;
             FillingInputs = false;
         }
@@ -219,10 +217,6 @@ namespace Elwig.Windows {
             DataPlot.Color = ColorUngebunden;
             DataPlot.MarkerStyle = new MarkerStyle(MarkerShape.FilledCircle, 9, ColorUngebunden);
 
-            if (SelectedGraphEntry?.GebundenGraph == null) {
-                ChangeActiveGraph(SelectedGraphEntry?.DataGraph);
-            }
-
             OechslePricePlot.Interaction.Enable(new PlotActions() {
                 ZoomIn = StandardActions.ZoomIn,
                 ZoomOut = StandardActions.ZoomOut,
@@ -509,7 +503,7 @@ namespace Elwig.Windows {
                 ChangeMarker(PrimaryMarkedPointPlot, true, ActiveGraph!.GetOechsleAt(PrimaryMarkedPoint), ActiveGraph.GetPriceAt(PrimaryMarkedPoint));
 
                 OechsleInput.Text = Highlighted.Graph!.GetOechsleAt(Highlighted.Index).ToString();
-                PriceInput.Text = Highlighted.Graph.GetPriceAt(Highlighted.Index).ToString();
+                PriceInput.Text = Math.Round(Highlighted.Graph.GetPriceAt(Highlighted.Index), Season.Precision).ToString();
 
                 EnableActionButtons();
             } else {
@@ -724,26 +718,31 @@ namespace Elwig.Windows {
             }
         }
 
-        private void VaributeInput_Changed(object sender, ItemSelectionChangedEventArgs e) {
-            if (FillingInputs || e.Item is not Varibute v) return;
+        private void VaributeInput_Changed(object sender, SelectionChangedEventArgs evt) {
+            if (FillingInputs) return;
             var isOpen = VaributeInput.IsDropDownOpen;
-            if (e.IsSelected) {
-                if (RemoveVaributeFromOthers(e.Item.ToString())) {
+
+            foreach (var i in evt.AddedItems) {
+                if (i is not Varibute v) continue;
+                if (RemoveVaributeFromOthers(v.ToString())) {
                     if (AbgewertetInput.IsChecked == true) {
                         v.AssignedAbgewGraphId = SelectedGraphEntry?.Id;
                     } else {
                         v.AssignedGraphId = SelectedGraphEntry?.Id;
                     }
                 } else {
-                    VaributeInput.SelectedItems.Remove(e.Item);
+                    VaributeInput.SelectedItems.Remove(v);
                 }
-            } else {
+            }
+            foreach (var i in evt.RemovedItems) {
+                if (i is not Varibute v) continue;
                 if (AbgewertetInput.IsChecked == true) {
                     v.AssignedAbgewGraphId = null;
                 } else {
                     v.AssignedGraphId = null;
                 }
             }
+
             SelectedGraphEntry!.Vaributes = VaributeInput.SelectedItems.Cast<Varibute>().ToList();
             SetHasChanged();
             GraphList.Items.Refresh();

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -1,9 +1,10 @@
-<local:AdministrationWindow x:Class="Elwig.Windows.DeliveryAdminWindow"
+<local:AdministrationWindow
+        x:Class="Elwig.Windows.DeliveryAdminWindow"
+        AutomationProperties.AutomationId="DeliveryAdminWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
-        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         Title="Lieferungen - Elwig" Height="720" Width="1100" MinHeight="720" MinWidth="1000"
         Loaded="Window_Loaded">
     <Window.Resources>
@@ -35,7 +36,7 @@
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="VerticalAlignment" Value="Top"/>
         </Style>
-        <Style TargetType="xctk:CheckComboBox">
+        <Style TargetType="ctrl:CheckComboBox">
             <Setter Property="Height" Value="25"/>
             <Setter Property="FontSize" Value="14"/>
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
@@ -175,9 +176,9 @@
                     </TextBlock>
                 </TextBox.ToolTip>
             </TextBox>
-            <xctk:IntegerUpDown x:Name="SeasonInput" Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1000" Maximum="9999"
-                                Margin="0,10,100,0" VerticalAlignment="Top" HorizontalAlignment="Right"
-                                ValueChanged="SeasonInput_ValueChanged"/>
+            <ctrl:IntegerUpDown x:Name="SeasonInput" Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1900" Maximum="9999"
+                                Margin="0,10,100,0" VerticalAlignment="Top" HorizontalAlignment="Right" Text="2020"
+                                TextChanged="SeasonInput_TextChanged"/>
             <CheckBox x:Name="TodayOnlyInput" Content="Nur heute"
                       HorizontalAlignment="Right" Margin="0,7,18,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"
                       Checked="TodayOnlyInput_Changed" Unchecked="TodayOnlyInput_Changed"/>
@@ -474,9 +475,9 @@
                     </Grid.ColumnDefinitions>
 
                     <Label Content="Zu-/Abschläge:" Margin="10,10,0,10"/>
-                    <xctk:CheckComboBox x:Name="ModifiersInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
+                    <ctrl:CheckComboBox x:Name="ModifiersInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
                                         ItemTemplate="{StaticResource ModifierTemplate}" Delimiter=", " AllItemsSelectedContent="Alle"
-                                        ItemSelectionChanged="ModifiersInput_SelectionChanged"/>
+                                        SelectionChanged="ModifiersInput_SelectionChanged"/>
 
                     <Label Content="Anmerkung:" Margin="10,40,0,10"/>
                     <TextBox x:Name="PartCommentInput" Grid.Column="1" Margin="0,40,10,10" Grid.ColumnSpan="2"

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -19,7 +19,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Elwig.Windows {
     public partial class DeliveryAdminWindow : AdministrationWindow {
@@ -1067,7 +1066,7 @@ namespace Elwig.Windows {
 
             await RefreshDeliveryList();
             var d = DeliveryList.SelectedItem as Delivery;
-            var y = d?.Year ?? Utils.CurrentLastSeason;
+            var y = d?.Year ?? SeasonInput.Value;
             ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
                 .Where(m => m.IsActive || !IsCreating)
                 .Include(m => m.PostalDest.AtPlz!.Ort)
@@ -1084,7 +1083,11 @@ namespace Elwig.Windows {
             cultList.Insert(0, new NullItem(""));
             ControlUtils.RenewItemsSource(CultivationInput, cultList, null, ControlUtils.RenewSourceDefault.First);
             ControlUtils.RenewItemsSource(WineQualityLevelInput, await ctx.WineQualityLevels.ToListAsync());
-            ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers.Where(m => m.Year == y).OrderBy(m => m.Ordering).ToListAsync());
+            ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
+                .Where(m => m.Year == y && (!IsCreating || m.IsActive))
+                .OrderBy(m => m.Ordering)
+                .Include(m => m.Season.Currency)
+                .ToListAsync());
             ControlUtils.RenewItemsSource(WineOriginInput, (await ctx.WineOrigins.ToListAsync()).OrderByDescending(o => o.SortKey).ThenBy(o => o.HkId));
             var kgList = (await ctx.Katastralgemeinden
                 .Where(k => k.WbKg != null)
@@ -1112,10 +1115,18 @@ namespace Elwig.Windows {
         private async Task RefreshDeliveryParts() {
             using var ctx = new AppDbContext();
             if (DeliveryList.SelectedItem is Delivery d) {
-                ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers.Where(m => m.Year == d.Year).OrderBy(m => m.Ordering).ToListAsync());
+                ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
+                    .Where(m => m.Year == d.Year && (!IsCreating || m.IsActive))
+                    .OrderBy(m => m.Ordering)
+                    .Include(m => m.Season.Currency)
+                    .ToListAsync());
                 ControlUtils.RenewItemsSource(DeliveryPartList, d.FilteredParts.OrderBy(p => p.DPNr).ToList(), DeliveryPartList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
             } else {
-                ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers.Where(m => m.Year == Utils.CurrentLastSeason).OrderBy(m => m.Ordering).ToListAsync());
+                ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
+                    .Where(m => m.Year == SeasonInput.Value && (!IsCreating || m.IsActive))
+                    .OrderBy(m => m.Ordering)
+                    .Include(m => m.Season.Currency)
+                    .ToListAsync());
                 DeliveryPartList.ItemsSource = null;
             }
         }
@@ -1267,7 +1278,10 @@ namespace Elwig.Windows {
                     ctx.Add(p);
                 }
 
-                ctx.UpdateDeliveryPartModifiers(p, ModifiersInput.SelectedItems.Cast<Modifier>());
+                ctx.UpdateDeliveryPartModifiers(p, await ctx.DeliveryPartModifiers
+                    .Where(m => m.Year == p.Year && m.DId == p.DId && m.DPNr == p.DPNr)
+                    .Select(m => m.Modifier)
+                    .ToListAsync(), ModifiersInput.SelectedItems.Cast<Modifier>());
 
                 if (originalMgNr != null && originalMgNr.Value != d.MgNr) {
                     // update origin (KgNr), if default is selected
@@ -1344,8 +1358,8 @@ namespace Elwig.Windows {
             await RefreshDeliveryListQuery(true);
         }
 
-        private async void SeasonInput_ValueChanged(object sender, RoutedEventArgs evt) {
-            if (SeasonInput.Value == null) return;
+        private async void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            if (SeasonInput.Value == null || TodayOnlyInput == null || AllSeasonsInput == null) return;
             TodayOnlyInput.IsChecked = false;
             AllSeasonsInput.IsChecked = false;
             await RefreshDeliveryListQuery();
@@ -1541,6 +1555,11 @@ namespace Elwig.Windows {
             var attrList = await ctx.WineAttributes.Where(a => a.IsActive).OrderBy(a => a.Name).Cast<object>().ToListAsync();
             attrList.Insert(0, new NullItem(""));
             ControlUtils.RenewItemsSource(AttributeInput, attrList, null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
+                .Where(m => m.Year == SeasonInput.Value && m.IsActive)
+                .OrderBy(m => m.Ordering)
+                .Include(m => m.Season.Currency)
+                .ToListAsync());
             ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
                 .Where(m => m.IsActive || !IsReceipt)
                 .Include(m => m.PostalDest.AtPlz!.Ort)
@@ -1592,7 +1611,7 @@ namespace Elwig.Windows {
                     p2.HkId = "OEST";
                     ctx.Add(p2);
 
-                    ctx.UpdateDeliveryPartModifiers(p2, p.Modifiers);
+                    ctx.UpdateDeliveryPartModifiers(p2, [], p.Modifiers);
                 }
                 await ctx.SaveChangesAsync();
                 await RefreshDeliveryParts();
@@ -2047,7 +2066,7 @@ namespace Elwig.Windows {
 
         }
 
-        private void ModifiersInput_SelectionChanged(object sender, ItemSelectionChangedEventArgs evt) {
+        private void ModifiersInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
             if (!IsEditing && !IsCreating) return;
             var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
             var source = ModifiersInput.ItemsSource.Cast<Modifier>();

Elwig/Windows/DocumentViewerWindow.xaml

@@ -1,4 +1,5 @@
 <Window x:Class="Elwig.Windows.DocumentViewerWindow"
+        AutomationProperties.AutomationId="DocumentViewerWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

Elwig/Windows/MailWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
-        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
         mc:Ignorable="d"
         MinWidth="650" MinHeight="400" Height="600" Width="950"
         Closed="Window_Closed"
@@ -54,7 +54,7 @@
                     <Button x:Name="DocumentAddButton" Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="14"
                             Grid.Column="1" Margin="0,0,0,30" VerticalAlignment="Center" Height="25" IsEnabled="False"
                             Click="DocumentAddButton_Click"/>
-                    <Button x:Name="DocumentRemoveButton" Content="&#xE74D;" FontFamily="Segoe MDL2 Assets" FontSize="14" Padding="1.5,0,0,0"
+                    <Button x:Name="DocumentRemoveButton" Content="&#xE74D;" FontFamily="Segoe MDL2 Assets" FontSize="16" Padding="1.5,0,0,0"
                             Grid.Column="1" Margin="0,30,0,0" VerticalAlignment="Center" Height="25" IsEnabled="False"
                             Click="DocumentRemoveButton_Click"/>
 
@@ -94,9 +94,10 @@
 
                 <TextBox x:Name="PostalLocation" Grid.Column="1"
                          Margin="10,30,10,10" Width="120" HorizontalAlignment="Left"/>
-                <Label Margin="130,30,10,10" FontSize="14" Grid.Column="1">
-                    <TextBlock>, am <Run x:Name="PostalDate">01.01.2020</Run></TextBlock>
-                </Label>
+                <Label Content=", am" Margin="130,30,10,10" FontSize="14" Grid.Column="1"/>
+                <TextBox x:Name="PostalDate" Grid.Column="1" Text="01.01.2020"
+                         Margin="162,30,10,10" Width="78" HorizontalAlignment="Left"
+                         TextChanged="Date_TextChanged" LostFocus="Date_LostFocus"/>
 
                 <GroupBox Header="Adressaten" Margin="10,70,10,47" Grid.Column="1">
                     <Grid>
@@ -117,26 +118,26 @@
                                      Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
 
                         <Label Content="Zwst.:" x:Name="MemberBranchLabel" Margin="10,120,0,10"/>
-                        <xctk:CheckComboBox x:Name="MemberBranchInput" AllItemsSelectedContent="Alle Stammzweigstellen" Delimiter=", " DisplayMemberPath="Name"
+                        <ctrl:CheckComboBox x:Name="MemberBranchInput" AllItemsSelectedContent="Alle Stammzweigstellen" Delimiter=", " DisplayMemberPath="Name"
                                             Margin="50,120,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
-                                            ItemSelectionChanged="MemberInput_SelectionChanged"/>
+                                            SelectionChanged="MemberInput_SelectionChanged"/>
 
                         <Label Content="Gem.:" x:Name="MemberKgLabel" Margin="10,150,0,10"/>
-                        <xctk:CheckComboBox x:Name="MemberKgInput" AllItemsSelectedContent="Alle Stammgemeinden" Delimiter=", " DisplayMemberPath="Name"
+                        <ctrl:CheckComboBox x:Name="MemberKgInput" AllItemsSelectedContent="Alle Stammgemeinden" Delimiter=", " DisplayMemberPath="Name"
                                             IsSelectAllActive="True" SelectAllContent="Alle Stammgemeinden"
                                             Margin="50,150,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
-                                            ItemSelectionChanged="MemberInput_SelectionChanged"/>
+                                            SelectionChanged="MemberInput_SelectionChanged"/>
 
                         <Label Content="Vtrg.:" x:Name="MemberAreaComLabel" Margin="10,180,0,10"/>
-                        <xctk:CheckComboBox x:Name="MemberAreaComInput" AllItemsSelectedContent="Alle Vertragsarten" Delimiter=", " DisplayMemberPath="VtrgId"
+                        <ctrl:CheckComboBox x:Name="MemberAreaComInput" AllItemsSelectedContent="Alle Vertragsarten" Delimiter=", " DisplayMemberPath="VtrgId"
                                             IsSelectAllActive="True" SelectAllContent="Alle Vertragsarten"
                                             Margin="50,180,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
-                                            ItemSelectionChanged="MemberInput_SelectionChanged"/>
+                                            SelectionChanged="MemberInput_SelectionChanged"/>
 
-                        <xctk:CheckComboBox x:Name="MemberCustomInput" AllItemsSelectedContent="Alle Mitglieder" Delimiter=", " DisplayMemberPath="AdministrativeName"
+                        <ctrl:CheckComboBox x:Name="MemberCustomInput" AllItemsSelectedContent="Alle Mitglieder" Delimiter=", " DisplayMemberPath="AdministrativeName"
                                             IsSelectAllActive="True" SelectAllContent="Alle Mitglieder"
                                             Margin="10,120,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
-                                            ItemSelectionChanged="MemberInput_SelectionChanged"/>
+                                            SelectionChanged="MemberInput_SelectionChanged"/>
                     </Grid>
                 </GroupBox>
 

Elwig/Windows/MailWindow.xaml.cs

@@ -53,38 +53,38 @@ namespace Elwig.Windows {
             CreditNote.Name,
         ];
 
-        public readonly int? Year;
+        public readonly int Year;
         public ObservableCollection<SelectedDoc> SelectedDocs = [];
         public IEnumerable<Member> Recipients = [];
 
         protected Document? PrintDocument;
         protected Dictionary<Member, List<Document>>? EmailDocuments;
 
-        public static readonly DependencyProperty PostalAllCountProperty = DependencyProperty.Register("PostalAllCount", typeof(int), typeof(MailWindow));
+        public static readonly DependencyProperty PostalAllCountProperty = DependencyProperty.Register(nameof(PostalAllCount), typeof(int), typeof(MailWindow));
         public int PostalAllCount {
             get => (int)GetValue(PostalAllCountProperty);
             private set => SetValue(PostalAllCountProperty, value);
         }
 
-        public static readonly DependencyProperty PostalWishCountProperty = DependencyProperty.Register("PostalWishCount", typeof(int), typeof(MailWindow));
+        public static readonly DependencyProperty PostalWishCountProperty = DependencyProperty.Register(nameof(PostalWishCount), typeof(int), typeof(MailWindow));
         public int PostalWishCount {
             get => (int)GetValue(PostalWishCountProperty);
             private set => SetValue(PostalWishCountProperty, value);
         }
 
-        public static readonly DependencyProperty PostalNoEmailCountProperty = DependencyProperty.Register("PostalNoEmailCount", typeof(int), typeof(MailWindow));
+        public static readonly DependencyProperty PostalNoEmailCountProperty = DependencyProperty.Register(nameof(PostalNoEmailCount), typeof(int), typeof(MailWindow));
         public int PostalNoEmailCount {
             get => (int)GetValue(PostalNoEmailCountProperty);
             private set => SetValue(PostalNoEmailCountProperty, value);
         }
 
-        public static readonly DependencyProperty EmailAllCountProperty = DependencyProperty.Register("EmailAllCount", typeof(int), typeof(MailWindow));
+        public static readonly DependencyProperty EmailAllCountProperty = DependencyProperty.Register(nameof(EmailAllCount), typeof(int), typeof(MailWindow));
         public int EmailAllCount {
             get => (int)GetValue(EmailAllCountProperty);
             private set => SetValue(EmailAllCountProperty, value);
         }
 
-        public static readonly DependencyProperty EmailWishCountProperty = DependencyProperty.Register("EmailWishCount", typeof(int), typeof(MailWindow));
+        public static readonly DependencyProperty EmailWishCountProperty = DependencyProperty.Register(nameof(EmailWishCount), typeof(int), typeof(MailWindow));
         public int EmailWishCount {
             get => (int)GetValue(EmailWishCountProperty);
             private set => SetValue(EmailWishCountProperty, value);
@@ -103,7 +103,7 @@ namespace Elwig.Windows {
         public MailWindow(int? year = null) {
             InitializeComponent();
             using (var ctx = new AppDbContext()) {
-                Year = year ?? ctx.Seasons.OrderBy(s => s.Year).LastOrDefault()?.Year;
+                Year = year ?? ctx.Seasons.OrderBy(s => s.Year).LastOrDefault()!.Year;
                 Title = $"Rundschreiben - Lese {Year} - Elwig";
             }
 
@@ -143,36 +143,44 @@ namespace Elwig.Windows {
                 .OrderBy(b => b.Name)
                 .ToListAsync(), MemberInput_SelectionChanged);
             if (MemberBranchInput.SelectedItems.Count == 0) {
-                MemberBranchInput.ItemSelectionChanged -= MemberInput_SelectionChanged;
+                MemberBranchInput.SelectionChanged -= MemberInput_SelectionChanged;
                 MemberBranchInput.SelectAll();
-                MemberBranchInput.ItemSelectionChanged += MemberInput_SelectionChanged;
+                MemberBranchInput.SelectionChanged += MemberInput_SelectionChanged;
             }
             ControlUtils.RenewItemsSource(MemberKgInput, await ctx.Katastralgemeinden
                 .Where(k => k.WbKg!.Members.Any())
                 .OrderBy(k => k.Name)
                 .ToListAsync(), MemberInput_SelectionChanged);
             if (MemberKgInput.SelectedItems.Count == 0) {
-                MemberKgInput.ItemSelectionChanged -= MemberInput_SelectionChanged;
+                MemberKgInput.SelectionChanged -= MemberInput_SelectionChanged;
                 MemberKgInput.SelectAll();
-                MemberKgInput.ItemSelectionChanged += MemberInput_SelectionChanged;
+                MemberKgInput.SelectionChanged += MemberInput_SelectionChanged;
             }
             ControlUtils.RenewItemsSource(MemberAreaComInput, await ctx.AreaCommitmentTypes
                 .OrderBy(a => a.VtrgId)
                 .ToListAsync(), MemberInput_SelectionChanged);
             if (MemberAreaComInput.SelectedItems.Count == 0) {
-                MemberAreaComInput.ItemSelectionChanged -= MemberInput_SelectionChanged;
+                MemberAreaComInput.SelectionChanged -= MemberInput_SelectionChanged;
                 MemberAreaComInput.SelectAll();
-                MemberAreaComInput.ItemSelectionChanged += MemberInput_SelectionChanged;
+                MemberAreaComInput.SelectionChanged += MemberInput_SelectionChanged;
             }
             ControlUtils.RenewItemsSource(MemberCustomInput, await ctx.Members
                 .Where(m => m.IsActive)
                 .OrderBy(m => m.FamilyName)
                 .ThenBy(m => m.GivenName)
+                .Include(m => m.Branch)
+                .Include(m => m.DefaultWbKg!.AtKg)
+                .Include(m => m.EmailAddresses)
+                .Include(m => m.TelephoneNumbers)
+                .Include(m => m.PostalDest.AtPlz!.Ort)
+                .Include(m => m.PostalDest.AtPlz!.Country)
+                .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
+                .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Country)
                 .ToListAsync(), MemberInput_SelectionChanged);
             if (MemberCustomInput.SelectedItems.Count == 0) {
-                MemberCustomInput.ItemSelectionChanged -= MemberInput_SelectionChanged;
+                MemberCustomInput.SelectionChanged -= MemberInput_SelectionChanged;
                 MemberCustomInput.SelectAll();
-                MemberCustomInput.ItemSelectionChanged += MemberInput_SelectionChanged;
+                MemberCustomInput.SelectionChanged += MemberInput_SelectionChanged;
             }
 
             await UpdateRecipients(ctx);
@@ -245,12 +253,14 @@ namespace Elwig.Windows {
             if (idx == 0) {
                 SelectedDocs.Add(new(DocType.MemberDataSheet, s, null));
             } else if (idx == 1) {
-                SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, ((int)Year!, DocumentNonDeliverersInput.IsChecked == true)));
+                SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, (Year, DocumentNonDeliverersInput.IsChecked == true)));
+                RecipientsDeliveryMembersInput.IsChecked = true;
             } else if (idx >= 2) {
                 using var ctx = new AppDbContext();
                 var name = s.Split(" – ")[^1];
                 var pv = ctx.PaymentVariants.Single(v => v.Year == Year && v.Name == name)!;
                 SelectedDocs.Add(new(DocType.CreditNote, s, (pv.Year, pv.AvNr)));
+                RecipientsDeliveryMembersInput.IsChecked = true;
             }
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
         }
@@ -288,34 +298,43 @@ namespace Elwig.Windows {
             await UpdateRecipients(ctx);
         }
 
-        private async void MemberInput_SelectionChanged(object sender, RoutedEventArgs evt) {
+        private async void MemberInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
             using var ctx = new AppDbContext();
             await UpdateRecipients(ctx);
         }
 
+        private void Date_TextChanged(object sender, RoutedEventArgs evt) {
+            Validator.CheckDate((TextBox)sender, true);
+        }
+
+        private void Date_LostFocus(object sender, RoutedEventArgs evt) {
+            var res = Validator.CheckDate((TextBox)sender, true);
+            if (!res.IsValid) ((TextBox)sender).Text = $"{Utils.Today:dd.MM.yyyy}";
+        }
+
         private async Task UpdateRecipients(AppDbContext ctx) {
             if (RecipientsCustomInput.IsChecked == true) {
                 Recipients = MemberCustomInput.SelectedItems.Cast<Member>().ToList();
             } else {
-                var year = (!await ctx.Deliveries.AnyAsync()) ? 0 : await ctx.Deliveries.MaxAsync(d => d.Year);
-
-                IQueryable<Member> query = ctx.Members.Where(m => m.IsActive);
+                IQueryable<Member> query = ctx.Members;
                 if (MemberBranchInput.SelectedItems.Count != MemberBranchInput.Items.Count) {
                     var zwst = MemberBranchInput.SelectedItems.Cast<Branch>().Select(b => b.ZwstId).ToList();
-                    query = query.Where(m => zwst.Contains(m.ZwstId));
+                    query = query.Where(m => zwst.Contains(m.ZwstId!));
                 }
                 if (MemberKgInput.SelectedItems.Count != MemberKgInput.Items.Count) {
                     var kgs = MemberKgInput.SelectedItems.Cast<AT_Kg>().Select(k => k.KgNr).ToList();
-                    query = query.Where(m => kgs.Contains((int)m.DefaultKgNr));
+                    query = query.Where(m => kgs.Contains((int)m.DefaultKgNr!));
                 }
 
                 if (RecipientsAreaComMembersInput.IsChecked == true) {
                     var vtrg = MemberAreaComInput.SelectedItems.Cast<AreaComType>().Select(a => a.VtrgId).ToList();
-                    query = query.Where(m => Utils.ActiveAreaCommitments(m.AreaCommitments).Any(c => vtrg.Contains(c.VtrgId)));
-                } else if (year > 0 && RecipientsDeliveryMembersInput.IsChecked == true) {
-                    query = query.Where(m => m.Deliveries.Any(d => d.Year == year));
-                } else if (year > 0 && RecipientsNonDeliveryMembersInput.IsChecked == true) {
-                    query = query.Where(m => !m.Deliveries.Any(d => d.Year == year));
+                    query = query.Where(m => m.IsActive && m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Year)).Any(c => vtrg.Contains(c.VtrgId)));
+                } else if (RecipientsDeliveryMembersInput.IsChecked == true) {
+                    query = query.Where(m => m.Deliveries.Any(d => d.Year == Year));
+                } else if (RecipientsNonDeliveryMembersInput.IsChecked == true) {
+                    query = query.Where(m => m.IsActive && !m.Deliveries.Any(d => d.Year == Year));
+                } else {
+                    query = query.Where(m => m.IsActive);
                 }
                 Recipients = await query
                     .Include(m => m.Branch)
@@ -483,6 +502,7 @@ namespace Elwig.Windows {
                 }
             }
 
+            var postalDate = DateOnly.ParseExact(PostalDate.Text, "dd.MM.yyyy");
             var memberDocs = recipients.Select(m => new {
                 Member = m,
                 Docs = docs.SelectMany<SelectedDoc, GeneratedDoc>(doc => {
@@ -490,7 +510,7 @@ namespace Elwig.Windows {
                         if (doc.Type == DocType.Custom) {
                             return [new GeneratedDoc((string)doc.Details!)];
                         } else if (doc.Type == DocType.MemberDataSheet) {
-                            return [new GeneratedDoc(new MemberDataSheet(m, ctx))];
+                            return [new GeneratedDoc(new MemberDataSheet(m, ctx) { Date = postalDate })];
                         } else if (doc.Type == DocType.DeliveryConfirmation) {
                             var details = ((int, bool))doc.Details!;
                             var year = details.Item1;
@@ -503,7 +523,7 @@ namespace Elwig.Windows {
                             } else {
                                 return [];
                             }
-                            return [new GeneratedDoc(new DeliveryConfirmation(ctx, year, m, data))];
+                            return [new GeneratedDoc(new DeliveryConfirmation(ctx, year, m, data) { Date = postalDate })];
                         } else if (doc.Type == DocType.CreditNote) {
                             var details = ((int, int))doc.Details!;
                             var year = details.Item1;
@@ -511,12 +531,13 @@ namespace Elwig.Windows {
                             var data = cnData[(year, avnr)];
                             try {
                                 return [new GeneratedDoc(new CreditNote(
-                                ctx, data.Item2[m.MgNr], data.Item1[m.MgNr],
-                                data.Item3.ConsiderContractPenalties,
-                                data.Item3.ConsiderTotalPenalty,
-                                data.Item3.ConsiderAutoBusinessShares,
-                                ctx.GetMemberUnderDelivery(year, m.MgNr).GetAwaiter().GetResult()
-                            ))];
+                                    ctx, data.Item2[m.MgNr], data.Item1[m.MgNr],
+                                    data.Item3.ConsiderContractPenalties,
+                                    data.Item3.ConsiderTotalPenalty,
+                                    data.Item3.ConsiderAutoBusinessShares,
+                                    data.Item3.ConsiderCustomModifiers,
+                                    ctx.GetMemberUnderDelivery(year, m.MgNr).GetAwaiter().GetResult()
+                                ) { Date = postalDate })];
                             } catch (Exception) {
                                 return [];
                             }
@@ -707,8 +728,9 @@ namespace Elwig.Windows {
             AvaiableDocumentsList.SelectedIndex = 1;
             if (AvaiableDocumentsList.SelectedItem is not string s || SelectedDocs.Any(d => d.Type == DocType.DeliveryConfirmation))
                 return;
-            SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, ((int)Year!, DocumentNonDeliverersInput.IsChecked == true)));
+            SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, (Year, DocumentNonDeliverersInput.IsChecked == true)));
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
+            RecipientsDeliveryMembersInput.IsChecked = true;
         }
 
         public void AddCreditNote(int index) {
@@ -720,6 +742,7 @@ namespace Elwig.Windows {
             var pv = ctx.PaymentVariants.Single(v => v.Year == Year && v.Name == name)!;
             SelectedDocs.Add(new(DocType.CreditNote, s, (pv.Year, pv.AvNr)));
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
+            RecipientsDeliveryMembersInput.IsChecked = true;
         }
     }
 }

Elwig/Windows/MainWindow.xaml

@@ -3,7 +3,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:local="clr-namespace:Elwig.Windows"
-        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
         Title="Elwig" Height="390" Width="520" ResizeMode="CanMinimize"
         Loaded="Window_Loaded" Closing="Window_Closing">
     <Window.Resources>
@@ -12,7 +12,7 @@
             <Setter Property="HorizontalAlignment" Value="Center"/>
             <Setter Property="FontSize" Value="14"/>
             <Setter Property="Padding" Value="9,3"/>
-            <Setter Property="Height" Value="32"/>
+            <Setter Property="Height" Value="35"/>
             <Setter Property="Width" Value="200"/>
         </Style>
     </Window.Resources>
@@ -54,46 +54,43 @@
         </Grid>
 
         <Button x:Name="MemberAdminButton" Content="Mitglieder" Click="MemberAdminButton_Click"
-                Margin="0,180,210,0"/>
+                Margin="0,170,205,0"/>
         <Button x:Name="MailButton" Content="Rundschreiben" Click="MailButton_Click"
-                Margin="210,180,0,0"/>
+                Margin="205,170,0,0"/>
         <Button x:Name="DeliveryAdminButton" Content="Lieferungen" Click="DeliveryAdminButton_Click"
-                Margin="0,220,210,0"/>
+                Margin="0,210,205,0"/>
         <Button x:Name="ReceiptButton" Content="Übernahme" Click="ReceiptButton_Click"
-                Margin="210,220,0,0"/>
+                Margin="205,210,0,0"/>
         <Button x:Name="BaseDataButton" Content="Stammdaten" Click="BaseDataButton_Click"
-                Margin="0,260,210,0"/>
+                Margin="0,250,205,0"/>
         <Button x:Name="RegistrationButton" Content="Anmeldungen" IsEnabled="False"
-                Margin="210,260,0,0"/>
+                Margin="205,250,0,0"/>
 
-        <Expander x:Name="SeasonFinish" Header="Leseabschluss" Expanded="SeasonFinish_Expanded" Collapsed="SeasonFinish_Collapsed"
-                  HorizontalAlignment="Center" Width="410" Margin="0,300,0,0" VerticalAlignment="Top">
+        <Expander x:Name="SeasonFinish" Header="Leseabschluss" SnapsToDevicePixels="True"
+                  Expanded="SeasonFinish_Expanded" Collapsed="SeasonFinish_Collapsed"
+                  HorizontalAlignment="Center" Width="407" Margin="0,290,0,0" VerticalAlignment="Top">
             <Grid>
                 <Border BorderBrush="LightGray" BorderThickness="1"/>
-                <Label Content="Saison:" Margin="0,10,100,0" VerticalAlignment="Top" HorizontalAlignment="Center" Padding="2,4,2,4" Height="25"/>
-                <xctk:IntegerUpDown Name="SeasonInput" Height="25" Width="56" FontSize="14" Minimum="1000" Maximum="9999"
-                                    Margin="0,10,0,0" VerticalAlignment="Top" HorizontalAlignment="Center"
-                                    ValueChanged="SeasonInput_ValueChanged"/>
-
-                <Button x:Name="DeliveryConfirmationButton" Content="Anlieferungsbestätigung"
-                        Click="DeliveryConfirmationButton_Click"
-                        Margin="0,50,200,10" Width="190"/>
-
-                <Button x:Name="PaymentButton" Content="Auszahlung"
-                        Click="PaymentButton_Click"
-                        Margin="200,50,0,10" Width="190"/>
+                <Label Content="Saison:" Margin="0,13,100,0" VerticalAlignment="Top" HorizontalAlignment="Center" Padding="2,4,2,4" Height="25"/>
+                <ctrl:IntegerUpDown x:Name="SeasonInput" Height="25" Width="56" FontSize="14" Minimum="1900" Maximum="9999"
+                                    Margin="0,13,0,0" VerticalAlignment="Top" HorizontalAlignment="Center"
+                                    TextChanged="SeasonInput_TextChanged"/>
 
                 <Button x:Name="OverUnderDeliveryButton" Content="Über-/Unterlieferungen"
                         Click="OverUnderDeliveryButton_Click"
-                        Margin="0,90,200,10" Width="190"/>
+                        Margin="0,50,195,10" Width="190"/>
 
-                <Button x:Name="AutoBusinessSharesButton" Content="Autom. GA nachzeichnen"
-                        Click="AutoBusinessSharesButton_Click" IsEnabled="False"
-                        Margin="200,90,0,10" Width="190"/>
+                <Button x:Name="DeliveryConfirmationButton" Content="Anlieferungsbestätigung"
+                        Click="DeliveryConfirmationButton_Click"
+                        Margin="195,50,0,10" Width="190"/>
 
                 <Button x:Name="BreakdownButton" Content="Sorten-/Qual.aufteilung"
                         Click="BreakdownButton_Click"
-                        Margin="0,130,200,10" Width="190"/>
+                        Margin="0,90,195,10" Width="190"/>
+
+                <Button x:Name="PaymentButton" Content="Auszahlung"
+                        Click="PaymentButton_Click"
+                        Margin="195,90,0,10" Width="190"/>
             </Grid>
         </Expander>
     </Grid>

Elwig/Windows/MainWindow.xaml.cs

@@ -14,6 +14,7 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 
 namespace Elwig.Windows {
@@ -34,7 +35,7 @@ namespace Elwig.Windows {
         }
 
         private void Window_Closing(object sender, CancelEventArgs evt) {
-            if (App.NumWindows > 1 && !App.ForceShutdown) {
+            if (App.NumWindows > 1 && !App.ForceShutdown && !App.Current.Windows.Cast<Window>().Any(w => ((w as AdministrationWindow)?.IsEditing ?? false) || ((w as AdministrationWindow)?.IsCreating ?? false))) {
                 var res = MessageBox.Show("Es sind noch weitere Fenster geöffnet.\nSollen alle Fenster geschlossen werden?",
                     "Elwig beenden", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
                 if (res != MessageBoxResult.Yes) {
@@ -147,25 +148,24 @@ namespace Elwig.Windows {
         }
 
         protected override Task OnRenewContext(AppDbContext ctx) {
-            SeasonInput_ValueChanged(null, null);
+            SeasonInput_TextChanged(null, null);
             return Task.CompletedTask;
         }
 
         private void SeasonFinish_Expanded(object sender, RoutedEventArgs evt) {
-            Height = 570;
+            Height = 530;
         }
 
         private void SeasonFinish_Collapsed(object sender, RoutedEventArgs evt) {
             Height = 390;
         }
 
-        private async void SeasonInput_ValueChanged(object? sender, RoutedEventArgs? evt) {
+        private async void SeasonInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
             using var ctx = new AppDbContext();
             var s0 = await ctx.Seasons.FindAsync(SeasonInput.Value);
             var valid = (s0 != null);
             DeliveryConfirmationButton.IsEnabled = valid;
             OverUnderDeliveryButton.IsEnabled = valid;
-            AutoBusinessSharesButton.IsEnabled = valid && false;
             PaymentButton.IsEnabled = valid;
             BreakdownButton.IsEnabled = valid;
         }
@@ -210,27 +210,6 @@ namespace Elwig.Windows {
             Mouse.OverrideCursor = null;
         }
 
-        private async void AutoBusinessSharesButton_Click(object sender, RoutedEventArgs evt) {
-            if (SeasonInput.Value is not int year)
-                return;
-            if (false && App.Client.IsMatzen) {
-                AutoBusinessSharesButton.IsEnabled = false;
-                Mouse.OverrideCursor = Cursors.AppStarting;
-
-                var b = new Billing(year);
-                await b.AutoAdjustBusinessShare();
-
-                Mouse.OverrideCursor = null;
-                AutoBusinessSharesButton.IsEnabled = true;
-            } else {
-                MessageBox.Show(
-                    "Es ist kein automatisches Nachzeichnen der Geschäftsanteile\n" +
-                    "für diese Genossenschaft eingestellt!\n" +
-                    "Bitte wenden Sie sich an die Programmierer!", "Fehler",
-                    MessageBoxButton.OK, MessageBoxImage.Information);
-            }
-        }
-
         private void PaymentButton_Click(object sender, RoutedEventArgs evt) {
             if (SeasonInput.Value is not int year)
                 return;

Elwig/Windows/MemberAdminWindow.xaml

@@ -1,5 +1,6 @@
 <local:AdministrationWindow
         x:Class="Elwig.Windows.MemberAdminWindow"
+        AutomationProperties.AutomationId="MemberAdminWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:local="clr-namespace:Elwig.Windows"
@@ -71,6 +72,16 @@
                 <MenuItem x:Name="Menu_DeliveryConfirmation_Email" Header="...per E-Mail schicken" IsEnabled="False"
                           Click="Menu_DeliveryConfirmation_Email_Click"/>
             </MenuItem>
+            <MenuItem Header="Traubengutschrift" x:Name="Menu_CreditNote">
+                <MenuItem x:Name="Menu_CreditNote_Show" Header="...anzeigen (PDF)" IsEnabled="False"
+                          Click="Menu_CreditNote_Show_Click"/>
+                <MenuItem x:Name="Menu_CreditNote_SavePdf" Header="...speichern... (PDF)" IsEnabled="False"
+                          Click="Menu_CreditNote_SavePdf_Click"/>
+                <MenuItem x:Name="Menu_CreditNote_Print" Header="...drucken" IsEnabled="False"
+                          Click="Menu_CreditNote_Print_Click"/>
+                <MenuItem x:Name="Menu_CreditNote_Email" Header="...per E-Mail schicken" IsEnabled="False"
+                          Click="Menu_CreditNote_Email_Click"/>
+            </MenuItem>
             <MenuItem Header="Mitgliederliste" x:Name="Menu_List">
                 <MenuItem x:Name="Menu_List_SaveActive" Header="...mit Aktiven speichern (Excel)"
                           Click="Menu_List_SaveActive_Click" InputGestureText="Strg+L"/>
@@ -513,7 +524,7 @@
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
                               HorizontalAlignment="Left" Margin="0,0,0,15" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
                     <CheckBox x:Name="ContactEmailInput" Content="E-Mail" IsEnabled="False"
-                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Checked="ContactEmailInput_Changed" Unchecked="ContactEmailInput_Changed"
                               HorizontalAlignment="Left" Margin="60,0,0,15" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
 
                     <Button x:Name="DeliveryButton" Content="Lieferungen" Click="DeliveryButton_Click" IsEnabled="False"

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -15,6 +15,7 @@ using Elwig.Models.Dtos;
 using Elwig.Helpers.Export;
 using Microsoft.Win32;
 using Elwig.Helpers.Billing;
+using Elwig.Dialogs;
 
 namespace Elwig.Windows {
     public partial class MemberAdminWindow : AdministrationWindow {
@@ -318,9 +319,10 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(BranchInput, await ctx.Branches.OrderBy(b => b.Name).ToListAsync());
             ControlUtils.RenewItemsSource(DefaultKgInput, await ctx.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync());
 
+            var seasons = await ctx.Seasons.OrderByDescending(s => s.Year).ToListAsync();
             Menu_DeliveryConfirmation.Items.Clear();
-            foreach (var s in await ctx.Seasons.OrderByDescending(s => s.Year).ToListAsync()) {
-                var i = new MenuItem { Header = $"Saison {s.Year}...", IsEnabled = MemberList.SelectedItem != null };
+            foreach (var s in seasons) {
+                var i = new MenuItem { Header = $"Saison {s.Year}...", Tag = s.Year, IsEnabled = MemberList.SelectedItem != null };
                 var show = new MenuItem { Header = "...anzeigen (PDF)" };
                 show.Click += Menu_DeliveryConfirmation_Show_Click;
                 i.Items.Add(show);
@@ -330,10 +332,31 @@ namespace Elwig.Windows {
                 var print = new MenuItem { Header = "...drucken" };
                 print.Click += Menu_DeliveryConfirmation_Print_Click;
                 i.Items.Add(print);
-                Menu_DeliveryConfirmation.Items.Add(i);
                 var email = new MenuItem { Header = "...per E-Mail schicken" };
                 email.Click += Menu_DeliveryConfirmation_Email_Click;
                 i.Items.Add(email);
+                Menu_DeliveryConfirmation.Items.Add(i);
+            }
+            Menu_CreditNote.Items.Clear();
+            foreach (var s in seasons) {
+                var i1 = new MenuItem { Header = $"Saison {s.Year}...", Tag = s.Year, IsEnabled = MemberList.SelectedItem != null };
+                foreach (var v in s.PaymentVariants.OrderByDescending(v => v.AvNr)) {
+                    var i2 = new MenuItem { Header = $"...{v.Name}...", Tag = v.AvNr };
+                    var show = new MenuItem { Header = "...anzeigen (PDF)" };
+                    show.Click += Menu_CreditNote_Show_Click;
+                    i2.Items.Add(show);
+                    var pdf = new MenuItem { Header = "...speichern... (PDF)" };
+                    pdf.Click += Menu_CreditNote_Email_Click;
+                    i2.Items.Add(pdf);
+                    var print = new MenuItem { Header = "...drucken" };
+                    print.Click += Menu_CreditNote_Print_Click;
+                    i2.Items.Add(print);
+                    var email = new MenuItem { Header = "...per E-Mail schicken" };
+                    email.Click += Menu_CreditNote_Email_Click;
+                    i2.Items.Add(email);
+                    i1.Items.Add(i2);
+                }
+                Menu_CreditNote.Items.Add(i1);
             }
 
             await RefreshMemberList();
@@ -454,20 +477,38 @@ namespace Elwig.Windows {
             if (MemberList.SelectedItem is not Member m)
                 return;
 
-            var r = MessageBox.Show(
-                $"Soll das Mitglied \"{m.AdministrativeName}\" (MgNr. {m.MgNr}) wirklich unwiderruflich gelöscht werden?\n" +
-                $"Sämtliche Lieferungen und Flächenbindungen dieses Mitglieds werden auch gelöscht!",
-                "Mitglied löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-            if (r == MessageBoxResult.OK) {
+            int areaComs = 0, deliveries = 0, credits = 0;
+            using (var ctx = new AppDbContext()) {
+                var l = (await ctx.Members.FindAsync(m.MgNr))!;
+                areaComs = l.AreaCommitments.Count;
+                deliveries = l.Deliveries.Count;
+                credits = l.Credits.Count;
+            }
+            var d = new DeleteMemberDialog(m.MgNr, m.AdministrativeName, areaComs, deliveries, credits);
+            if (d.ShowDialog() == true) {
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
                     using (var ctx = new AppDbContext()) {
-                        ctx.Remove(m);
+                        var l = (await ctx.Members.FindAsync(m.MgNr))!;
+                        if (d.DeletePaymentData) {
+                            ctx.RemoveRange(l.Credits);
+                        }
+                        if (d.DeleteDeliveries) {
+                            ctx.RemoveRange(l.Deliveries);
+                        }
+                        if (d.DeleteAreaComs) {
+                            ctx.RemoveRange(l.AreaCommitments);
+                        }
+                        ctx.Remove(l);
                         await ctx.SaveChangesAsync();
                     }
                     await App.HintContextChange();
                 } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                    MessageBox.Show(str, "Mitglied löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
+                Mouse.OverrideCursor = null;
             }
         }
 
@@ -608,31 +649,31 @@ namespace Elwig.Windows {
         }
 
         private async void Menu_DeliveryConfirmation_Show_Click(object sender, RoutedEventArgs evt) {
-            var season = ((sender as MenuItem)?.Parent as MenuItem)?.Header?.ToString()?.Split(' ')[^1].Split('.')[0];
-            if (MemberList.SelectedItem is not Member m || season == null || !int.TryParse(season, out var s))
+            var year = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
+            if (MemberList.SelectedItem is not Member m || year == null)
                 return;
-            await GenerateDeliveryConfirmation(m, s, ExportMode.Show);
+            await GenerateDeliveryConfirmation(m, (int)year, ExportMode.Show);
         }
 
         private async void Menu_DeliveryConfirmation_SavePdf_Click(object sender, RoutedEventArgs evt) {
-            var season = ((sender as MenuItem)?.Parent as MenuItem)?.Header?.ToString()?.Split(' ')[^1].Split('.')[0];
-            if (MemberList.SelectedItem is not Member m || season == null || !int.TryParse(season, out var s))
+            var year = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
+            if (MemberList.SelectedItem is not Member m || year == null)
                 return;
-            await GenerateDeliveryConfirmation(m, s, ExportMode.SavePdf);
+            await GenerateDeliveryConfirmation(m, (int)year, ExportMode.SavePdf);
         }
 
         private async void Menu_DeliveryConfirmation_Print_Click(object sender, RoutedEventArgs evt) {
-            var season = ((sender as MenuItem)?.Parent as MenuItem)?.Header?.ToString()?.Split(' ')[^1].Split('.')[0];
-            if (MemberList.SelectedItem is not Member m || season == null || !int.TryParse(season, out var s))
+            var year = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
+            if (MemberList.SelectedItem is not Member m || year == null)
                 return;
-            await GenerateDeliveryConfirmation(m, s, ExportMode.Print);
+            await GenerateDeliveryConfirmation(m, (int)year, ExportMode.Print);
         }
 
         private async void Menu_DeliveryConfirmation_Email_Click(object sender, RoutedEventArgs evt) {
-            var season = ((sender as MenuItem)?.Parent as MenuItem)?.Header?.ToString()?.Split(' ')[^1].Split('.')[0];
-            if (MemberList.SelectedItem is not Member m || season == null || !int.TryParse(season, out var s))
+            var year = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
+            if (MemberList.SelectedItem is not Member m || year == null)
                 return;
-            await GenerateDeliveryConfirmation(m, s, ExportMode.Email);
+            await GenerateDeliveryConfirmation(m, (int)year, ExportMode.Email);
         }
 
         private static async Task GenerateDeliveryConfirmation(Member m, int year, ExportMode mode) {
@@ -653,6 +694,57 @@ namespace Elwig.Windows {
             Mouse.OverrideCursor = null;
         }
 
+        private async void Menu_CreditNote_Show_Click(object sender, RoutedEventArgs evt) {
+            var year = (int?)(((sender as MenuItem)?.Parent as MenuItem)?.Parent as MenuItem)?.Tag;
+            var avnr = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
+            if (MemberList.SelectedItem is not Member m || year == null || avnr == null)
+                return;
+            await GenerateCreditNote(m, (int)year, (int)avnr, ExportMode.Show);
+        }
+
+        private async void Menu_CreditNote_SavePdf_Click(object sender, RoutedEventArgs evt) {
+            var year = (int?)(((sender as MenuItem)?.Parent as MenuItem)?.Parent as MenuItem)?.Tag;
+            var avnr = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
+            if (MemberList.SelectedItem is not Member m || year == null || avnr == null)
+                return;
+            await GenerateCreditNote(m, (int)year, (int)avnr, ExportMode.SavePdf);
+        }
+
+        private async void Menu_CreditNote_Print_Click(object sender, RoutedEventArgs evt) {
+            var year = (int?)(((sender as MenuItem)?.Parent as MenuItem)?.Parent as MenuItem)?.Tag;
+            var avnr = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
+            if (MemberList.SelectedItem is not Member m || year == null || avnr == null)
+                return;
+            await GenerateCreditNote(m, (int)year, (int)avnr, ExportMode.Print);
+        }
+
+        private async void Menu_CreditNote_Email_Click(object sender, RoutedEventArgs evt) {
+            var year = (int?)(((sender as MenuItem)?.Parent as MenuItem)?.Parent as MenuItem)?.Tag;
+            var avnr = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
+            if (MemberList.SelectedItem is not Member m || year == null || avnr == null)
+                return;
+            await GenerateCreditNote(m, (int)year, (int)avnr, ExportMode.Email);
+        }
+
+        private static async Task GenerateCreditNote(Member m, int year, int avnr, ExportMode mode) {
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                using var ctx = new AppDbContext();
+                var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
+                var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, year, avnr);
+                var p = (await ctx.MemberPayments.FindAsync(year, avnr, m.MgNr))!;
+                var b = BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data);
+
+                using var doc = new CreditNote(ctx, p, data[m.MgNr],
+                    b.ConsiderContractPenalties, b.ConsiderTotalPenalty, b.ConsiderAutoBusinessShares, b.ConsiderCustomModifiers,
+                    await ctx.GetMemberUnderDelivery(year, m.MgNr));
+                await Utils.ExportDocument(doc, mode, emailData: (m, $"{CreditNote.Name} {v.Name}", $"Im Anhang finden Sie die Traubengutschrift {v.Name}"));
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            Mouse.OverrideCursor = null;
+        }
+
         private async void Menu_List_SaveActive_Click(object sender, RoutedEventArgs evt) { await GenerateMemberList(0, ExportMode.SaveList); }
         private async void Menu_List_ShowActive_Click(object sender, RoutedEventArgs evt) { await GenerateMemberList(0, ExportMode.Show); }
         private async void Menu_List_SavePdfActive_Click(object sender, RoutedEventArgs evt) { await GenerateMemberList(0, ExportMode.SavePdf); }
@@ -1044,12 +1136,18 @@ namespace Elwig.Windows {
             ContactPostalInput.IsChecked = m.ContactViaPost;
             ContactEmailInput.IsChecked = m.ContactViaEmail;
 
+            Dictionary<int, int> delivieries;
             using (var ctx = new AppDbContext()) {
                 var d1 = ctx.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason && d.MgNr == m.MgNr);
                 var d2 = ctx.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason - 1 && d.MgNr == m.MgNr);
                 StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): {d2.Count():N0} ({d2.Sum(d => d.Parts.Count):N0}), {d2.SelectMany(d => d.Parts).Sum(p => p.Weight):N0} kg";
                 StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): {d1.Count():N0} ({d1.Sum(d => d.Parts.Count):N0}), {d1.SelectMany(d => d.Parts).Sum(p => p.Weight):N0} kg";
                 StatusAreaCommitment.Text = $"Gebundene Fläche: {m.ActiveAreaCommitments(ctx).Select(c => c.Area).Sum():N0} m²";
+                delivieries = ctx.Deliveries
+                    .Where(d => d.MgNr == m.MgNr)
+                    .SelectMany(d => d.Parts)
+                    .GroupBy(d => d.Year)
+                    .ToDictionary(g => g.Key, g => g.Sum(d => d.Weight));
             }
 
             Menu_Contact_Email.IsEnabled = m.EmailAddresses.Count > 0;
@@ -1062,6 +1160,13 @@ namespace Elwig.Windows {
                 i.IsEnabled = true;
                 (i.Items[^1] as MenuItem)!.IsEnabled = App.Config.Smtp != null && m.EmailAddresses.Count > 0;
             }
+            foreach (var i in Menu_CreditNote.Items.Cast<MenuItem>()) {
+                var year = (int)i.Tag;
+                i.IsEnabled = delivieries.GetValueOrDefault(year, 0) > 0;
+                foreach (var v in i.Items.Cast<MenuItem>()) {
+                    (v.Items[^1] as MenuItem)!.IsEnabled = App.Config.Smtp != null && m.EmailAddresses.Count > 0;
+                }
+            }
 
             FinishInputFilling();
         }
@@ -1076,6 +1181,9 @@ namespace Elwig.Windows {
             foreach (var i in Menu_DeliveryConfirmation.Items.Cast<MenuItem>()) {
                 i.IsEnabled = false;
             }
+            foreach (var i in Menu_CreditNote.Items.Cast<MenuItem>()) {
+                i.IsEnabled = false;
+            }
             MemberReferenceButton.IsEnabled = false;
             StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): -";
             StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): -";
@@ -1115,7 +1223,7 @@ namespace Elwig.Windows {
             var valid = InputLostFocus((TextBox)sender, Validator.CheckPredecessorMgNr);
             if (valid && PredecessorMgNrInput.Text != "" && (IsEditing || IsCreating)) {
                 var mgnr = int.Parse(PredecessorMgNrInput.Text);
-                if (MemberList.SelectedItem is Member m && m.MgNr == mgnr)
+                if (MemberList.SelectedItem is not Member m || m.MgNr == mgnr)
                     return;
                 using var ctx = new AppDbContext();
                 var areaComs = await ctx.AreaCommitments
@@ -1123,20 +1231,23 @@ namespace Elwig.Windows {
                     .ToListAsync();
                 if (areaComs.Count == 0)
                     return;
-                var res = MessageBox.Show("Sollen die aktiven Flächenbindungen des angegebenen\n" +
-                    $"Vorgängers übernommen werden? ({areaComs.Sum(c => c.Area)} m²)\n\n" +
-                    "Die Änderungen werden erst beim Speichern übernommen!",
-                    "Aktive Flächenbindungen übernehmen", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No);
-                if (res != MessageBoxResult.Yes)
+
+                var oldMember = (await ctx.Members.FindAsync(mgnr))!;
+                var d = new AreaComDialog(oldMember.AdministrativeName, m.AdministrativeName, areaComs.Count, areaComs.Sum(c => c.Area));
+                if (d.ShowDialog() != true)
                     return;
-                TransferPredecessorAreaComs = Utils.FollowingSeason;
+                TransferPredecessorAreaComs = d.SuccessorSeason;
                 SetOriginalValue(PredecessorMgNrInput, -1);  // hack to allow user to save
                 UpdateButtons();
             }
         }
 
         private new void EmailAddressInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            base.EmailAddressInput_TextChanged(sender, evt);
+            if (sender == EmailAddress1Input && ContactEmailInput.IsChecked == true) {
+                InputTextChanged((TextBox)sender, Validator.CheckEmailAddress((TextBox)sender, true));
+            } else {
+                base.EmailAddressInput_TextChanged(sender, evt);
+            }
             UpdateContactInfoVisibility(IsEditing || IsCreating);
         }
 
@@ -1145,6 +1256,10 @@ namespace Elwig.Windows {
             UpdateContactInfoVisibility(IsEditing || IsCreating);
         }
 
+        private void ContactEmailInput_Changed(object sender, RoutedEventArgs evt) {
+            EmailAddressInput_TextChanged(EmailAddress1Input, new TextChangedEventArgs(evt.RoutedEvent, UndoAction.None));
+        }
+
         private void KgDetailsButton_Click(object sender, RoutedEventArgs evt) {
             if (DefaultKgInput.SelectedItem is AT_Kg kg) {
                 App.FocusOriginHierarchyKg(kg.KgNr);
@@ -1171,18 +1286,18 @@ namespace Elwig.Windows {
         }
 
         private async void ActiveInput_Changed(object sender, RoutedEventArgs evt) {
+            if (MemberList.SelectedItem is not Member m)
+                return;
             if ((IsEditing || IsCreating) && ActiveInput.IsChecked == false && int.TryParse(MgNrInput.Text, out var mgnr)) {
                 using var ctx = new AppDbContext();
                 var areaComs = await ctx.AreaCommitments
                     .Where(c => c.MgNr == mgnr && (c.YearTo == null || c.YearTo >= Utils.FollowingSeason))
                     .ToListAsync();
-                if (areaComs.Count >= 0) {
-                    var res = MessageBox.Show($"Sollen die aktiven Flächenbindungen gekündigt werden? ({areaComs.Sum(c => c.Area)} m²)\n" +
-                        "Falls die Flächenbindungen später an ein neues Mitglied\n" +
-                        "übertragen werden sollen bitte \"Nein\" auswählen!\n\n" +
-                        "Die Änderungen werden erst beim Speichern übernommen!",
-                        "Flächenbindungen kündigen", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No);
-                    CancelAreaComs = res == MessageBoxResult.Yes ? Utils.FollowingSeason - 1 : null;
+                if (areaComs.Count > 0) {
+                    var d = new AreaComDialog(m.AdministrativeName, areaComs.Count, areaComs.Sum(c => c.Area));
+                    if (d.ShowDialog() == true) {
+                        CancelAreaComs = d.CancelSeason;
+                    }
                 }
             }
             CheckBox_Changed(sender, evt);

Elwig/Windows/PaymentAdjustmentWindow.xaml

@@ -0,0 +1,271 @@
+<local:ContextWindow
+        x:Class="Elwig.Windows.PaymentAdjustmentWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Windows"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        Title="Auszahlung anpassen - Elwig" Height="600" Width="1000" MinHeight="400" MinWidth="850">
+    <Window.Resources>
+        <ctrl:UnitConverter x:Key="CurrencyConverter" Precision="2" Unit="€"/>
+        <ctrl:UnitConverter x:Key="WeightConverter" Precision="0" Unit="kg"/>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="ctrl:UnitTextBox">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="9,3"/>
+            <Setter Property="Height" Value="27"/>
+        </Style>
+    </Window.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="19"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="24"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="2*" MinWidth="300"/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition Width="1*" MinWidth="380"/>
+        </Grid.ColumnDefinitions>
+
+        <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
+        </Menu>
+
+        <Grid Grid.Row="1">
+            <DataGrid x:Name="MemberList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
+                      CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" Margin="10,10,5,10"
+                      SelectionChanged="MemberList_SelectionChanged">
+                <DataGrid.Resources>
+                    <Style TargetType="{x:Type DataGridRow}">
+                        <Style.Setters>
+                            <Setter Property="Background" Value="{Binding Path=Background}"></Setter>
+                            <Setter Property="Foreground" Value="{Binding Path=Foreground}"></Setter>
+                        </Style.Setters>
+                    </Style>
+                </DataGrid.Resources>
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="MgNr." Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="45">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Nachname" Binding="{Binding FamilyName}" Width="100"/>
+                    <DataGridTextColumn Header="Vorname" Binding="{Binding GivenName}" Width="90"/>
+                    <DataGridTextColumn Header="GA" Binding="{Binding BusinessShares, StringFormat='{}{0:N0} '}" Width="35">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Ü.-/U.-Lfrg." Binding="{Binding OverUnder, Converter={StaticResource WeightConverter},StringFormat='{}{0} '}" Width="70">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Strafe GA" Binding="{Binding PenaltyBs, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="65">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Pönale FB" Binding="{Binding PenaltyAc, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="65">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Nachz." Binding="{Binding Adjust, StringFormat='{}{0:N0} '}" Width="45">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Nachz.Betr." Binding="{Binding AdjustAmount, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="70">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Weitere" Binding="{Binding Custom, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="65">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Gesamt" Binding="{Binding Total, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="65">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+        <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+
+        <Grid Grid.Column="2" Grid.Row="1">
+            <GroupBox Header="Benutzerdefinierte Zu-/Abschläge" Margin="5,10,10,10" Height="180" Width="365"
+                      VerticalAlignment="Top" HorizontalAlignment="Left">
+                <Grid>
+                    <Label Content="Mitglied:" Margin="10,10,10,10"/>
+                    <TextBox x:Name="MgNrInput" Width="48" Margin="70,10,10,10" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus"/>
+                    <ComboBox x:Name="MemberInput" Margin="123,10,40,10" IsEditable="True"
+                              ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
+                              SelectionChanged="MemberInput_SelectionChanged"
+                              VerticalAlignment="Top" Height="25" FontSize="14"/>
+                    <Button x:Name="MemberReferenceButton" Grid.Column="1" Height="25" Width="25" FontFamily="Segoe MDL2 Assets" Content="&#xEE35;" Padding="0,0,0,0"
+                            Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Right" ToolTip="Zu Mitglied springen"
+                            Click="MemberReferenceButton_Click"/>
+
+                    <Label Content="Betrag:" Margin="10,40,10,10"/>
+                    <ctrl:UnitTextBox x:Name="CustomAmountInput" Width="80" Margin="70,40,10,10" Unit="€"
+                                      TextChanged="CustomAmountInput_TextChanged"/>
+
+                    <Label Content="Freitext:" Margin="10,70,10,10"/>
+                    <TextBox x:Name="CustomCommentInput" Margin="70,70,10,10"/>
+
+                    <Button x:Name="SaveCustomButton" Content="Speichern" Margin="0,0,125,10" Width="120"
+                            HorizontalAlignment="Center" VerticalAlignment="Bottom"
+                            Click="CustomButton_Click"/>
+                    <Button x:Name="RemoveCustomButton" Content="Entfernen" Margin="125,0,0,10" Width="120"
+                            HorizontalAlignment="Center" VerticalAlignment="Bottom"
+                            Click="CustomButton_Click"/>
+                </Grid>
+            </GroupBox>
+
+            <GroupBox Header="Automatische Nachzeichnung der Geschäftsanteile" Margin="5,10,10,10" Height="180" Width="365"
+                      VerticalAlignment="Bottom" HorizontalAlignment="Left">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition Width="28*"/>
+                    </Grid.ColumnDefinitions>
+                    <Label Content="Absoluter Freibetrag:" Margin="10,10,0,0" Grid.ColumnSpan="2"/>
+                    <ctrl:UnitTextBox x:Name="AllowanceKgInput" Unit="kg" Margin="128,10,0,0" Width="70"
+                           TextChanged="KgInput_TextChanged" Grid.Column="1"/>
+                    <ctrl:UnitTextBox x:Name="AllowanceBsInput" Unit="GA" Margin="203,10,0,0" Width="60"
+                           TextChanged="PercentInput_TextChanged" Grid.Column="1"/>
+
+                    <Label Content="Relativer Freibetrag:" Margin="10,40,0,0" Grid.ColumnSpan="2"/>
+                    <ctrl:UnitTextBox x:Name="AllowanceKgPerBsInput" Unit="kg/GA" Margin="128,40,0,0" Width="87"
+                           TextChanged="KgInput_TextChanged" Grid.Column="1"/>
+                    <ctrl:UnitTextBox x:Name="AllowancePercentInput" Unit="%" Margin="220,40,0,0" Width="60"
+                           TextChanged="PercentInput_TextChanged" Grid.Column="1"/>
+
+                    <Label Content="Nur mind. nachz.:" Margin="10,70,0,0" Grid.ColumnSpan="2"/>
+                    <ctrl:UnitTextBox x:Name="MinBsInput" Unit="GA" Margin="128,70,0,0" Width="50"
+                           TextChanged="BsInput_TextChanged" Grid.Column="1"/>
+
+                    <Button x:Name="SeasonButton" Content="GA-Wert" Margin="0,0,10,42" Width="120"
+                            HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                            Click="SeasonButton_Click" Grid.Column="1"/>
+                    <Button x:Name="AutoAdjustBsButton" Content="Nachzeichnen" Margin="0,0,135,10" Width="120"
+                            HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                            Click="AutoAdjustBsButton_Click" Grid.Column="1"/>
+                    <Button x:Name="UnAdjustBsButton" Content="Rückgängig" Margin="0,0,10,10" Width="120"
+                            HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                            Click="UnAdjustBsButton_Click" Grid.Column="1"/>
+                </Grid>
+            </GroupBox>
+        </Grid>
+
+        <StatusBar Grid.Row="2" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
+            <StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="1.25*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="130"/>
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+            <StatusBarItem Grid.Column="0" HorizontalContentAlignment="Stretch">
+                <DockPanel>
+                    <TextBlock Text="Strafe GA: "/>
+                    <TextBlock x:Name="PenaltyBusinessShares" Text="-"/>
+                </DockPanel>
+            </StatusBarItem>
+            <Separator Grid.Column="1"/>
+            <StatusBarItem Grid.Column="2" HorizontalContentAlignment="Stretch">
+                <DockPanel>
+                    <TextBlock Text="Pönale FB: "/>
+                    <TextBlock x:Name="PenaltyAreaCommitments" Text="-"/>
+                </DockPanel>
+            </StatusBarItem>
+            <Separator Grid.Column="3"/>
+            <StatusBarItem Grid.Column="4" HorizontalContentAlignment="Stretch">
+                <DockPanel>
+                    <TextBlock Text="Nachz.: "/>
+                    <TextBlock x:Name="AutoBusinessShareAdjustment" Text="-"/>
+                </DockPanel>
+            </StatusBarItem>
+            <Separator Grid.Column="5"/>
+            <StatusBarItem Grid.Column="6" HorizontalContentAlignment="Stretch">
+                <DockPanel>
+                    <TextBlock Text="Weitere: "/>
+                    <TextBlock x:Name="CustomModifiers" Text="-"/>
+                </DockPanel>
+            </StatusBarItem>
+            <Separator Grid.Column="7"/>
+            <StatusBarItem Grid.Column="8" HorizontalContentAlignment="Stretch">
+                <DockPanel>
+                    <TextBlock Text="Gesamt: "/>
+                    <TextBlock x:Name="TotalModifiers" Text="-"/>
+                </DockPanel>
+            </StatusBarItem>
+            <Separator Grid.Column="9"/>
+            <StatusBarItem Grid.Column="10" HorizontalContentAlignment="Stretch">
+                <DockPanel>
+                    <TextBlock Text="Nicht-Lieferanten: "/>
+                    <TextBlock x:Name="NonDeliveries" Text="-"/>
+                </DockPanel>
+            </StatusBarItem>
+        </StatusBar>
+    </Grid>
+</local:ContextWindow>

Elwig/Windows/PaymentAdjustmentWindow.xaml.cs

@@ -0,0 +1,290 @@
+using Elwig.Helpers;
+using Elwig.Helpers.Billing;
+using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace Elwig.Windows {
+    public partial class PaymentAdjustmentWindow : ContextWindow {
+
+        public readonly int Year;
+        public readonly bool SeasonLocked;
+
+        public Dictionary<int, PaymentCustom>? CustomPayments;
+
+        public PaymentAdjustmentWindow(int year) {
+            InitializeComponent();
+            Year = year;
+            using (var ctx = new AppDbContext()) {
+                SeasonLocked = ctx.Seasons.Find(Year + 1) != null;
+            }
+            Title = $"Auszahlung anpassen - Lese {Year} - Elwig";
+            AutoAdjustBsButton.IsEnabled = !SeasonLocked;
+            UnAdjustBsButton.IsEnabled = !SeasonLocked;
+            SaveCustomButton.IsEnabled = !SeasonLocked;
+            RemoveCustomButton.IsEnabled = !SeasonLocked;
+            CustomAmountInput.IsEnabled = !SeasonLocked;
+            CustomCommentInput.IsEnabled = !SeasonLocked;
+
+            AllowanceKgInput.Text = $"{App.Client.AutoAdjustBs.AllowanceKg}";
+            AllowanceBsInput.Text = $"{App.Client.AutoAdjustBs.AllowanceBs}";
+            AllowanceKgPerBsInput.Text = $"{App.Client.AutoAdjustBs.AllowanceKgPerBs}";
+            AllowancePercentInput.Text = $"{App.Client.AutoAdjustBs.AllowancePercent}";
+            MinBsInput.Text = $"{App.Client.AutoAdjustBs.MinBs}";
+        }
+
+        protected override async Task OnRenewContext(AppDbContext ctx) {
+            var members = await ctx.Members
+                .Select(m => new {
+                    m.MgNr,
+                    m.FamilyName,
+                    m.GivenName,
+                    m.BusinessShares,
+                    m.IsActive,
+                })
+                .OrderBy(m => m.FamilyName)
+                .ThenBy(m => m.GivenName)
+                .ThenBy(m => m.MgNr)
+                .ToListAsync();
+            var season = (await ctx.Seasons.FindAsync(Year))!;
+            var contracts = await ctx.AreaCommitmentTypes.ToDictionaryAsync(t => t.VtrgId, t => t);
+
+            var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, Year);
+            var tbl2 = await AreaComUnderDeliveryData.ForSeason(ctx.AreaComUnderDeliveryRows, Year);
+            var weight = tbl1.Rows.ToDictionary(r => r.MgNr, r => r.Weight);
+            var areaComs = tbl2.Rows.ToDictionary(r => r.MgNr, r => r.VtrgIds.Zip(r.UnderDeliveries).ToDictionary(r => r.First, r => r.Second));
+            CustomPayments = await ctx.CustomPayments.Where(p => p.Year == Year).ToDictionaryAsync(p => p.MgNr, p => p);
+
+            var history = await ctx.MemberHistory
+                .Where(h => h.DateString.CompareTo($"{Year}-01-01") >= 0 && h.DateString.CompareTo($"{Year}-12-31") <= 0 && h.Type == "auto" && h.BusinessShares > 0)
+                .GroupBy(h => h.Member)
+                .ToDictionaryAsync(h => h.Key.MgNr, h => h.Sum(g => g.BusinessShares));
+
+            var list = members
+                .Select(m => new {
+                    m.MgNr, m.FamilyName, m.GivenName,
+                    m.IsActive,
+                    BusinessShares = m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0),
+                    DeliveryObligation = (m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0)) * season.MinKgPerBusinessShare,
+                    DeliveryRight = (m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0)) * season.MaxKgPerBusinessShare,
+                    Adjust = history.TryGetValue(m.MgNr, out int v2) ? (int?)v2 : null,
+                })
+                .Select(m => new {
+                    m.MgNr, m.FamilyName, m.GivenName,
+                    m.BusinessShares,
+                    Weight = weight.GetValueOrDefault(m.MgNr, 0),
+                    OverUnder = weight.TryGetValue(m.MgNr, out int v1) ?
+                        (v1 < m.DeliveryObligation ? (int?)v1 - m.DeliveryObligation :
+                         v1 > m.DeliveryRight ? (int?)v1 - m.DeliveryRight : null)
+                        : (m.IsActive ? -m.DeliveryObligation : null),
+                    m.Adjust,
+                    AdjustAmount = m.Adjust * -season.BusinessShareValue,
+                })
+                .Select(m => new {
+                    m.MgNr, m.FamilyName, m.GivenName,
+                    m.BusinessShares, m.Weight, m.OverUnder,
+                    PenaltyBs = m.OverUnder != null && m.OverUnder < 0 ?
+                        (season.PenaltyPerKg * m.OverUnder ?? 0) +
+                        (-season.PenaltyAmount ?? 0) +
+                        (season.PenaltyPerBsAmount * Math.Floor(m.OverUnder / season.MinKgPerBusinessShare ?? 0m) ?? 0) +
+                        (m.Weight == 0 ? (-season.PenaltyNone ?? 0) + (-season.PenaltyPerBsNone * m.BusinessShares ?? 0) : 0)
+                        : (decimal?)null,
+                    PenaltyAc = areaComs.TryGetValue(m.MgNr, out var c) ? c.Select(r => {
+                            var con = contracts[r.Key];
+                            return (r.Value.Kg * con.PenaltyPerKg ?? 0) + (r.Value.Kg < 0 ? con.PenaltyAmount ?? 0 : 0) + (r.Value.Percent == -100 ? con.PenaltyNone ?? 0 : 0);
+                        }).Sum() : (decimal?)null,
+                    m.Adjust,
+                    m.AdjustAmount,
+                    Custom = CustomPayments!.GetValueOrDefault(m.MgNr, null)?.Amount,
+                })
+                .Select(m => new {
+                    m.MgNr, m.FamilyName, m.GivenName,
+                    m.BusinessShares, m.Weight, m.OverUnder,
+                    PenaltyBs = m.PenaltyBs == null || m.PenaltyBs == 0 ? (decimal?)null : Math.Round((decimal)m.PenaltyBs, 2),
+                    PenaltyAc = m.PenaltyAc == null ? (decimal?)null : Math.Round((decimal)m.PenaltyAc, 2),
+                    m.Adjust,
+                    AdjustAmount = m.AdjustAmount == null ? (decimal?)null : Math.Round((decimal)m.AdjustAmount, 2),
+                    m.Custom
+                })
+                .Select(m => new {
+                    m.MgNr, m.FamilyName, m.GivenName,
+                    m.BusinessShares, m.Weight, m.OverUnder,
+                    m.PenaltyBs, m.PenaltyAc, m.Adjust, m.AdjustAmount, m.Custom,
+                    Total = (m.PenaltyBs ?? 0) + (m.PenaltyAc ?? 0) + (m.AdjustAmount ?? 0) + (m.Custom ?? 0),
+                })
+                .Select(m => new {
+                    m.MgNr, m.FamilyName, m.GivenName,
+                    m.BusinessShares, m.Weight, m.OverUnder,
+                    m.PenaltyBs, m.PenaltyAc, m.Adjust, m.AdjustAmount, m.Custom,
+                    m.Total,
+                    Background = m.Weight == 0 ? Brushes.Orange : m.Weight / 2 < -m.Total ? Brushes.Red : Brushes.White,
+                    Foreground = m.Total == 0 ? Brushes.Gray : Brushes.Black,
+                })
+                .Where(m => m.OverUnder != null || m.Adjust != null || m.PenaltyBs != null || m.PenaltyAc != null || m.Custom != null)
+                .OrderByDescending(m => m.OverUnder ?? 0)
+                .ThenBy(m => m.FamilyName)
+                .ThenBy(m => m.GivenName)
+                .ThenBy(m => m.MgNr)
+                .ToList();
+
+            MemberList.ItemsSource = list;
+
+            var sym = season.Currency.Symbol ?? season.Currency.Code;
+            PenaltyBusinessShares.Text = $"{list.Count(r => r.PenaltyBs != null && r.PenaltyBs != 0)} Mg. / {list.Sum(r => r.PenaltyBs):N2} {sym}";
+            PenaltyAreaCommitments.Text = $"{list.Count(r => r.PenaltyAc != null && r.PenaltyAc != 0)} Mg. / {list.Sum(r => r.PenaltyAc):N2} {sym}";
+            AutoBusinessShareAdjustment.Text = $"{list.Count(r => r.Adjust > 0)} Mg. / {list.Sum(r => r.Adjust)} GA / {list.Sum(r => r.AdjustAmount):N2} {sym}";
+            CustomModifiers.Text = $"{list.Count(r => r.Custom != null)} Mg. / {list.Sum(r => r.Custom):N2} {sym}";
+            TotalModifiers.Text = $"{list.Count(r => r.Total != 0)} Mg. / {list.Sum(r => r.Total):N2} {sym}";
+            NonDeliveries.Text = $"{list.Count(r => r.Weight == 0):N0}";
+
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
+                .OrderBy(m => m.FamilyName)
+                .ThenBy(m => m.GivenName)
+                .ThenBy(m => m.MgNr)
+                .ToListAsync());
+            CustomAmountInput.Unit = sym;
+        }
+
+        private async void AutoAdjustBsButton_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                int? kg = AllowanceKgInput.Text == "" ? null : int.Parse(AllowanceKgInput.Text);
+                double? bs = AllowanceBsInput.Text == "" ? null : double.Parse(AllowanceBsInput.Text);
+                int? kgPerBs = AllowanceKgPerBsInput.Text == "" ? null : int.Parse(AllowanceKgPerBsInput.Text);
+                double? percent = AllowancePercentInput.Text == "" ? null : double.Parse(AllowancePercentInput.Text);
+                int? minBs = MinBsInput.Text == "" ? null : int.Parse(MinBsInput.Text);
+
+                App.Client.AutoAdjustBs.AllowanceKg = kg;
+                App.Client.AutoAdjustBs.AllowanceBs = bs;
+                App.Client.AutoAdjustBs.AllowanceKgPerBs = kgPerBs;
+                App.Client.AutoAdjustBs.AllowancePercent = percent;
+                App.Client.AutoAdjustBs.MinBs = minBs;
+                await App.Client.UpdateValues();
+
+                var b = new Billing(Year);
+                await b.AutoAdjustBusinessShares(new DateOnly(Year, 11, 30), kg ?? default, bs ?? default, kgPerBs ?? default, percent / 100.0 ?? default, minBs ?? default);
+                await App.HintContextChange();
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "GA Nachzeichnen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            Mouse.OverrideCursor = null;
+        }
+
+        private async void UnAdjustBsButton_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var b = new Billing(Year);
+                await b.UnAdjustBusinessShares();
+                await App.HintContextChange();
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "GA Nachzeichnen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            Mouse.OverrideCursor = null;
+        }
+
+        private void SeasonButton_Click(object sender, RoutedEventArgs evt) {
+            App.FocusBaseDataSeason(Year);
+        }
+
+        private void KgInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            Validator.CheckInteger((TextBox)sender, false, 6);
+        }
+
+        private void BsInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            Validator.CheckInteger((TextBox)sender, false, 3);
+        }
+
+        private void PercentInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            Validator.CheckDecimal((TextBox)sender, false, 3, 2);
+        }
+
+        private void MemberList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            if (MemberList.SelectedItem != null) {
+                var i = MemberList.SelectedItem;
+                var t = i.GetType();
+                MgNrInput.Text = t.GetProperty("MgNr")?.GetValue(i)?.ToString();
+            }
+        }
+
+        private void MgNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            var res = Validator.CheckMgNr((TextBox)sender, true);
+            ControlUtils.SelectItemWithPk(MemberInput, res.IsValid ? int.Parse(MgNrInput.Text) : null);
+        }
+
+        private void MgNrInput_LostFocus(object sender, RoutedEventArgs evt) {
+            var res = Validator.CheckMgNr((TextBox)sender, true);
+            ControlUtils.SelectItemWithPk(MemberInput, res.IsValid ? int.Parse(MgNrInput.Text) : null);
+        }
+
+        private void MemberInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            if (MemberInput.SelectedItem is Member m) {
+                MgNrInput.Text = m.MgNr.ToString();
+                MemberList.SelectedItem = MemberList.ItemsSource.Cast<object>().FirstOrDefault(i => {
+                    var t = i.GetType();
+                    return (int?)t.GetProperty("MgNr")?.GetValue(i) == m.MgNr;
+                });
+                if (MemberList.SelectedItem != null)
+                    MemberList.ScrollIntoView(MemberList.SelectedItem);
+
+                if (CustomPayments?.TryGetValue(m.MgNr, out var p) == true) {
+                    CustomAmountInput.Text = $"{p.Amount:N2}";
+                    CustomCommentInput.Text = p.Comment ?? "";
+                } else {
+                    CustomAmountInput.Text = "";
+                    CustomCommentInput.Text = "";
+                }
+            } else {
+                CustomAmountInput.Text = "";
+                CustomCommentInput.Text = "";
+            }
+        }
+
+        private void MemberReferenceButton_Click(object sender, RoutedEventArgs evt) {
+            if (MemberInput.SelectedItem is not Member m) return;
+            App.FocusMember(m.MgNr);
+        }
+
+        private void CustomAmountInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            Validator.CheckDecimal((TextBox)sender, false, 4, 2, true);
+        }
+
+        private async void CustomButton_Click(object sender, RoutedEventArgs evt) {
+            if (MemberInput.SelectedItem is not Member m) return;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                using var ctx = new AppDbContext();
+                if (CustomPayments?.TryGetValue(m.MgNr, out var p) == true) {
+                    ctx.Remove(p);
+                }
+                if (sender == SaveCustomButton && decimal.TryParse(CustomAmountInput.Text, out var num)) {
+                    var text = CustomCommentInput.Text.Trim();
+                    ctx.Add(new PaymentCustom {
+                        MgNr = m.MgNr,
+                        Year = Year,
+                        Amount = num,
+                        Comment = text == "" ? null : text,
+                    });
+                }
+                await ctx.SaveChangesAsync();
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Benutzerdefinierten Zu-/Abschlag speichern", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            await App.HintContextChange();
+            Mouse.OverrideCursor = null;
+        }
+    }
+}

Elwig/Windows/PaymentVariantsWindow.xaml

@@ -6,8 +6,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
-        mc:Ignorable="d"
-        Title="Auszahlungsvarianten - Elwig" Height="450" Width="820" MinHeight="380" MinWidth="820">
+        Title="Auszahlungsvarianten - Elwig" Height="480" Width="850" MinHeight="400" MinWidth="830">
     <Window.Resources>
         <Style TargetType="Label">
             <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -142,9 +141,12 @@
             <CheckBox x:Name="ConsiderAutoInput" Content="Automatische Nachzeichnungen der GA"
                       Margin="110,155,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderAutoInput_Changed" Unchecked="ConsiderAutoInput_Changed"/>
-            <Label Content="&#xF0AE;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="0" Grid.Column="1" Margin="108,175,10,10"/>
+            <CheckBox x:Name="ConsiderCustomInput" Content="Benutzerdefinierte Zu-/Abschläge pro Mitglied"
+                      Margin="110,175,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
+                      Checked="ConsiderCustomInput_Changed" Unchecked="ConsiderCustomInput_Changed"/>
+            <Label Content="&#xF0AE;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="0" Grid.Column="1" Margin="108,195,10,10"/>
 
-            <Grid Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="50,180,10,10">
+            <Grid Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="50,200,10,10">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="110"/>
                     <ColumnDefinition Width="27"/>
@@ -156,6 +158,8 @@
                     <RowDefinition Height="27"/>
                     <RowDefinition Height="5"/>
                     <RowDefinition Height="27"/>
+                    <RowDefinition Height="5"/>
+                    <RowDefinition Height="27"/>
                 </Grid.RowDefinitions>
 
                 <Grid.Resources>
@@ -171,22 +175,32 @@
                     </Style>
                 </Grid.Resources>
 
-                <Button x:Name="ModifierButton" Content="Zu-/Abschläge" Grid.Column="0" Grid.Row="0"
-                        Click="ModifierButton_Click"/>
-                <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="0" Grid.Column="1" RenderTransformOrigin="0.5,0.5" >
-                    <Label.RenderTransform>
-                        <TransformGroup>
-                            <RotateTransform Angle="45"/>
-                            <TranslateTransform Y="5"/>
-                        </TransformGroup>
-                    </Label.RenderTransform>
-                </Label>
                 <Button x:Name="EditButton" Content="Bearbeiten" Grid.Column="0" Grid.Row="2"
                         Click="EditButton_Click"/>
                 <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="1"/>
+                <Button x:Name="ModifierButton" Content="Zu-/Abschläge" Grid.Column="0" Grid.Row="4"
+                        Click="ModifierButton_Click"/>
+                <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="1" RenderTransformOrigin="0.5,0.5" >
+                    <Label.RenderTransform>
+                        <TransformGroup>
+                            <RotateTransform Angle="-45"/>
+                            <TranslateTransform Y="-5"/>
+                        </TransformGroup>
+                    </Label.RenderTransform>
+                </Label>
                 <Button x:Name="CalculateButton" Content="Berechnen" Grid.Column="2" Grid.Row="2"
                         Click="CalculateButton_Click"/>
                 <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="3" x:Name="Arrow3"/>
+                <Button x:Name="PaymentAdjustmentButton" Content="Anpassen" Grid.Column="2" Grid.Row="4"
+                        Click="PaymentAdjustmentButton_Click"/>
+                <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="3" x:Name="Arrow4" RenderTransformOrigin="0.5,0.5" >
+                    <Label.RenderTransform>
+                        <TransformGroup>
+                            <RotateTransform Angle="-45"/>
+                            <TranslateTransform Y="-5"/>
+                        </TransformGroup>
+                    </Label.RenderTransform>
+                </Label>
                 <Button x:Name="CommitButton" Content="Festsetzen" Grid.Column="4" Grid.Row="2"
                         Click="CommitButton_Click"/>
                 <Button x:Name="RevertButton" Content="Freigeben" Grid.Column="4" Grid.Row="2"

Elwig/Windows/PaymentVariantsWindow.xaml.cs

@@ -65,6 +65,7 @@ namespace Elwig.Windows {
                 RevertButton.IsEnabled = locked && !SeasonLocked;
                 RevertButton.Visibility = locked ? Visibility.Visible : Visibility.Hidden;
                 Arrow3.Content = locked ? "\xF0B0" : "\xF0AF";
+                Arrow4.Content = locked ? "\xF0B0" : "\xF0AF";
                 CopyButton.IsEnabled = true;
                 EditButton.Content = locked ? "Ansehen" : "Bearbeiten";
                 EditButton.IsEnabled = true;
@@ -91,6 +92,7 @@ namespace Elwig.Windows {
                     ConsiderPenaltiesInput.IsChecked = BillingData.ConsiderContractPenalties;
                     ConsiderPenaltyInput.IsChecked = BillingData.ConsiderTotalPenalty;
                     ConsiderAutoInput.IsChecked = BillingData.ConsiderAutoBusinessShares;
+                    ConsiderCustomInput.IsChecked = BillingData.ConsiderCustomModifiers;
                     if (BillingData.NetWeightModifier != 0) {
                         WeightModifierInput.Text = $"{Math.Round(BillingData.NetWeightModifier * 100.0, 8)}";
                     } else if (BillingData.GrossWeightModifier != 0) {
@@ -105,6 +107,7 @@ namespace Elwig.Windows {
                     ConsiderPenaltiesInput.IsChecked = false;
                     ConsiderPenaltyInput.IsChecked = false;
                     ConsiderAutoInput.IsChecked = false;
+                    ConsiderCustomInput.IsChecked = false;
                     WeightModifierInput.Text = "";
                     DataInput.Text = v.Data;
                 }
@@ -113,6 +116,7 @@ namespace Elwig.Windows {
                 ConsiderPenaltiesInput.IsEnabled = !locked;
                 ConsiderPenaltyInput.IsEnabled = !locked;
                 ConsiderAutoInput.IsEnabled = !locked;
+                ConsiderCustomInput.IsEnabled = !locked;
                 DataInput.IsReadOnly = locked;
             } else {
                 EditButton.Content = "Bearbeiten";
@@ -125,6 +129,7 @@ namespace Elwig.Windows {
                 RevertButton.IsEnabled = false;
                 RevertButton.Visibility = Visibility.Hidden;
                 Arrow3.Content = "\xF0AF";
+                Arrow4.Content = "\xF0AF";
                 DeleteButton.IsEnabled = false;
                 MailButton.IsEnabled = false;
                 Menu_ExportSave.IsEnabled = false;
@@ -153,6 +158,8 @@ namespace Elwig.Windows {
                 ConsiderPenaltyInput.IsEnabled = false;
                 ConsiderAutoInput.IsChecked = false;
                 ConsiderAutoInput.IsEnabled = false;
+                ConsiderCustomInput.IsChecked = false;
+                ConsiderCustomInput.IsEnabled = false;
                 DataInput.Text = "";
                 DataInput.IsReadOnly = true;
             }
@@ -168,6 +175,7 @@ namespace Elwig.Windows {
                 (ConsiderPenaltiesInput.IsChecked != BillingData?.ConsiderContractPenalties) ||
                 (ConsiderPenaltyInput.IsChecked != BillingData?.ConsiderTotalPenalty) ||
                 (ConsiderAutoInput.IsChecked != BillingData?.ConsiderAutoBusinessShares) ||
+                (ConsiderCustomInput.IsChecked != BillingData?.ConsiderCustomModifiers) ||
                 WeightModifierChanged);
             CalculateButton.IsEnabled = !SaveButton.IsEnabled && PaymentVariantList.SelectedItem is PaymentVar { TestVariant: true };
             CommitButton.IsEnabled = CalculateButton.IsEnabled;
@@ -295,6 +303,10 @@ namespace Elwig.Windows {
             App.FocusChartWindow(v.Year, v.AvNr);
         }
 
+        private void PaymentAdjustmentButton_Click(object sender, RoutedEventArgs evt) {
+            App.FocusPaymentAdjustment(Year);
+        }
+
         private async void MailButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar pv)
                 return;
@@ -424,7 +436,7 @@ namespace Elwig.Windows {
                 Menu_EbicsSave.IsEnabled = false;
                 Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
-                    using var e = new Ebics(v, d.FileName, 9);
+                    using var e = new Ebics(v, d.FileName, App.Client.ExportEbicsVersion, (Ebics.AddressMode)App.Client.ExportEbicsAddress);
                     await e.ExportAsync(Transaction.FromPaymentVariant(v));
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -471,6 +483,7 @@ namespace Elwig.Windows {
                 d.ConsiderContractPenalties = ConsiderPenaltiesInput.IsChecked ?? false;
                 d.ConsiderTotalPenalty = ConsiderPenaltyInput.IsChecked ?? false;
                 d.ConsiderAutoBusinessShares = ConsiderAutoInput.IsChecked ?? false;
+                d.ConsiderCustomModifiers = ConsiderCustomInput.IsChecked ?? false;
                 var modVal = WeightModifierInput.Text.Length > 0 ? double.Parse(WeightModifierInput.Text) : 0;
                 d.NetWeightModifier = modVal > 0 ? modVal / 100.0 : 0;
                 d.GrossWeightModifier = modVal < 0 ? modVal / 100.0 : 0;
@@ -488,6 +501,7 @@ namespace Elwig.Windows {
                 ConsiderPenaltiesInput_Changed(null, null);
                 ConsiderPenaltyInput_Changed(null, null);
                 ConsiderAutoInput_Changed(null, null);
+                ConsiderCustomInput_Changed(null, null);
                 WeightModifierInput_TextChanged(null, null);
             } catch (Exception exc) {
                 await HintContextChange();
@@ -630,6 +644,19 @@ namespace Elwig.Windows {
             UpdateSaveButton();
         }
 
+        private void ConsiderCustomInput_Changed(object? sender, RoutedEventArgs? evt) {
+            if (BillingData == null) {
+                ControlUtils.ClearInputState(ConsiderCustomInput);
+                return;
+            }
+            if (BillingData.ConsiderCustomModifiers != ConsiderCustomInput.IsChecked) {
+                ControlUtils.SetInputChanged(ConsiderCustomInput);
+            } else {
+                ControlUtils.ClearInputState(ConsiderCustomInput);
+            }
+            UpdateSaveButton();
+        }
+
         private void WeightModifierInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
             var res = Validator.CheckDecimal(WeightModifierInput, false, 3, 2, true);
             if (BillingData == null) {

Elwig/fetch-resources.bat

@@ -1,5 +1,5 @@
 ::mkdir "C:\Program Files\Elwig"
-::curl -s -L "http://www.columbia.edu/~em36/PDFtoPrinter.exe" -z "C:\Program Files\Elwig\PDFtoPrinter.exe" -o "C:\Program Files\Elwig\PDFtoPrinter.exe"
+::curl --fail -s -L "https://github.com/emendelson/pdftoprinter/raw/main/PDFtoPrinter.exe" -z "C:\Program Files\Elwig\PDFtoPrinter.exe" -o "C:\Program Files\Elwig\PDFtoPrinter.exe"
 mkdir "C:\ProgramData\Elwig\resources"
 copy /b /y Documents\*.css "C:\ProgramData\Elwig\resources"
 copy /b /y Documents\*.cshtml "C:\ProgramData\Elwig\resources"

Installer/Files/config.ini

@@ -11,11 +11,11 @@ file = database.sqlite3
 ;log = db.log
 
 [update]
-url = https://www.necronda.net/elwig/files/elwig/latest
+url = https://elwig.at/files/elwig/latest
 auto = true
 
 [sync]
-;url = https://www.necronda.net/elwig/clients/WGX/
+;url = https://elwig.at/clients/WGX/
 ;username = ""
 ;password = ""
 

Installer/Installer.wixproj

@@ -25,7 +25,7 @@
     </Task>
   </UsingTask>
   <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild">
-    <Exec Command="curl -s -L &quot;http://www.columbia.edu/~em36/PDFtoPrinter.exe&quot; -z &quot;$(ProjectDir)\Files\PDFtoPrinter.exe&quot; -o &quot;$(ProjectDir)\Files\PDFtoPrinter.exe&quot;" />
+    <Exec Command="curl --fail -s -L &quot;https://github.com/emendelson/pdftoprinter/raw/main/PDFtoPrinter.exe&quot; -z &quot;$(ProjectDir)\Files\PDFtoPrinter.exe&quot; -o &quot;$(ProjectDir)\Files\PDFtoPrinter.exe&quot;" />
     <Exec Command="dotnet publish &quot;$(ProjectDir)\..\Elwig\Elwig.csproj&quot; &quot;/p:PublishProfile=$(ProjectDir)\..\Elwig\Properties\PublishProfiles\FolderProfile.pubxml&quot;" />
     <GetFileVersion AssemblyPath="..\Elwig\bin\Publish\Elwig.exe">
       <Output TaskParameter="Version" PropertyName="ElwigFileVersion" />

README.md

@@ -0,0 +1,4 @@
+
+Elwig
+=====
+

Setup/Setup.wixproj

@@ -5,15 +5,15 @@
     <Cultures>de-AT</Cultures>
   </PropertyGroup>
   <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild">
-    <Exec Command="curl -s -L &quot;https://go.microsoft.com/fwlink/p/?LinkId=2124703&quot; -z &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot; -o &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot;" />
-    <Exec Command="curl -s -L &quot;https://aka.ms/vs/17/release/vc_redist.x86.exe&quot; -z &quot;$(ProjectDir)\Files\VC_redist.x86.exe&quot; -o &quot;$(ProjectDir)\Files\VC_redist.x86.exe&quot;" />
+    <Exec Command="curl --fail -s -L &quot;https://go.microsoft.com/fwlink/p/?LinkId=2124703&quot; -z &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot; -o &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot;" />
+    <Exec Command="curl --fail -s -L &quot;https://aka.ms/vs/17/release/vc_redist.x86.exe&quot; -z &quot;$(ProjectDir)\Files\VC_redist.x86.exe&quot; -o &quot;$(ProjectDir)\Files\VC_redist.x86.exe&quot;" />
     <PropertyGroup>
       <DefineConstants>ElwigProjectDir=..\Elwig</DefineConstants>
     </PropertyGroup>
   </Target>
   <ItemGroup>
     <ProjectReference Include="..\Installer\Installer.wixproj" />
-    <PackageReference Include="WixToolset.Bal.wixext" Version="5.0.0" />
-    <PackageReference Include="WixToolset.Util.wixext" Version="5.0.0" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="5.0.1" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="5.0.1" />
   </ItemGroup>
 </Project>

Tests/DocumentTests/CreditNoteTest.cs

@@ -13,7 +13,7 @@ namespace Tests.DocumentTests {
             var m = await ctx.Members.FindAsync(101);
             var p = await ctx.MemberPayments.Where(p => p.Year == 2020 && p.AvNr == 1).SingleAsync();
             var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, 2020, 1);
-            using var doc = new CreditNote(ctx, p, data[m!.MgNr], false, false, false,
+            using var doc = new CreditNote(ctx, p, data[m!.MgNr], false, false, false, false,
                 ctx.GetMemberUnderDelivery(2020, m!.MgNr).GetAwaiter().GetResult());
             var text = await Utils.GeneratePdfText(doc);
             Assert.Multiple(() => {
@@ -22,11 +22,11 @@ namespace Tests.DocumentTests {
                     Winzerstraße 1
                     2223 Hohenruppersdorf
                     """));
-                Assert.That(text, Contains.Substring("1472583"));  // Betriebsnummer
+                Assert.That(text, Contains.Substring("0123463"));  // Betriebsnummer
                 Assert.That(text, Contains.Substring("pauschaliert"));
-                Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
+                Assert.That(text, Contains.Substring($"Wolkersdorf, am {Elwig.Helpers.Utils.Today:dd.MM.yyyy}"));
                 Assert.That(text, Contains.Substring("Traubengutschrift Max Mustermann – Probevariante"));
-                Assert.That(text, Contains.Substring("AT12 3456 7890 1234 5678"));
+                Assert.That(text, Contains.Substring("AT81 1234 5678 9012 3457"));
                 Assert.That(text, Contains.Substring("""
                     20201001X001 1 Grüner Veltliner 73 15,0 ungeb.: 3 219 0,5000 - - 1 609,50
                     20201001X003 1 Grüner Veltliner 75 15,4 ungeb.: 2 561 - -

Tests/DocumentTests/DeliveryConfirmationTest.cs

@@ -19,9 +19,9 @@ namespace Tests.DocumentTests {
                     Winzerstraße 1
                     2223 Hohenruppersdorf
                     """));
-                Assert.That(text, Contains.Substring("1472583"));  // Betriebsnummer
+                Assert.That(text, Contains.Substring("0123463"));  // Betriebsnummer
                 Assert.That(text, Contains.Substring("pauschaliert"));
-                Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
+                Assert.That(text, Contains.Substring($"Wolkersdorf, am {Elwig.Helpers.Utils.Today:dd.MM.yyyy}"));
                 Assert.That(text, Contains.Substring("Anlieferungsbestätigung 2020"));
                 Assert.That(text, Contains.Substring("""
                     20201001X003 2 Grüner Veltliner Kabinett Kabinett 87 17,6 ungeb.: 3 129 3 129 n

Tests/DocumentTests/DeliveryJournalTest.cs

@@ -12,35 +12,36 @@ namespace Tests.DocumentTests {
             var data = await DeliveryJournalData.FromQuery(ctx.Deliveries.Where(d => d.Year == 2020).SelectMany(d => d.Parts), ["Saison 2020"]);
             using var doc = new DeliveryJournal("Saison 2020", data);
             var text = await Utils.GeneratePdfText(doc, true);
+            var table = Utils.ExtractTable(text);
             Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("Lieferjournal"));
                 Assert.That(text, Contains.Substring("Saison 2020"));
-                Assert.That(text, Contains.Substring("""
-                    20201001X001       1      01.10.2020 09:03  101 MUSTERMANN Max               Grüner Veltliner      73   15,0     3 219
-                    20201001X002       1      01.10.2020 09:35  102 WEINBAUER Wernhardt          Grüner Veltliner      86   17,5     2 987
-                    20201001X002       2      01.10.2020 09:35  102 WEINBAUER Wernhardt          Grüner Veltliner      87   17,7     1 873
-                    20201001X003       1      01.10.2020 10:24  101 MUSTERMANN Max               Grüner Veltliner      75   15,4     2 561
-                    20201001X003       2      01.10.2020 10:24  101 MUSTERMANN Max               Grüner Veltliner      87   17,6     3 129
-                    20201001X003       3      01.10.2020 10:24  101 MUSTERMANN Max               Grüner Veltliner      79   16,1     1 280
-                    20201001X004       1      01.10.2020 11:13  102 WEINBAUER Wernhardt          Grüner Veltliner      82   16,7     4 002
-                    20201001X004       2      01.10.2020 11:13  102 WEINBAUER Wernhardt          Grüner Veltliner      75   15,3       481
-                    20201001X005       1      01.10.2020 12:45  101 MUSTERMANN Max               Welschriesling        84   17,0     3 192
-                    20201001X005       2      01.10.2020 12:45  101 MUSTERMANN Max               Welschriesling        84   17,1     2 190
-                    20201001X006       1      01.10.2020 13:18  102 WEINBAUER Wernhardt          Grüner Veltliner      74   15,2     1 732
-                    20201002X001       1      02.10.2020 09:13  103 MUSTERBAUER Matthäus         Grüner Veltliner      80   16,3     3 198
-                    20201002X001       2      02.10.2020 09:13  103 MUSTERBAUER Matthäus         Grüner Veltliner      75   15,4     2 134
-                    20201002X002       1      02.10.2020 09:28  103 MUSTERBAUER Matthäus         Grüner Veltliner      78   16,0     2 901
-                    20201002X002       2      02.10.2020 09:28  103 MUSTERBAUER Matthäus         Grüner Veltliner      85   17,3     3 321
-                    20201002X003       1      02.10.2020 10:11  103 MUSTERBAUER Matthäus         Welschriesling        85   17,2     3 998
-                    20201003X001       1      03.10.2020 14:13  104 WINZER Waltraud              Zweigelt              73   15,0     1 212
-                    20201003X001       2      03.10.2020 14:13  104 WINZER Waltraud              Zweigelt              74   15,2     2 471
-                    20201003X001       3      03.10.2020 14:13  104 WINZER Waltraud              Zweigelt              77   15,7       842
-                    20201003X002       1      03.10.2020 14:39  104 WINZER Waltraud              Zweigelt              84   17,0     3 578
-                    20201003X002       2      03.10.2020 14:39  104 WINZER Waltraud              Zweigelt              85   17,2     3 862
-                    20201003X003       1      03.10.2020 15:15  104 WINZER Waltraud              Blauer Portugieser    89   18,0     2 410
-                    20201003X003       2      03.10.2020 15:15  104 WINZER Waltraud              Blauer Portugieser    89   18,1     2 313
-                    Gesamt:                   (Teil-)Lieferungen: 12 (23)                                              82   16,6    58 886
-                    """));
+                Assert.That(table, Is.EqualTo(new string[][] {
+                    ["20201001X001", "1", "01.10.2020 09:03", "101 MUSTERMANN Max",       "Grüner Veltliner",   "73", "15,0",  "3 219"],
+                    ["20201001X002", "1", "01.10.2020 09:35", "102 WEINBAUER Wernhardt",  "Grüner Veltliner",   "86", "17,5",  "2 987"],
+                    ["20201001X002", "2", "01.10.2020 09:35", "102 WEINBAUER Wernhardt",  "Grüner Veltliner",   "87", "17,7",  "1 873"],
+                    ["20201001X003", "1", "01.10.2020 10:24", "101 MUSTERMANN Max",       "Grüner Veltliner",   "75", "15,4",  "2 561"],
+                    ["20201001X003", "2", "01.10.2020 10:24", "101 MUSTERMANN Max",       "Grüner Veltliner",   "87", "17,6",  "3 129"],
+                    ["20201001X003", "3", "01.10.2020 10:24", "101 MUSTERMANN Max",       "Grüner Veltliner",   "79", "16,1",  "1 280"],
+                    ["20201001X004", "1", "01.10.2020 11:13", "102 WEINBAUER Wernhardt",  "Grüner Veltliner",   "82", "16,7",  "4 002"],
+                    ["20201001X004", "2", "01.10.2020 11:13", "102 WEINBAUER Wernhardt",  "Grüner Veltliner",   "75", "15,3",    "481"],
+                    ["20201001X005", "1", "01.10.2020 12:45", "101 MUSTERMANN Max",       "Welschriesling",     "84", "17,0",  "3 192"],
+                    ["20201001X005", "2", "01.10.2020 12:45", "101 MUSTERMANN Max",       "Welschriesling",     "84", "17,1",  "2 190"],
+                    ["20201001X006", "1", "01.10.2020 13:18", "102 WEINBAUER Wernhardt",  "Grüner Veltliner",   "74", "15,2",  "1 732"],
+                    ["20201002X001", "1", "02.10.2020 09:13", "103 MUSTERBAUER Matthäus", "Grüner Veltliner",   "80", "16,3",  "3 198"],
+                    ["20201002X001", "2", "02.10.2020 09:13", "103 MUSTERBAUER Matthäus", "Grüner Veltliner",   "75", "15,4",  "2 134"],
+                    ["20201002X002", "1", "02.10.2020 09:28", "103 MUSTERBAUER Matthäus", "Grüner Veltliner",   "78", "16,0",  "2 901"],
+                    ["20201002X002", "2", "02.10.2020 09:28", "103 MUSTERBAUER Matthäus", "Grüner Veltliner",   "85", "17,3",  "3 321"],
+                    ["20201002X003", "1", "02.10.2020 10:11", "103 MUSTERBAUER Matthäus", "Welschriesling",     "85", "17,2",  "3 998"],
+                    ["20201003X001", "1", "03.10.2020 14:13", "104 WINZER Waltraud",      "Zweigelt",           "73", "15,0",  "1 212"],
+                    ["20201003X001", "2", "03.10.2020 14:13", "104 WINZER Waltraud",      "Zweigelt",           "74", "15,2",  "2 471"],
+                    ["20201003X001", "3", "03.10.2020 14:13", "104 WINZER Waltraud",      "Zweigelt",           "77", "15,7",    "842"],
+                    ["20201003X002", "1", "03.10.2020 14:39", "104 WINZER Waltraud",      "Zweigelt",           "84", "17,0",  "3 578"],
+                    ["20201003X002", "2", "03.10.2020 14:39", "104 WINZER Waltraud",      "Zweigelt",           "85", "17,2",  "3 862"],
+                    ["20201003X003", "1", "03.10.2020 15:15", "104 WINZER Waltraud",      "Blauer Portugieser", "89", "18,0",  "2 410"],
+                    ["20201003X003", "2", "03.10.2020 15:15", "104 WINZER Waltraud",      "Blauer Portugieser", "89", "18,1",  "2 313"],
+                    ["Gesamt:",           "(Teil-)Lieferungen: 12 (23)",                                        "82", "16,6", "58 886"],
+                }));
             });
         }
     }

Tests/DocumentTests/DeliveryNoteTest.cs

@@ -13,13 +13,13 @@ namespace Tests.DocumentTests {
             var text = await Utils.GeneratePdfText(doc);
             Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("""
-                MUSTERMANN Max
-                Winzerstraße 1
-                2223 Hohenruppersdorf
-                """));
-                Assert.That(text, Contains.Substring("1472583"));  // Betriebsnummer
+                    MUSTERMANN Max
+                    Winzerstraße 1
+                    2223 Hohenruppersdorf
+                    """));
+                Assert.That(text, Contains.Substring("0123463"));  // Betriebsnummer
                 Assert.That(text, Contains.Substring("pauschaliert"));
-                Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
+                Assert.That(text, Contains.Substring($"Wolkersdorf, am {Elwig.Helpers.Utils.Today:dd.MM.yyyy}"));
                 Assert.That(text, Contains.Substring("Traubenübernahmeschein Nr. 20201001X001"));
                 Assert.That(text, Contains.Substring("Ich bin der Text, der auf einem Traubenübernahmeschein steht!"));
                 Assert.That(text, Contains.Substring("""
@@ -44,9 +44,9 @@ namespace Tests.DocumentTests {
                     Winzerstraße 2
                     2223 Hohenruppersdorf
                     """));
-                Assert.That(text, Contains.Substring("4725836"));  // Betriebsnummer
+                Assert.That(text, Contains.Substring("0123471"));  // Betriebsnummer
                 Assert.That(text, Contains.Substring("pauschaliert"));
-                Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
+                Assert.That(text, Contains.Substring($"Wolkersdorf, am {Elwig.Helpers.Utils.Today:dd.MM.yyyy}"));
                 Assert.That(text, Contains.Substring("Traubenübernahmeschein Nr. 20201001X004"));
                 Assert.That(text, Contains.Substring("Ich bin der Text, der auf einem Traubenübernahmeschein steht!"));
                 Assert.That(text, Contains.Substring("""
@@ -73,13 +73,13 @@ namespace Tests.DocumentTests {
             var text = await Utils.GeneratePdfText(doc);
             Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("""
-                MUSTERMANN Max
-                Winzerstraße 1
-                2223 Hohenruppersdorf
-                """));
-                Assert.That(text, Contains.Substring("1472583"));  // Betriebsnummer
+                    MUSTERMANN Max
+                    Winzerstraße 1
+                    2223 Hohenruppersdorf
+                    """));
+                Assert.That(text, Contains.Substring("0123463"));  // Betriebsnummer
                 Assert.That(text, Contains.Substring("pauschaliert"));
-                Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
+                Assert.That(text, Contains.Substring($"Wolkersdorf, am {Elwig.Helpers.Utils.Today:dd.MM.yyyy}"));
                 Assert.That(text, Contains.Substring("Traubenübernahmeschein Nr. 20201001X003"));
                 Assert.That(text, Contains.Substring("Ich bin der Text, der auf einem Traubenübernahmeschein steht!"));
                 Assert.That(text, Contains.Substring("""
@@ -112,13 +112,13 @@ namespace Tests.DocumentTests {
             var text = await Utils.GeneratePdfText(doc);
             Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("""
-                MUSTERBAUER Matthäus
-                Brünner Straße 10
-                2120 Wolkersdorf im Weinviertel
-                """));
-                Assert.That(text, Contains.Substring("7258369"));  // Betriebsnummer
+                    MUSTERBAUER Matthäus
+                    Brünner Straße 10
+                    2120 Wolkersdorf im Weinviertel
+                    """));
+                Assert.That(text, Contains.Substring("0123480"));  // Betriebsnummer
                 Assert.That(text, Contains.Substring("pauschaliert"));
-                Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
+                Assert.That(text, Contains.Substring($"Wolkersdorf, am {Elwig.Helpers.Utils.Today:dd.MM.yyyy}"));
                 Assert.That(text, Contains.Substring("Traubenübernahmeschein Nr. 20201002X001"));
                 Assert.That(text, Contains.Substring("Ich bin der Text, der auf einem Traubenübernahmeschein steht!"));
                 Assert.That(text, Contains.Substring("""

Tests/DocumentTests/MemberDataSheetTest.cs

@@ -32,8 +32,8 @@ namespace Tests.DocumentTests {
                     Adresse: Hauptstraße 1
                     PLZ/Ort: 2122 Riedenthal (Riedenthal)
                     """));
-                Assert.That(text, Contains.Substring("IBAN: AT12 3456 7890 1234 5678"));
-                Assert.That(text, Contains.Substring("Betriebs-Nr.: 2583691"));
+                Assert.That(text, Contains.Substring("IBAN: AT97 1234 5678 9012 3460"));
+                Assert.That(text, Contains.Substring("Betriebs-Nr.: 0123498"));
                 Assert.That(text, Contains.Substring("Stammgemeinde: Wolkersdorf"));
             });
         }

Tests/DocumentTests/MemberListTest.cs

@@ -12,14 +12,15 @@ namespace Tests.DocumentTests {
             var data = await MemberListData.FromQuery(ctx.Members, []);
             using var doc = new MemberList("Alle Mitglieder", data);
             var text = await Utils.GeneratePdfText(doc, true);
+            var table = Utils.ExtractTable(text);
             Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("Mitgliederliste"));
                 Assert.That(text, Contains.Substring("Alle Mitglieder"));
-                Assert.That(text, Contains.Substring("""
-                     101 MUSTERMANN Max                 Winzerstraße 1            2223   Hohenruppersdorf   1472583     0   Hohenruppersdorf
-                     102 WEINBAUER Wernhardt            Winzerstraße 2            2223   Hohenruppersdorf   4725836     0   Hohenruppersdorf
-                         W&B Weinbauer GesbR            Winzerstraße 2            2223   Hohenruppersdorf
-                    """));
+                Assert.That(table.Take(3), Is.EqualTo(new string[][] {
+                     ["101 MUSTERMANN Max",      "Winzerstraße 1", "2223", "Hohenruppersdorf", "0123463", "0", "Hohenruppersdorf"],
+                     ["102 WEINBAUER Wernhardt", "Winzerstraße 2", "2223", "Hohenruppersdorf", "0123471", "0", "Hohenruppersdorf"],
+                     [    "W&B Weinbauer GesbR", "Winzerstraße 2", "2223", "Hohenruppersdorf"],
+                }));
             });
         }
     }

Tests/DocumentTests/Utils.cs

@@ -1,5 +1,6 @@
 using Elwig.Documents;
 using NReco.PdfRenderer;
+using System.Text.RegularExpressions;
 
 namespace Tests.DocumentTests {
     public static class Utils {
@@ -16,5 +17,13 @@ namespace Tests.DocumentTests {
                 File.Delete(FileName);
             }
         }
+
+        public static string[][] ExtractTable(string text) {
+            return text.Split('\n')
+                .Select(row => Regex.Split(row, @"\s{2,}").Select(c => c.Trim()).Where(c => c.Length > 0).ToArray())
+                .Where(row => row.Length > 3)
+                .Skip(1)
+                .ToArray();
+        }
     }
 }

Tests/E2ETests/AppSession.cs

@@ -0,0 +1,49 @@
+using OpenQA.Selenium.Appium.Windows;
+using OpenQA.Selenium.Appium;
+
+namespace Tests.E2ETests {
+    public class AppSession : IDisposable {
+
+        private const int WaitForAppLaunch = 3;
+        private readonly string WinAppDriverUrl;
+        public readonly WindowsDriver<WindowsElement> App;
+        public readonly WindowsDriver<WindowsElement> Desktop;
+
+        public AppSession(string appPath, string? appArgs, string winAppDriverUrl) {
+            WinAppDriverUrl = winAppDriverUrl;
+            var appiumOptions = new AppiumOptions();
+            appiumOptions.AddAdditionalCapability("app", appPath);
+            if (appArgs != null)
+                appiumOptions.AddAdditionalCapability("appArguments", appArgs);
+            appiumOptions.AddAdditionalCapability("deviceName", "WindowsPC");
+            appiumOptions.AddAdditionalCapability("ms:waitForAppLaunch", WaitForAppLaunch);
+            App = new WindowsDriver<WindowsElement>(new Uri(WinAppDriverUrl), appiumOptions);
+            Assert.That(App, Is.Not.Null);
+            Assert.That(App.SessionId, Is.Not.Null);
+            App.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(1.5);
+            var desktopOptions = new AppiumOptions();
+            desktopOptions.AddAdditionalCapability("app", "Root");
+            desktopOptions.AddAdditionalCapability("deviceName", "WindowsPC");
+            Desktop = new WindowsDriver<WindowsElement>(new Uri(WinAppDriverUrl), desktopOptions);
+        }
+
+        public WindowsDriver<WindowsElement> CreateWindowDriver(string windowName) {
+            var window = Desktop.FindElementByAccessibilityId(windowName);
+            var windowHandle = int.Parse(window.GetAttribute("NativeWindowHandle")).ToString("x"); // Convert to Hex
+            var appiumOptions = new AppiumOptions();
+            appiumOptions.AddAdditionalCapability("appTopLevelWindow", windowHandle);
+            return new WindowsDriver<WindowsElement>(new Uri(WinAppDriverUrl), appiumOptions);
+        }
+
+        public void Dispose() {
+            GC.SuppressFinalize(this);
+            App.Close();
+            try {
+                Desktop.FindElement(By.Name("Ja")).Click();
+            } catch { }
+            App.Dispose();
+            Desktop.Close();
+            Desktop.Dispose();
+        }
+    }
+}

Tests/E2ETests/DeliveryAdminWindowReceiptTest.cs

@@ -0,0 +1,85 @@
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium.Windows;
+using Tests.WeighingTests;
+
+namespace Tests.E2ETests {
+    [TestFixture, Order(2)]
+    public class DeliveryAdminWindowReceiptTest {
+
+        private MockScale Mock;
+        private AppSession Session;
+
+        [OneTimeSetUp]
+        public void Setup() {
+            Mock = new CommandMockScale(12345, ScaleHandlers.Handle_IT3000A) {
+                Weight = 3210,
+            };
+            Session = new(Utils.ApplicationPath, Utils.ConfigPath, WinAppDriver.WinAppDriverUrl);
+            Session.App.FindElement(By.Name("Stammdaten")).Click();
+            Thread.Sleep(500);
+            var window = Session.CreateWindowDriver("BaseDataWindow");
+            window.FindElement(By.Name("Saisons")).Click();
+            window.FindElement(By.Name("Neu anlegen...")).Click();
+            var dialog = Session.CreateWindowDriver("NewSeasonDialog");
+            dialog.FindElement(By.Name("Bestätigen")).Click();
+            dialog.Close();
+            Thread.Sleep(500);
+            window.Close();
+        }
+
+        [OneTimeTearDown]
+        public void Teardown() {
+            Session.Dispose();
+            Mock.Dispose();
+        }
+
+        private WindowsDriver<WindowsElement> OpenReceiptWindow() {
+            Session.App.FindElement(By.Name("Übernahme")).Click();
+            Thread.Sleep(Utils.WINDOW_OPEN_SLEEP);
+            return Session.CreateWindowDriver("DeliveryAdminWindow");
+        }
+
+        private void FinishDeliveryNote(WindowsDriver<WindowsElement> window) {
+            window.FindElement(By.Name("Abschließen")).Click();
+            Thread.Sleep(2000);
+            var doc = Session.CreateWindowDriver("DocumentViewerWindow");
+            Assert.That(doc.Title, Contains.Substring("Traubenübernahmeschein"));
+            Thread.Sleep(500);
+            doc.Close();
+            Thread.Sleep(500);
+        }
+
+        [Test]
+        public void Test_1_Minimal() {
+            var window = OpenReceiptWindow();
+            window.FindElement(By.WpfId("MgNrInput")).SendKeys("101" + Keys.Enter + "GV" + Keys.Enter + "73" + Keys.Enter + Keys.Enter);
+            Thread.Sleep(500);
+            FinishDeliveryNote(window);
+            window.Close();
+        }
+
+        [Test]
+        public void Test_2_OtherInputs() {
+            var window = OpenReceiptWindow();
+            window.FindElement(By.WpfId("MemberInput")).SendKeys("Mustermann Max");
+            window.FindElement(By.WpfId("WineVarietyInput")).SelectItem("Zweigelt");
+            window.FindElement(By.WpfId("GradationKmwInput")).SendKeys("18");
+            window.FindElement(By.Name("Wiegen")).Click();
+            Thread.Sleep(500);
+            FinishDeliveryNote(window);
+            window.Close();
+        }
+
+        [Test]
+        public void Test_3_AttributeCultivationModifier() {
+            var window = OpenReceiptWindow();
+            window.FindElement(By.WpfId("MgNrInput")).SendKeys("102" + Keys.Enter + "GVK");
+            window.FindElement(By.WpfId("CultivationInput")).SelectItem("Bio");
+            window.FindElement(By.WpfId("GradationOeInput")).SendKeys("73" + Keys.Enter + Keys.Enter);
+
+            Thread.Sleep(500);
+            FinishDeliveryNote(window);
+            window.Close();
+        }
+    }
+}

Tests/E2ETests/MainWindowTest.cs

@@ -0,0 +1,50 @@
+namespace Tests.E2ETests {
+    [TestFixture, Order(1)]
+    public class MainWindowTest {
+
+        private AppSession Session;
+
+        [OneTimeSetUp]
+        public void Setup() {
+            Session = new(Utils.ApplicationPath, Utils.ConfigPath, WinAppDriver.WinAppDriverUrl);
+        }
+
+        [OneTimeTearDown]
+        public void Teardown() {
+            Session.Dispose();
+        }
+
+        [Test]
+        public void Test_Open_MemberAdminWindow() {
+            Assert.DoesNotThrow(() => {
+                Session.App.FindElement(By.Name("Mitglieder")).Click();
+                Thread.Sleep(Utils.WINDOW_OPEN_SLEEP);
+                var window = Session.CreateWindowDriver("MemberAdminWindow");
+                Assert.That(window.Title, Is.EqualTo("Mitglieder - Elwig"));
+                window.Close();
+            });
+        }
+
+        [Test]
+        public void Test_Open_DeliveryAdminWindow() {
+            Assert.DoesNotThrow(() => {
+                Session.App.FindElement(By.Name("Lieferungen")).Click();
+                Thread.Sleep(Utils.WINDOW_OPEN_SLEEP);
+                var window = Session.CreateWindowDriver("DeliveryAdminWindow");
+                Assert.That(window.Title, Is.EqualTo("Lieferungen - Elwig"));
+                window.Close();
+            });
+        }
+
+        [Test]
+        public void Test_Open_BaseDataWindow() {
+            Assert.DoesNotThrow(() => {
+                Session.App.FindElement(By.Name("Stammdaten")).Click();
+                Thread.Sleep(Utils.WINDOW_OPEN_SLEEP);
+                var window = Session.CreateWindowDriver("BaseDataWindow");
+                Assert.That(window.Title, Is.EqualTo("Stammdaten - Elwig"));
+                window.Close();
+            });
+        }
+    }
+}

Tests/E2ETests/MemberAdminWindowTest.cs

@@ -0,0 +1,146 @@
+using OpenQA.Selenium.Appium.Windows;
+
+namespace Tests.E2ETests {
+    [TestFixture, Order(3)]
+    public class MemberAdminWindowTest {
+
+        private AppSession Session;
+        private WindowsDriver<WindowsElement> Window;
+
+        [OneTimeSetUp]
+        public void WindowSetup() {
+            Session = new(Utils.ApplicationPath, Utils.ConfigPath, WinAppDriver.WinAppDriverUrl);
+            Session.App.FindElement(By.Name("Mitglieder")).Click();
+            Thread.Sleep(Utils.WINDOW_OPEN_SLEEP);
+            Window = Session.CreateWindowDriver("MemberAdminWindow");
+        }
+
+        [OneTimeTearDown]
+        public void WindowTeardown() {
+            Window.Close();
+            Window.Quit();
+            Session.Dispose();
+        }
+
+        [TearDown]
+        public void Teardown() {
+            Window.FindElement(By.WpfId("SearchInput")).Clear();
+            Thread.Sleep(500);
+        }
+
+        [Test]
+        public void Test_1_CreateMember() {
+            Window.FindElement(By.WpfId("NewMemberButton")).Click();
+
+            Window.FindElement(By.WpfId("MgNrInput")).Clear();
+            Window.FindElement(By.WpfId("MgNrInput")).SendKeys("9999");
+
+            Window.FindElement(By.WpfId("GivenNameInput")).SendKeys("Norbert");
+            Window.FindElement(By.WpfId("FamilyNameInput")).SendKeys("Neuling");
+            Window.FindElement(By.WpfId("PrefixInput")).SendKeys("Ing.");
+            Window.FindElement(By.WpfId("SuffixInput")).SendKeys("jun.");
+            Window.FindElement(By.WpfId("BirthdayInput")).SendKeys("1987");
+
+            Window.FindElement(By.WpfId("AddressInput")).SendKeys("Musterstraße 9");
+            Window.FindElement(By.WpfId("PlzInput")).SendKeys("2120");
+            Window.FindElement(By.WpfId("OrtInput")).SelectItem(1);
+
+            Window.FindElement(By.WpfId("EmailAddress1Input")).SendKeys("norbert.neuling@aon.at");
+            Window.FindElement(By.WpfId("EmailAddress2Input")).SendKeys("nathalie.neuling@aon.at");
+
+            Window.FindElement(By.WpfId("PhoneNr1TypeInput")).SelectItem(1);
+            Window.FindElement(By.WpfId("PhoneNr1Input")).SendKeys("012345678");
+
+            Window.FindElement(By.WpfId("PhoneNr2TypeInput")).SelectItem(2);
+            Window.FindElement(By.WpfId("PhoneNr2Input")).SendKeys("0664123456");
+
+            Window.FindElement(By.WpfId("IbanInput")).SendKeys("AT611904300234573201");
+            Window.FindElement(By.WpfId("BicInput")).SendKeys("RLNWATWWWDF");
+
+            Window.FindElement(By.WpfId("UstIdNrInput")).SendKeys("ATU66192906");  // TODO: Testdaten?
+            Window.FindElement(By.WpfId("LfbisNrInput")).SendKeys("1251074");  // TODO: Testdaten?
+
+            Window.FindElement(By.WpfId("BuchführendInput")).Click();
+            Window.FindElement(By.WpfId("OrganicInput")).Click();
+
+            Window.FindElement(By.WpfId("BillingNameInput")).SendKeys("Neuling KG");
+            Window.FindElement(By.WpfId("BillingAddressInput")).SendKeys("Betriebsstraße 1");
+            Window.FindElement(By.WpfId("BillingPlzInput")).SendKeys("2120");
+            Window.FindElement(By.WpfId("BillingOrtInput")).SelectItem(2);
+
+            Window.FindElement(By.WpfId("BusinessSharesInput")).SendKeys("10");
+            Window.FindElement(By.WpfId("BranchInput")).SelectItem("Matzen");
+            Window.FindElement(By.WpfId("DefaultKgInput")).SelectItem(3);
+
+            Window.FindElement(By.WpfId("VollLieferantInput")).Click();
+            Window.FindElement(By.WpfId("FunkionärInput")).Click();
+
+            Window.FindElement(By.WpfId("CommentInput")).SendKeys("Die lieben Mustermänner und Musterfrauen!");
+            Window.FindElement(By.WpfId("ContactEmailInput")).Click();
+
+            Window.FindElement(By.WpfId("SaveButton")).Click();
+
+            Window.FindElement(By.WpfId("SearchInput")).SendKeys("9999");
+            Thread.Sleep(500);
+            var memberListRow = Window.FindElement(By.WpfId("MemberList")).FindElement(By.ClassName("DataGridRow"));
+            Assert.Multiple(() => {
+                Assert.That(memberListRow, Is.Not.Null);
+                Assert.That(memberListRow.FindElement(By.Name("9999 ")), Is.Not.Null);
+                Assert.That(memberListRow.FindElement(By.Name("Norbert")), Is.Not.Null);
+                Assert.That(memberListRow.FindElement(By.Name("Neuling")), Is.Not.Null);
+            });
+        }
+
+        [Test]
+        public void Test_2_EditMember() {
+            Window!.FindElement(By.WpfId("SearchInput")).SendKeys("9999");
+            Thread.Sleep(500);
+            var memberList = Window.FindElement(By.WpfId("MemberList"));
+            Assert.That(memberList, Is.Not.Null);
+
+            var memberListRows = memberList.FindElements(By.ClassName("DataGridRow"));
+            Assert.That(memberListRows, Has.Count.EqualTo(1));
+
+            Window.FindElement(By.WpfId("EditMemberButton")).Click();
+
+            var businessSharesInput = Window.FindElement(By.WpfId("BusinessSharesInput"));
+            Assert.That(businessSharesInput, Is.Not.Null);
+
+            var businessShares = int.Parse(businessSharesInput.Text);
+            businessSharesInput.Clear();
+            businessSharesInput.SendKeys($"{businessShares + 5}");
+
+            Window.FindElement(By.WpfId("SaveButton")).Click();
+
+            var newBusinessShares = int.Parse(businessSharesInput.Text);
+            Assert.That(newBusinessShares, Is.EqualTo(businessShares + 5));
+        }
+
+        [Test]
+        public void Test_3_DeleteMember() {
+            Window!.FindElement(By.WpfId("SearchInput")).SendKeys("9999");
+            Thread.Sleep(500);
+            var memberList = Window.FindElement(By.WpfId("MemberList"));
+            Assert.That(memberList, Is.Not.Null);
+
+            var memberListRows = memberList.FindElements(By.ClassName("DataGridRow"));
+            Assert.That(memberListRows, Has.Count.EqualTo(1));
+
+            var memberListRow = memberListRows.First();
+            Assert.Multiple(() => {
+                Assert.That(memberListRow, Is.Not.Null);
+                Assert.That(memberListRow.FindElement(By.Name("9999 ")), Is.Not.Null);
+                Assert.That(memberListRow.FindElement(By.Name("Norbert")), Is.Not.Null);
+                Assert.That(memberListRow.FindElement(By.Name("Neuling")), Is.Not.Null);
+            });
+
+            Window.FindElement(By.WpfId("DeleteMemberButton")).Click();
+            var dialog = Session.CreateWindowDriver("DeleteMemberDialog");
+            dialog.FindElement(By.WpfId("NameInput")).SendKeys("9999 Ing. Norbert Neuling jun.");
+            dialog.FindElement(By.WpfId("ConfirmButton")).Click();
+
+            memberListRows = memberList.FindElements(By.ClassName("DataGridRow"));
+            Assert.That(memberListRows, Has.Count.EqualTo(0));
+        }
+    }
+}

Tests/E2ETests/Setup.cs

@@ -0,0 +1,37 @@
+using Elwig.Helpers;
+using System.Reflection;
+
+namespace Tests.E2ETests {
+    [SetUpFixture]
+    public static class Setup {
+
+        private static WinAppDriver? Driver;
+
+        [OneTimeSetUp]
+        public static void SetupWinAppDriver() {
+            Driver = new();
+        }
+
+        [OneTimeSetUp]
+        public static async Task SetupDatabase() {
+            if (File.Exists(Utils.TestDatabasePath)) File.Delete(Utils.TestDatabasePath);
+            using var cnx = await AppDbContext.ConnectAsync($"Data Source=\"{Utils.TestDatabasePath}\"; Mode=ReadWriteCreate; Foreign Keys=True; Cache=Default");
+            await AppDbContext.ExecuteEmbeddedScript(cnx, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.Create.sql");
+            await AppDbContext.ExecuteEmbeddedScript(cnx, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.Insert.sql");
+            await AppDbContext.ExecuteEmbeddedScript(cnx, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.E2EInsert.sql");
+        }
+
+        [OneTimeTearDown]
+        public static void TeardownWinAppDriver() {
+            Driver?.Dispose();
+        }
+
+        [OneTimeTearDown]
+        public static void TeardownDatabase() {
+            try {
+                // FIXME not working - other process using file
+                File.Delete(Utils.TestDatabasePath);
+            } catch { }
+        }
+    }
+}

Tests/E2ETests/Utils.cs

@@ -0,0 +1,31 @@
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium;
+
+namespace Tests.E2ETests {
+    public static class Utils {
+
+        public const int WINDOW_OPEN_SLEEP = 2000;
+
+        public static readonly string ApplicationPath = Path.GetFullPath(@"..\..\..\..\Elwig\bin\Debug\net8.0-windows\Elwig.exe");
+        public static readonly string ConfigPath = Path.GetFullPath(@"..\..\..\..\Tests\config.test.ini");
+        public static readonly string TestDatabasePath = Path.GetFullPath(@"..\..\..\..\Tests\ElwigTestDB.sqlite3");
+
+        public static void SelectItem(this IWebElement element, int count) {
+            element.Click();
+            element.SendKeys(string.Concat(Enumerable.Repeat(Keys.Down, count)));
+            element.SendKeys(Keys.Enter);
+        }
+
+        public static void SelectItem(this IWebElement element, string text) {
+            element.Click();
+            element.SendKeys(text);
+            element.SendKeys(Keys.Enter);
+        }
+    }
+
+    public class By : OpenQA.Selenium.By {
+        public static OpenQA.Selenium.By WpfId(string wpfName) {
+            return new ByAccessibilityId(wpfName);
+        }
+    }
+}

Tests/E2ETests/WinAppDriver.cs

@@ -0,0 +1,27 @@
+using System.Diagnostics;
+
+namespace Tests.E2ETests {
+    public class WinAppDriver : IDisposable {
+
+        public const string WinAppDriverUrl = "http://127.0.0.1:4723";
+        private const string WinAppDriverPath = @"C:\Program Files (x86)\Windows Application Driver\WinAppDriver.exe";
+        private readonly Process WinAppDriverProcess;
+
+        public WinAppDriver() {
+            WinAppDriverProcess = Process.Start(new ProcessStartInfo(WinAppDriverPath) {
+                //UseShellExecute = true,
+                //Verb = "runas",  // run as administrator
+                RedirectStandardInput = true,
+                EnvironmentVariables = {
+                //    { "DX.UITESTINGENABLED", "1" },
+                }
+            })!;
+        }
+
+        public void Dispose() {
+            GC.SuppressFinalize(this);
+            WinAppDriverProcess.StandardInput.WriteLine("");
+            WinAppDriverProcess.Dispose();
+        }
+    }
+}

Tests/HelperTests/EbicsTest.cs

@@ -14,16 +14,16 @@ namespace Tests.HelperTests {
         public static readonly string FileName = Path.Combine(Path.GetTempPath(), "test_ebics.xml");
         public static readonly string Iban = "AT123456789012345678";
 
-        private static void ValidateSchema(string xmlPath, int version) {
+        private static void ValidateSchema(string xmlPath, int version, string? extra = null) {
             XmlDocument xml = new();
             xml.Load(xmlPath);
             var schema = new XmlTextReader(Assembly.GetExecutingAssembly()
-                .GetManifestResourceStream($"Tests.Resources.Schemas.pain.001.001.{version:00}.xsd")!);
+                .GetManifestResourceStream($"Tests.Resources.Schemas.pain.001.001.{version:00}{extra}.xsd")!);
             xml.Schemas.Add(null, schema);
             xml.Validate(null);
         }
 
-        private static async Task CreateXmlFile(int version) {
+        private static async Task CreateXmlFile(int version, Ebics.AddressMode mode = Ebics.AddressMode.Full) {
             var v = new PaymentVar() {
                 Year = 2020,
                 AvNr = 1,
@@ -35,7 +35,7 @@ namespace Tests.HelperTests {
             using var ctx = new AppDbContext();
             var members = ctx.Members.ToList();
             Assert.That(members, Has.Count.GreaterThan(0));
-            using var exporter = new Ebics(v, FileName, version);
+            using var exporter = new Ebics(v, FileName, version, mode);
             await exporter.ExportAsync(members.Select(m => new Transaction(m, 1234.56m, "EUR", m.MgNr % 100)));
         }
 
@@ -64,6 +64,12 @@ namespace Tests.HelperTests {
             Assert.DoesNotThrow(() => ValidateSchema(FileName, 3));
         }
 
+        [Test]
+        public async Task Test_CustomerCreditTransferInitiationV03_AT() {
+            await CreateXmlFile(3, Ebics.AddressMode.Lines);
+            Assert.DoesNotThrow(() => ValidateSchema(FileName, 3, ".AT"));
+        }
+
         [Test]
         public async Task Test_CustomerCreditTransferInitiationV04() {
             await CreateXmlFile(4);