Bump version to 0.11.1

.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

.gitea/workflows/test.yaml

@@ -2,6 +2,7 @@ name: Test
 on:
   push:
     branches: ["**"]
+    paths: ["Elwig/**", "Tests/**", "Installer/Files/*.exe", ".gitea/workflows/test.yaml"]
 jobs:
   test:
     name: Run tests
@@ -9,6 +10,19 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+      - name: Check for Byte order marks
+        shell: powershell
+        run: |
+          $pattern = [char]::ConvertFromUtf32(0xFEFF)
+          $files = git grep -IEl "^$pattern"
+          if ( $lastexitcode -ne 1 ) {
+            echo "Files with BOM found:"
+            echo $files
+            exit 1
+          } else {
+            echo "No files with BOM found"
+            exit 0
+          }
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v1.1
       - name: Setup NuGet
@@ -26,4 +40,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,711 @@
+
+Changelog
+=========
+
+
+[v0.11.1][v0.11.1] (2024-09-19) {#v0.11.1}
+------------------------------------------
+
+### Neue Funktionen {#v0.11.1-features}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) mehr Filter hinzugefügt; das Gewicht wird (wie im Lieferungen-Fenster) aufgeschlüsselt. (27d8a5cfb6)
+
+### Behobene Fehler {#v0.11.1-bugfixes}
+
+* Beim Export der BKI-Liste werden Namen von Rechnungsadressen _immer_ richtig getrennt. (871bc299bd)
+* Flächenbindungen ohne Startsaison werden ohne Fehler gehandhabt. (21a1b11d68)
+
+### Sonstiges {#v0.11.1-misc}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`)...
+	* die Liste der Lesepläne vergrößert. (a18b58f438)
+	* sind abgesagte Lesepläne durchgestrichen. (74200083ab)
+	* wird beim Erstellen das Feld für die MgNr direkt fokussiert. (3f7cd2a6ff)
+* Abhängigkeiten aktualisiert. (eee90c784b, d8beb03b96)
+* Kleinigkeiten in `DeliveryService`. (642fb3a625)
+
+[v0.11.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.1
+
+
+
+
+[v0.11.0][v0.11.0] (2024-09-16) {#v0.11.0}
+------------------------------------------
+
+### Neue Funktionen {#v0.11.0-features}
+
+* Im Rundschreiben-Fenster (`MailWindow`) können jetzt auch Funktionäre, Bio-Betriebe oder angemeldete Mitglieder für einen Leseplan adressiert werden. (5c08f61963)
+* Im Leseplan-Fenster (`DeliveryScheduleAdminWindow`) können nun auch Attribut, Bewirtschaftungsart, und ob der Leseplan abgesagt ist angegeben werden. (d8a10152b3)
+
+### Sonstiges {#v0.11.0-misc}
+
+* `App.HintContextChange()` ist synchron und fügt Arbeitsaufträge dem Dispatcher hinzu. (f09c43c1bd)
+
+[v0.11.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.0
+
+
+
+
+[v0.10.8][v0.10.8] (2024-09-05) {#v0.10.8}
+------------------------------------------
+
+### Neue Funktionen {#v0.10.8-features}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) gibt es eine neue Spalte `Datum` und es können alle Lesepläne nach z.B. einem Mitglied durchsucht werden. (a5638135a3, 7437187630)
+
+### Behobene Fehler {#v0.10.8-bugfixes}
+
+* Versuch 3: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (8d9172f91e)
+
+### Sonstiges {#v0.10.8-misc}
+
+* Im Lieferjournal (`DeliveryJournal`) ist die Sortierung der Filter für das Gewicht korrigiert. (22514715c1)
+* In der Anmeldeliste (`DeliveryAncmtList`) wurde die Spalte `Anmldg.` zentriert. (f43d9c020c)
+* In Geschäftsdokumenten (`BusinessDocument`) wurden im Informationsblock `:` hinzugefügt. (26235f8c0a)
+* Im Mitgliedsstammdatenblat (`MemberDataSheet`) wird der USt.-Steuersatz zusätzlich zu _Buchführend: ja/nein_ angezeigt. (a04c7d538e)
+
+[v0.10.8]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.8
+
+
+
+
+[v0.10.7][v0.10.7] (2024-09-02) {#v0.10.7}
+------------------------------------------
+
+### Neue Funktionen {#v0.10.7-features}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) wird der Anmeldezeitpunkt angezeigt; in der Anmeldeliste als `ok` oder `verspät.`. (141086673f)
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) kann nach dem Gesamtgewicht einer Lieferung gefiltert werden (z.B. `<500kg`, `>8000kg`). (543185d48e)
+
+### Behobene Fehler {#v0.10.7-bugfixes}
+
+* Versuch 2: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (6627ab6d12)
+
+[v0.10.7]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.7
+
+
+
+
+[v0.10.6][v0.10.6] (2024-08-30) {#v0.10.6}
+------------------------------------------
+
+### Behobene Fehler {#v0.10.6-bugfixes}
+
+* Der Titel des Flächenbindungs-Fensters (`AreaComAdminWindow`) ist jetzt _Flächenbindungen_, nicht mehr _Lieferungen_. (ee1315929c)
+* Im Auszahlungsvariante-Fenster (`ChartWindow`) einen Skalierungs-Fehler behoben. ([#33][i33])
+* Versuch: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (8c8c0a8c2b)
+
+### Sonstiges {#v0.10.6-misc}
+
+* SQL-Queries für Auszahlung-Anpassen-Fenster (`PaymentAdjustmentWindow`) und Über-/Unterlieferungen effizienter umgeschrieben. (9930e6173c)
+* Im Haupt-Fenster (`MainWindow`) den Menüpunkt _Waagen_ zu _Waage_ geändert. (8ce8492c74)
+* Im Übernahme-Fenster (`DeliveryAdminWindow`) wird in der Teil-Lieferungen-Liste immer die letzte Teil-Lieferung angezeigt. (2ef10b4bb2)
+* Breite des Traubenanmeldungen-Fensters (`DeliveryAncmtAdminWindow`) leicht erhöht und Fehler beim Enter-Drücken im _Gewicht_ Eingabefeld. (21f68caf4c, e18bc58b6c)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) wird das ändern der Kontaktart E-Mail wieder farblich hervorgehoben. (78a72c641f)
+
+[v0.10.6]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.6
+[i33]: https://git.necronda.net/winzer/elwig/issues/33
+
+
+
+
+[v0.10.5][v0.10.5] (2024-08-24) {#v0.10.5}
+------------------------------------------
+
+### Neue Funktionen {#v0.10.5-features}
+
+* Im Mitglieder-Fenster (`MemberAdminWindow`) kann der Benutzer beim Übertragen von Flächenbindungen entscheiden, ob der Beginn der Laufzeit übernommen werden soll, oder nicht. (bec1b165bf)
+* Im Haupt-Fenster (`MainWindow`) ist es nun möglich für Waagen vom Typ `SysTec-IT` Datum und Uhrzeit festzulegen. (cd2b482b5a)
+
+### Sonstiges {#v0.10.5-misc}
+
+* Abstände in der Statusleiste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`). (adbe418b7c)
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) scheinen keine Warnungen mehr auf, wenn ein nicht-optionales Feld nicht ausgefüllt wurde. (2ae2564647)
+
+[v0.10.5]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.5
+
+
+
+
+[v0.10.4][v0.10.4] (2024-08-22) {#v0.10.4}
+------------------------------------------
+
+### Sonstiges {#v0.10.4-misc}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) wird der Wochentag auch beim Bearbeiten angezeigt. (85931e62e8)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) werden Anzahl der Mitglieder und Geschäftsanteile nicht mehr von allen aktiven angezeigt, sonder von den momentan gefilterten. (49e4b65c27)
+* Statusleiste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`). (f54677d429)
+
+[v0.10.4]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.4
+
+
+
+
+[v0.10.3][v0.10.3] (2024-08-21) {#v0.10.3}
+------------------------------------------
+
+### Behobene Fehler {#v0.10.3-bugfixes}
+
+* Datum für _Anmeldungen bis_ im Leseplan-Fenster (`DeliveryScheduleAdminWindow`) ab jetzt änderbar. (84d8d0cecb)
+
+### Sonstiges {#v0.10.3-misc}
+
+* Wochentag bei Leseplan-Liste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) anzeigen. (fe7f9d675b)
+
+[v0.10.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.3
+
+
+
+
+[v0.10.2][v0.10.2] (2024-08-16) {#v0.10.2}
+------------------------------------------
+
+### Behobene Fehler {#v0.10.2-bugfixes}
+
+* Beim Hochladen der Mitgliederdaten sind Flächenbindungen nicht mitexportiert worden. (204dfe8745)
+* Beim Importieren von älteren Exportdaten kam es zu einem Fehler. (cd40075702)
+
+[v0.10.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.2
+
+
+
+
+[v0.10.1][v0.10.1] (2024-08-14) {#v0.10.1}
+------------------------------------------
+
+### Neue Funktionen {#v0.10.1-features}
+
+* In der Mitglieder-Liste (PDF und Excel) werden ggf. gefilterte Flächenbindungen angegeben. (d3839c288a)
+
+### Behobene Fehler {#v0.10.1-bugfixes}
+
+* Fehler beim Berechnen...
+  * falls in Saison keine Lieferungen vorhanden sind. (48970de652)
+  * falls der Vorname eines Mitgliedes nicht gesetzt ist. (2764a0ca21)
+
+[v0.10.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.1
+
+
+
+
+[v0.10.0][v0.10.0] (2024-08-13) {#v0.10.0}
+------------------------------------------
+
+> [!NOTE]
+> Mitglieder können ab dieser Version als juristische Person markiert werden.
+> Es ist empfohlen, dies bei entsprechenden Mitglieder zu überprüfen und einzusetzen (z.B. Bezirksbauernkammer, Lagerhaus).
+
+### Neue Funktionen {#v0.10.0-features}
+
+* Traubenanmeldungen und Leseplanung sind ab jetzt verfügbar. ([#14][i14])
+* Mitglieder können nun auch als juristische Person markiert werden. ([#54][i54])
+* Im Auszahlungsvarianten-Fenster kann unter _Anpassen_ (`PaymentAdjustmentWindow`) nun auch ein Absoluter oder Relativer Zu-/Abschlag pro Mitglied festgelegt werden, der **vor der MwSt.** angewendet wird. (4d89a17e80)
+
+### Behobene Fehler {#v0.10.0-bugfixes}
+
+* Beim Erstellen eines neuen Mitgliedes war es nicht möglich die Flächenbindungen des Vorgängers zu übernehmen. (9127cd3f03)
+
+### Sonstiges {#v0.10.0-misc}
+
+* Für den Treuebonus der WG Matzen werden nun auch Lieferungen der Vorgänger miteinbezogen. (2333077aa5)
+* In den Variantendaten einer Auszahlungsvariante (`PaymentVariantSummary`) werden Zu-/Abschläge pro Mitglied explizit angegeben, somit ist die Zwischensumme korrekt. (f52c11b91e)
+
+[v0.10.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.0
+[i14]: https://git.necronda.net/winzer/elwig/issues/14
+[i54]: https://git.necronda.net/winzer/elwig/issues/54
+
+
+
+
+[v0.9.3][v0.9.3] (2024-08-02) {#v0.9.3}
+---------------------------------------
+
+### Sonstiges {#v0.9.3-misc}
+
+* Das Lieferjournal als Excel-Liste beinhaltet nun auch Liefer-Zweigstelle und Stamm-Zweigstelle des Liefernaten. (cf05a0c658)
+
+[v0.9.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.9.3
+
+
+
+
+[v0.9.2][v0.9.2] (2024-08-01) {#v0.9.2}
+---------------------------------------
+
+### Behobene Fehler {#v0.9.2-bugfixes}
+
+* Verhalten beim Schließen des Haupt-Fensters (`MainWindow`) nicht immer richtig. (8db6007264)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) führt beim Erstellen eines Mitglied das Eingeben einer Tel.-Nr. zu einem Fehler. (4403754ada)
+
+[v0.9.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.9.2
+
+
+
+
+[v0.9.1][v0.9.1] (2024-08-01) {#v0.9.1}
+---------------------------------------
+
+### Neue Funktionen {#v0.9.1-features}
+
+* Im Rundschreiben-Fenster (`MailWindow`) können E-Mails ohne Anhänge verschickt werden. (f69d2809f3)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) und Lieferungen-Fenster (`DeliveryAdminWindow`) kann das/die momentan ausgewählte Mitglied/Lieferung alleine exportiert werden. (db4de5b5fe)
+* Exporte für Mitglieder enthalten nun auch deren Flächenbindungen. (10ee1d6548)
+
+### Behobene Fehler {#v0.9.1-bugfixes}
+
+* Sortierung der Wiegen-Knöpfe im Übernahme-Fenster (`DeliveryAdminWindow`). (7786fb421a)
+
+### Sonstiges {#v0.9.1-misc}
+
+* Deutsche Fehlermeldung beim Hochladen/Herunterladen im Haupt-Fenster (`MainWindow`). (91717f8efb)
+* Waagen-Fehler _Brutto negativ_ implementiert. (39f93da0ba)
+
+[v0.9.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.9.1
+
+
+
+
+[v0.9.0][v0.9.0] (2024-07-28) {#v0.9.0}
+---------------------------------------
+
+### Neue Funktionen {#v0.9.0-features}
+
+* Flächenbindungen werden als Tabelle in der Status-Leiste im Mitglieder-Fenster (`MemberAdminWindow`) angezeigt. ([#26][i26])
+* Filter für E-Mail-Adressen, Tel.-Nr. und Kontaktarten im Mitglieder-Fenster (`MemberAdminWindow`). (1141331608)
+* Auf Lieferscheinen (`DeliveryNote`) werden nun _Brutto, Tara, Netto_ werte abgedruckt. (fd0ed97305, 4aa3362029, 53d3affefe)
+* Beim Exportieren der Mitgliederliste werden auch Tel.-Nr. und E-Mail-Adressen exportiert. (b6afb94246)
+* Benutzerfreundliches Synchronisieren zwischen Standorten. ([#3][i3])
+* Übernehmer _müssen_ explizit entscheiden, ob _gerebelt gewogen_ oder nicht. (935b31f6e3)
+
+### Behobene Fehler {#v0.9.0-bugfixes}
+
+* Zu-/Abschläge im Lieferungen-Fenster (`DeliveryAdminWindow`). (f235d5b380)
+* Falls keine Saison existierte führte das zu einem Absturz im Rundschreiben-Fenster (`MailWindow`). (84f772a32f)
+* Beim Drucken _sollte_ kein Kommandozeilen-Fenster mehr sichtbar sein. (d741ba92dc)
+* Wenn bei einem Mitglied keine Stamm-KG hinterlegt war, kam es zu inkonsistentem Verhalten im Übernahme-Fenster (`DeliveryAdminWinodw`). (4c3f0c40fa)
+
+### Sonstiges {#v0.9.0-misc}
+
+* Model-View-ViewModel (MVVM) implementiert! ([#10][i10])
+* Die nächste Saison "beginnt" bereits im Juli (statt erst im August) (`CurrentLastSeason`). (c314321039)
+* Automatisierte Tests für Waagen (Sitzendorf, Haugsdorf). (8e9f2f4e90)
+* Überprüfung auf Byte-Order-Marks in allen Quellcode-Dateien. (53c7cb2ec0, f09753ccc2)
+
+[v0.9.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.9.0
+[i3]: https://git.necronda.net/winzer/elwig/issues/3
+[i10]: https://git.necronda.net/winzer/elwig/issues/10
+[i26]: https://git.necronda.net/winzer/elwig/issues/26
+
+
+
+
+[v0.8.9][v0.8.9] (2024-07-23) {#v0.8.9}
+---------------------------------------
+
+### Behobene Fehler {#v0.8.9-bugfixes}
+
+* Absturz im Rundschreiben-Fenster (`MailWindow`). Fehler bei `CheckComboBox`. (49f03c0a3c)
+* Excel-Exporte können nun auch Sonderzeichen (wie `&`) enthalten. (ba9e1d7201)
+
+[v0.8.9]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.9
+
+
+
+
+[v0.8.8][v0.8.8] (2024-07-22) {#v0.8.8}
+---------------------------------------
+
+### Behobene Fehler {#v0.8.8-bugfixes}
+
+* Schnittstelle für Gassner-Waagen nicht funktionsfähig. (4c75dbe4aa)
+
+[v0.8.8]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.8
+
+
+
+
+[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

@@ -29,22 +29,12 @@ namespace Elwig {
         private readonly DispatcherTimer _autoUpdateTimer = new() { Interval = TimeSpan.FromHours(1) };
 
         public static readonly string DataPath = @"C:\ProgramData\Elwig\";
+        public static readonly string ConfigPath = Path.Combine(DataPath, "config.ini");
         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 int VersionMajor { get; private set; }
-        public static int VersionMinor { get; private set; }
-        public static int VersionPatch { get; private set; }
-        public static string Version {
-            get => $"{VersionMajor}.{VersionMinor}.{VersionPatch}";
-            private set {
-                var p = value.Split(".").Select(p => int.Parse(p.Trim())).ToArray();
-                VersionMajor = p.ElementAtOrDefault(0);
-                VersionMinor = p.ElementAtOrDefault(1);
-                VersionPatch = p.ElementAtOrDefault(2);
-            }
-        }
+        public static Config Config { get; private set; } = new(ConfigPath);
+        public static Version Version { get; private set; } = new();
 
         public static int BranchNum { get; private set; }
         public static string ZwstId { get; private set; }
@@ -74,16 +64,22 @@ 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;
+                var ch = CurrentLastWrite;
+                if (ch > LastChanged) {
+                    LastChanged = ch;
                     OnContextChanged();
                 }
             };
         }
 
         private static void OnContextChanged() {
-            MainDispatcher.BeginInvoke(async () => await HintContextChange());
+            MainDispatcher.BeginInvoke(HintContextChange);
         }
 
         private static void OverrideCulture() {
@@ -104,7 +100,7 @@ namespace Elwig {
         }
 
         protected override async void OnStartup(StartupEventArgs evt) {
-            Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0";
+            Version = new Version(typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0");
 
             try {
                 await AppDbUpdater.CheckDb();
@@ -159,7 +155,7 @@ namespace Elwig {
                     list.Add(Scale.FromConfig(s));
                 } catch (Exception e) {
                     list.Add(new InvalidScale(s.Id));
-                    if (Config.Debug || s.Required)
+                    if (s.Required)
                         MessageBox.Show($"Unable to create scale {s.Id}:\n\n{e.Message}", "Scale Error",
                             MessageBoxButton.OK, MessageBoxImage.Error);
                 }
@@ -205,11 +201,13 @@ namespace Elwig {
             BranchMobileNr = entry.Item8;
         }
 
-        public static async Task HintContextChange() {
-            CurrentApp.LastChanged = CurrentLastWrite;
+        public static void HintContextChange() {
+            var ch = CurrentLastWrite;
+            if (ch > CurrentApp.LastChanged)
+                CurrentApp.LastChanged = ch;
             foreach (Window w in CurrentApp.Windows) {
                 if (w is not ContextWindow c) continue;
-                await c.HintContextChange();
+                MainDispatcher.BeginInvoke(c.HintContextChange);
             }
         }
 
@@ -222,10 +220,10 @@ 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)) {
+            if (latest != null && new Version(latest.Value.Version) > Version) {
                 await MainDispatcher.BeginInvoke(() => {
                     var d = new UpdateDialog(latest.Value.Version, latest.Value.Url, latest.Value.Size);
                     if (d.ShowDialog() == true) {
@@ -233,9 +231,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);
+                }
             }
         }
 
@@ -254,15 +257,15 @@ namespace Elwig {
         }
 
         public static DeliveryAdminWindow FocusReceipt() {
-            return FocusWindow<DeliveryAdminWindow>(() => new(true), w => w.IsReceipt);
+            return FocusWindow<DeliveryAdminWindow>(() => new(true), w => w.ViewModel.IsReceipt);
         }
 
         public static DeliveryAdminWindow FocusMemberDeliveries(int mgnr) {
-            return FocusWindow<DeliveryAdminWindow>(() => new(mgnr), w => w.MgNr == mgnr);
+            return FocusWindow<DeliveryAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember?.MgNr == mgnr);
         }
 
         public static AreaComAdminWindow FocusMemberAreaComs(int mgnr) {
-            return FocusWindow<AreaComAdminWindow>(() => new(mgnr), w => w.MgNr == mgnr);
+            return FocusWindow<AreaComAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember.MgNr == mgnr);
         }
 
         public static BaseDataWindow FocusBaseData() {
@@ -292,10 +295,22 @@ namespace Elwig {
             return w;
         }
 
+        public static DeliveryAncmtAdminWindow FocusDeliveryAncmt() {
+            return FocusWindow<DeliveryAncmtAdminWindow>(() => new());
+        }
+
+        public static DeliveryScheduleAdminWindow FocusDeliverySchedule() {
+            return FocusWindow<DeliveryScheduleAdminWindow>(() => new());
+        }
+
         public static PaymentVariantsWindow FocusPaymentVariants(int year) {
             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

@@ -1,73 +1,112 @@
-using System.Linq;
+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 static readonly DependencyProperty DelimiterProperty = DependencyProperty.Register("Delimiter", typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata(", "));
+        public new static readonly DependencyProperty SelectedItemsProperty = DependencyProperty.Register(nameof(SelectedItems), typeof(IList), typeof(CheckComboBox), new FrameworkPropertyMetadata(null, 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("AllItemsSelectedContent", typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata("All"));
+        public static readonly DependencyProperty ListDisplayMemberPathProperty = DependencyProperty.Register(nameof(ListDisplayMemberPath), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata(null));
+        public string ListDisplayMemberPath {
+            get => (string)GetValue(ListDisplayMemberPathProperty);
+            set => SetValue(ListDisplayMemberPathProperty, 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("IsSelectAllActive", typeof(bool), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
+        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("SelectAllContent", typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata("All"));
+        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("AllItemsSelected", typeof(bool?), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
+        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("IsDropDownOpen", typeof(bool), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
+        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("MaxDropDownHeight", typeof(double), typeof(CheckComboBox), new FrameworkPropertyMetadata(ComboBox.MaxDropDownHeightProperty.DefaultMetadata.DefaultValue));
+        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 TextBlock TextBox;
+        private bool _viewHandled;
+        private bool _modelHandled;
+        private TextBlock _textBox;
 
         public CheckComboBox() {
             SelectionMode = SelectionMode.Multiple;
+            SelectedItems = new ObservableCollection<object>();
         }
 
         public override void OnApplyTemplate() {
-            TextBox = (GetTemplateChild("TextBox") as TextBlock)!;
+            _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;
-            SelectionChanged += OnSelectionChanged;
+            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;
         }
@@ -82,25 +121,47 @@ namespace Elwig.Controls {
         }
 
         private void OnSelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            var dmp = DisplayMemberPath != null && DisplayMemberPath != "" ? DisplayMemberPath : null;
+            SelectItemsReverse();
+            var dmp = !string.IsNullOrEmpty(ListDisplayMemberPath) ? ListDisplayMemberPath : !string.IsNullOrEmpty(DisplayMemberPath) ? DisplayMemberPath : null;
             if (SelectedItems.Count == ItemsSource.Cast<object>().Count() && AllItemsSelectedContent != null) {
-                TextBox.Text = AllItemsSelectedContent;
+                _textBox.Text = AllItemsSelectedContent;
                 AllItemsSelected = true;
             } else if (SelectedItems.Count == 0) {
-                TextBox.Text = "";
+                _textBox.Text = "";
                 AllItemsSelected = false;
             } else {
-                TextBox.Text = string.Join(Delimiter,
+                _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/IntegerUpDown.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
@@ -8,13 +8,13 @@ using System.Windows.Input;
 namespace Elwig.Controls {
     public class IntegerUpDown : TextBox {
 
-        public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register("Miminum", typeof(int?), typeof(IntegerUpDown), new FrameworkPropertyMetadata(null));
+        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("Maximum", typeof(int?), typeof(IntegerUpDown), new FrameworkPropertyMetadata(null));
+        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);

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

@@ -1,10 +1,10 @@
-using System.Windows;
+using System.Windows;
 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

@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<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:UnitTextBox" BasedOn="{StaticResource {x:Type TextBox}}">

Elwig/Controls/VisibilityConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Data;
 using System.Globalization;

Elwig/Controls/WidthToMarginConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Data;
 using System.Globalization;

Elwig/Controls/WineOriginTemplateSelector.cs

@@ -1,4 +1,4 @@
-using System.Windows.Controls;
+using System.Windows.Controls;
 using System.Windows;
 
 namespace Elwig.Controls {
@@ -12,4 +12,4 @@ namespace Elwig.Controls {
             }
         }
     }
-}
+}

Elwig/Controls/WineQualityLevelTemplateSelector.cs

@@ -1,4 +1,4 @@
-using System.Windows.Controls;
+using System.Windows.Controls;
 using System.Windows;
 
 namespace Elwig.Controls {

Elwig/Controls/WineVarietyTemplateSelector.cs

@@ -1,4 +1,4 @@
-using System.Windows.Controls;
+using System.Windows.Controls;
 using System.Windows;
 
 namespace Elwig.Controls {

Elwig/Dialogs/AreaComDialog.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="Elwig.Dialogs.AreaComDialog"
+<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"
@@ -8,7 +8,7 @@
         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
         WindowStartupLocation="CenterOwner"
         DataContext="{Binding RelativeSource={RelativeSource Self}}"
-        Title="Flächenbindungen übertragen" Height="230" Width="450">
+        Title="Flächenbindungen übertragen" Height="260" Width="450">
     <Window.Resources>
         <Style TargetType="Label">
             <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -48,11 +48,15 @@
                             Minimum="1900" Maximum="9999"
                             HorizontalAlignment="Center" VerticalAlignment="Top"
                             TextChanged="SeasonInput_TextChanged"/>
+        <CheckBox x:Name="CopyYearToInput" Content="Beginn der Laufzeit von Vorgänger übernehmen" Margin="0,80,0,0"
+                  HorizontalAlignment="Center" VerticalAlignment="Top"
+                  Checked="CopyYearToInput_Changed" Unchecked="CopyYearToInput_Changed"
+                  IsChecked="{Binding MaintainYearTo}"/>
 
-        <TextBlock x:Name="DescBlock1" Margin="0,85,0,0" TextAlignment="Center"
+        <TextBlock x:Name="DescBlock1" Margin="0,105,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.
+            und werden beim <Bold>Nachfolger</Bold> ab <Run x:Name="DescBlock1Season" Text="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">

Elwig/Dialogs/AreaComDialog.xaml.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers;
+using Elwig.Helpers;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -7,6 +7,7 @@ namespace Elwig.Dialogs {
 
         public int CancelSeason { get; set; }
         public int SuccessorSeason => CancelSeason + 1;
+        public bool MaintainYearTo { get; set; }
 
         public string AreaComNum { get; set; }
         public string Area { get; set; }
@@ -22,6 +23,7 @@ namespace Elwig.Dialogs {
             QuestionBlock2.Visibility = Visibility.Visible;
             DescBlock1.Visibility = Visibility.Hidden;
             DescBlock2.Visibility = Visibility.Visible;
+            CopyYearToInput.Visibility = Visibility.Hidden;
             Height = 240;
             SeasonInput.Margin = new(0, 40, 0, 0);
             SeasonLabel.Margin = new(0, 40, 100, 0);
@@ -41,7 +43,13 @@ namespace Elwig.Dialogs {
             CancelSeason = (int)SeasonInput.Value!;
             CancelSeason1.Text = $"{CancelSeason}";
             CancelSeason2.Text = $"{CancelSeason}";
-            TransferSeason.Text = $"{SuccessorSeason}";
+            TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}";
+            DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison ";
+        }
+
+        private void CopyYearToInput_Changed(object sender, RoutedEventArgs evt) {
+            TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}";
+            DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison ";
         }
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {

Elwig/Dialogs/DeleteMemberDialog.xaml

@@ -1,4 +1,5 @@
-<Window x:Class="Elwig.Dialogs.DeleteMemberDialog"
+<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"

Elwig/Dialogs/DeleteMemberDialog.xaml.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers;
+using Elwig.Helpers;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;

Elwig/Dialogs/NewSeasonDialog.xaml

@@ -1,4 +1,5 @@
-<Window x:Class="Elwig.Dialogs.NewSeasonDialog"
+<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"

Elwig/Dialogs/NewSeasonDialog.xaml.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers;
+using Elwig.Helpers;
 using Elwig.Models.Entities;
 using System.Collections.Generic;
 using System.Windows;

Elwig/Dialogs/UpdateDialog.xaml

@@ -1,15 +1,17 @@
-<Window x:Class="Elwig.Dialogs.UpdateDialog"
+<Window x:Class="Elwig.Dialogs.UpdateDialog"
         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"
         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!
@@ -19,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

@@ -1,10 +1,12 @@
-using Elwig.Helpers;
+using Elwig.Helpers;
 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/BusinessDocument.cs

@@ -22,9 +22,9 @@ namespace Elwig.Documents {
             var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
             Aside = $"<table><colgroup><col span='1' style='width: 22.5mm;'/><col span='1' style='width: 42.5mm;'/></colgroup>" +
                 $"<thead><tr><th colspan='2'>Mitglied</th></tr></thead><tbody>" +
-                $"<tr><th>Mitglieds-Nr.</th><td>{m.MgNr}</td></tr>" +
-                $"<tr><th>Betriebs-Nr.</th><td>{m.LfbisNr}</td></tr>" +
-                $"<tr><th>UID</th><td>{uid}</td></tr>" +
+                $"<tr><th>Mitglieds-Nr.:</th><td>{m.MgNr}</td></tr>" +
+                $"<tr><th>Betriebs-Nr.:</th><td>{m.LfbisNr}</td></tr>" +
+                $"<tr><th>UID:</th><td>{uid}</td></tr>" +
                 $"</tbody></table>";
         }
 
@@ -32,7 +32,7 @@ namespace Elwig.Documents {
             get {
                 IAddress addr = (Member.BillingAddress != null && UseBillingAddress) ? Member.BillingAddress : Member;
                 var plz = addr.PostalDest.AtPlz;
-                return (addr is BillingAddr ? $"{addr.Name}\n" : "") + $"{Member.AdministrativeName}\n{addr.Address}\n{plz?.Plz} {plz?.Ort.Name.Split(",")[0]}\n{addr.PostalDest.Country.Name}";
+                return string.Join("\n", ((string?[])[Member.BillingAddress?.FullName, Member.AdministrativeName, Member.ForTheAttentionOf, addr.Address, $"{plz?.Plz} {plz?.Ort.Name.Split(",")[0]}", addr.PostalDest.Country.Name]).Where(s => !string.IsNullOrWhiteSpace(s)));
             }
         }
 

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,26 +30,33 @@ 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) {
+            base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.FullName)} – {p.Variant.Name}", p.Member) {
             UseBillingAddress = true;
             ShowDateAndLocation = true;
             Data = data;
             Payment = p;
             Credit = p.Credit;
             var season = p.Variant.Season;
+            if (considerCustomModifiers) {
+                CustomPayment = ctx.CustomPayments.Find(p.Year, p.MgNr);
+            }
+
             var mod = App.Client.IsMatzen ? ctx.Modifiers.Where(m => m.Year == season.Year && m.Name.StartsWith("Treue")).FirstOrDefault() : null;
-            if (mod != null) {
+            if (CustomPayment?.ModComment != null) {
+                MemberModifier = CustomPayment.ModComment;
+            } else if (mod != null) {
                 MemberModifier = $"{mod.Name} ({mod.ValueStr})";
             } else {
                 MemberModifier = "Sonstige Zu-/Abschläge";
             }
             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>Ü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>" +
+                $"<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>" +
                 $"</tbody></table>";
             Text = App.Client.TextCreditNote;
             DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : p.MgNr);
@@ -56,9 +66,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 +76,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);

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?.Amount != null) {
+                @Raw(FormatRow(Model.CustomPayment.Comment ?? ((Model.CustomPayment.Amount.Value) < 0 ? "Weitere Abzüge" : "Weitere Zuschläge"), Model.CustomPayment.Amount.Value, add: true));
+                penalty += Model.CustomPayment.Amount.Value;
             }
 
             @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/DeliveryAncmtList.cs

@@ -0,0 +1,21 @@
+using Elwig.Models.Dtos;
+using System.Collections.Generic;
+
+namespace Elwig.Documents {
+    public class DeliveryAncmtList : Document {
+
+        public new static string Name => "Anmeldeliste";
+
+        public string Filter;
+        public IEnumerable<DeliveryAncmtListRow> Announcements;
+
+        public DeliveryAncmtList(string filter, IEnumerable<DeliveryAncmtListRow> announcements) : base($"{Name} {filter}") {
+            Filter = filter;
+            Announcements = announcements;
+        }
+
+        public DeliveryAncmtList(string filter, DeliveryAncmtListData data) :
+            this(filter, data.Rows) {
+        }
+    }
+}

Elwig/Documents/DeliveryAncmtList.cshtml

@@ -0,0 +1,49 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.DeliveryAncmtList>
+@model Elwig.Documents.DeliveryAncmtList
+@{ Layout = "Document"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryAncmtList.css" />
+<main>
+    <h1>Anmeldeliste</h1>
+    <h2>@Model.Filter</h2>
+    <table class="announcement-list">
+        <colgroup>
+            <col style="width: 18mm;"/>
+            <col style="width: 12mm;"/>
+            <col style="width: 70mm;"/>
+            <col style="width: 40mm;"/>
+            <col style="width: 11mm;"/>
+            <col style="width: 14mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2">Datum</th>
+                <th rowspan="2">MgNr.</th>
+                <th rowspan="2" style="text-align: left;">Mitglied</th>
+                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th rowspan="2">Anmldg.</th>
+                <th>Gewicht</th>
+            </tr>
+            <tr>
+                <th class="unit">[kg]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var a in Model.Announcements) {
+                <tr>
+                    <td>@($"{a.Date:dd.MM.yyyy}")</td>
+                    <td class="number">@a.MgNr</td>
+                    <td>@a.AdministrativeName</td>
+                    <td>@a.Variety</td>
+                    <td class="small center">@(a.Status ?? "-")</td>
+                    <td class="number">@($"{a.Weight:N0}")</td>
+                </tr>
+            }
+            <tr class="sum bold">
+                <td colspan="2">Gesamt:</td>
+                <td colspan="2">Anmeldungen: @($"{Model.Announcements.Count():N0}")</td>
+                <td colspan="2" class="number">@($"{Model.Announcements.Sum(a => a.Weight):N0}")</td>
+            </tr>
+        </tbody>
+    </table>
+</main>

Elwig/Documents/DeliveryAncmtList.css

@@ -0,0 +1,13 @@
+
+h1 {
+    text-align: center;
+    font-size: 24pt;
+    margin-top: 10mm;
+    margin-bottom: 2mm;
+}
+
+h2 {
+    text-align: center;
+    font-size: 14pt;
+    margin-top: 2mm;
+}

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -33,9 +33,9 @@
                 <th>Gewicht</th>
                 <th rowspan="3" style="padding: 0;">
                     <svg width="10" height="40" xmlns="http://www.w3.org/2000/svg">
-                        <text x="-40" y="5" transform="rotate(270)" font-size="8pt" font-style="italic" font-family="Times New Roman"
+                        <text x="-40" y="4" transform="rotate(270)" font-size="8pt" font-style="italic" font-family="Times New Roman"
                               style="text-anchor: start; alignment-baseline: middle;">
-                            bto./nto.
+                            gerebelt
                         </text>
                     </svg>
                 </th>
@@ -81,7 +81,7 @@
                         }
                         @if (i == p.Buckets.Length - 1) {
                             <td class="number">@($"{p.Weight:N0}")</td>
-                            <td class="small">@(p.IsNetWeight ? "n" : "b")</td>
+                            <td style="font-size: 7pt;">@(p.IsNetWeight ? "\u2611" : "\u2610")</td>
                         } else {
                             <td></td>
                             <td></td>

Elwig/Documents/DeliveryNote.cs

@@ -23,9 +23,9 @@ namespace Elwig.Documents {
             Delivery = d;
             Aside = Aside.Replace("</table>", "") +
                 $"<thead><tr><th colspan='2'>Lieferung</th></tr></thead><tbody>" +
-                $"<tr><th>LS-Nr.</th><td>{d.LsNr}</td></tr>" +
-                $"<tr><th>Datum/Zeit</th><td>{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}</td></tr>" +
-                $"<tr><th>Zweigstelle</th><td>{d.Branch.Name}</td></tr>" +
+                $"<tr><th>LS-Nr.:</th><td>{d.LsNr}</td></tr>" +
+                $"<tr><th>Datum/Zeit:</th><td>{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}</td></tr>" +
+                $"<tr><th>Zweigstelle:</th><td>{d.Branch.Name}</td></tr>" +
                 $"</tbody></table>";
             Text = App.Client.TextDeliveryNote;
             DocumentId = d.LsNr;

Elwig/Documents/DeliveryNote.cshtml

@@ -60,8 +60,18 @@
                 }
             }
             <tr><td></td><td colspan="5">
-                @Raw(part.IsManualWeighing ? "<i>Handwiegung</i>" : $"<i>Waage:</i> {part.ScaleId ?? "?"}, <i>ID:</i> {part.WeighingId ?? "?"}")
-                (@(part.IsNetWeight ? "netto/gerebelt gewogen" : "brutto/nicht gerebelt gewogen"))@Raw(part.WeighingReason != null ? $", <i>Begründung:</i>" : "") @part.WeighingReason
+                @if (part.IsManualWeighing) {
+                    <i>Handwiegung @(part.IsNetWeight ? " (gerebelt gewogen)" : " (nicht gerebelt gewogen)")</i>@Raw(part.WeighingReason != null ? ", <i>Begründung:</i> " : "") @part.WeighingReason
+                } else {
+                    var info = part.WeighingInfo;
+                    <i>Waage:</i> @(part.ScaleId ?? "?")@(", ") <i>ID:</i> @(info.Id ?? "?")
+                    @(info.Date != null || info.Time != null ? " – " : "")@(info.Time != null ? $"{info.Time:HH:mm}" : "")@(info.Date != null ? $", {info.Date:dd.MM.yyyy}" : "")
+                    @if (info.Gross != null && info.Tare != null && info.Net != null) {
+                        <br/><i>Brutto:</i> @($"{info.Gross:N0} kg")@(" – ") <i>Tara:</i> @($"{info.Tare:N0} kg")@(" – ") <i>Netto:</i> @($"{info.Net:N0} kg")@(" – ")@Raw(part.IsNetWeight ? "<i>gerebelt gewogen</i>" : "<i>nicht gerebelt gewogen</i>")
+                    } else {
+                        @Raw($" <i>({(part.IsNetWeight ? "gerebelt gewogen" : "nicht gerebelt gewogen")})</i>")
+                    }
+                }
             </td></tr>
             @if (part.Comment != null) {
                 <tr><td></td><td colspan="5"><i>Anmerkung:</i> @part.Comment</td></tr>

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() {
@@ -90,6 +90,8 @@ namespace Elwig.Documents {
                 name = "WineQualityStatistics";
             } else if (this is PaymentVariantSummary) {
                 name = "PaymentVariantSummary";
+            } else if (this is DeliveryAncmtList) {
+                name = "DeliveryAncmtList";
             } else {
                 throw new InvalidOperationException("Invalid document object");
             }
@@ -156,7 +158,7 @@ namespace Elwig.Documents {
 
         public void Show() {
             if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            Pdf.Show(_pdfFile.NewReference(), Title + (this is BusinessDocument b ? $" - {b.Member.Name}" : ""));
+            Pdf.Show(_pdfFile.NewReference(), Title + (this is BusinessDocument b ? $" - {b.Member.FullName}" : ""));
         }
 
         public MimePart AsEmailAttachment(string filename) {

Elwig/Documents/Letterhead.cs

@@ -2,7 +2,7 @@ using Elwig.Models.Entities;
 
 namespace Elwig.Documents {
     public class Letterhead : BusinessDocument {
-        public Letterhead(Member m) : base($"Briefkopf {m.Name}", m, true) {
+        public Letterhead(Member m) : base($"Briefkopf {m.FullName}", m, true) {
             Aside = "";
         }
     }

Elwig/Documents/MemberDataSheet.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers;
+using Elwig.Helpers;
 using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;

Elwig/Documents/MemberDataSheet.cshtml

@@ -1,4 +1,4 @@
-@using RazorLight
+@using RazorLight
 @using Elwig.Helpers
 @inherits TemplatePage<Elwig.Documents.MemberDataSheet>
 @model Elwig.Documents.MemberDataSheet
@@ -18,21 +18,31 @@
         <tbody>
             <tr class="sectionheading"><th colspan="6">Persönliche Daten</th></tr>
             <tr>
-                <th class="small">Titel (vorangestellt)</th>
-                <th class="small">Vorname</th>
-                <th colspan="3" class="small">Nachname</th>
-                <th class="small">Titel (nachgestellt)</th>
+                @if (Model.Member.IsJuridicalPerson) {
+                    <th colspan="3" class="small">Name</th>
+                    <th colspan="3" class="small">Zu Handen</th>
+                } else {
+                    <th class="small">Titel (vorangestellt)</th>
+                    <th class="small">Vorname</th>
+                    <th colspan="3" class="small">Nachname</th>
+                    <th class="small">Titel (nachgestellt)</th>
+                }
             </tr>
             <tr>
-                <td class="large">@Model.Member.Prefix</td>
-                <td class="large">@Model.Member.GivenName @Model.Member.MiddleName</td>
-                <td class="large" colspan="3">@Model.Member.FamilyName</td>
-                <td class="large">@Model.Member.Suffix</td>
+                @if (Model.Member.IsJuridicalPerson) {
+                    <td colspan="3" class="large">@Model.Member.Name</td>
+                    <td colspan="3" class="large">@Model.Member.ForTheAttentionOf</td>
+                } else {
+                    <td class="large">@Model.Member.Prefix</td>
+                    <td class="large">@Model.Member.GivenName @Model.Member.MiddleName</td>
+                    <td class="large" colspan="3">@Model.Member.Name</td>
+                    <td class="large">@Model.Member.Suffix</td>
+                }
             </tr>
             <tr>
                 <th>Mitglieds-Nr.:</th>
                 <td>@Model.Member.MgNr</td>
-                <th colspan="2">Geburtsjahr/-tag:</th>
+                <th colspan="2">@(Model.Member.IsJuridicalPerson ? "Gründungsjahr/-tag" : "Geburtsjahr/-tag"):</th>
                 <td colspan="2">@(string.Join('.', Model.Member.Birthday?.Split('-')?.Reverse() ?? Array.Empty<string>()))</td>
             </tr>
             <tr>
@@ -50,7 +60,7 @@
             <tr class="sectionheading"><th colspan="6">Rechnungsadresse (optional)</th></tr>
             <tr>
                 <th>Name:</th>
-                <td colspan="5">@Model.Member.BillingAddress?.Name</td>
+                <td colspan="5">@Model.Member.BillingAddress?.FullName</td>
             </tr>
             <tr>
                 <th>Adresse:</th>
@@ -105,7 +115,7 @@
                 <th>Stammgemeinde:</th>
                 <td>@Model.Member.DefaultKg?.Name</td>
                 <th colspan="2">Buchführend:</th>
-                <td colspan="2">@(Model.Member.IsBuchführend ? "Ja" : "Nein")</td>
+                <td colspan="2">@(Model.Member.IsBuchführend ? "Ja" : "Nein") <span class="small">(@((Model.Member.IsBuchführend ? Model.Season.VatNormal : Model.Season.VatFlatrate) * 100)% USt.)</span></td>
             </tr>
             <tr>
                 <th colspan="2" class="small">(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)</th>
@@ -196,7 +206,7 @@
                             <td class="text">@areaCom.GstNr.Replace(",", ", ").Replace("-", "–")</td>
                             <td class="number">@($"{areaCom.Area:N0}")</td>
                             <td class="center">@areaCom.WineCult?.Name</td>
-                            <td class="center">@(areaCom.YearTo == null ? $"ab {areaCom.YearFrom}" : $"{areaCom.YearFrom}–{areaCom.YearTo}")</td>
+                            <td class="center">@(areaCom.YearTo == null ? (areaCom.YearFrom == null ? "unbefristet" : $"ab {areaCom.YearFrom}") : (areaCom.YearFrom == null ? $"bis {areaCom.YearTo}" : $"{areaCom.YearFrom}–{areaCom.YearTo}"))</td>
                         </tr>
                         lastContract = contractType.AreaComType.DisplayName;
                     }

Elwig/Documents/MemberDataSheet.css

@@ -1,4 +1,4 @@
-
+
 h2 {
     margin-bottom: 0.5em !important;
 }

Elwig/Documents/MemberList.cs

@@ -1,5 +1,6 @@
-using Elwig.Models.Dtos;
+using Elwig.Models.Dtos;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Elwig.Documents {
     public class MemberList : Document {
@@ -9,9 +10,17 @@ namespace Elwig.Documents {
         public string Filter;
         public IEnumerable<MemberListRow> Members;
 
+        public string[] AreaComFilters;
+        public bool FilterAreaComs => AreaComFilters.Length > 0;
+
         public MemberList(string filter, IEnumerable<MemberListRow> members) : base(Name) {
             Filter = filter;
             Members = members;
+            AreaComFilters = [..members
+                .SelectMany(m => m.AreaCommitmentsFiltered)
+                .Select(c => c.VtrgId)
+                .Distinct()
+                .Order()];
         }
 
         public MemberList(string filter, MemberListData data) :

Elwig/Documents/MemberList.cshtml

@@ -8,30 +8,61 @@
     <h2>@Model.Filter</h2>
     <table class="members">
         <colgroup>
-            <col style="width: 8mm;"/>
-            <col style="width: 42mm;"/>
-            <col style="width: 40mm;"/>
             <col style="width:  8mm;"/>
-            <col style="width: 20mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 38mm;"/>
+            } else {
+                <col style="width: 42mm;"/>
+            }
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 36mm;"/>
+            } else {
+                <col style="width: 40mm;"/>
+            }
+            <col style="width:  8mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 18mm;"/>
+            } else {
+                <col style="width: 20mm;"/>
+            }
             <col style="width: 12mm;"/>
-            <col style="width:  5mm;" />
-            <col style="width: 18mm;"/>
+            <col style="width:  5mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 16mm;"/>
+            } else {
+                <col style="width: 18mm;"/>
+            }
             <col style="width: 12mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 12mm;"/>
+            }
         </colgroup>
         <thead>
             <tr>
-                <th rowspan="2">Nr.</th>
-                <th rowspan="2" style="text-align: left;">Name</th>
-                <th rowspan="2" style="text-align: left;">Adresse</th>
-                <th rowspan="2">PLZ</th>
-                <th rowspan="2" style="text-align: left;">Ort</th>
-                <th rowspan="2">Betr.-Nr.</th>
-                <th rowspan="2">GA</th>
-                <th rowspan="2" style="text-align: left;">Stamm-KG</th>
-                <th>Geb. Fl.</th>
+                @{
+                    var headerSpan = Model.FilterAreaComs ? 3 : 2;
+                }
+                <th rowspan="@headerSpan">Nr.</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Name</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Adresse</th>
+                <th rowspan="@headerSpan">PLZ</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Ort</th>
+                <th rowspan="@headerSpan">Betr.-Nr.</th>
+                <th rowspan="@headerSpan">GA</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Stamm-KG</th>
+                <th colspan="@(Model.FilterAreaComs ? Model.AreaComFilters.Length : 1)">Geb. Fl.</th>
             </tr>
+            @if (Model.FilterAreaComs) {
+                <tr>
+                    @foreach (var vtrgId in Model.AreaComFilters) {
+                        <th>@vtrgId</th>
+                    }
+                </tr>
+            }
             <tr>
-                <th class="unit">[m²]</th>
+                @for (int i = 0; i < Math.Max(Model.AreaComFilters.Length, 1); i++) {
+                    <th class="unit">[m²]</th>
+                }
             </tr>
         </thead>
         <tbody class="small">
@@ -40,22 +71,28 @@
             }
             @foreach (var m in Model.Members) {
                 if (lastBranch != null && m.Branch != lastBranch) {
-                    <tr class="spacing"><td colspan="9"></td></tr>
+                    <tr class="spacing"><td colspan="@(8 + Math.Max(Model.AreaComFilters.Length, 1))"></td></tr>
                     <tr class="header">
-                        <th colspan="9">@m.Branch</th>
+                        <th colspan="@(8 + Math.Max(Model.AreaComFilters.Length, 1))">@m.Branch</th>
                     </tr>
                     lastBranch = m.Branch;
                 }
                 <tr>
                     <td class="number" rowspan="@(m.BillingName != null ? 2 : 1)">@m.MgNr</td>
-                    <td>@m.Name1.Replace('ß', 'ẞ').ToUpper() @m.Name2</td>
+                    <td>@m.AdminName1 @m.Name2</td>
                     <td>@m.Address</td>
                     <td>@m.Plz</td>
                     <td class="tiny">@m.Locality</td>
                     <td>@m.LfbisNr</td>
                     <td class="number">@m.BusinessShares</td>
                     <td class="tiny">@m.DefaultKg</td>
-                    <td class="number">@($"{m.AreaCommitment:N0}")</td>
+                    @if (Model.AreaComFilters.Length > 0) {
+                        foreach (var v in Model.AreaComFilters) {
+                            <td class="number">@($"{m.AreaCommitmentsFiltered.FirstOrDefault(c => c.VtrgId == v).Area:N0}")</td>
+                        }
+                    } else {
+                        <td class="number">@($"{m.AreaCommitment:N0}")</td>
+                    }
                 </tr>
                 if (m.BillingName != null) {
                     <tr>

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

@@ -20,9 +20,10 @@
         @{
             //var sum1 = Model.Variant.DeliveryPartPayments.Sum(p => p.NetAmount);
             //var sum2 = Model.Variant.Credits.Sum(p => p.);  //Model.Variant.MemberPayments.Sum(p => p.Amount);
-            var modifiers = Model.Variant.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount);
+            var deliveryModifiers = Model.Variant.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount);
+            var memberModifiers = Model.Variant.Credits.Sum(c => c.Payment.Amount - c.Payment.NetAmount);
             var sum2 = Model.Variant.Credits.Sum(p => p.NetAmount);
-            var sum1 = sum2 - modifiers;
+            var sum1 = sum2 - deliveryModifiers - memberModifiers;
             var payed = -Model.Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
             var netSum = Model.Variant.Credits.Sum(p => p.NetAmount) - Model.Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
             var vat = Model.Variant.Credits.Sum(p => p.VatAmount);
@@ -49,7 +50,7 @@
                 <td class="center">@(Model.BillingData.ConsiderContractPenalties ? "Ja" : "Nein")</td>
             </tr>
             <tr>
-                <th style="overflow: visible;">Nto./bto.-Zuschl:</th>
+                <th style="overflow: visible;">Rebel-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}") %
@@ -66,6 +67,12 @@
                 <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>
@@ -78,30 +85,30 @@
                 <td colspan="2" class="number">@($"{Model.MemberNum:N0}")</td>
             </tr>
             <tr>
-                <th colspan="2">Zu-/Abschläge (Lieferungen):</th>
-                <td class="number">@Utils.GetSign(modifiers)</td>
-                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(modifiers):N2}")</td>
+                <th colspan="2">Zu-/Abschläge (Mitglieder):</th>
+                <td class="number">@Utils.GetSign(memberModifiers)</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(memberModifiers):N2}")</td>
                 <th class="lborder">Lieferungen:</th>
                 <td colspan="2" class="number">@($"{Model.DeliveryNum:N0}")</td>
             </tr>
+            <tr>
+                <th colspan="2">Zu-/Abschläge (Lieferungen):</th>
+                <td class="number">@Utils.GetSign(deliveryModifiers)</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(deliveryModifiers):N2}")</td>
+                <th class="lborder">Teillieferungen:</th>
+                <td colspan="2" class="number">@($"{Model.DeliveryPartNum:N0}")</td>
+            </tr>
             <tr>
                 <th colspan="2">Gesamtsumme:</th>
                 <td class="number tborder"></td>
                 <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{sum2:N2}")</td>
-                <th class="lborder">Teillieferungen:</th>
-                <td colspan="2" class="number">@($"{Model.DeliveryPartNum:N0}")</td>
+                <th class="lborder"></th>
+                <td colspan="2"></td>
             </tr>
             <tr>
                 <th colspan="2">Bisher ausgezahlt:</th>
                 <td class="number">@Utils.GetSign(payed)</td>
                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(payed):N2}")</td>
-                <th class="lborder"></th>
-                <td colspan="2"></td>
-            </tr>
-            <tr>
-                <th colspan="2">Nettosumme:</th>
-                <td class="number tborder"></td>
-                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{netSum:N2}")</td>
                 @{
                     var weiRows = Model.Data.Rows.Where(r => r.QualityLevel == "Wein");
                     var minWei = weiRows.Min(r => r.Ungeb.Price);
@@ -111,9 +118,9 @@
                 <td colspan="2" class="center tborder">@(minWei != maxWei ? $"{minWei:N4}–{maxWei:N4}" : $"{minWei:N4}") @Model.CurrencySymbol/kg</td>
             </tr>
             <tr>
-                <th colspan="2">Mehrwertsteuer:</th>
-                <td class="number">@Utils.GetSign(vat)</td>
-                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(vat):N2}")</td>
+                <th colspan="2">Nettosumme:</th>
+                <td class="number tborder"></td>
+                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{netSum:N2}")</td>
                 @{
                     var quwRows = Model.Data.Rows.Where(r => r.QualityLevel != "Wein");
                     var minPrice = quwRows.Min(r => r.Ungeb.Price);
@@ -123,9 +130,9 @@
                 <td colspan="2" class="center">@(minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") @Model.CurrencySymbol/kg</td>
             </tr>
             <tr>
-                <th colspan="2">Bruttosumme:</th>
-                <td class="number tborder"></td>
-                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{grossSum:N2}")</td>
+                <th colspan="2">Mehrwertsteuer:</th>
+                <td class="number">@Utils.GetSign(vat)</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(vat):N2}")</td>
                 @{
                     var gebRows = Model.Data.Rows
                     .Where(r => r.Geb.Price != null && r.Ungeb.Price != null)
@@ -138,6 +145,13 @@
                     @(minGeb != maxGeb ? $"{minGeb:N4}–{maxGeb:N4} {Model.CurrencySymbol}/kg" : minGeb == 0 ? "-" : $"{minGeb:N4} {Model.CurrencySymbol}/kg")
                 </td>
             </tr>
+            <tr>
+                <th colspan="2">Bruttosumme:</th>
+                <td class="number tborder"></td>
+                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{grossSum:N2}")</td>
+                <th class="lborder"></th>
+                <td colspan="2"></td>
+            </tr>
             <tr>
                 <th colspan="2">Abzüge (Strafen/Pönalen, GA, ...):</th>
                 <td class="number">@Utils.GetSign(totalMods)</td>
@@ -161,6 +175,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/Documents/WineQualityStatistics.cs

@@ -1,4 +1,4 @@
-using Elwig.Models.Dtos;
+using Elwig.Models.Dtos;
 using System.Collections.Generic;
 
 namespace Elwig.Documents {

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.8.4</Version>
+    <Version>0.11.1</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -25,16 +25,17 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="LinqKit" Version="1.2.5" />
-    <PackageReference Include="MailKit" Version="4.6.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.31" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
+    <PackageReference Include="LinqKit" Version="1.3.0" />
+    <PackageReference Include="MailKit" Version="4.7.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.33" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
-    <PackageReference Include="NJsonSchema" Version="11.0.0" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
+    <PackageReference Include="NJsonSchema" Version="11.0.2" />
     <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.0.34" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.39" />
     <PackageReference Include="System.IO.Ports" Version="8.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
   </ItemGroup>

Elwig/Helpers/ActionCommand.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows.Input;
 
 namespace Elwig.Helpers {

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 {
 
@@ -50,6 +51,9 @@ namespace Elwig.Helpers {
         public DbSet<MemberHistory> MemberHistory { get; private set; }
         public DbSet<AreaCom> AreaCommitments { get; private set; }
         public DbSet<Season> Seasons { get; private set; }
+        public DbSet<DeliverySchedule> DeliverySchedules { get; private set; }
+        public DbSet<DeliveryScheduleWineVar> DeliveryScheduleWineVarieties { get; private set; }
+        public DbSet<DeliveryAncmt> DeliveryAnnouncements { get; private set; }
         public DbSet<Modifier> Modifiers { get; private set; }
         public DbSet<Delivery> Deliveries { get; private set; }
         public DbSet<DeliveryPart> DeliveryParts { get; private set; }
@@ -57,6 +61,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 +101,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;
@@ -234,6 +239,13 @@ namespace Elwig.Helpers {
             return c + 1;
         }
 
+        public async Task<int> NextDsNr(int year) {
+            int c = 0;
+            (await DeliverySchedules.Where(s => s.Year == year).Select(s => s.DsNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
+        }
+
         public async Task<WineQualLevel> GetWineQualityLevel(double kmw) {
             return await WineQualityLevels
                 .Where(q => !q.IsPredicate && (q.MinKmw == null || q.MinKmw <= kmw))
@@ -264,6 +276,31 @@ namespace Elwig.Helpers {
             }
         }
 
+        public void UpdateDeliveryScheduleWineVarieties(DeliverySchedule schedule, IEnumerable<(WineVar, int)> oldVarieties, IEnumerable<(WineVar, int)> newVarieties) {
+            foreach (var v in WineVarieties) {
+                var e = new DeliveryScheduleWineVar {
+                    Year = schedule.Year,
+                    DsNr = schedule.DsNr,
+                    SortId = v.SortId,
+                    Priority = 1,
+                };
+                var o = oldVarieties.Where(x => x.Item1.SortId == e.SortId).Select(x => x.Item2).FirstOrDefault(-1);
+                var n = newVarieties.Where(x => x.Item1.SortId == e.SortId).Select(x => x.Item2).FirstOrDefault(-1);
+                if (n != -1) {
+                    e.Priority = n;
+                    if (o == -1) {
+                        Add(e);
+                    } else {
+                        Update(e);
+                    }
+                } else {
+                    if (o != -1) {
+                        Remove(e);
+                    }
+                }
+            }
+        }
+
         private async Task FetchMemberAreaCommitmentBuckets(int year, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();
@@ -354,27 +391,6 @@ namespace Elwig.Helpers {
             _memberUnderDelivery[year] = buckets;
         }
 
-        public async Task<Dictionary<int, long>> GetBusinessSharePenalties(int year) {
-            using var cnx = await ConnectAsync();
-            var dict = new Dictionary<int, long>();
-            using var cmd = cnx.CreateCommand();
-            cmd.CommandText = $"""
-                SELECT mgnr, ROUND((
-                      COALESCE(-s.penalty_amount, 0) +
-                      COALESCE(-s.penalty_per_bs_amount * CEIL(CAST(-u.diff AS REAL) / s.min_kg_per_bs), 0) +
-                      COALESCE(u.diff * s.penalty_per_kg, 0)
-                    ) / POW(10, s.precision - 2))
-                FROM v_total_under_delivery u
-                    JOIN season s ON s.year = u.year
-                WHERE s.year = {year} AND u.diff < 0
-                """;
-            using var reader = await cmd.ExecuteReaderAsync();
-            while (await reader.ReadAsync()) {
-                dict[reader.GetInt32(0)] = reader.GetInt64(1);
-            }
-            return dict;
-        }
-
         public async Task<Dictionary<string, AreaComBucket>> GetMemberAreaCommitmentBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
             if (!_memberAreaCommitmentBuckets.ContainsKey(year))
                 await FetchMemberAreaCommitmentBuckets(year, cnx);
@@ -457,5 +473,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,15 +9,15 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 20;
+        public static readonly int RequiredSchemaVersion = 30;
 
         private static int VersionOffset = 0;
 
-        public static async Task<string> CheckDb() {
+        public static async Task<Version> CheckDb() {
             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);
@@ -28,18 +28,14 @@ namespace Elwig.Helpers {
             await UpdateDbSchema(cnx, (int)(schemaVers / 100), RequiredSchemaVersion);
 
             var userVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA user_version") ?? 0;
-            var major = userVers >> 24;
-            var minor = (userVers >> 16) & 0xFF;
-            var patch = userVers & 0xFFFF;
+            var v = new Version((int)(userVers >> 24), (int)((userVers >> 16) & 0xFF), (int)(userVers & 0xFFFF));
 
-            if (App.VersionMajor > major ||
-                (App.VersionMajor == major && App.VersionMinor > minor) ||
-                (App.VersionMajor == major && App.VersionMinor == minor && App.VersionPatch > patch)) {
-                long vers = (App.VersionMajor << 24) | (App.VersionMinor << 16) | App.VersionPatch;
+            if (App.Version > v) {
+                long vers = (App.Version.Major << 24) | (App.Version.Minor << 16) | App.Version.Build;
                 await AppDbContext.ExecuteBatch(cnx, $"PRAGMA user_version = {vers}");
             }
 
-            return $"{major}.{minor}.{patch}";
+            return v;
         }
 
         private static async Task UpdateDbSchema(SqliteConnection cnx, int fromVersion, int toVersion) {

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';
                 """);
         }
 
@@ -126,13 +157,15 @@ namespace Elwig.Helpers.Billing {
                 lastMgNr = mgnr;
             }
 
-            await AppDbContext.ExecuteBatch(cnx, $"""
-                UPDATE delivery_part_bucket SET value = 0 WHERE year = {Year};
-                INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
-                VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '{i.Item4}', {i.Item5})"))}
-                ON CONFLICT DO UPDATE
-                SET discr = excluded.discr, value = value + excluded.value;
-                """);
+            await AppDbContext.ExecuteBatch(cnx, $"UPDATE delivery_part_bucket SET value = 0 WHERE year = {Year}");
+            if (inserts.Count > 0) {
+                await AppDbContext.ExecuteBatch(cnx, $"""
+                    INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+                    VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '{i.Item4}', {i.Item5})"))}
+                    ON CONFLICT DO UPDATE
+                    SET discr = excluded.discr, value = value + excluded.value;
+                    """);
+            }
 
             if (!avoidUnderDlvrs) {
                 if (ownCnx) await cnx.DisposeAsync();

Elwig/Helpers/Billing/BillingData.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NJsonSchema;
 using System;
 using System.Collections.Generic;
@@ -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

@@ -29,6 +29,8 @@ namespace Elwig.Helpers.Billing {
             await CalculatePrices(cnx);
             if (Data.ConsiderDelieryModifiers) {
                 await CalculateDeliveryModifiers(cnx);
+            }
+            if (Data.ConsiderCustomModifiers) {
                 await CalculateMemberModifiers(cnx);
             }
             await tx.CommitAsync();
@@ -46,8 +48,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.ConsiderTotalPenalty}, COALESCE(b.total_penalty, 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))
+                           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
@@ -64,28 +68,12 @@ 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_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};
                     """);
-            if (Data.ConsiderTotalPenalty) {
-                if (App.Client.IsWinzerkeller) {
-                    // TODO
-                } else {
-                    await AppDbContext.ExecuteBatch(cnx, $"""
-                        UPDATE credit AS c
-                        SET modifiers = modifiers + ROUND((
-                              COALESCE(-s.penalty_amount, 0) +
-                              COALESCE(-s.penalty_per_bs_amount * CEIL(CAST(-u.diff AS REAL) / s.min_kg_per_bs), 0) +
-                              COALESCE(u.diff * s.penalty_per_kg, 0)
-                            ) / POW(10, s.precision - 2))
-                        FROM v_total_under_delivery u
-                            JOIN season s ON s.year = u.year
-                        WHERE c.year = {Year} AND c.avnr = {AvNr} AND (u.year, u.mgnr) = (c.year, c.mgnr) AND
-                              u.diff < 0
-                        """);
-                }
-            }
             await AppDbContext.ExecuteBatch(cnx, $"""
                 UPDATE payment_variant SET test_variant = FALSE WHERE (year, avnr) = ({Year}, {AvNr});
                 """);
@@ -118,18 +106,21 @@ namespace Elwig.Helpers.Billing {
             if (App.Client.IsMatzen) {
                 var lastYears = 3;
                 var multiplier = 0.50;
+                var includePredecessor = true;
                 var modName = "Treue%";
                 await AppDbContext.ExecuteBatch(cnx, $"""
                     INSERT INTO payment_member (year, avnr, mgnr, net_amount, mod_abs, mod_rel)
                     SELECT c.year, {AvNr}, s.mgnr, 0,
                            ROUND(s.sum * COALESCE(m.abs, 0)),
                            COALESCE(m.rel, 0)
-                    FROM (SELECT {Year} AS year, mgnr,
-                                 ROUND(AVG(sum) * {multiplier}) AS baseline,
-                                 COUNT(*) = {lastYears} AND MIN(sum) > 0 AS allowed
-                          FROM v_stat_member
-                          WHERE year > {Year} - {lastYears}
-                          GROUP BY mgnr
+                    FROM (SELECT {Year} AS year, m.mgnr,
+                                 ROUND(AVG(COALESCE(a.sum, b.sum)) * {multiplier}) AS baseline,
+                                 COUNT(*) = {lastYears} AND MIN(COALESCE(a.sum, b.sum)) > 0 AS allowed
+                          FROM member m
+                              LEFT JOIN v_stat_member a ON a.mgnr = m.mgnr
+                              FULL OUTER JOIN v_stat_member b ON b.mgnr = m.predecessor_mgnr AND b.year = a.year AND {(includePredecessor ? "TRUE" : "FALSE")}
+                          WHERE a.year > {Year} - {lastYears}
+                          GROUP BY m.mgnr
                           HAVING allowed) c
                         JOIN v_stat_member s ON (s.year, s.mgnr) = (c.year, c.mgnr)
                         LEFT JOIN modifier m ON m.year = c.year AND m.name LIKE '{modName}'
@@ -139,6 +130,16 @@ namespace Elwig.Helpers.Billing {
                         mod_rel = mod_rel + excluded.mod_rel
                     """);
             }
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                INSERT INTO payment_member (year, avnr, mgnr, net_amount, mod_abs, mod_rel)
+                SELECT x.year, {AvNr}, x.mgnr, 0, COALESCE(x.mod_abs * POW(10, s.precision - 2), 0), COALESCE(x.mod_rel, 0)
+                FROM payment_custom x
+                    JOIN season s ON s.year = x.year
+                WHERE x.year = {Year}
+                ON CONFLICT DO UPDATE
+                SET mod_abs = mod_abs + excluded.mod_abs,
+                    mod_rel = mod_rel + excluded.mod_rel
+                """);
         }
 
         protected async Task CalculatePrices(SqliteConnection cnx) {

Elwig/Helpers/Billing/EditBillingData.cs

@@ -1,4 +1,4 @@
-using Elwig.Models.Entities;
+using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Elwig/Helpers/Billing/GraphEntry.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 

Elwig/Helpers/Billing/PaymentBillingData.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Nodes;

Elwig/Helpers/Billing/Varibute.cs

@@ -1,4 +1,4 @@
-using Elwig.Models.Entities;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;

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;
 
@@ -69,6 +70,8 @@ namespace Elwig.Helpers {
         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) {
@@ -138,6 +141,15 @@ namespace Elwig.Helpers {
                     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();
             }
@@ -171,6 +183,9 @@ namespace Elwig.Helpers {
                 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),
@@ -199,6 +214,7 @@ namespace Elwig.Helpers {
                 ("TEXT_EMAIL_BODY", TextEmailBody),
                 ("EXPORT_EBICS_VERSION", ExportEbicsVersion.ToString()),
                 ("EXPORT_EBICS_ADDRESS", exportEbicsAddress),
+                ("AUTOADJUST_BUSINESSSHARES", autoAdjust),
             ];
         }
 

Elwig/Helpers/Config.cs

@@ -69,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"];
@@ -87,7 +87,7 @@ namespace Elwig.Helpers {
             SmtpPassword = config["smtp:password"];
             SmtpFrom = config["smtp:from"];
 
-            var scales = config.AsEnumerable().Where(i => i.Key.StartsWith("scale.")).GroupBy(i => i.Key.Split(':')[0][6..]).Select(i => i.Key);
+            var scales = config.AsEnumerable().Where(i => i.Key.StartsWith("scale.")).GroupBy(i => i.Key.Split(':')[0][6..]).Select(i => i.Key).Order();
             ScaleList.Clear();
             Scales = ScaleList;
             foreach (var s in scales) {

Elwig/Helpers/ControlUtils.cs

@@ -11,11 +11,7 @@ using Brushes = System.Windows.Media.Brushes;
 namespace Elwig.Helpers {
     public class ControlUtils {
 
-        public enum RenewSourceDefault {
-            None,
-            IfOnly,
-            First
-        }
+        public enum RenewSourceDefault { None, IfOnly, First }
 
         private static void SetControlBorderBrush(Control input, Brush brush) {
             if (input is ComboBox cb) {
@@ -134,19 +130,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) {
@@ -159,15 +167,19 @@ namespace Elwig.Helpers {
             return item;
         }
 
-        public static object? GetItemFromSource(IEnumerable source, object? item) {
-            return GetItemFromSource(source, Utils.GetEntityIdentifier(item));
+        public static T? GetItemFromSource<T>(IEnumerable source, T? item) {
+            return (T?)GetItemFromSource(source, Utils.GetEntityIdentifier(item));
+        }
+
+        public static object? GetItemFromSourceWithPk(IEnumerable source, params object?[] primaryKey) {
+            return GetItemFromSource(source, (int?)Utils.GetEntityIdetifierForPk(primaryKey));
         }
 
         public static void SelectItemWithHash(Selector input, int? hash) {
             if (hash == null) {
                 input.SelectedItem = null;
             } else {
-                input.SelectedItem = GetItemFromSource(input.ItemsSource, (int)hash);
+                input.SelectedItem = GetItemFromSource(input.ItemsSource, hash);
             }
             if (input is ListBox lb && lb.SelectedItem is object lbItem) {
                 lb.ScrollIntoView(lbItem);

Elwig/Helpers/Export/Bki.cs

@@ -29,7 +29,7 @@ namespace Elwig.Helpers.Export {
             using var cnx = await AppDbContext.ConnectAsync();
             using var cmd = cnx.CreateCommand();
             cmd.CommandText = $"""
-                SELECT lfbis_nr, family_name, name, billing_name, address, plz, ort, area,
+                SELECT lfbis_nr, name, other_names, billing_name, address, plz, ort, area,
                        date, weight, type, sortid, qualid, year, hkid, kmw, oe
                 FROM v_bki_delivery
                 WHERE year = {year}

Elwig/Helpers/Export/Ebics.cs

@@ -38,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;
@@ -80,16 +83,16 @@ namespace Elwig.Helpers.Export {
                         <PmtId><EndToEndId>{id}</EndToEndId></PmtId>
                         <Amt><InstdAmt Ccy="{tx.Currency}">{Transaction.FormatAmount(tx.Amount)}</InstdAmt></Amt>
                         <Cdtr>
-                         <Nm>{SecurityElement.Escape(a.Name[..Math.Min(140, a.Name.Length)])}</Nm>
+                         <Nm>{SecurityElement.Escape(a.FullName[..Math.Min(140, a.FullName.Length)])}</Nm>
                     """);
                 if (ShowAddresses != AddressMode.Omit) {
                     var full = ShowAddresses == AddressMode.Full;
                     await Writer.WriteLineAsync($"""
-                             <PstlAdr>
-                              {(full ? $"<StrtNm>{SecurityElement.Escape(a1?[..Math.Min(70, a1.Length)])}</StrtNm> <BldgNb>{SecurityElement.Escape(a2?[..Math.Min(16, a2.Length)])}</BldgNb>" : $"<AdrLine>{a.Address[..Math.Min(70, a.Address.Length)]}</AdrLine>")}
+                             <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{(full ? "" : "--")}>
-                             </PstlAdr>
+                             {(full ? $" <Ctry>{a.PostalDest.Country.Alpha2}</Ctry>\r\n     " : "")}</PstlAdr>
                         """);
                 }
                 await Writer.WriteLineAsync($"""

Elwig/Helpers/Export/ElwigData.cs

@@ -1,4 +1,4 @@
-using System.IO.Compression;
+using System.IO.Compression;
 using System.IO;
 using System.Threading.Tasks;
 using Elwig.Models.Entities;
@@ -8,12 +8,17 @@ using System.Text.Json.Nodes;
 using System.Linq;
 using System.Windows;
 using Microsoft.EntityFrameworkCore;
+using System.Text.Json;
 
 namespace Elwig.Helpers.Export {
     public static class ElwigData {
 
+        public enum ImportMode { Auto, Interactively, FromBranches }
+
         public static readonly string ImportedTxt = Path.Combine(App.DataPath, "imported.txt");
 
+        private static readonly JsonSerializerOptions JsonOpts = new() { Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
+
         public static async Task<string[]> GetImportedFiles() {
             try {
                 return await File.ReadAllLinesAsync(ImportedTxt, Utils.UTF8);
@@ -22,40 +27,75 @@ namespace Elwig.Helpers.Export {
             }
         }
 
-        public static async Task AddImportedFiles(IEnumerable<string> filenames) {
+        public static async Task AddImportedFiles(params string[] filenames) {
             await File.AppendAllLinesAsync(ImportedTxt, filenames, Utils.UTF8);
         }
 
-        public static Task Import(string filename, bool interactive) => Import([filename], interactive);
+        public static Task Import(string filename, ImportMode mode) => Import([filename], mode);
 
-        public static async Task Import(IEnumerable<string> filenames, bool interactive) {
+        public static async Task Import(IEnumerable<string> filenames, ImportMode mode) {
             try {
-                using var ctx = new AppDbContext();
-                var currentDids = await ctx.Deliveries
-                    .GroupBy(d => d.Year)
-                    .ToDictionaryAsync(g => g.Key, g => g.Max(d => d.DId));
+                Dictionary<string, Branch> branches;
+                Dictionary<int, int> currentDids;
+                Dictionary<string, int> currentLsNrs;
+                Dictionary<int, List<WbRd>> currentWbRde;
+                Dictionary<int, AT_Kg> kgs;
 
-                var deliveries = new List<Delivery>();
-                var deliveryParts = new List<DeliveryPart>();
-                var modifiers = new List<DeliveryPartModifier>();
+                using (var ctx = new AppDbContext()) {
+                    branches = await ctx.Branches.ToDictionaryAsync(b => b.ZwstId);
+                    currentDids = await ctx.Deliveries
+                        .GroupBy(d => d.Year)
+                        .ToDictionaryAsync(g => g.Key, g => g.Max(d => d.DId));
+                    currentLsNrs = await ctx.Deliveries
+                        .ToDictionaryAsync(d => d.LsNr, d => d.DId);
+                    currentWbRde = await ctx.WbRde
+                        .GroupBy(r => r.KgNr)
+                        .ToDictionaryAsync(g => g.Key, g => g.ToList());
+                    kgs = await ctx.Katastralgemeinden.Include(k => k.WbKg).ToDictionaryAsync(k => k.KgNr);
+                }
 
-                var metaData = new List<(string Name, int DeliveryNum, string Filters)>();
+                var data = new List<(
+                    List<Member> Members,
+                    List<BillingAddr> BillingAddresses,
+                    List<MemberTelNr> TelephoneNumbers,
+                    List<MemberEmailAddr> EmailAddresses,
+                    List<AreaCom> AreaCommitments,
+                    List<WbRd> Riede,
+                    List<Delivery> Deliveries,
+                    List<DeliveryPart> DeliveryParts,
+                    List<DeliveryPartModifier> Modifiers)>();
+
+                var metaData = new List<(string FileName, string ZwstId, string Device,
+                    int? MemberNum, string? MemberFilters,
+                    int? AreaComNum, string? AreaComFilters,
+                    int? DeliveryNum, string? DeliveryFilters)>();
 
                 foreach (var filename in filenames) {
+                    // TODO read encrypted files
                     using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
 
                     var version = zip.GetEntry("version");
                     using (var reader = new StreamReader(version!.Open(), Utils.UTF8)) {
                         if (await reader.ReadToEndAsync() != "elwig:1")
-                            throw new FileFormatException("Ungültige Export-Datei");
+                            throw new FileFormatException($"Ungültige Export-Datei ({filename})");
                     }
 
                     var metaJson = zip.GetEntry("meta.json");
                     var meta = await JsonNode.ParseAsync(metaJson!.Open());
-                    var deliveryCount = meta!["deliveries"]?["count"]!.AsValue().GetValue<int>();
-                    var deliveryFilters = meta!["deliveries"]?["filters"]!.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
-                    if (deliveryCount != null && deliveryFilters != null)
-                        metaData.Add((Path.GetFileName(filename), (int)deliveryCount, string.Join(" / ", deliveryFilters)));
+                    var memberCount = meta!["members"]?["count"]?.AsValue().GetValue<int>();
+                    var memberFilters = meta!["members"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                    var areaComCount = meta!["area_commitments"]?["count"]?.AsValue().GetValue<int>();
+                    var areaComFilters = meta!["area_commitments"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                    var deliveryCount = meta!["deliveries"]?["count"]?.AsValue().GetValue<int>();
+                    var deliveryFilters = meta!["deliveries"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                    metaData.Add((Path.GetFileName(filename),
+                        meta["zwstid"]!.AsValue().GetValue<string>(), meta["device"]!.AsValue().GetValue<string>(),
+                        memberCount, memberFilters != null ? string.Join(" / ", memberFilters) : null,
+                        areaComCount, areaComFilters != null ? string.Join(" / ", areaComFilters) : null,
+                        deliveryCount, deliveryFilters != null ? string.Join(" / ", deliveryFilters) : null));
+
+                    data.Add(new([], [], [], [], [], [], [], new([], [])));
+                    var r = data[^1];
 
                     var membersJson = zip.GetEntry("members.json");
                     if (membersJson != null) {
@@ -63,7 +103,11 @@ namespace Elwig.Helpers.Export {
                         string? line;
                         while ((line = await reader.ReadLineAsync()) != null) {
                             var obj = JsonNode.Parse(line)!.AsObject();
-                            // TODO import members.json
+                            var (m, b, telNrs, emailAddrs) = obj.ToMember(kgs);
+                            r.Members.Add(m);
+                            if (b != null) r.BillingAddresses.Add(b);
+                            r.TelephoneNumbers.AddRange(telNrs);
+                            r.EmailAddresses.AddRange(emailAddrs);
                         }
                     }
 
@@ -73,7 +117,12 @@ namespace Elwig.Helpers.Export {
                         string? line;
                         while ((line = await reader.ReadLineAsync()) != null) {
                             var obj = JsonNode.Parse(line)!.AsObject();
-                            // TODO import area_commitments.json
+                            var (areaCom, wbrd) = obj.ToAreaCom(kgs, currentWbRde);
+                            r.AreaCommitments.Add(areaCom);
+                            if (wbrd != null) {
+                                currentWbRde[wbrd.KgNr].Add(wbrd);
+                                r.Riede.Add(wbrd);
+                            }
                         }
                     }
 
@@ -83,85 +132,446 @@ namespace Elwig.Helpers.Export {
                         string? line;
                         while ((line = await reader.ReadLineAsync()) != null) {
                             var obj = JsonNode.Parse(line)!.AsObject();
-                            var (d, parts, mods) = JsonToDelivery(obj, currentDids);
-                            deliveries.Add(d);
-                            deliveryParts.AddRange(parts);
-                            modifiers.AddRange(mods);
+                            var (d, parts, mods) = obj.ToDelivery(currentLsNrs, currentDids);
+                            r.Deliveries.Add(d);
+                            r.DeliveryParts.AddRange(parts);
+                            r.Modifiers.AddRange(mods);
                         }
                     }
                 }
 
-                var lsnrs = deliveries.Select(d => d.LsNr).ToList();
-                var duplicateLsNrs = await ctx.Deliveries
-                    .Where(d => lsnrs.Contains(d.LsNr))
-                    .Select(d => d.LsNr)
-                    .ToListAsync();
-                var duplicateDIds = deliveries
-                    .Where(d => duplicateLsNrs.Contains(d.LsNr))
-                    .Select(d => (d.Year, d.DId))
-                    .ToList();
-                bool overwriteDelivieries = false;
-                if (duplicateLsNrs.Count > 0) {
-                    var res = MessageBox.Show($"Sollen {duplicateLsNrs.Count} Lieferungen überschreiben werden?", "Lieferungen überschreiben",
-                        MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
-                    overwriteDelivieries = res == MessageBoxResult.Yes;
+                var importedMembers = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string Filters)>();
+                var importedAreaComs = new List<(string FileName, string ZwstId, string Device, int Imported, int NotImported, string Filters)>();
+                var importedDeliveries = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string Filters)>();
+
+                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, areaCommitments, riede, deliveries, deliveryParts, modifiers), meta) in data.Zip(metaData)) {
+                    var branch = branches[meta.ZwstId];
+                    var device = meta.Device;
+
+                    using var ctx = new AppDbContext();
+
+                    var mgnrs = members.Select(m => m.MgNr).ToList();
+                    var duplicateMgNrs = await ctx.Members
+                        .Where(m => mgnrs.Contains(m.MgNr))
+                        .Select(m => m.MgNr)
+                        .ToListAsync();
+                    bool importNewMembers = false, importDuplicateMembers = false;
+                    if (mode == ImportMode.Interactively) {
+                        if (mgnrs.Count - duplicateMgNrs.Count > 0)
+                            importNewMembers = ImportQuestion(branch.Name, device, "Mitglieder", false, mgnrs.Count - duplicateMgNrs.Count);
+                    } else {
+                        importNewMembers = true;
+                    }
+                    if (duplicateMgNrs.Count > 0)
+                        importDuplicateMembers = ImportQuestion(branch.Name, device, "Mitglieder", true, duplicateMgNrs.Count);
+
+                    var fbnrs = areaCommitments.Select(c => c.FbNr).ToList();
+                    var duplicateFbNrs = await ctx.AreaCommitments
+                        .Where(c => fbnrs.Contains(c.FbNr))
+                        .Select(c => c.FbNr)
+                        .ToListAsync();
+
+                    var lsnrs = deliveries.Select(d => d.LsNr).ToList();
+                    var duplicateLsNrs = await ctx.Deliveries
+                        .Where(d => lsnrs.Contains(d.LsNr))
+                        .Select(d => d.LsNr)
+                        .ToListAsync();
+                    var duplicateDIds = deliveries
+                        .Where(d => duplicateLsNrs.Contains(d.LsNr))
+                        .Select(d => (d.Year, d.DId))
+                        .ToList();
+                    var allowedDuplicateLsNrs = new List<string>();
+                    bool importNewDeliveries = false, importDuplicateDeliveries = false;
+                    if (mode == ImportMode.Interactively) {
+                        if (lsnrs.Count - duplicateLsNrs.Count > 0)
+                            importNewDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", false, lsnrs.Count - duplicateLsNrs.Count);
+                        if (duplicateLsNrs.Count > 0)
+                            importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count);
+                    } else if (mode == ImportMode.FromBranches) {
+                        importNewDeliveries = true;
+                        if (duplicateLsNrs.Count > 0) {
+                            allowedDuplicateLsNrs = await ctx.Deliveries
+                                .Where(d => lsnrs.Contains(d.LsNr) && d.ZwstId == branch.ZwstId)
+                                .Select(d => d.LsNr)
+                                .ToListAsync();
+                            if (duplicateLsNrs.Count - allowedDuplicateLsNrs.Count > 0)
+                                importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count - allowedDuplicateLsNrs.Count);
+                        }
+                    } else {
+                        importNewDeliveries = true;
+                        if (duplicateLsNrs.Count > 0)
+                            importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count);
+                    }
+
+                    if (importDuplicateMembers) {
+                        ctx.RemoveRange(ctx.BillingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(n => duplicateMgNrs.Contains(n.MgNr)));
+                        ctx.RemoveRange(ctx.MemberEmailAddrs.Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.UpdateRange(members.Where(m => duplicateMgNrs.Contains(m.MgNr)));
+                        ctx.AddRange(billingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.AddRange(telephoneNumbers.Where(n => duplicateMgNrs.Contains(n.MgNr)));
+                        ctx.AddRange(emailAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.UpdateRange(areaCommitments.Where(c => duplicateMgNrs.Contains(c.MgNr) && duplicateFbNrs.Contains(c.FbNr)));
+                        ctx.AddRange(areaCommitments.Where(c => duplicateMgNrs.Contains(c.MgNr) && !duplicateFbNrs.Contains(c.FbNr)));
+                    }
+                    if (importNewMembers) {
+                        ctx.AddRange(members.Where(m => !duplicateMgNrs.Contains(m.MgNr)));
+                        ctx.AddRange(billingAddresses.Where(a => !duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.AddRange(telephoneNumbers.Where(n => !duplicateMgNrs.Contains(n.MgNr)));
+                        ctx.AddRange(emailAddresses.Where(a => !duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.UpdateRange(areaCommitments.Where(c => !duplicateMgNrs.Contains(c.MgNr) && duplicateFbNrs.Contains(c.FbNr)));
+                        ctx.AddRange(areaCommitments.Where(c => !duplicateMgNrs.Contains(c.MgNr) && !duplicateFbNrs.Contains(c.FbNr)));
+                    }
+                    if (members.Count > 0) {
+                        var n = importNewMembers ? members.Count - duplicateMgNrs.Count : 0;
+                        var o = importDuplicateMembers ? duplicateMgNrs.Count : 0;
+                        importedMembers.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, members.Count - n - o, meta.MemberFilters));
+                    }
+                    if (areaCommitments.Count > 0) {
+                        ctx.AddRange(riede);
+                        var imported = areaCommitments.Where(c => (importNewMembers && !duplicateMgNrs.Contains(c.MgNr)) || (importDuplicateMembers && duplicateMgNrs.Contains(c.MgNr))).ToList();
+                        importedAreaComs.Add((meta.FileName, meta.ZwstId, meta.Device, imported.Count, areaCommitments.Count - imported.Count, meta.AreaComFilters));
+                    }
+
+                    if (allowedDuplicateLsNrs.Count > 0) {
+                        var dids = deliveries
+                            .Where(d => allowedDuplicateLsNrs.Contains(d.LsNr))
+                            .Select(d => (d.Year, d.DId))
+                            .ToList();
+                        ctx.RemoveRange(ctx.DeliveryParts
+                            .Where(p => allowedDuplicateLsNrs.Contains(p.Delivery.LsNr))
+                            .SelectMany(p => p.PartModifiers));
+                        ctx.RemoveRange(ctx.DeliveryParts.Where(p => allowedDuplicateLsNrs.Contains(p.Delivery.LsNr)));
+                        ctx.UpdateRange(deliveries.Where(d => dids.Contains((d.Year, d.DId))));
+                        ctx.AddRange(deliveryParts.Where(p => dids.Contains((p.Year, p.DId))));
+                        ctx.AddRange(modifiers.Where(m => dids.Contains((m.Year, m.DId))));
+                    }
+                    if (importDuplicateDeliveries) {
+                        var l = duplicateLsNrs.Except(allowedDuplicateLsNrs).ToList();
+                        var dids = deliveries
+                            .Where(d => l.Contains(d.LsNr))
+                            .Select(d => (d.Year, d.DId))
+                            .ToList();
+                        ctx.RemoveRange(ctx.DeliveryParts
+                            .Where(p => l.Contains(p.Delivery.LsNr))
+                            .SelectMany(p => p.PartModifiers));
+                        ctx.RemoveRange(ctx.DeliveryParts.Where(p => l.Contains(p.Delivery.LsNr)));
+                        ctx.UpdateRange(deliveries.Where(d => dids.Contains((d.Year, d.DId))));
+                        ctx.AddRange(deliveryParts.Where(p => dids.Contains((p.Year, p.DId))));
+                        ctx.AddRange(modifiers.Where(m => dids.Contains((m.Year, m.DId))));
+                    }
+                    if (importNewDeliveries) {
+                        ctx.AddRange(deliveries.Where(d => !duplicateDIds.Contains((d.Year, d.DId))));
+                        ctx.AddRange(deliveryParts.Where(p => !duplicateDIds.Contains((p.Year, p.DId))));
+                        ctx.AddRange(modifiers.Where(m => !duplicateDIds.Contains((m.Year, m.DId))));
+                    }
+                    if (deliveries.Count > 0) {
+                        var n = importNewDeliveries ? deliveries.Count - duplicateDIds.Count : 0;
+                        var o = allowedDuplicateLsNrs.Count + (importDuplicateDeliveries ? duplicateDIds.Count - allowedDuplicateLsNrs.Count : 0);
+                        importedDeliveries.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, deliveries.Count - n - o, meta.DeliveryFilters));
+                    }
+
+                    await ctx.SaveChangesAsync();
+                    await AddImportedFiles(Path.GetFileName(meta.FileName));
                 }
-                if (overwriteDelivieries) {
-                    ctx.RemoveRange(ctx.Deliveries.Where(d => duplicateLsNrs.Contains(d.LsNr)));
-                    ctx.AddRange(deliveries);
-                    ctx.AddRange(deliveryParts);
-                    ctx.AddRange(modifiers);
-                } else {
-                    ctx.AddRange(deliveries.Where(d => !duplicateDIds.Contains((d.Year, d.DId))));
-                    ctx.AddRange(deliveryParts.Where(p => !duplicateDIds.Contains((p.Year, p.DId))));
-                    ctx.AddRange(modifiers.Where(m => !duplicateDIds.Contains((m.Year, m.DId))));
-                }
-                await ctx.SaveChangesAsync();
-                await AddImportedFiles(filenames.Select(f => Path.GetFileName(f)));
-                await App.HintContextChange();
+                App.HintContextChange();
 
                 MessageBox.Show(
                     $"Das importieren der Daten war erfolgreich!\n" +
                     $"Folgendes wurde importiert:\n" +
-                    $"  Lieferungen: {deliveries.Count}\n" +
-                    string.Join("\n", metaData.Select(d => $"    {d.Name} ({d.DeliveryNum})\n      {d.Filters}")) +
-                    "\n", "Importieren erfolgreich",
+                    string.Join("\n", [
+                        $"Mitglieder: {importedMembers.Sum(d => d.New + d.Overwritten)}",
+                        ..importedMembers.Select(d =>
+                            $"  {d.FileName} ({d.New + d.Overwritten})\n" +
+                            $"    ({d.New} neu, {d.Overwritten} überschrieben, {d.NotImported} nicht importiert)\n" +
+                            $"    Zweigstelle: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
+                            $"    Filter: {d.Filters}"),
+                        $"Flächenbindungen: {importedAreaComs.Sum(d => d.Imported)}",
+                        ..importedAreaComs.Select(d =>
+                            $"  {d.FileName} ({d.Imported})\n" +
+                            $"    ({d.Imported} importiert, {d.NotImported} nicht importiert)\n" +
+                            $"    Zweigstelle: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
+                            $"    Filter: {d.Filters}"),
+                        $"Lieferungen: {importedDeliveries.Sum(d => d.New + d.Overwritten)}",
+                        ..importedDeliveries.Select(d =>
+                            $"  {d.FileName} ({d.New + d.Overwritten})\n" +
+                            $"    ({d.New} neu, {d.Overwritten} überschr., {d.NotImported} nicht importiert)\n" +
+                            $"    Zwst.: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
+                            $"    Filter: {d.Filters}")
+                    ]),
+                    "Importieren erfolgreich",
                     MessageBoxButton.OK, MessageBoxImage.Information);
             } 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, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
         }
 
-        public static async Task ExportDeliveries(string filename, IEnumerable<Delivery> deliveries, IEnumerable<string> filters) {
-            File.Delete(filename);
-            using var zip = ZipFile.Open(filename, ZipArchiveMode.Create);
+        private static bool ImportQuestion(string branch, string device, string subject, bool duplicate, int number) {
+            return MessageBox.Show(
+                $"Sollen {number} {(duplicate ? "" : "neue ")}{subject} durch die Zweigstelle\n" +
+                $"{branch} (Gerät {device}) {(duplicate ? "überschrieben" : "importiert")} werden?",
+                $"{subject} importieren",
+                MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes
+            ) == MessageBoxResult.Yes;
+        }
 
-            var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
-            using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
-                await writer.WriteAsync("elwig:1");
-            }
+        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<string> filters) {
+            return new ElwigExport {
+                Members = (members, filters)
+            }.Export(filename);
+        }
 
-            var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
-            using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
-                await writer.WriteAsync(
-                    $"{{\"timestamp\": \"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}\", " +
-                    $"\"zwstid\": \"{App.ZwstId}\", \"device\": \"{Environment.MachineName}\", " +
-                    $"\"deliveries\": {{" +
-                    $"\"count\": {deliveries.Count()}, " +
-                    $"\"parts\": {deliveries.Sum(d => d.Parts.Count)}, " +
-                    $"\"filters\": [{string.Join(", ", filters.Select(f => '"' + f + '"'))}]" +
-                    $"}}}}");
-            }
+        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<AreaCom> areaComs, IEnumerable<string> filters) {
+            return new ElwigExport {
+                Members = (members, filters),
+                AreaComs = (areaComs, ["von exportierten Mitgliedern"]),
+            }.Export(filename);
+        }
 
-            var json = zip.CreateEntry("deliveries.json");
-            using (var writer = new StreamWriter(json.Open(), Utils.UTF8)) {
-                foreach (var d in deliveries) {
-                    await writer.WriteLineAsync(DeliveryToJson(d).ToJsonString());
+        public static Task Export(string filename, IEnumerable<Delivery> deliveries, IEnumerable<string> filters) {
+            return new ElwigExport {
+                Deliveries = (deliveries, filters)
+            }.Export(filename);
+        }
+
+        public class ElwigExport {
+            public (IEnumerable<Member> Members, IEnumerable<string> Filters)? Members { get; set; }
+            public (IEnumerable<AreaCom> AreaComs, IEnumerable<string> Filters)? AreaComs { get; set; }
+            public (IEnumerable<Delivery> Deliveries, IEnumerable<string> Filters)? Deliveries { get; set; }
+
+            public async Task Export(string filename) {
+                File.Delete(filename);
+                using var zip = ZipFile.Open(filename, ZipArchiveMode.Create);
+
+                var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
+                    await writer.WriteAsync("elwig:1");
+                }
+
+                var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
+                    var obj = new JsonObject {
+                        ["timestamp"] = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}",
+                        ["zwstid"] = App.ZwstId,
+                        ["device"] = Environment.MachineName,
+                    };
+                    if (Members != null)
+                        obj["members"] = new JsonObject {
+                            ["count"] = Members.Value.Members.Count(),
+                            ["filters"] = new JsonArray(Members.Value.Filters.Select(f => (JsonNode)f).ToArray()),
+                        };
+                    if (AreaComs != null)
+                        obj["area_commitments"] = new JsonObject {
+                            ["count"] = AreaComs.Value.AreaComs.Count(),
+                            ["filters"] = new JsonArray(AreaComs.Value.Filters.Select(f => (JsonNode)f).ToArray()),
+                        };
+                    if (Deliveries != null)
+                        obj["deliveries"] = new JsonObject {
+                            ["count"] = Deliveries.Value.Deliveries.Count(),
+                            ["parts"] = Deliveries.Value.Deliveries.Sum(d => d.Parts.Count),
+                            ["filters"] = new JsonArray(Deliveries.Value.Filters.Select(f => (JsonNode)f).ToArray()),
+                        };
+                    await writer.WriteAsync(obj.ToJsonString(JsonOpts));
+                }
+
+                // TODO encrypt files
+                if (Members != null) {
+                    var json = zip.CreateEntry("members.json", CompressionLevel.SmallestSize);
+                    using var writer = new StreamWriter(json.Open(), Utils.UTF8);
+                    foreach (var m in Members.Value.Members) {
+                        await writer.WriteLineAsync(m.ToJson().ToJsonString(JsonOpts));
+                    }
+                }
+                if (AreaComs != null) {
+                    var json = zip.CreateEntry("area_commitments.json", CompressionLevel.SmallestSize);
+                    using var writer = new StreamWriter(json.Open(), Utils.UTF8);
+                    foreach (var c in AreaComs.Value.AreaComs) {
+                        await writer.WriteLineAsync(c.ToJson().ToJsonString(JsonOpts));
+                    }
+                }
+                if (Deliveries != null) {
+                    var json = zip.CreateEntry("deliveries.json", CompressionLevel.SmallestSize);
+                    using var writer = new StreamWriter(json.Open(), Utils.UTF8);
+                    foreach (var d in Deliveries.Value.Deliveries) {
+                        await writer.WriteLineAsync(d.ToJson().ToJsonString(JsonOpts));
+                    }
                 }
             }
         }
 
-        public static JsonObject DeliveryToJson(Delivery d) {
+        public static JsonObject ToJson(this Member m) {
+            return new JsonObject {
+                ["mgnr"] = m.MgNr,
+                ["predecessor_mgnr"] = m.PredecessorMgNr,
+                ["name"] = m.Name,
+                ["prefix"] = m.Prefix,
+                ["given_name"] = m.GivenName,
+                ["middle_names"] = m.MiddleName,
+                ["suffix"] = m.Suffix,
+                ["attn"] = m.ForTheAttentionOf,
+                ["birthday"] = m.Birthday,
+                ["entry_date"] = m.EntryDate != null ? $"{m.EntryDate:yyyy-MM-dd}" : null,
+                ["exit_date"] = m.ExitDate != null ? $"{m.ExitDate:yyyy-MM-dd}" : null,
+                ["business_shares"] = m.BusinessShares,
+                ["accounting_nr"] = m.AccountingNr,
+                ["zwstid"] = m.ZwstId,
+                ["lfbis_nr"] = m.LfbisNr,
+                ["ustid_nr"] = m.UstIdNr,
+                ["juridical_pers"] = m.IsJuridicalPerson,
+                ["volllieferant"] = m.IsVollLieferant,
+                ["buchführend"] = m.IsBuchführend,
+                ["organic"] = m.IsOrganic,
+                ["funktionär"] = m.IsFunktionär,
+                ["active"] = m.IsActive,
+                ["deceased"] = m.IsDeceased,
+                ["iban"] = m.Iban,
+                ["bic"] = m.Bic,
+                ["default_kgnr"] = m.DefaultKgNr,
+                ["contact_postal"] = m.ContactViaPost,
+                ["contact_email"] = m.ContactViaEmail,
+                ["address"] = new JsonObject {
+                    ["address"] = m.Address,
+                    ["postal_dest"] = m.PostalDestId,
+                    ["country"] = m.CountryNum,
+                },
+                ["billing_address"] = m.BillingAddress != null ? new JsonObject {
+                    ["name"] = m.BillingAddress.FullName,
+                    ["address"] = m.BillingAddress.Address,
+                    ["postal_dest"] = m.BillingAddress.PostalDestId,
+                    ["country"] = m.BillingAddress.CountryNum,
+                } : null,
+                ["telephone_numbers"] = new JsonArray(m.TelephoneNumbers.OrderBy(n => n.Nr).Select(n => {
+                    var obj = new JsonObject {
+                        ["number"] = n.Number,
+                        ["type"] = n.Type,
+                    };
+                    if (n.Comment != null) obj["comment"] = n.Comment;
+                    return obj;
+                }).ToArray()),
+                ["email_addresses"] = new JsonArray(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => {
+                    var obj = new JsonObject {
+                        ["address"] = a.Address,
+                    };
+                    if (a.Comment != null) obj["comment"] = a.Comment;
+                    return obj;
+                }).ToArray()),
+                ["comment"] = m.Comment,
+            };
+        }
+
+        public static (Member, BillingAddr?, List<MemberTelNr>, List<MemberEmailAddr>) ToMember(this JsonNode json, Dictionary<int, AT_Kg> kgs) {
+            var mgnr = json["mgnr"]!.AsValue().GetValue<int>();
+            var kgnr = json["default_kgnr"]?.AsValue().GetValue<int>();
+            if (kgnr != null && !kgs.Values.Any(k => k.WbKg?.KgNr == kgnr)) {
+                throw new ArgumentException($"Für KG {(kgs.TryGetValue(kgnr.Value, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten → Herkunftshierarchie)");
+            }
+            return (new Member {
+                MgNr = mgnr,
+                PredecessorMgNr = json["predecessor_mgnr"]?.AsValue().GetValue<int>(),
+                Name = json["name"]?.AsValue().GetValue<string>() ?? json["family_name"]!.AsValue().GetValue<string>(),
+                Prefix = json["prefix"]?.AsValue().GetValue<string>(),
+                GivenName = json["given_name"]?.AsValue().GetValue<string>(),
+                MiddleName = json["middle_names"]?.AsValue().GetValue<string>(),
+                Suffix = json["suffix"]?.AsValue().GetValue<string>(),
+                ForTheAttentionOf = json["attn"]?.AsValue().GetValue<string>(),
+                Birthday = json["birthday"]?.AsValue().GetValue<string>(),
+                EntryDateString = json["entry_date"]?.AsValue().GetValue<string>(),
+                ExitDateString = json["exit_date"]?.AsValue().GetValue<string>(),
+                BusinessShares = json["business_shares"]?.AsValue().GetValue<int>() ?? 0,
+                AccountingNr = json["accounting_nr"]?.AsValue().GetValue<string>(),
+                ZwstId = json["zwstid"]?.AsValue().GetValue<string>(),
+                LfbisNr = json["lfbis_nr"]?.AsValue().GetValue<string>(),
+                UstIdNr = json["ustid_nr"]?.AsValue().GetValue<string>(),
+                IsJuridicalPerson = json["juridical_pers"]?.AsValue().GetValue<bool>() ?? false,
+                IsVollLieferant = json["volllieferant"]?.AsValue().GetValue<bool>() ?? false,
+                IsBuchführend = json["buchführend"]?.AsValue().GetValue<bool>() ?? false,
+                IsOrganic = json["organic"]?.AsValue().GetValue<bool>() ?? false,
+                IsFunktionär = json["funktionär"]?.AsValue().GetValue<bool>() ?? false,
+                IsActive = json["active"]?.AsValue().GetValue<bool>() ?? false,
+                IsDeceased = json["deceased"]?.AsValue().GetValue<bool>() ?? false,
+                Iban = json["iban"]?.AsValue().GetValue<string>(),
+                Bic = json["bic"]?.AsValue().GetValue<string>(),
+                CountryNum = json["address"]!["country"]!.AsValue().GetValue<int>(),
+                PostalDestId = json["address"]!["postal_dest"]!.AsValue().GetValue<string>(),
+                Address = json["address"]!["address"]!.AsValue().GetValue<string>(),
+                DefaultKgNr = kgnr,
+                ContactViaPost = json["contact_postal"]?.AsValue().GetValue<bool>() ?? false,
+                ContactViaEmail = json["contact_email"]?.AsValue().GetValue<bool>() ?? false,
+                Comment = json["comment"]?.AsValue().GetValue<string>(),
+            }, json["billing_address"] is JsonObject a ? new BillingAddr {
+                MgNr = mgnr,
+                FullName = a["name"]!.AsValue().GetValue<string>(),
+                CountryNum = a["country"]!.AsValue().GetValue<int>(),
+                PostalDestId = a["postal_dest"]!.AsValue().GetValue<string>(),
+                Address = a["address"]!.AsValue().GetValue<string>(),
+            } : null, json["telephone_numbers"]!.AsArray().Select(n => n!.AsObject()).Select((n, i) => new MemberTelNr {
+                MgNr = mgnr,
+                Nr = i + 1,
+                Type = n["type"]!.AsValue().GetValue<string>(),
+                Number = n["number"]!.AsValue().GetValue<string>(),
+                Comment = n["comment"]?.AsValue().GetValue<string>(),
+            }).ToList(), json["email_addresses"]!.AsArray().Select(a => a!.AsObject()).Select((a, i) => new MemberEmailAddr {
+                MgNr = mgnr,
+                Nr = i + 1,
+                Address = a["address"]!.AsValue().GetValue<string>(),
+                Comment = a["comment"]?.AsValue().GetValue<string>(),
+            }).ToList());
+        }
+
+        public static JsonObject ToJson(this AreaCom c) {
+            return new JsonObject {
+                ["fbnr"] = c.FbNr,
+                ["mgnr"] = c.MgNr,
+                ["vtrgid"] = c.VtrgId,
+                ["cultid"] = c.CultId,
+                ["area"] = c.Area,
+                ["kgnr"] = c.KgNr,
+                ["gstnr"] = c.GstNr,
+                ["ried"] = c.Rd?.Name,
+                ["year_from"] = c.YearFrom,
+                ["year_to"] = c.YearTo,
+                ["comment"] = c.Comment,
+            };
+        }
+
+        public static (AreaCom, WbRd?) ToAreaCom(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
+            var kgnr = json["kgnr"]!.AsValue().GetValue<int>();
+            var ried = json["ried"]?.AsValue().GetValue<string>();
+            WbRd? rd = null;
+            bool newRd = false;
+            if (ried != null) {
+                var rde = riede[kgnr] ?? throw new ArgumentException($"Für KG {(kgs.TryGetValue(kgnr, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten → Herkunftshierarchie)");
+                rd = rde.FirstOrDefault(r => r.Name == ried);
+                if (rd == null) {
+                    newRd = true;
+                    rd = new WbRd {
+                        KgNr = kgnr,
+                        RdNr = (rde.Count == 0 ? 0 : rde.Max(r => r.RdNr)) + 1,
+                        Name = ried,
+                    };
+                    rde.Add(rd);
+                }
+            }
+            return (new AreaCom {
+                FbNr = json["fbnr"]!.AsValue().GetValue<int>(),
+                MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
+                VtrgId = json["vtrgid"]!.AsValue().GetValue<string>(),
+                CultId = json["cultid"]?.AsValue().GetValue<string>(),
+                Area = json["area"]!.AsValue().GetValue<int>(),
+                KgNr = kgnr,
+                GstNr = json["gstnr"]?.AsValue().GetValue<string>() ?? "-",
+                RdNr = rd?.RdNr,
+                YearFrom = json["year_from"]?.AsValue().GetValue<int>(),
+                YearTo = json["year_to"]?.AsValue().GetValue<int>(),
+                Comment = json["comment"]?.AsValue().GetValue<string>(),
+            }, newRd ? rd : null);
+        }
+
+        public static JsonObject ToJson(this Delivery d) {
             return new JsonObject {
                 ["lsnr"] = d.LsNr,
                 ["year"] = d.Year,
@@ -194,7 +604,7 @@ namespace Elwig.Helpers.Export {
                     if (p.Temperature != null) obj["temperature"] = p.Temperature;
                     if (p.Acid != null) obj["acid"] = p.Acid;
                     if (p.ScaleId != null) obj["scale_id"] = p.ScaleId;
-                    if (p.WeighingId != null) obj["weighing_id"] = p.WeighingId;
+                    if (p.WeighingData != null) obj["weighing_data"] = JsonNode.Parse(p.WeighingData);
                     if (p.WeighingReason != null) obj["weighing_reason"] = p.WeighingReason;
                     return obj;
                 }).ToArray()),
@@ -202,9 +612,15 @@ namespace Elwig.Helpers.Export {
             };
         }
 
-        public static (Delivery, List<DeliveryPart>, List<DeliveryPartModifier>) JsonToDelivery(JsonNode json, Dictionary<int, int> currentDids) {
+        public static (Delivery, List<DeliveryPart>, List<DeliveryPartModifier>) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids) {
             var year = json["year"]!.AsValue().GetValue<int>();
-            var did = ++currentDids[year];
+            var lsnr = json["lsnr"]!.AsValue().GetValue<string>();
+            var did = currentLsNrs.GetValueOrDefault(lsnr, -1);
+            if (did == -1) {
+                if (!currentDids.ContainsKey(year)) currentDids[year] = 0;
+                did = ++currentDids[year];
+            }
+            currentLsNrs[lsnr] = did;
             return (new Delivery {
                 Year = year,
                 DId = did,
@@ -212,7 +628,7 @@ namespace Elwig.Helpers.Export {
                 TimeString = json["time"]?.AsValue().GetValue<string>(),
                 ZwstId = json["zwstid"]!.AsValue().GetValue<string>(),
                 LNr = json["lnr"]!.AsValue().GetValue<int>(),
-                LsNr = json["lsnr"]!.AsValue().GetValue<string>(),
+                LsNr = lsnr,
                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
             }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => new DeliveryPart {
@@ -238,7 +654,7 @@ namespace Elwig.Helpers.Export {
                 Temperature = p["temperature"]?.AsValue().GetValue<double>(),
                 Acid = p["acid"]?.AsValue().GetValue<double>(),
                 ScaleId = p["scale_id"]?.AsValue().GetValue<string>(),
-                WeighingId = p["weighing_id"]?.AsValue().GetValue<string>(),
+                WeighingData = p["weighing_data"]?.AsObject().ToJsonString(JsonOpts),
                 WeighingReason = p["weighing_reason"]?.AsValue().GetValue<string>(),
             }).ToList(), json["parts"]!.AsArray().SelectMany(p => p!["modids"]!.AsArray().Select(m => new DeliveryPartModifier {
                 Year = year,

Elwig/Helpers/Export/Ods.cs

@@ -1,4 +1,4 @@
-using Elwig.Models.Dtos;
+using Elwig.Models.Dtos;
 using System;
 using System.Collections.Generic;
 using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
@@ -6,6 +6,7 @@ using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Security;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Export {
@@ -312,7 +313,7 @@ namespace Elwig.Helpers.Export {
                 }
                 c = $"<{ct} office:value-type=\"float\" calcext:value-type=\"float\" office:value=\"{v.ToString(CultureInfo.InvariantCulture)}\"{add}><text:p>{data}</text:p></{ct}>";
             } else {
-                c = $"<{ct} office:value-type=\"string\" calcext:value-type=\"string\"{add}><text:p>{data}</text:p></{ct}>";
+                c = $"<{ct} office:value-type=\"string\" calcext:value-type=\"string\"{add}><text:p>{SecurityElement.Escape(data.ToString())}</text:p></{ct}>";
             }
 
             return $"      {c}\r\n" + (colSpan > 1 ? $"      <table:covered-table-cell table:number-rows-repeated=\"{colSpan - 1}\"/>\r\n" : "");

Elwig/Helpers/ExportMode.cs

@@ -1,4 +1,4 @@
-namespace Elwig.Helpers {
+namespace Elwig.Helpers {
     public enum ExportMode {
         Show, SaveList, SavePdf, Print, Email, Export, Upload
     }

Elwig/Helpers/Extensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Net.Http;
 using System.Runtime.InteropServices;

Elwig/Helpers/Printing/Pdf.cs

@@ -94,7 +94,11 @@ namespace Elwig.Helpers.Printing {
 
         public static async Task Print(string path, int copies = 1) {
             try {
-                var p = new Process() { StartInfo = new() { FileName = PdfToPrinter } };
+                var p = new Process() { StartInfo = new() {
+                    FileName = PdfToPrinter,
+                    CreateNoWindow = true,
+                    UseShellExecute = false,
+                } };
                 p.StartInfo.ArgumentList.Add(path);
                 p.StartInfo.ArgumentList.Add("/s");
                 p.StartInfo.ArgumentList.Add($"copies={copies}");

Elwig/Helpers/Utils.cs

@@ -36,7 +36,7 @@ namespace Elwig.Helpers {
 
         public static int CurrentYear => DateTime.Now.Year;
         public static int CurrentNextSeason => DateTime.Now.Year - (DateTime.Now.Month <= 3 ? 1 : 0);
-        public static int CurrentLastSeason => DateTime.Now.Year - (DateTime.Now.Month <= 7 ? 1 : 0);
+        public static int CurrentLastSeason => DateTime.Now.Year - (DateTime.Now.Month <= 6 ? 1 : 0);
         public static int FollowingSeason => DateTime.Now.Year + (DateTime.Now.Month >= 11 ? 1 : 0);
         public static DateTime Today => (DateTime.Now.Hour >= 3) ? DateTime.Today : DateTime.Today.AddDays(-1);
 
@@ -197,7 +197,7 @@ namespace Elwig.Helpers {
         }
 
         public static void MailTo(string emailAddress) {
-            MailTo(new string[] { emailAddress });
+            MailTo([emailAddress]);
         }
 
         public static void MailTo(IEnumerable<string> emailAddresses) {
@@ -348,7 +348,7 @@ namespace Elwig.Helpers {
         }
 
         public static (string, string?) SplitName(string fullName, string? familyName) {
-            if (familyName == null || familyName == "") return (fullName, null);
+            if (string.IsNullOrWhiteSpace(familyName)) return (fullName, null);
             var p0 = fullName.IndexOf(familyName, StringComparison.CurrentCultureIgnoreCase);
             if (p0 == -1) return (fullName, null);
             var p1 = fullName.IndexOf(" und ");
@@ -362,8 +362,10 @@ namespace Elwig.Helpers {
                     var p3 = fullName.LastIndexOf(' ', p2 - 1);
                     return (fullName[0..p3], fullName[(p3 + 1)..^0]);
                 }
-            } else {
+            } else if (p0 + familyName.Length >= fullName.Length || fullName[p0 + familyName.Length] == ' ') {
                 return (familyName, fullName.Replace(familyName, "").Replace("  ", " ").Trim());
+            } else {
+                return (fullName, null);
             }
         }
 
@@ -425,8 +427,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;
@@ -534,6 +539,11 @@ namespace Elwig.Helpers {
             }
         }
 
+        public static int GetEntityIdetifierForPk(params object?[] primaryKey) {
+            var pk = primaryKey.Select(k => k?.GetHashCode() ?? 0).ToArray();
+            return ((IStructuralEquatable)pk).GetHashCode(EqualityComparer<int>.Default);
+        }
+
         public static int? GetEntityIdentifier(object? obj) {
             if (obj == null) {
                 return null;
@@ -549,15 +559,15 @@ namespace Elwig.Helpers {
         }
 
         public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments() => ActiveAreaCommitments(CurrentYear);
-        public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments(int yearTo) =>
-            c => (c.YearFrom <= yearTo) && (c.YearTo == null || c.YearTo >= yearTo);
+        public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments(int year) =>
+            c => (c.YearFrom == null || c.YearFrom <= year) && (c.YearTo == null || c.YearTo >= year);
 
         public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query) => ActiveAreaCommitments(query, CurrentYear);
-        public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query, int yearTo) =>
-            query.Where(ActiveAreaCommitments(yearTo));
+        public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query, int year) =>
+            query.Where(ActiveAreaCommitments(year));
 
         public static IEnumerable<AreaCom> ActiveAreaCommitments(IEnumerable<AreaCom> query) => ActiveAreaCommitments(query, CurrentYear);
-        public static IEnumerable<AreaCom> ActiveAreaCommitments(IEnumerable<AreaCom> query, int yearTo) =>
-            query.Where(c => ActiveAreaCommitments(yearTo).Invoke(c));
+        public static IEnumerable<AreaCom> ActiveAreaCommitments(IEnumerable<AreaCom> query, int year) =>
+            query.Where(c => ActiveAreaCommitments(year).Invoke(c));
     }
 }

Elwig/Helpers/Validator.cs

@@ -8,7 +8,7 @@ namespace Elwig.Helpers {
     public static class Validator {
 
         private static readonly Dictionary<string, string[][]> PHONE_NRS = new() {
-            { "43", new string[][] {
+            { "43", [
                 [],
                 ["57", "59"],
                 [
@@ -17,17 +17,17 @@ namespace Elwig.Helpers {
                     "650", "651", "652", "653", "655", "657", "659", "660", "661",
                     "663", "664", "665", "666", "667", "668", "669", "67", "68", "69"
                 ]
-            } },
-            { "49", Array.Empty<string[]>() },
-            { "48", Array.Empty<string[]>() },
-            { "420", Array.Empty<string[]>() },
-            { "421", Array.Empty<string[]>() },
-            { "36", Array.Empty<string[]>() },
-            { "386", Array.Empty<string[]>() },
-            { "39", Array.Empty<string[]>() },
-            { "33", Array.Empty<string[]>() },
-            { "41", Array.Empty<string[]>() },
-            { "423", Array.Empty<string[]>() },
+            ] },
+            { "49", [] },
+            { "48", [] },
+            { "420", [] },
+            { "421", [] },
+            { "36", [] },
+            { "386", [] },
+            { "39", [] },
+            { "33", [] },
+            { "41", [] },
+            { "423", [] },
         };
 
         public static ValidationResult CheckInteger(TextBox input, bool required) {

Elwig/Helpers/Weighing/AveryEventScale.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Threading;
@@ -79,7 +79,7 @@ namespace Elwig.Helpers.Weighing {
             identNr = identNr.Length > 0 && identNr != "0" ? identNr : null;
             var parsedDate = DateOnly.Parse(date);
             return new() {
-                Weight = int.Parse(netto),
+                NetWeight = int.Parse(netto),
                 WeighingId = identNr,
                 FullWeighingId = identNr != null ? $"{parsedDate:yyyy-MM-dd}/{identNr}" : null,
                 Date = parsedDate,

Elwig/Helpers/Weighing/GassnerScale.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.IO.Ports;
 using System.Text;
@@ -60,23 +60,23 @@ namespace Elwig.Helpers.Weighing {
                 throw new IOException("Invalid response from scale: Received record has invalid size");
             var line = record[2..];
 
-            var status  = line[ 0.. 2];
-            var brutto  = line[ 2.. 9].Trim();
-            var tara    = line[ 9..16].Trim();
-            var netto   = line[16..23].Trim();
-            var scaleNr = line[23..25].Trim();
-            var identNr = line[25..31].Trim();
-            var date    = line[31..39];
-            var time    = line[39..45];
+            var brutto  = line[ 0.. 7].Trim();
+            var tara    = line[ 7..14].Trim();
+            var netto   = line[14..21].Trim();
+            var scaleNr = line[21..23].Trim();
+            var identNr = line[23..29].Trim();
+            var date    = line[29..37];
+            var time    = line[37..43];
 
             identNr = identNr.Length > 0 && identNr != "0" ? identNr : null;
-            var parsedDate = DateOnly.ParseExact(date, "yyyyMMdd");
             return new() {
-                Weight = int.Parse(netto),
+                GrossWeight = int.Parse(brutto),
+                TareWeight = int.Parse(tara),
+                NetWeight = int.Parse(netto),
                 WeighingId = identNr,
                 FullWeighingId = identNr,
-                Date = parsedDate,
-                Time = TimeOnly.ParseExact(time, "HHmmss"),
+                Date = DateOnly.TryParseExact(date, "yyyyMMdd", out var d) ? d : null,
+                Time = TimeOnly.TryParseExact(time, "HHmmss", out var t) ? t : null,
             };
         }
 
@@ -118,5 +118,9 @@ namespace Elwig.Helpers.Weighing {
         public async Task RevokeFillingClearance() {
             await SetFillingClearance(false);
         }
+
+        public Task SetDateAndTime(DateTime dateTime) {
+            throw new NotImplementedException("Für Waagen vom Typ 'Gassner' ist diese Funktion noch nicht implementiert");
+        }
     }
 }

Elwig/Helpers/Weighing/ICommandScale.cs

@@ -1,8 +1,9 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Weighing {
     /// <summary>
-    /// Interface for controlling a a scale which responds to commands sent to it
+    /// Interface for controlling a weighing scale which responds to commands sent to it
     /// </summary>
     public interface ICommandScale : IScale {
         /// <summary>
@@ -31,5 +32,10 @@ namespace Elwig.Helpers.Weighing {
         /// Revoke clearance to fill the scale container
         /// </summary>
         Task RevokeFillingClearance();
+
+        /// <summary>
+        /// Try to set date and time on the scale
+        /// </summary>
+        Task SetDateAndTime(DateTime dateTime);
     }
 }

Elwig/Helpers/Weighing/IEventScale.cs

@@ -1,6 +1,6 @@
-namespace Elwig.Helpers.Weighing {
+namespace Elwig.Helpers.Weighing {
     /// <summary>
-    /// Interface for controlling a a scale which automatically sends weighing updates
+    /// Interface for controlling a weighing scale which automatically sends weighing updates
     /// </summary>
     public interface IEventScale : IScale {
 

Elwig/Helpers/Weighing/IScale.cs

@@ -2,7 +2,7 @@ using System;
 
 namespace Elwig.Helpers.Weighing {
     /// <summary>
-    /// Interface for controlling a industrial scale (industrial terminal, "IT")
+    /// Interface for controlling a industrial weighing scale (industrial terminal, "IT")
     /// </summary>
     public interface IScale : IDisposable {
         /// <summary>

Elwig/Helpers/Weighing/Scale.cs

@@ -1,4 +1,4 @@
-using System.IO.Ports;
+using System.IO.Ports;
 using System.IO;
 using System.Net.Sockets;
 using System;

Elwig/Helpers/Weighing/SysTecITScale.cs

@@ -38,12 +38,12 @@ namespace Elwig.Helpers.Weighing {
             }
 
             var error = line[1..3];
+            string msg = $"Unbekannter Fehler (Fehler code {error})";
             if (error[0] == '0') {
                 if (error[1] != '0') {
                     throw new IOException($"Invalid response from scale (error code {error})");
                 }
             } else if (error[0] == '1') {
-                string msg = $"Unbekannter Fehler (Fehler code {error})";
                 switch (error[1]) {
                     case '1': msg = "Allgemeiner Waagenfehler"; break;
                     case '2': msg = "Waage in Überlast"; break;
@@ -53,8 +53,12 @@ namespace Elwig.Helpers.Weighing {
                     case '7': msg = "Druckmuster enthält ungültiges Kommando"; break;
                 }
                 throw new IOException($"Waagenfehler {error}: {msg}");
+            } else if (error[0] == '2') {
+                switch (error[1]) {
+                    case '0': msg = "Brutto negativ"; break;
+                }
+                throw new IOException($"Fehler {error}: {msg}");
             } else if (error[0] == '3') {
-                string msg = $"Unbekannter Fehler (Fehler code {error})";
                 switch (error[1]) {
                     case '1': msg = "Übertragunsfehler"; break;
                     case '2': msg = "Ungültiger Befehl"; break;
@@ -98,7 +102,9 @@ namespace Elwig.Helpers.Weighing {
             identNr = identNr.Length > 0 && identNr != "0" ? identNr : null;
             var parsedDate = DateOnly.Parse(date);
             return new() {
-                Weight = int.Parse(netto),
+                GrossWeight = int.Parse(brutto),
+                TareWeight = int.Parse(tara),
+                NetWeight = int.Parse(netto),
                 WeighingId = identNr,
                 FullWeighingId = identNr != null ? $"{parsedDate:yyyy-MM-dd}/{identNr}" : null,
                 Date = parsedDate,
@@ -155,5 +161,10 @@ namespace Elwig.Helpers.Weighing {
         public async Task RevokeFillingClearance() {
             await SetFillingClearance(false);
         }
+
+        public async Task SetDateAndTime(DateTime dateTime) {
+            await SendCommand($"ST{dateTime:dd.MM.yyHH:mm:ss}");
+            await ReceiveResponse();
+        }
     }
 }

Elwig/Helpers/Weighing/WeighingEventArgs.cs

@@ -1,12 +1,7 @@
-using System;
+using System;
 
 namespace Elwig.Helpers.Weighing {
-    public class WeighingEventArgs : EventArgs {
-
-        public WeighingResult Result { get; set; }
-
-        public WeighingEventArgs(WeighingResult result) {
-            Result = result;
-        }
+    public class WeighingEventArgs(WeighingResult result) : EventArgs {
+        public readonly WeighingResult Result = result;
     }
 }

Elwig/Helpers/Weighing/WeighingResult.cs

@@ -1,14 +1,25 @@
 using System;
+using System.Text.Json.Nodes;
 
 namespace Elwig.Helpers.Weighing {
     /// <summary>
-    /// Result of a weighing process on an industrial scale
+    /// Result of a weighing process on an industrial weighing scale
     /// </summary>
     public struct WeighingResult {
+        /// <summary>
+        /// Measured gross weight in kg
+        /// </summary>
+        public int? GrossWeight;
+
+        /// <summary>
+        /// Measured tare weight in kg
+        /// </summary>
+        public int? TareWeight;
+
         /// <summary>
         /// Measured net weight in kg
         /// </summary>
-        public int? Weight;
+        public int? NetWeight;
 
         /// <summary>
         /// Weighing id (or IdentNr) provided by the scale
@@ -30,12 +41,22 @@ namespace Elwig.Helpers.Weighing {
         /// </summary>
         public TimeOnly? Time;
 
-        /// <returns>&lt;Weight/WeighingId/Date/Time&gt;</returns>
+        /// <returns>&lt;[GrossWeight-TaraWeight=]NetWeight/WeighingId/Date/Time&gt;</returns>
         public override readonly string ToString() {
-            var w = Weight != null ? $"{Weight}kg" : "";
+            var w = NetWeight != null ? (GrossWeight != null && TareWeight != null ? $"{GrossWeight}-{TareWeight}=" : "") + $"{NetWeight}kg" : "";
             return $"<{w}/{WeighingId}/{Date:yyyy-MM-dd}/{Time:HH:mm}>";
         }
 
-
+        public readonly JsonObject ToJson() {
+            var obj = new JsonObject();
+            if (FullWeighingId != null) obj["id"] = FullWeighingId;
+            if (WeighingId != null) obj["nr"] = int.Parse(WeighingId);
+            if (Date != null) obj["date"] = $"{Date:yyyy-MM-dd}";
+            if (Time != null) obj["time"] = $"{Time:HH:mm:ss}";
+            if (GrossWeight != null) obj["gross_weight"] = GrossWeight;
+            if (TareWeight != null) obj["tare_weight"] = TareWeight;
+            if (NetWeight != null) obj["net_weight"] = NetWeight;
+            return obj;
+        }
     }
 }

Elwig/Models/Dtos/AreaComUnderDeliveyData.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
@@ -35,17 +35,17 @@ namespace Elwig.Models.Dtos {
 
         private static async Task<IEnumerable<AreaComUnderDeliveryRowSingle>> FromDbSet(DbSet<AreaComUnderDeliveryRowSingle> table, int year) {
             return await table.FromSqlRaw($"""
-                    SELECT m.mgnr, m.family_name AS name_1,
+                    SELECT m.mgnr, m.name AS name_1,
                            COALESCE(m.prefix || ' ', '') || m.given_name ||
                            COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
                            p.plz, o.name AS ort, m.address,
                            c.bucket, c.area, u.min_kg, u.weight
-                    FROM member m
+                    FROM v_area_commitment_bucket_strict c
+                        LEFT JOIN member m ON m.mgnr = 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 v_area_commitment_bucket_strict c ON c.mgnr = m.mgnr AND c.year = {year}
                         JOIN v_under_delivery u ON (u.mgnr, u.bucket, u.year) = (m.mgnr, c.bucket, c.year)
-                    WHERE m.active = 1
+                    WHERE c.year = {year} AND m.active = 1
                     ORDER BY m.mgnr, c.bucket
                     """).ToListAsync();
         }
@@ -54,7 +54,7 @@ namespace Elwig.Models.Dtos {
     public class AreaComUnderDeliveryRow {
         public int MgNr;
         public string Name1;
-        public string Name2;
+        public string? Name2;
         public string Address;
         public int Plz;
         public string Locality;
@@ -88,7 +88,7 @@ namespace Elwig.Models.Dtos {
         [Column("name_1")]
         public required string Name1 { get; set; }
         [Column("name_2")]
-        public required string Name2 { get; set; }
+        public string? Name2 { get; set; }
         [Column("address")]
         public required string Address { get; set; }
         [Column("plz")]

Elwig/Models/Dtos/CreditNoteData.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers;
+using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
@@ -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),
@@ -42,30 +43,33 @@ namespace Elwig.Models.Dtos {
         public static async Task<CreditNoteData> ForPaymentVariant(AppDbContext ctx, int year, int avnr) {
             var variant = await ctx.PaymentVariants.FindAsync(year, avnr);
             var name = variant!.Name;
-            var bsPenalty = await ctx.GetBusinessSharePenalties(year);
             var data = BillingData.FromJson(variant!.Data);
-            var rows = (await FromDbSet(ctx.CreditNoteRows, year, avnr)).Select(r => new CreditNoteRow(r, data, bsPenalty)).ToList();
+            var rows = (await FromDbSet(ctx.CreditNoteRows, year, avnr)).Select(r => new CreditNoteRow(r, data)).ToList();
             return new CreditNoteData(rows, year, name);
         }
 
         private static async Task<IEnumerable<CreditNoteRowSingle>> FromDbSet(DbSet<CreditNoteRowSingle> table, int year, int avnr) {
             return await table.FromSqlRaw($"""
-                SELECT m.mgnr, m.family_name AS name_1,
+                SELECT m.mgnr, m.name AS name_1,
                        COALESCE(m.prefix || ' ', '') || m.given_name ||
                        COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
                        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(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_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();
@@ -75,7 +79,7 @@ namespace Elwig.Models.Dtos {
     public class CreditNoteRow {
         public int MgNr;
         public string Name1;
-        public string Name2;
+        public string? Name2;
         public string Address;
         public int Plz;
         public string Locality;
@@ -91,11 +95,12 @@ 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;
 
-        public CreditNoteRow(CreditNoteRowSingle row, BillingData data, Dictionary<int, long> bsPenalty) {
+        public CreditNoteRow(CreditNoteRowSingle row, BillingData data) {
             byte prec1 = 2, prec2 = row.Precision;
             MgNr = row.MgNr;
             Name1 = row.Name1;
@@ -117,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 = (!bsPenalty.TryGetValue(row.MgNr, out var val) || val == 0) ? null : Utils.DecFromDb(val, 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);
@@ -137,7 +144,7 @@ namespace Elwig.Models.Dtos {
         [Column("name_1")]
         public required string Name1 { get; set; }
         [Column("name_2")]
-        public required string Name2 { get; set; }
+        public string? Name2 { get; set; }
         [Column("address")]
         public required string Address { get; set; }
         [Column("plz")]
@@ -172,9 +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("auto_bs")]
         public long? AutoBs { get; set; }
+        [Column("custom_mod")]
+        public long? CustomMod { get; set; }
     }
 }

Elwig/Models/Dtos/CreditNoteDeliveryData.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers.Billing;
+using Elwig.Helpers.Billing;
 using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System;

Elwig/Models/Dtos/DataTable.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;

Elwig/Models/Dtos/DeliveryAncmtListData.cs

@@ -0,0 +1,71 @@
+using Elwig.Documents;
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class DeliveryAncmtListData : DataTable<DeliveryAncmtListRow> {
+
+        private static readonly (string, string, string?, int?)[] FieldNames = [
+            ("Date", "Datum", null, 20),
+            ("Branch", "Zweigstelle", null, 30),
+            ("MgNr", "MgNr.", null, 12),
+            ("Name1", "Name", null, 40),
+            ("Name2", "Vorname", null, 40),
+            ("SortId", "Sorte", null, 10),
+            ("Weight", "Gewicht", "kg", 20),
+            ("CreatedTimestamp", "Angemeldet", null, 35),
+            ("ModifiedTimestamp", "Geändert", null, 35),
+            ("Status", "Status", null, 20),
+        ];
+
+        public DeliveryAncmtListData(IEnumerable<DeliveryAncmtListRow> rows, List<string> filterNames) :
+            base(DeliveryAncmtList.Name, DeliveryAncmtList.Name, string.Join(" / ", filterNames), rows, FieldNames) {
+        }
+
+        public static async Task<DeliveryAncmtListData> FromQuery(IQueryable<DeliveryAncmt> query, List<string> filterNames) {
+            return new((await query
+                .Include(a => a.Schedule.Branch)
+                .Include(a => a.Member)
+                .Include(a => a.Variety)
+                .AsSplitQuery()
+                .ToListAsync()).Select(d => new DeliveryAncmtListRow(d)), filterNames);
+        }
+    }
+
+    public class DeliveryAncmtListRow {
+        public DateOnly Date;
+        public string Branch;
+        public int MgNr;
+        public string Name1;
+        public string? Name2;
+        public string AdministrativeName;
+        public string SortId;
+        public string Variety;
+        public DateTime CreatedTimestamp;
+        public DateTime? ModifiedTimestamp;
+        public int Weight;
+        public string? Status;
+
+        public DeliveryAncmtListRow(DeliveryAncmt a) {
+            var s = a.Schedule;
+            var m = a.Member;
+
+            Date = s.Date;
+            Branch = s.Branch.Name;
+            MgNr = m.MgNr;
+            Name1 = m.AdministrativeName1;
+            Name2 = m.AdministrativeName2;
+            AdministrativeName = m.AdministrativeName;
+            SortId = a.SortId;
+            Variety = a.Variety.Name;
+            CreatedTimestamp = a.CreatedTimestamp;
+            ModifiedTimestamp = a.ModifiedTimestamp == a.CreatedTimestamp ? null : a.ModifiedTimestamp;
+            Weight = a.Weight;
+            Status = s.AncmtTo == null ? null : a.CreatedTimestamp >= s.AncmtTo ? "verspät." : "ok";
+        }
+    }
+}

Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs

@@ -1,4 +1,4 @@
-using Elwig.Models.Entities;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;

Elwig/Models/Dtos/DeliveryJournalData.cs

@@ -1,4 +1,4 @@
-using Elwig.Documents;
+using Elwig.Documents;
 using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System;
@@ -14,16 +14,18 @@ namespace Elwig.Models.Dtos {
             ("Pos", "Pos.", null, 10),
             ("Date", "Datum", null, 20),
             ("Time", "Zeit", null, 20),
+            ("DeliveryBranch", "Zweigstelle", null, 30),
             ("MgNr", "MgNr.", null, 12),
             ("Name1", "Name", null, 40),
             ("Name2", "Vorname", null, 40),
+            ("MemberBranch", "Stamm-Zwst.", null, 30),
             ("SortId", "Sorte", null, 10),
             ("AttrId", "Attr.", null, 15),
             ("CultId", "Bewirt.", null, 15),
             ("QualId", "Qualität", null, 15),
             ("Gradation", "Gradation", "°Oe|°KMW", 40),
             ("Weight", "Gewicht", "kg", 20),
-            ("NetGross", "bto./nto.", null, 20),
+            ("IsNetWeight", "Gerebelt", null, 20),
             ("HkId", "Herkunft", null, 20),
             ("Modifiers", "Zu-/Abschläge", null, 40),
             ("Comment", "Anmerkung", null, 60),
@@ -35,7 +37,7 @@ namespace Elwig.Models.Dtos {
 
         public static async Task<DeliveryJournalData> FromQuery(IQueryable<DeliveryPart> query, List<string> filterNames) {
             return new((await query
-                .Include(p => p.Delivery.Member)
+                .Include(p => p.Delivery.Member.Branch)
                 .Include(p => p.Delivery.Branch)
                 .Include(p => p.PartModifiers).ThenInclude(m => m.Modifier)
                 .Include(p => p.Variety)
@@ -53,10 +55,12 @@ namespace Elwig.Models.Dtos {
         public int Pos;
         public DateOnly Date;
         public TimeOnly? Time;
+        public string DeliveryBranch;
         public int MgNr;
         public string Name1;
-        public string Name2;
+        public string? Name2;
         public string AdministrativeName;
+        public string? MemberBranch;
         public string SortId;
         public string Variety;
         public string? AttrId;
@@ -71,7 +75,6 @@ namespace Elwig.Models.Dtos {
         public double Oe => Gradation.Oe;
         public int Weight { get; set; }
         public bool IsNetWeight;
-        public string NetGross => IsNetWeight ? "n" : "b";
         public string? Modifiers;
         public string? Comment;
 
@@ -83,10 +86,12 @@ namespace Elwig.Models.Dtos {
             Pos = p.DPNr;
             Date = d.Date;
             Time = d.Time;
+            DeliveryBranch = d.Branch.Name;
             MgNr = m.MgNr;
-            Name1 = m.FamilyName;
+            Name1 = m.Name;
             Name2 = m.AdministrativeName2;
             AdministrativeName = m.AdministrativeName;
+            MemberBranch = m.Branch?.Name;
 
             SortId = p.SortId;
             Variety = p.Variety.Name;

Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -37,7 +37,7 @@ namespace Elwig.Models.Dtos {
 
         private static async Task<IEnumerable<MemberDeliveryPerVariantRowSingle>> FromDbSet(DbSet<MemberDeliveryPerVariantRowSingle> table, int year) {
             return await table.FromSqlRaw($"""
-                    SELECT m.mgnr, m.family_name AS name_1,
+                    SELECT m.mgnr, m.name AS name_1,
                            COALESCE(m.prefix || ' ', '') || m.given_name ||
                            COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
                            p.plz, o.name AS ort, m.address,
@@ -72,7 +72,7 @@ namespace Elwig.Models.Dtos {
     public class MemberDeliveryPerVariantRow {
         public int MgNr;
         public string Name1;
-        public string Name2;
+        public string? Name2;
         public string Address;
         public int Plz;
         public string Locality;
@@ -104,7 +104,7 @@ namespace Elwig.Models.Dtos {
         [Column("name_1")]
         public required string Name1 { get; set; }
         [Column("name_2")]
-        public required string Name2 { get; set; }
+        public string? Name2 { get; set; }
         [Column("address")]
         public required string Address { get; set; }
         [Column("plz")]

Elwig/Models/Dtos/MemberListData.cs

@@ -1,4 +1,4 @@
-using Elwig.Documents;
+using Elwig.Documents;
 using Elwig.Models.Entities;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -31,30 +31,42 @@ namespace Elwig.Models.Dtos {
             ("EntryDate", "Eintritt", null, 20),
             ("ExitDate", "Austritt", null, 20),
             ("AreaCommitment", "geb. Fläche", "m²", 20),
+            ("AreaCommitmentsFiltered", "geb. Fläche", "Vtrg.|m²", 30),
             ("UstIdNr", "UID", null, 25),
             ("Iban", "IBAN", null, 45),
             ("Bic", "BIC", null, 30),
-            ("Comment", "Anmerkung", null, 60),
+            ("TelNrLandline", "Festnetz", null, 35),
+            ("TelNrMobile", "Mobil", null, 35),
+            ("EmailAddress", "E-Mail", null, 70),
+            ("AdditionalContact", "Weitere", null, 70),
+            ("Comment", "Anmerkung", null, 80),
         ];
 
         public MemberListData(IEnumerable<MemberListRow> rows, List<string> filterNames) :
             base(MemberList.Name, MemberList.Name, string.Join(" / ", filterNames), rows, FieldNames) {
         }
 
-        public static async Task<MemberListData> FromQuery(IQueryable<Member> query, List<string> filterNames) {
-            var areaCom = await query.ToDictionaryAsync(m => m.MgNr, m => Utils.ActiveAreaCommitments(m.AreaCommitments).Sum(c => c.Area));
+        public static async Task<MemberListData> FromQuery(IQueryable<Member> query, List<string> filterNames, IEnumerable<string> filterAreaCom) {
+            var areaComs = await query.ToDictionaryAsync(m => m.MgNr, m => Utils.ActiveAreaCommitments(m.AreaCommitments));
             return new((await query
                 .Include(m => m.DefaultWbKg!.AtKg)
                 .Include(m => m.Branch)
                 .Include(m => m.PostalDest.AtPlz!.Ort)
                 .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
-                .ToListAsync()).Select(m => new MemberListRow(m, areaCom[m.MgNr])), filterNames);
+                .Include(m => m.TelephoneNumbers)
+                .Include(m => m.EmailAddresses)
+                .AsSplitQuery()
+                .ToListAsync()).Select(m => new MemberListRow(m,
+                    areaComs[m.MgNr].Sum(c => c.Area),
+                    areaComs[m.MgNr].Where(c => filterAreaCom.Contains(c.VtrgId)).GroupBy(c => c.VtrgId).ToDictionary(g => g.Key, g => g.Sum(c => c.Area)))),
+                filterNames);
         }
     }
 
     public class MemberListRow {
         public int MgNr;
         public string? Name1;
+        public string? AdminName1;
         public string? Name2;
         public string? DefaultKg;
         public string? Branch;
@@ -71,16 +83,22 @@ namespace Elwig.Models.Dtos {
         public string? Iban;
         public string? Bic;
         public int? AreaCommitment;
+        public (string VtrgId, int Area)[] AreaCommitmentsFiltered;
         public bool IsBuchführend;
         public bool IsOrganic;
         public bool IsActive;
         public DateOnly? EntryDate;
         public DateOnly? ExitDate;
+        public string? TelNrLandline;
+        public string? TelNrMobile;
+        public string? EmailAddress;
+        public string? AdditionalContact;
         public string? Comment;
 
-        public MemberListRow(Member m, int? areaCom = null) {
+        public MemberListRow(Member m, int? areaCom = null, Dictionary<string, int>? filtered = null) {
             MgNr = m.MgNr;
-            Name1 = m.FamilyName;
+            Name1 = m.Name;
+            AdminName1 = m.AdministrativeName1;
             Name2 = m.AdministrativeName2;
             DefaultKg = m.DefaultKg?.Name;
             Branch = m.Branch?.Name;
@@ -89,7 +107,7 @@ namespace Elwig.Models.Dtos {
             Plz = m.PostalDest.AtPlz!.Plz;
             Locality = m.PostalDest.AtPlz!.Ort.Name;
             if (m.BillingAddress is BillingAddr a) {
-                BillingName = a.Name;
+                BillingName = a.FullName;
                 BillingAddress = a.Address;
                 BillingPlz = a.PostalDest.AtPlz!.Plz;
                 BillingLocality = a.PostalDest.AtPlz!.Ort.Name;
@@ -103,8 +121,18 @@ namespace Elwig.Models.Dtos {
             IsActive = m.IsActive;
             EntryDate = m.EntryDate;
             ExitDate = m.ExitDate;
+            TelNrLandline = m.TelephoneNumbers.OrderBy(n => n.Nr).FirstOrDefault(n => n.Type == "landline")?.Number;
+            TelNrMobile = m.TelephoneNumbers.OrderBy(n => n.Nr).FirstOrDefault(n => n.Type == "mobile")?.Number;
+            EmailAddress = m.EmailAddresses.OrderBy(a => a.Nr).FirstOrDefault()?.Address;
+            AdditionalContact = string.Join(", ", m.TelephoneNumbers
+                .OrderBy(n => n.Nr)
+                .Select(n => n.Number)
+                .Except([TelNrLandline, TelNrMobile])
+                .Distinct()
+                .Concat(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).Except([EmailAddress])));
             Comment = m.Comment;
             AreaCommitment = areaCom == 0 ? null : areaCom;
+            AreaCommitmentsFiltered = filtered != null ? filtered.OrderBy(f => f.Key).Select(f => (f.Key, f.Value)).ToArray() : [];
         }
     }
 }

Elwig/Models/Dtos/OverUnderDeliveryData.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Threading.Tasks;
@@ -26,19 +26,19 @@ namespace Elwig.Models.Dtos {
 
         public static async Task<OverUnderDeliveryData> ForSeason(DbSet<OverUnderDeliveryRow> table, int year) {
             var rows = await table.FromSqlRaw($"""
-                SELECT m.mgnr, m.family_name AS name_1,
+                SELECT m.mgnr, m.name AS name_1,
                        COALESCE(m.prefix || ' ', '') || m.given_name ||
                        COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
                        p.plz, o.name AS ort, m.address, m.business_shares,
                        m.business_shares * s.min_kg_per_bs AS min_kg,
                        m.business_shares * s.max_kg_per_bs AS max_kg,
                        COALESCE(SUM(d.weight), 0) AS sum
-                FROM member m
+                FROM v_delivery d
+                    LEFT JOIN member m ON m.mgnr = d.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 = {year}
-                    LEFT JOIN v_delivery d ON d.mgnr = m.mgnr AND d.year = s.year
-                WHERE m.active = 1
+                    LEFT JOIN season s ON s.year = d.year
+                WHERE s.year = {year} AND (m.active = TRUE OR d.weight > 0)
                 GROUP BY d.year, m.mgnr
                 ORDER BY 100.0 * sum / max_kg, m.mgnr;
                 """).ToListAsync();
@@ -53,7 +53,7 @@ namespace Elwig.Models.Dtos {
         [Column("name_1")]
         public required string Name1 { get; set; }
         [Column("name_2")]
-        public required string Name2 { get; set; }
+        public string? Name2 { get; set; }
         [Column("address")]
         public required string Address { get; set; }
         [Column("plz")]

Elwig/Models/Dtos/PaymentVariantSummaryData.cs

@@ -1,4 +1,4 @@
-using Elwig.Documents;
+using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;

Elwig/Models/Dtos/WeightBreakdownData.cs

@@ -1,4 +1,4 @@
-using Elwig.Models.Entities;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;

Elwig/Models/Dtos/WineQualityStatisticsData.cs

@@ -1,4 +1,4 @@
-using Elwig.Models.Entities;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;

Elwig/Models/Entities/AreaCom.cs

@@ -1,5 +1,6 @@
 using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -31,7 +32,7 @@ namespace Elwig.Models.Entities {
         public int? RdNr { get; set; }
 
         [Column("year_from")]
-        public int YearFrom { get; set; }
+        public int? YearFrom { get; set; }
 
         [Column("year_to")]
         public int? YearTo { get; set; }
@@ -39,6 +40,16 @@ namespace Elwig.Models.Entities {
         [Column("comment")]
         public string? Comment { get; set; }
 
+        [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public long CTime { get; private set; }
+        [NotMapped]
+        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+
+        [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public long MTime { get; private set; }
+        [NotMapped]
+        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+
         [ForeignKey("MgNr")]
         public virtual Member Member { get; private set; } = null!;
 

Elwig/Models/Entities/BillingAddr.cs

@@ -8,7 +8,7 @@ namespace Elwig.Models.Entities {
         public int MgNr { get; set; }
 
         [Column("name")]
-        public required string Name { get; set; }
+        public required string FullName { get; set; }
 
         [Column("country")]
         public int CountryNum { get; set; }

Elwig/Models/Entities/Credit.cs

@@ -83,15 +83,15 @@ namespace Elwig.Models.Entities {
             get => Utils.DecFromDb(AmountValue, 2);
         }
 
-        [Column("ctime")]
+        [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
         public long CTime { get; private set; }
         [NotMapped]
         public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
 
-        [Column("mtime")]
+        [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
         public long MTime { get; private set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
 
         [ForeignKey("Year, AvNr, MgNr")]
         public virtual PaymentMember Payment { get; private set; } = null!;

Elwig/Models/Entities/Delivery.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("time")]
         public string? TimeString { get; set; }
-
         [NotMapped]
         public TimeOnly? Time {
             get => (TimeString == null) ? null : TimeOnly.ParseExact(TimeString, "HH:mm:ss");
@@ -63,6 +61,16 @@ namespace Elwig.Models.Entities {
         [Column("comment")]
         public string? Comment { get; set; }
 
+        [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public long CTime { get; private set; }
+        [NotMapped]
+        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+
+        [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public long MTime { get; private set; }
+        [NotMapped]
+        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+
         [ForeignKey("Year")]
         public virtual Season Season { get; private set; } = null!;
 
@@ -110,7 +118,7 @@ namespace Elwig.Models.Entities {
         public int SearchScore(IEnumerable<string> keywords) {
             var list = new string?[] {
                 LsNr, Time?.ToString("HH:mm"),
-                Member.FamilyName, Member.MiddleName, Member.GivenName, Member.BillingAddress?.Name,
+                Member.Name, Member.MiddleName, Member.GivenName, Member.BillingAddress?.FullName,
                 Comment
             }.ToList();
             list.AddRange(Parts.Select(p => p.Comment).Distinct());

Elwig/Models/Entities/DeliveryAncmt.cs

@@ -0,0 +1,56 @@
+using Elwig.Helpers;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models.Entities {
+    [Table("delivery_announcement"), PrimaryKey("Year", "DsNr", "MgNr", "SortId")]
+    public class DeliveryAncmt {
+
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("dsnr")]
+        public int DsNr { get; set; }
+
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+
+        [Column("sortid")]
+        public required string SortId { get; set; }
+
+        [Column("weight")]
+        public int Weight { get; set; }
+
+        [Column("type")]
+        public required string Type { get; set; }
+
+        [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public long CTime { get; private set; }
+        [NotMapped]
+        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+
+        [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public long MTime { get; private set; }
+        [NotMapped]
+        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+
+        [ForeignKey("Year, DsNr")]
+        public virtual DeliverySchedule Schedule { get; private set; } = null!;
+
+        [ForeignKey("MgNr")]
+        public virtual Member Member { get; private set; } = null!;
+
+        [ForeignKey("SortId")]
+        public virtual WineVar Variety { get; private set; } = null!;
+
+        public int SearchScore(IEnumerable<string> keywords) {
+            return Utils.GetSearchScore([
+                Schedule.Description,
+                Member.Name, Member.MiddleName, Member.GivenName,
+                Member.BillingAddress?.FullName,
+            ], keywords);
+        }
+    }
+}

Elwig/Models/Entities/DeliveryPart.cs

@@ -1,8 +1,10 @@
 using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using System.Text.Json.Nodes;
 
 namespace Elwig.Models.Entities {
     [Table("delivery_part"), PrimaryKey("Year", "DId", "DPNr")]
@@ -99,8 +101,26 @@ namespace Elwig.Models.Entities {
         [Column("scale_id")]
         public string? ScaleId { get; set; }
 
-        [Column("weighing_id")]
-        public string? WeighingId { get; set; }
+        [Column("weighing_data")]
+        public string? WeighingData { get; set; }
+        [NotMapped]
+        public (string? Id, int? Gross, int? Tare, int? Net, DateOnly? Date, TimeOnly? Time) WeighingInfo {
+            get {
+                try {
+                    var obj = JsonNode.Parse(WeighingData!)!.AsObject();
+                    return (
+                        obj["id"]?.AsValue().GetValue<string>(),
+                        obj["gross_weight"]?.AsValue().GetValue<int>(),
+                        obj["tare_weight"]?.AsValue().GetValue<int>(),
+                        obj["net_weight"]?.AsValue().GetValue<int>(),
+                        DateOnly.TryParseExact(obj["date"]?.AsValue().GetValue<string>(), "yyyy-MM-dd", out var d) ? d : null,
+                        TimeOnly.TryParseExact(obj["time"]?.AsValue().GetValue<string>(), ["HH:mm:ss", "HH:mm"], out var t) ? t : null
+                    );
+                } catch {
+                    return (null, null, null, null, null, null);
+                }
+            }
+        }
 
         [Column("weighing_reason")]
         public string? WeighingReason { get; set; }
@@ -108,6 +128,16 @@ namespace Elwig.Models.Entities {
         [Column("comment")]
         public string? Comment { get; set; }
 
+        [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public long CTime { get; private set; }
+        [NotMapped]
+        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+
+        [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public long MTime { get; private set; }
+        [NotMapped]
+        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+
         [InverseProperty(nameof(DeliveryPartModifier.Part))]
         public virtual ICollection<DeliveryPartModifier> PartModifiers { get; private set; } = null!;
 

Elwig/Models/Entities/DeliverySchedule.cs

@@ -0,0 +1,92 @@
+using Elwig.Helpers;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Windows;
+
+namespace Elwig.Models.Entities {
+    [Table("delivery_schedule"), PrimaryKey("Year", "DsNr")]
+    public class DeliverySchedule {
+
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("dsnr")]
+        public int DsNr { get; set; }
+
+        [Column("date")]
+        public required string DateString { get; set; }
+        [NotMapped]
+        public DateOnly Date {
+            get => DateOnly.ParseExact(DateString, "yyyy-MM-dd");
+            set => DateString = value.ToString("yyyy-MM-dd");
+        }
+
+        [Column("zwstid")]
+        public required string ZwstId { get; set; }
+
+        [Column("description")]
+        public required string Description { get; set; }
+
+        [NotMapped]
+        public string Identifier => $"{Date:dd.MM.} - {ZwstId} - {Description}";
+
+        [Column("attrid")]
+        public string? AttrId { get; set; }
+
+        [Column("cultid")]
+        public string? CultId { get; set; }
+
+        [Column("max_weight")]
+        public int? MaxWeight { get; set; }
+        [NotMapped]
+        public int AnnouncedWeight => Announcements.Sum(a => a.Weight);
+        [NotMapped]
+        public double? Percent => (double)AnnouncedWeight / MaxWeight * 100;
+
+        [Column("cancelled")]
+        public bool IsCancelled { get; set; }
+        [NotMapped]
+        public TextDecorationCollection? TextDecoration => IsCancelled ? TextDecorations.Strikethrough : null;
+
+        [Column("ancmt_from")]
+        public long? AncmtFromUnix { get; set; }
+        [NotMapped]
+        public DateTime? AncmtFrom {
+            get => AncmtFromUnix != null ? DateTimeOffset.FromUnixTimeSeconds(AncmtFromUnix.Value).LocalDateTime : null;
+            set => AncmtFromUnix = value != null ? new DateTimeOffset(value.Value).ToUnixTimeSeconds() : null;
+        }
+
+        [Column("ancmt_to")]
+        public long? AncmtToUnix { get; set; }
+        [NotMapped]
+        public DateTime? AncmtTo {
+            get => AncmtToUnix != null ? DateTimeOffset.FromUnixTimeSeconds(AncmtToUnix.Value).LocalDateTime : null;
+            set => AncmtToUnix = value != null ? new DateTimeOffset(value.Value).ToUnixTimeSeconds() : null;
+        }
+
+        [ForeignKey("Year")]
+        public virtual Season Season { get; private set; } = null!;
+
+        [ForeignKey("ZwstId")]
+        public virtual Branch Branch { get; private set; } = null!;
+
+        [ForeignKey("AttrId")]
+        public virtual WineAttr? Attribute { get; private set; }
+
+        [ForeignKey("CultId")]
+        public virtual WineCult? Cultivation { get; private set; }
+
+        [InverseProperty(nameof(DeliveryScheduleWineVar.Schedule))]
+        public virtual ICollection<DeliveryScheduleWineVar> Varieties { get; private set; } = null!;
+
+        [InverseProperty(nameof(DeliveryAncmt.Schedule))]
+        public virtual ICollection<DeliveryAncmt> Announcements { get; private set; } = null!;
+
+        public int SearchScore(IEnumerable<string> keywords) {
+            return Utils.GetSearchScore([Description], keywords);
+        }
+    }
+}

Elwig/Models/Entities/DeliveryScheduleWineVar.cs

@@ -0,0 +1,26 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models.Entities {
+    [Table("delivery_schedule_wine_variety"), PrimaryKey("Year", "DsNr", "SortId")]
+    public class DeliveryScheduleWineVar {
+
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("dsnr")]
+        public int DsNr { get; set; }
+
+        [Column("sortid")]
+        public required string SortId { get; set; }
+
+        [Column("priority")]
+        public int Priority { get; set; }
+
+        [ForeignKey("Year, DsNr")]
+        public virtual DeliverySchedule Schedule { get; private set; } = null!;
+
+        [ForeignKey("SortId")]
+        public virtual WineVar Variety { get; private set; } = null!;
+    }
+}

Elwig/Models/Entities/Member.cs

@@ -14,52 +14,45 @@ namespace Elwig.Models.Entities {
         [Column("predecessor_mgnr")]
         public int? PredecessorMgNr { get; set; }
 
+        [Column("name")]
+        public required string Name { get; set; }
+
         [Column("prefix")]
         public string? Prefix { get; set; }
 
         [Column("given_name")]
-        public required string GivenName { get; set; }
+        public string? GivenName { get; set; }
 
         [Column("middle_names")]
         public string? MiddleName { get; set; }
-
         [NotMapped]
         public string[] MiddleNames {
             get => (MiddleName != null) ? MiddleName.Split(" ") : [];
             set => MiddleName = (value.Length > 0) ? string.Join(" ", value) : null;
         }
 
-        [Column("family_name")]
-        public required string FamilyName { get; set; }
-
         [Column("suffix")]
         public string? Suffix { get; set; }
 
-        public string Name =>
-            (Prefix != null ? Prefix + " " : "") +
-            GivenName + " " +
-            (MiddleName != null ? MiddleName + " " : "") +
-            FamilyName +
-            (Suffix != null ? " " + Suffix : "");
+        [Column("attn")]
+        public string? ForTheAttentionOf { get; set; }
 
-        public string ShortName => GivenName + " " + FamilyName;
-
-        public string AdministrativeName => AdministrativeName1 + " " + AdministrativeName2;
-
-        public string AdministrativeName1 => FamilyName.Replace('ß', 'ẞ').ToUpper();
-
-        public string AdministrativeName2 =>
-            (Prefix != null ? Prefix + " " : "") +
-            GivenName +
-            (MiddleName != null ? " " + MiddleName : "") +
-            (Suffix != null ? " " + Suffix : "");
+        [NotMapped]
+        public string FullName => IsJuridicalPerson ? Name : string.Join(" ", ((string?[])[Prefix, GivenName, MiddleName, Name, Suffix]).Where(s => !string.IsNullOrWhiteSpace(s)));
+        [NotMapped]
+        public string ShortName => (!string.IsNullOrWhiteSpace(GivenName) ? $"{GivenName} " : "") + Name;
+        [NotMapped]
+        public string AdministrativeName => AdministrativeName1 + (!string.IsNullOrWhiteSpace(AdministrativeName2) ? $" {AdministrativeName2}" : "");
+        [NotMapped]
+        public string AdministrativeName1 => IsJuridicalPerson ? Name : Name.Replace('ß', 'ẞ').ToUpper();
+        [NotMapped]
+        public string? AdministrativeName2 => IsJuridicalPerson ? null : string.Join(" ", ((string?[])[Prefix, GivenName, MiddleName, Suffix]).Where(s => !string.IsNullOrWhiteSpace(s)));
 
         [Column("birthday")]
         public string? Birthday { get; set; }
 
         [Column("entry_date")]
         public string? EntryDateString { get; set; }
-
         [NotMapped]
         public DateOnly? EntryDate {
             get => EntryDateString != null ? DateOnly.ParseExact(EntryDateString, "yyyy-MM-dd") : null;
@@ -68,7 +61,6 @@ namespace Elwig.Models.Entities {
 
         [Column("exit_date")]
         public string? ExitDateString { get; set; }
-
         [NotMapped]
         public DateOnly? ExitDate {
             get => ExitDateString != null ? DateOnly.ParseExact(ExitDateString, "yyyy-MM-dd") : null;
@@ -90,6 +82,9 @@ namespace Elwig.Models.Entities {
         [Column("ustid_nr")]
         public string? UstIdNr { get; set; }
 
+        [Column("juridical_pers")]
+        public bool IsJuridicalPerson { get; set; }
+
         [Column("volllieferant")]
         public bool IsVollLieferant { get; set; }
 
@@ -146,23 +141,35 @@ namespace Elwig.Models.Entities {
 
         [ForeignKey("DefaultKgNr")]
         public virtual WbKg? DefaultWbKg { get; private set; }
-
         [NotMapped]
         public AT_Kg? DefaultKg => DefaultWbKg?.AtKg;
 
+        [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public long CTime { get; private set; }
+        [NotMapped]
+        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+
+        [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public long MTime { get; private set; }
+        [NotMapped]
+        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+
         [ForeignKey("ZwstId")]
         public virtual Branch? Branch { get; private set; }
 
         [InverseProperty(nameof(AreaCom.Member))]
         public virtual ICollection<AreaCom> AreaCommitments { get; private set; } = null!;
 
-        public IQueryable<AreaCom> ActiveAreaCommitments(AppDbContext ctx) {
-            return ctx.AreaCommitments.Where(c => c.MgNr == MgNr).Where(Utils.ActiveAreaCommitments());
+        public IQueryable<AreaCom> ActiveAreaCommitments(AppDbContext ctx, int? year = null) {
+            return ctx.AreaCommitments.Where(c => c.MgNr == MgNr).Where(Utils.ActiveAreaCommitments(year ?? Utils.CurrentYear));
         }
 
         [InverseProperty(nameof(BillingAddr.Member))]
         public virtual BillingAddr? BillingAddress { get; private set; }
 
+        [InverseProperty(nameof(Delivery.Member))]
+        public virtual ICollection<DeliveryAncmt> Announcements { get; private set; } = null!;
+
         [InverseProperty(nameof(Delivery.Member))]
         public virtual ICollection<Delivery> Deliveries { get; private set; } = null!;
 
@@ -179,8 +186,8 @@ namespace Elwig.Models.Entities {
 
         public int SearchScore(IEnumerable<string> keywords) {
             return Utils.GetSearchScore([
-                FamilyName, MiddleName, GivenName,
-                BillingAddress?.Name,
+                Name, MiddleName, GivenName,
+                BillingAddress?.FullName,
                 Comment,
             ], keywords);
         }

Elwig/Models/Entities/MemberHistory.cs

@@ -1,9 +1,9 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 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,50 @@
+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("mod_abs")]
+        public long? ModAbsValue { get; set; }
+        [NotMapped]
+        public decimal? ModAbs {
+            get => ModAbsValue != null ? Utils.DecFromDb(ModAbsValue.Value, 2) : null;
+            set => ModAbsValue = value != null ? Utils.DecToDb(value.Value, 2) : null;
+        }
+
+        [Column("mod_rel")]
+        public double? ModRelValue { get; set; }
+        [NotMapped]
+        public decimal? ModRel {
+            get => ModRelValue != null ? (decimal)ModRelValue.Value : null;
+            set => ModRelValue = value != null ? (double)value.Value : null;
+        }
+
+        [Column("mod_comment")]
+        public string? ModComment { get; set; }
+
+        [Column("amount")]
+        public long? AmountValue { get; set; }
+        [NotMapped]
+        public decimal? Amount {
+            get => AmountValue != null ? Utils.DecFromDb(AmountValue.Value, 2) : null;
+            set => AmountValue = value != null ? Utils.DecToDb(value.Value, 2) : null;
+        }
+
+        [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 long? CalcTimeUnix { get; set; }
+        [NotMapped]
+        public DateTime? CalcTime => CalcTimeUnix != null ? DateTimeOffset.FromUnixTimeSeconds(CalcTimeUnix.Value).LocalDateTime : null;
 
         [Column("comment")]
         public string? Comment { get; set; }
@@ -45,6 +45,16 @@ namespace Elwig.Models.Entities {
         [Column("data")]
         public required string Data { get; set; }
 
+        [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public long CTime { get; private set; }
+        [NotMapped]
+        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+
+        [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        public long MTime { get; private set; }
+        [NotMapped]
+        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+
         [ForeignKey("Year")]
         public virtual Season Season { get; private set; } = null!;