Bump version to 0.11.1

DeliveryAncmtAdminWindow: Add more filters and tooltip for weight
DeliveryService: Small fixes
2024-09-19 12:35:25 +02:00 · 2024-09-19 11:56:45 +02:00 · 2024-09-19 11:54:57 +02:00 · 2024-09-19 09:34:44 +02:00 · 2024-09-18 18:26:16 +02:00 · 2024-09-17 23:18:51 +02:00
97 changed files with 4247 additions and 635 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,6 +3,245 @@ 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}
 ---------------------------------------

--- a/Elwig/App.xaml.cs
+++ b/Elwig/App.xaml.cs
@ -34,18 +34,7 @@ namespace Elwig {
        public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");

        public static Config Config { get; private set; } = new(ConfigPath);
-        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 Version Version { get; private set; } = new();

        public static int BranchNum { get; private set; }
        public static string ZwstId { get; private set; }
@ -81,15 +70,16 @@ namespace Elwig {
            }

            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() {
@ -110,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();
@ -211,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);
            }
        }

@ -231,7 +223,7 @@ namespace Elwig {
        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) {
@ -303,6 +295,14 @@ 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);
        }
--- a/Elwig/Controls/CheckComboBox.cs
+++ b/Elwig/Controls/CheckComboBox.cs
@ -20,6 +20,12 @@ namespace Elwig.Controls {
            set => SetValue(DelimiterProperty, value);
        }

+        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);
@ -116,7 +122,7 @@ namespace Elwig.Controls {

        private void OnSelectionChanged(object sender, SelectionChangedEventArgs evt) {
            SelectItemsReverse();
-            var dmp = DisplayMemberPath != null && DisplayMemberPath != "" ? DisplayMemberPath : null;
+            var dmp = !string.IsNullOrEmpty(ListDisplayMemberPath) ? ListDisplayMemberPath : !string.IsNullOrEmpty(DisplayMemberPath) ? DisplayMemberPath : null;
            if (SelectedItems.Count == ItemsSource.Cast<object>().Count() && AllItemsSelectedContent != null) {
                _textBox.Text = AllItemsSelectedContent;
                AllItemsSelected = true;
--- a/Elwig/Dialogs/AreaComDialog.xaml
+++ b/Elwig/Dialogs/AreaComDialog.xaml
@ -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">
--- a/Elwig/Dialogs/AreaComDialog.xaml.cs
+++ b/Elwig/Dialogs/AreaComDialog.xaml.cs
@ -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) {
--- a/Elwig/Documents/BusinessDocument.cs
+++ b/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)));
            }
        }

--- a/Elwig/Documents/CreditNote.cs
+++ b/Elwig/Documents/CreditNote.cs
@ -33,24 +33,30 @@ namespace Elwig.Documents {
            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>Datum</th><td>{p.Variant.Date:dd.MM.yyyy}</td></tr>" +
-                $"<tr><th>Überw. am</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
+                $"<tr><th>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);
@ -88,8 +94,5 @@ namespace Elwig.Documents {
                    .Where(u => u.Item3 != 0)
                    .ToList();
            }
-            if (considerCustomModifiers) {
-                CustomPayment = ctx.CustomPayments.Find(p.Year, p.MgNr);
-            }
        }
    }}
--- a/Elwig/Documents/CreditNote.cshtml
+++ b/Elwig/Documents/CreditNote.cshtml
@ -157,9 +157,9 @@
                @Raw(FormatRow($"Autom. Nachz. von GA ({Model.MemberAutoBusinessShares})", Model.MemberAutoBusinessSharesAmount, add: true));
                penalty += Model.MemberAutoBusinessSharesAmount;
            }
-            @if (Model.CustomPayment != null) {
-                @Raw(FormatRow(Model.CustomPayment.Comment ?? (Model.CustomPayment.Amount < 0 ? "Weitere Abzüge" : "Weitere Zuschläge"), Model.CustomPayment.Amount, add: true));
-                penalty += Model.CustomPayment.Amount;
+            @if (Model.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) {
--- a/Elwig/Documents/DeliveryAncmtList.cs
+++ b/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) {
+        }
+    }
+}
--- a/Elwig/Documents/DeliveryAncmtList.cshtml
+++ b/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>
--- a/Elwig/Documents/DeliveryAncmtList.css
+++ b/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;
+}
--- a/Elwig/Documents/DeliveryNote.cs
+++ b/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;
--- a/Elwig/Documents/Document.cs
+++ b/Elwig/Documents/Document.cs
@ -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) {
--- a/Elwig/Documents/Letterhead.cs
+++ b/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 = "";
        }
    }
--- a/Elwig/Documents/MemberDataSheet.cshtml
+++ b/Elwig/Documents/MemberDataSheet.cshtml
@ -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;
                    }
--- a/Elwig/Documents/MemberList.cs
+++ b/Elwig/Documents/MemberList.cs
@ -1,5 +1,6 @@
 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) :
--- a/Elwig/Documents/MemberList.cshtml
+++ b/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>
--- a/Elwig/Documents/PaymentVariantSummary.cshtml
+++ b/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}") %
@ -84,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);
@ -117,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);
@ -129,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)
@ -144,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>
--- a/Elwig/Elwig.csproj
+++ b/Elwig/Elwig.csproj
@ -7,7 +7,7 @@
    <UseWPF>true</UseWPF>
    <PreserveCompilationContext>true</PreserveCompilationContext>
    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.9.1</Version>
+    <Version>0.11.1</Version>
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <ApplicationManifest>app.manifest</ApplicationManifest>
@ -25,17 +25,17 @@
  </Target>

  <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <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.32" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />
+    <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.2592.51" />
+    <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.36" />
+    <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>
--- a/Elwig/Helpers/AppDbContext.cs
+++ b/Elwig/Helpers/AppDbContext.cs
@ -51,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; }
@ -236,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))
@ -266,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();
--- a/Elwig/Helpers/AppDbUpdater.cs
+++ b/Elwig/Helpers/AppDbUpdater.cs
@ -9,11 +9,11 @@ namespace Elwig.Helpers {
    public static class AppDbUpdater {

        // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 25;
+        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;
@ -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) {
--- a/Elwig/Helpers/Billing/Billing.cs
+++ b/Elwig/Helpers/Billing/Billing.cs
@ -157,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();
--- a/Elwig/Helpers/Billing/BillingVariant.cs
+++ b/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();
@ -104,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}'
@ -125,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) {
--- a/Elwig/Helpers/Export/Bki.cs
+++ b/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}
--- a/Elwig/Helpers/Export/Ebics.cs
+++ b/Elwig/Helpers/Export/Ebics.cs
@ -83,7 +83,7 @@ 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;
--- a/Elwig/Helpers/Export/ElwigData.cs
+++ b/Elwig/Helpers/Export/ElwigData.cs
@ -39,6 +39,7 @@ namespace Elwig.Helpers.Export {
                Dictionary<int, int> currentDids;
                Dictionary<string, int> currentLsNrs;
                Dictionary<int, List<WbRd>> currentWbRde;
+                Dictionary<int, AT_Kg> kgs;

                using (var ctx = new AppDbContext()) {
                    branches = await ctx.Branches.ToDictionaryAsync(b => b.ZwstId);
@ -50,6 +51,7 @@ namespace Elwig.Helpers.Export {
                    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 data = new List<(
@ -101,9 +103,9 @@ namespace Elwig.Helpers.Export {
                        string? line;
                        while ((line = await reader.ReadLineAsync()) != null) {
                            var obj = JsonNode.Parse(line)!.AsObject();
-                            var (m, b, telNrs, emailAddrs) = obj.ToMember();
+                            var (m, b, telNrs, emailAddrs) = obj.ToMember(kgs);
                            r.Members.Add(m);
-                            if (b != null) data[^1].BillingAddresses.Add(b);
+                            if (b != null) r.BillingAddresses.Add(b);
                            r.TelephoneNumbers.AddRange(telNrs);
                            r.EmailAddresses.AddRange(emailAddrs);
                        }
@ -115,9 +117,12 @@ namespace Elwig.Helpers.Export {
                        string? line;
                        while ((line = await reader.ReadLineAsync()) != null) {
                            var obj = JsonNode.Parse(line)!.AsObject();
-                            var (areaCom, wbrd) = obj.ToAreaCom(currentWbRde);
+                            var (areaCom, wbrd) = obj.ToAreaCom(kgs, currentWbRde);
                            r.AreaCommitments.Add(areaCom);
-                            if (wbrd != null) r.Riede.Add(wbrd);
+                            if (wbrd != null) {
+                                currentWbRde[wbrd.KgNr].Add(wbrd);
+                                r.Riede.Add(wbrd);
+                            }
                        }
                    }

@ -223,6 +228,7 @@ namespace Elwig.Helpers.Export {
                        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));
                    }
@ -268,7 +274,7 @@ namespace Elwig.Helpers.Export {
                    await ctx.SaveChangesAsync();
                    await AddImportedFiles(Path.GetFileName(meta.FileName));
                }
-                await App.HintContextChange();
+                App.HintContextChange();

                MessageBox.Show(
                    $"Das importieren der Daten war erfolgreich!\n" +
@ -401,11 +407,12 @@ namespace Elwig.Helpers.Export {
            return new JsonObject {
                ["mgnr"] = m.MgNr,
                ["predecessor_mgnr"] = m.PredecessorMgNr,
+                ["name"] = m.Name,
                ["prefix"] = m.Prefix,
                ["given_name"] = m.GivenName,
                ["middle_names"] = m.MiddleName,
-                ["family_name"] = m.FamilyName,
                ["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,
@ -414,6 +421,7 @@ namespace Elwig.Helpers.Export {
                ["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,
@ -431,7 +439,7 @@ namespace Elwig.Helpers.Export {
                    ["country"] = m.CountryNum,
                },
                ["billing_address"] = m.BillingAddress != null ? new JsonObject {
-                    ["name"] = m.BillingAddress.Name,
+                    ["name"] = m.BillingAddress.FullName,
                    ["address"] = m.BillingAddress.Address,
                    ["postal_dest"] = m.BillingAddress.PostalDestId,
                    ["country"] = m.BillingAddress.CountryNum,
@ -455,16 +463,21 @@ namespace Elwig.Helpers.Export {
            };
        }

-        public static (Member, BillingAddr?, List<MemberTelNr>, List<MemberEmailAddr>) ToMember(this JsonNode json) {
+        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>(),
+                GivenName = json["given_name"]?.AsValue().GetValue<string>(),
                MiddleName = json["middle_names"]?.AsValue().GetValue<string>(),
-                FamilyName = json["family_name"]!.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>(),
@ -473,6 +486,7 @@ namespace Elwig.Helpers.Export {
                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,
@ -484,13 +498,13 @@ namespace Elwig.Helpers.Export {
                CountryNum = json["address"]!["country"]!.AsValue().GetValue<int>(),
                PostalDestId = json["address"]!["postal_dest"]!.AsValue().GetValue<string>(),
                Address = json["address"]!["address"]!.AsValue().GetValue<string>(),
-                DefaultKgNr = json["default_kgnr"]?.AsValue().GetValue<int>(),
+                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,
-                Name = a["name"]!.AsValue().GetValue<string>(),
+                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>(),
@ -524,13 +538,13 @@ namespace Elwig.Helpers.Export {
            };
        }

-        public static (AreaCom, WbRd?) ToAreaCom(this JsonNode json, Dictionary<int, List<WbRd>> riede) {
+        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($"KG {kgnr:00000} is no WbKg");
+                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;
@ -551,7 +565,7 @@ namespace Elwig.Helpers.Export {
                KgNr = kgnr,
                GstNr = json["gstnr"]?.AsValue().GetValue<string>() ?? "-",
                RdNr = rd?.RdNr,
-                YearFrom = json["year_from"]!.AsValue().GetValue<int>(),
+                YearFrom = json["year_from"]?.AsValue().GetValue<int>(),
                YearTo = json["year_to"]?.AsValue().GetValue<int>(),
                Comment = json["comment"]?.AsValue().GetValue<string>(),
            }, newRd ? rd : null);
--- a/Elwig/Helpers/Utils.cs
+++ b/Elwig/Helpers/Utils.cs
@ -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);
            }
        }

@ -558,7 +560,7 @@ namespace Elwig.Helpers {

        public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments() => ActiveAreaCommitments(CurrentYear);
        public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments(int year) =>
-            c => (c.YearFrom <= year) && (c.YearTo == null || c.YearTo >= 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 year) =>
--- a/Elwig/Helpers/Validator.cs
+++ b/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) {
--- a/Elwig/Helpers/Weighing/GassnerScale.cs
+++ b/Elwig/Helpers/Weighing/GassnerScale.cs
@ -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");
+        }
    }
 }
--- a/Elwig/Helpers/Weighing/ICommandScale.cs
+++ b/Elwig/Helpers/Weighing/ICommandScale.cs
@ -1,3 +1,4 @@
+using System;
 using System.Threading.Tasks;

 namespace Elwig.Helpers.Weighing {
@ -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);
    }
 }
--- a/Elwig/Helpers/Weighing/SysTecITScale.cs
+++ b/Elwig/Helpers/Weighing/SysTecITScale.cs
@ -161,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();
+        }
    }
 }
--- a/Elwig/Models/Dtos/AreaComUnderDeliveyData.cs
+++ b/Elwig/Models/Dtos/AreaComUnderDeliveyData.cs
@ -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")]
--- a/Elwig/Models/Dtos/CreditNoteData.cs
+++ b/Elwig/Models/Dtos/CreditNoteData.cs
@ -50,7 +50,7 @@ namespace Elwig.Models.Dtos {

        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,
@ -79,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;
@ -144,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")]
--- a/Elwig/Models/Dtos/DeliveryAncmtListData.cs
+++ b/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";
+        }
+    }
+}
--- a/Elwig/Models/Dtos/DeliveryJournalData.cs
+++ b/Elwig/Models/Dtos/DeliveryJournalData.cs
@ -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;
--- a/Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs
+++ b/Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs
@ -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")]
--- a/Elwig/Models/Dtos/MemberListData.cs
+++ b/Elwig/Models/Dtos/MemberListData.cs
@ -31,6 +31,7 @@ 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),
@ -45,8 +46,8 @@ namespace Elwig.Models.Dtos {
            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)
@ -55,13 +56,17 @@ namespace Elwig.Models.Dtos {
                .Include(m => m.TelephoneNumbers)
                .Include(m => m.EmailAddresses)
                .AsSplitQuery()
-                .ToListAsync()).Select(m => new MemberListRow(m, areaCom[m.MgNr])), filterNames);
+                .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;
@ -78,6 +83,7 @@ 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;
@ -89,9 +95,10 @@ namespace Elwig.Models.Dtos {
        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;
@ -100,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;
@ -125,6 +132,7 @@ namespace Elwig.Models.Dtos {
                .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() : [];
        }
    }
 }
--- a/Elwig/Models/Dtos/OverUnderDeliveryData.cs
+++ b/Elwig/Models/Dtos/OverUnderDeliveryData.cs
@ -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 = TRUE OR d.weight > 0
+                    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")]
--- a/Elwig/Models/Entities/AreaCom.cs
+++ b/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!;

--- a/Elwig/Models/Entities/BillingAddr.cs
+++ b/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; }
--- a/Elwig/Models/Entities/Credit.cs
+++ b/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!;
--- a/Elwig/Models/Entities/Delivery.cs
+++ b/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());
--- a/Elwig/Models/Entities/DeliveryAncmt.cs
+++ b/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);
+        }
+    }
+}
--- a/Elwig/Models/Entities/DeliveryPart.cs
+++ b/Elwig/Models/Entities/DeliveryPart.cs
@ -128,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!;

--- a/Elwig/Models/Entities/DeliverySchedule.cs
+++ b/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);
+        }
+    }
+}
--- a/Elwig/Models/Entities/DeliveryScheduleWineVar.cs
+++ b/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!;
+    }
+}
--- a/Elwig/Models/Entities/Member.cs
+++ b/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,10 +141,19 @@ 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; }

@ -163,6 +167,9 @@ namespace Elwig.Models.Entities {
        [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);
        }
--- a/Elwig/Models/Entities/PaymentCustom.cs
+++ b/Elwig/Models/Entities/PaymentCustom.cs
@ -11,12 +11,31 @@ namespace Elwig.Models.Entities {
        [Column("mgnr")]
        public int MgNr { get; set; }

-        [Column("amount")]
-        public long AmountValue { get; set; }
+        [Column("mod_abs")]
+        public long? ModAbsValue { get; set; }
        [NotMapped]
-        public decimal Amount {
-            get => Utils.DecFromDb(AmountValue, 2);
-            set => AmountValue = Utils.DecToDb(value, 2);
+        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")]
--- a/Elwig/Models/Entities/PaymentVar.cs
+++ b/Elwig/Models/Entities/PaymentVar.cs
@ -35,9 +35,9 @@ namespace Elwig.Models.Entities {
        public bool TestVariant { get; set; }

        [Column("calc_time")]
-        public int? CalcTimeUnix { get; set; }
+        public long? CalcTimeUnix { get; set; }
        [NotMapped]
-        public DateTime? CalcTime => CalcTimeUnix != null ? DateTimeOffset.FromUnixTimeSeconds((long)CalcTimeUnix).UtcDateTime.ToLocalTime() : null;
+        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!;

--- a/Elwig/Models/IAddress.cs
+++ b/Elwig/Models/IAddress.cs
@ -2,7 +2,7 @@ using Elwig.Models.Entities;

 namespace Elwig.Models {
    public interface IAddress {
-        string Name { get; }
+        string FullName { get; }
        string Address { get; }
        PostalDest PostalDest { get; }
    }
--- a/Elwig/Resources/Sql/25-26.sql
+++ b/Elwig/Resources/Sql/25-26.sql
@ -0,0 +1,91 @@
+-- schema version 25 to 26
+
+CREATE TABLE delivery_schedule (
+    year        INTEGER NOT NULL,
+    dsnr        INTEGER NOT NULL,
+
+    date        TEXT    NOT NULL CHECK (date LIKE year || '-%' AND date REGEXP '^[1-9][0-9]{3}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$'),
+    zwstid      TEXT    NOT NULL,
+    description TEXT    NOT NULL,
+    max_weight  INTEGER,
+
+    ancmt_from  INTEGER,
+    ancmt_to    INTEGER,
+
+    CONSTRAINT pk_delivery_schedule PRIMARY KEY (year, dsnr),
+    CONSTRAINT fk_delivery_schedule_season FOREIGN KEY (year) REFERENCES season (year)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT,
+    CONSTRAINT fk_delivery_schedule_branch FOREIGN KEY (zwstid) REFERENCES branch (zwstid)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT
+) STRICT;
+
+CREATE TABLE delivery_schedule_wine_variety (
+    year     INTEGER NOT NULL,
+    dsnr     INTEGER NOT NULL,
+    sortid   TEXT    NOT NULL,
+
+    priority INTEGER NOT NULL DEFAULT 1,
+
+    CONSTRAINT pk_delivery_schedule_wine_variety PRIMARY KEY (year, dsnr, sortid),
+    CONSTRAINT fk_delivery_schedule_wine_variety_delivery_schedule FOREIGN KEY (year, dsnr) REFERENCES delivery_schedule (year, dsnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE,
+    CONSTRAINT fk_delivery_schedule_wine_variety_wine_variety FOREIGN KEY (sortid) REFERENCES wine_variety (sortid)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT
+) STRICT;
+
+CREATE TABLE delivery_announcement (
+    year   INTEGER NOT NULL,
+    dsnr   INTEGER NOT NULL,
+    mgnr   INTEGER NOT NULL,
+    sortid TEXT    NOT NULL,
+
+    weight INTEGER NOT NULL,
+
+    type   TEXT    NOT NULL,
+    ctime  INTEGER NOT NULL DEFAULT (UNIXEPOCH()),
+    mtime  INTEGER NOT NULL DEFAULT (UNIXEPOCH()),
+
+    CONSTRAINT pk_delivery_announcement PRIMARY KEY (year, dsnr, mgnr, sortid),
+    CONSTRAINT fk_delivery_announcement_delivery_schedule FOREIGN KEY (year, dsnr) REFERENCES delivery_schedule (year, dsnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE,
+    CONSTRAINT fk_delivery_announcement_member FOREIGN KEY (mgnr) REFERENCES member (mgnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE,
+    CONSTRAINT fk_delivery_announcement_wine_variety FOREIGN KEY (sortid) REFERENCES wine_variety (sortid)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT
+) STRICT;
+
+
+CREATE TRIGGER t_delivery_announcement_i_ctime
+    AFTER INSERT ON delivery_announcement FOR EACH ROW
+    WHEN NEW.ctime != UNIXEPOCH()
+BEGIN
+    UPDATE delivery_announcement SET ctime = UNIXEPOCH() WHERE (year, dsnr, mgnr, sortid) = (NEW.year, NEW.dsnr, NEW.mgnr, NEW.sortid);
+END;
+
+CREATE TRIGGER t_delivery_announcement_u_ctime
+    BEFORE UPDATE ON delivery_announcement FOR EACH ROW
+    WHEN OLD.ctime != NEW.ctime
+BEGIN
+    SELECT RAISE(ABORT, 'It is not allowed to change ctime');
+END;
+
+CREATE TRIGGER t_delivery_announcement_i_mtime
+    AFTER INSERT ON delivery_announcement FOR EACH ROW
+    WHEN NEW.mtime != UNIXEPOCH()
+BEGIN
+    UPDATE delivery_announcement SET mtime = UNIXEPOCH() WHERE (year, dsnr, mgnr, sortid) = (NEW.year, NEW.dsnr, NEW.mgnr, NEW.sortid);
+END;
+
+CREATE TRIGGER t_delivery_announcement_u_mtime
+    AFTER UPDATE ON delivery_announcement FOR EACH ROW
+    WHEN NEW.mtime != UNIXEPOCH()
+BEGIN
+    UPDATE delivery_announcement SET mtime = UNIXEPOCH() WHERE (year, dsnr, mgnr, sortid) = (NEW.year, NEW.dsnr, NEW.mgnr, NEW.sortid);
+END;
--- a/Elwig/Resources/Sql/26-27.sql
+++ b/Elwig/Resources/Sql/26-27.sql
@ -0,0 +1,48 @@
+-- schema version 26 to 27
+
+PRAGMA writable_schema = ON;
+
+ALTER TABLE member RENAME COLUMN family_name TO name;
+ALTER TABLE member ADD COLUMN attn TEXT DEFAULT NULL;
+ALTER TABLE member ADD COLUMN juridical_pers INTEGER NOT NULL CHECK (juridical_pers IN (TRUE, FALSE)) DEFAULT FALSE;
+
+UPDATE sqlite_schema SET sql = REPLACE(sql, 'given_name       TEXT    NOT NULL', 'given_name       TEXT DEFAULT NULL')
+WHERE type = 'table' AND name = 'member';
+
+DROP VIEW v_bki_member;
+CREATE VIEW v_bki_member AS
+SELECT s.year, m.mgnr, m.lfbis_nr, m.name,
+       (COALESCE(m.prefix || ' ', '') || m.given_name || COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '')) AS other_names,
+       a.name AS billing_name, COALESCE(a.address, m.address) AS address,
+       COALESCE(a.country, m.country) AS country, COALESCE(a.postal_dest, m.postal_dest) AS postal_dest,
+       SUM(IIF(c.year_from <= s.year AND (c.year_to IS NULL OR c.year_to >= s.year), c.area, 0)) AS area
+FROM season s, member m
+    LEFT JOIN member_billing_address a ON a.mgnr = m.mgnr
+    LEFT JOIN area_commitment c ON c.mgnr = m.mgnr
+GROUP BY s.year, m.mgnr;
+
+DROP VIEW v_bki_delivery;
+CREATE VIEW v_bki_delivery AS
+SELECT m.lfbis_nr, m.name, m.other_names, m.billing_name,
+       m.address, plz.plz, IIF(INSTR(o.name, ',') = 0, o.name, SUBSTR(o.name, 1, INSTR(o.name, ',') - 1)) AS ort,
+       d.date, d.weight, v.type, v.sortid, d.qualid, d.year, d.hkid, d.kmw, d.oe,
+       m.area
+FROM v_delivery d
+    JOIN v_bki_member m ON (m.year, m.mgnr) = (d.year, d.mgnr)
+    JOIN postal_dest pd ON (pd.country, pd.id) = (m.country, m.postal_dest)
+    LEFT JOIN AT_plz_dest ap ON (ap.country, ap.id) = (pd.country, pd.id)
+    LEFT JOIN AT_plz plz ON plz.plz = ap.plz
+    LEFT JOIN AT_ort o ON o.okz = ap.okz
+    JOIN wine_variety v ON v.sortid = d.sortid
+ORDER BY d.date, d.time;
+
+PRAGMA schema_version = 2601;
+PRAGMA writable_schema = OFF;
+
+UPDATE member
+SET name = a.name, juridical_pers = TRUE
+FROM member_billing_address a
+WHERE a.mgnr = member.mgnr AND member.name = '';
+
+DELETE FROM member_billing_address
+WHERE mgnr IN (SELECT mgnr FROM member WHERE name = member_billing_address.name)
--- a/Elwig/Resources/Sql/27-28.sql
+++ b/Elwig/Resources/Sql/27-28.sql
@ -0,0 +1,13 @@
+-- schema version 27 to 28
+
+ALTER TABLE payment_custom ADD COLUMN mod_abs INTEGER DEFAULT NULL;
+ALTER TABLE payment_custom ADD COLUMN mod_rel REAL DEFAULT NULL;
+ALTER TABLE payment_custom ADD COLUMN mod_comment TEXT DEFAULT NULL;
+
+PRAGMA writable_schema = ON;
+
+UPDATE sqlite_schema SET sql = REPLACE(REPLACE(sql, 'amount  INTEGER NOT NULL', 'amount      INTEGER DEFAULT NULL'), 'comment TEXT', 'comment     TEXT    DEFAULT NULL')
+WHERE type = 'table' AND name = 'payment_custom';
+
+PRAGMA schema_version = 2701;
+PRAGMA writable_schema = OFF;
--- a/Elwig/Resources/Sql/28-29.sql
+++ b/Elwig/Resources/Sql/28-29.sql
@ -0,0 +1,23 @@
+-- schema version 28 to 29
+
+ALTER TABLE delivery_schedule ADD COLUMN attrid TEXT DEFAULT NULL;
+ALTER TABLE delivery_schedule ADD COLUMN cultid TEXT DEFAULT NULL;
+ALTER TABLE delivery_schedule ADD COLUMN cancelled INTEGER NOT NULL CHECK (cancelled IN (TRUE, FALSE)) DEFAULT FALSE;
+UPDATE delivery_schedule SET cultid = 'B' WHERE UPPER(description) LIKE '%BIO%';
+UPDATE delivery_schedule SET cancelled = TRUE WHERE zwstid = 'M' AND date IN ('2024-09-14', '2024-09-16');
+
+PRAGMA writable_schema = ON;
+
+UPDATE sqlite_schema SET sql = REPLACE(sql, '
+) STRICT', ',
+    CONSTRAINT fk_delivery_schedule_wine_attribute FOREIGN KEY (attrid) REFERENCES wine_attribute (attrid)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT,
+    CONSTRAINT fk_delivery_schedule_wine_cultivation FOREIGN KEY (cultid) REFERENCES wine_cultivation (cultid)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT
+) STRICT')
+WHERE type = 'table' AND name = 'delivery_schedule';
+
+PRAGMA schema_version = 2801;
+PRAGMA writable_schema = OFF;
--- a/Elwig/Resources/Sql/29-30.sql
+++ b/Elwig/Resources/Sql/29-30.sql
@ -0,0 +1,18 @@
+-- schema version 29 to 30
+
+PRAGMA writable_schema = ON;
+
+DROP VIEW v_bki_member;
+CREATE VIEW v_bki_member AS
+SELECT s.year, m.mgnr, m.lfbis_nr, m.name,
+       (COALESCE(m.prefix || ' ', '') || m.given_name || COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '')) AS other_names,
+       a.name AS billing_name, COALESCE(a.address, m.address) AS address,
+       COALESCE(a.country, m.country) AS country, COALESCE(a.postal_dest, m.postal_dest) AS postal_dest,
+       SUM(COALESCE(IIF((c.year_from IS NULL OR c.year_from <= s.year) AND (c.year_to IS NULL OR c.year_to >= s.year), c.area, NULL), 0)) AS area
+FROM season s, member m
+    LEFT JOIN member_billing_address a ON a.mgnr = m.mgnr
+    LEFT JOIN area_commitment c ON c.mgnr = m.mgnr
+GROUP BY s.year, m.mgnr;
+
+PRAGMA schema_version = 2901;
+PRAGMA writable_schema = OFF;
--- a/Elwig/Services/AreaComService.cs
+++ b/Elwig/Services/AreaComService.cs
@ -100,42 +100,43 @@ namespace Elwig.Services {
        }

        public static async Task<int> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr) {
-            using var ctx = new AppDbContext();
            int newFbNr = (int)vm.FbNr!;

-            var a = new AreaCom {
-                FbNr = oldFbNr ?? newFbNr,
-                MgNr = (int)vm.MgNr!,
-                YearFrom = (int)vm.YearFrom!,
-                YearTo = vm.YearTo,
-                VtrgId = vm.AreaComType!.VtrgId,
-                CultId = vm.WineCult?.CultId,
-                Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
-                KgNr = vm.Kg!.KgNr,
-                RdNr = vm.Rd?.RdNr,
-                GstNr = vm.GstNr!.Trim(),
-                Area = (int)vm.Area!,
-            };
+            using (var ctx = new AppDbContext()) {
+                var a = new AreaCom {
+                    FbNr = oldFbNr ?? newFbNr,
+                    MgNr = (int)vm.MgNr!,
+                    YearFrom = vm.YearFrom,
+                    YearTo = vm.YearTo,
+                    VtrgId = vm.AreaComType!.VtrgId,
+                    CultId = vm.WineCult?.CultId,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
+                    KgNr = vm.Kg!.KgNr,
+                    RdNr = vm.Rd?.RdNr,
+                    GstNr = vm.GstNr!.Trim(),
+                    Area = (int)vm.Area!,
+                };

-            if (vm.Rd?.RdNr == 0) {
-                vm.Rd.RdNr = await ctx.NextRdNr(a.KgNr);
-                a.RdNr = vm.Rd.RdNr;
-                ctx.Add(vm.Rd);
+                if (vm.Rd?.RdNr == 0) {
+                    vm.Rd.RdNr = await ctx.NextRdNr(a.KgNr);
+                    a.RdNr = vm.Rd.RdNr;
+                    ctx.Add(vm.Rd);
+                }
+
+                if (oldFbNr != null) {
+                    ctx.Update(a);
+                } else {
+                    ctx.Add(a);
+                }
+
+                await ctx.SaveChangesAsync();
+
+                if (newFbNr != a.FbNr) {
+                    await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
+                }
            }

-            if (oldFbNr != null) {
-                ctx.Update(a);
-            } else {
-                ctx.Add(a);
-            }
-
-            await ctx.SaveChangesAsync();
-
-            if (newFbNr != a.FbNr) {
-                await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
-            }
-
-            await App.HintContextChange();
+            App.HintContextChange();

            return newFbNr;
        }
--- a/Elwig/Services/DeliveryAncmtService.cs
+++ b/Elwig/Services/DeliveryAncmtService.cs
@ -0,0 +1,398 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Elwig.ViewModels;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Elwig.Documents;
+using Elwig.Helpers.Export;
+using Elwig.Models.Dtos;
+using Microsoft.Win32;
+using System.Windows.Input;
+using System.Windows;
+using System;
+using LinqKit;
+using System.Windows.Controls;
+
+namespace Elwig.Services {
+    public static class DeliveryAncmtService {
+
+        public enum ExportSubject {
+            FromSelectedSchedule,
+        };
+
+        public static void InitInputs(this DeliveryAncmtAdminViewModel vm) {
+            if (vm.SelectedDeliverySchedule is DeliverySchedule s)
+                vm.DeliverySchedule = (DeliverySchedule?)ControlUtils.GetItemFromSourceWithPk(vm.DeliveryScheduleSource, s.Year, s.DsNr);
+        }
+
+        public static void ClearInputs(this DeliveryAncmtAdminViewModel vm) {
+            vm.StatusAncmtCreated = "-";
+            vm.StatusAncmtModified = "-";
+        }
+
+        public static async Task FillInputs(this DeliveryAncmtAdminViewModel vm, DeliveryAncmt a) {
+            vm.MgNr = a.MgNr;
+            vm.DeliverySchedule = (DeliverySchedule?)ControlUtils.GetItemFromSourceWithPk(vm.DeliveryScheduleSource, a.Year, a.DsNr);
+            vm.SortId = a.SortId;
+            vm.Weight = a.Weight;
+            vm.StatusAncmtCreated = $"{a.CreatedTimestamp:dd.MM.yyyy, HH:mm} ({a.Type})";
+            vm.StatusAncmtModified = a.ModifiedTimestamp != a.CreatedTimestamp ? $"{a.ModifiedTimestamp:dd.MM.yyyy, HH:mm}" : "-";
+        }
+
+        public static async Task<(List<string>, IQueryable<DeliveryAncmt>, List<string>)> GetFilters(this DeliveryAncmtAdminViewModel vm, AppDbContext ctx) {
+            List<string> filterNames = [];
+            IQueryable<DeliveryAncmt> deliveryAncmtQuery = ctx.DeliveryAnnouncements;
+            if (vm.SelectedDeliverySchedule is DeliverySchedule s) {
+                deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Year == s.Year && a.DsNr == s.DsNr);
+                filterNames.Add($"{s.Date:dd.MM.yyyy} – {s.Branch.Name} – {s.Description}");
+            } else {
+                deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Year == vm.FilterSeason && (!vm.FilterOnlyUpcoming || a.Schedule.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0));
+                filterNames.Add($"{vm.FilterSeason}");
+            }
+
+            var filterVar = new List<string>();
+            var filterNotVar = new List<string>();
+            var filterMgNr = new List<int>();
+            var filterZwst = new List<string>();
+            var filterAttr = new List<string>();
+            var filterNotAttr = new List<string>();
+            var filterCult = new List<string>();
+            var filterNotCult = new List<string>();
+            var filterDate = new List<(string?, string?)>();
+            int filterWeightGt = 0, filterWeightLt = 0;
+
+            var filter = vm.TextFilter;
+            if (filter.Count > 0) {
+                var var = await ctx.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
+                var mgnr = await ctx.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
+                var zwst = await ctx.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(' ')[0], b => b);
+                var attr = await ctx.WineAttributes.ToDictionaryAsync(a => a.Name.ToLower().Split(' ')[0], a => a);
+                var cult = await ctx.WineCultivations.ToDictionaryAsync(c => c.Name.ToLower().Split(' ')[0], c => c);
+
+                for (int i = 0; i < filter.Count; i++) {
+                    var e = filter[i];
+                    if (e.ToLower() is "r" or "rot") {
+                        filterVar.AddRange(var.Values.Where(v => v.IsRed).Select(v => v.SortId));
+                        filter.RemoveAt(i--);
+                        filterNames.Add("Rotweinsorten");
+                    } else if (e.ToLower() is "w" or "weiß" or "weiss") {
+                        filterVar.AddRange(var.Values.Where(v => v.IsWhite).Select(v => v.SortId));
+                        filter.RemoveAt(i--);
+                        filterNames.Add("Weißweinsorten");
+                    } else if (e.Length == 2 && var.ContainsKey(e.ToUpper())) {
+                        filterVar.Add(e.ToUpper());
+                        filter.RemoveAt(i--);
+                        filterNames.Add(var[e.ToUpper()].Name);
+                    } else if (e.Length == 3 && e[0] == '!' && var.ContainsKey(e[1..].ToUpper())) {
+                        filterNotVar.Add(e[1..].ToUpper());
+                        filter.RemoveAt(i--);
+                        filterNames.Add("außer " + var[e[1..].ToUpper()].Name);
+                    } else if (e.All(char.IsAsciiDigit) && mgnr.TryGetValue(e, out var member)) {
+                        filterMgNr.Add(int.Parse(e));
+                        filter.RemoveAt(i--);
+                        filterNames.Add(member.AdministrativeName);
+                    } else if (attr.ContainsKey(e.ToLower())) {
+                        var a = attr[e.ToLower()];
+                        filterAttr.Add(a.AttrId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"Attribut {a.Name}");
+                    } else if (e[0] == '!' && attr.ContainsKey(e[1..].ToLower())) {
+                        var a = attr[e[1..].ToLower()];
+                        filterNotAttr.Add(a.AttrId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"ohne Attribut {a.Name}");
+                    } else if (cult.ContainsKey(e.ToLower())) {
+                        var c = cult[e.ToLower()];
+                        filterCult.Add(c.CultId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"Bewirtschaftung {c.Name}");
+                    } else if (e[0] == '!' && cult.ContainsKey(e[1..].ToLower())) {
+                        var c = cult[e[1..].ToLower()];
+                        filterNotCult.Add(c.CultId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"ohne Bewirtschaftung {c.Name}");
+                    } else if (zwst.ContainsKey(e.ToLower())) {
+                        var b = zwst[e.ToLower()];
+                        filterZwst.Add(b.ZwstId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"Zweigstelle {b.Name}");
+                    } else if ((e.StartsWith('>') || e.StartsWith('<')) && e.EndsWith("kg")) {
+                        if (int.TryParse(e[1..^2], out var num)) {
+                            switch (e[0]) {
+                                case '>': filterWeightGt = num; break;
+                                case '<': filterWeightLt = num; break;
+                            }
+                            filter.RemoveAt(i--);
+                        }
+                        if (e.Length == 3) filter.RemoveAt(i--);
+                    } else if (DateOnly.TryParse(e, out var date)) {
+                        var str = date.ToString("yyyy-MM-dd");
+                        filterDate.Add((str, str));
+                        filter.RemoveAt(i--);
+                        if (filterNames.Contains($"{vm.FilterSeason}") && vm.FilterSeason == date.Year)
+                            filterNames.Remove($"{vm.FilterSeason}");
+                        filterNames.Add(date.ToString("dd.MM.yyyy"));
+                    } else if (Utils.DateFromToRegex.IsMatch(e)) {
+                        var parts = e.Split("-");
+                        if (parts.Length == 1) {
+                            // single date
+                            var dParts = parts[0].Split('.');
+                            var str = $"{dParts[2]}-{dParts[1].PadLeft(2, '0')}-{dParts[0].PadLeft(2, '0')}";
+                            filterDate.Add((str, str));
+                            filter.RemoveAt(i--);
+                            var n = string.Join('.', str.Split('-').Reverse());
+                            if (dParts[2] == "") {
+                                filterNames.Remove($"{vm.FilterSeason}");
+                                filterNames.Add(n + $"{vm.FilterSeason}");
+                            } else {
+                                if ($"{vm.FilterSeason}" == dParts[2])
+                                    filterNames.Remove($"{vm.FilterSeason}");
+                                filterNames.Add(n);
+                            }
+                        } else if (parts.Length == 2) {
+                            // from/to date
+                            var d1Parts = parts[0].Split('.');
+                            var d2Parts = parts[1].Split('.');
+                            var s1 = d1Parts.Length < 2 ? null : $"{d1Parts.ElementAtOrDefault(2)}-{d1Parts[1].PadLeft(2, '0')}-{d1Parts[0].PadLeft(2, '0')}";
+                            var s2 = d2Parts.Length < 2 ? null : $"{d2Parts.ElementAtOrDefault(2)}-{d2Parts[1].PadLeft(2, '0')}-{d2Parts[0].PadLeft(2, '0')}";
+                            filterDate.Add((s1, s2));
+                            filter.RemoveAt(i--);
+                            var n1 = s1 == null ? null : string.Join('.', s1.Split('-').Reverse());
+                            var n2 = s2 == null ? null : string.Join('.', s2.Split('-').Reverse());
+                            if (n1 != null && n2 != null) {
+                                filterNames.Add($"{n1}–{n2}");
+                            } else if (n1 != null) {
+                                filterNames.Add($"ab dem {n1}");
+                            } else if (n2 != null) {
+                                filterNames.Add($"bis zum {n2}");
+                            }
+                        }
+                    } else if (e.Length > 2 && e.StartsWith('"') && e.EndsWith('"')) {
+                        filter[i] = e[1..^1];
+                    } else if (e.Length <= 2) {
+                        filter.RemoveAt(i--);
+                    }
+                }
+
+                if (filterWeightGt > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Weight >= filterWeightGt);
+                if (filterWeightLt > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Weight <= filterWeightLt);
+                if (filterMgNr.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => filterMgNr.Contains(a.MgNr));
+                if (filterDate.Count > 0) {
+                    var pr = PredicateBuilder.New<DeliveryAncmt>(false);
+                    foreach (var (d1, d2) in filterDate)
+                        pr.Or(a => (d1 == null || d1.CompareTo(a.Schedule.DateString.Substring(10 - d1.Length)) <= 0) && (d2 == null || d2.CompareTo(a.Schedule.DateString.Substring(10 - d2.Length)) >= 0));
+                    deliveryAncmtQuery = deliveryAncmtQuery.Where(pr);
+                }
+                if (filterVar.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => filterVar.Contains(a.SortId));
+                if (filterNotVar.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => !filterNotVar.Contains(a.SortId));
+                if (filterZwst.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => filterZwst.Contains(a.Schedule.ZwstId));
+                if (filterAttr.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Schedule.AttrId != null && filterAttr.Contains(a.Schedule.AttrId));
+                if (filterNotAttr.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Schedule.AttrId == null || !filterNotAttr.Contains(a.Schedule.AttrId));
+                if (filterCult.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Schedule.CultId != null && filterCult.Contains(a.Schedule.CultId));
+                if (filterNotCult.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Schedule.CultId == null || !filterNotCult.Contains(a.Schedule.CultId));
+
+                if (filterWeightGt > 0 && filterWeightLt > 0) {
+                    filterNames.Add($"{filterWeightGt:N0}–{filterWeightLt:N0} kg");
+                } else if (filterWeightGt > 0) {
+                    filterNames.Add($"ab {filterWeightGt:N0} kg");
+                } else if (filterWeightLt > 0) {
+                    filterNames.Add($"bis {filterWeightLt:N0} kg");
+                }
+            }
+
+            return (filterNames, deliveryAncmtQuery, filter);
+        }
+
+        public static async Task<(int, int, int, string)> UpdateDeliveryAncmt(this DeliveryAncmtAdminViewModel vm, int? oldYear, int? oldDsNr, int? oldMgNr, string? oldSortId, string? oldType) {
+            int year = vm.DeliverySchedule!.Year;
+            int dsnr = vm.DeliverySchedule!.DsNr;
+            int newMgNr = vm.MgNr!.Value;
+            string newSortId = vm.SortId!;
+
+            using (var ctx = new AppDbContext()) {
+                var a = new DeliveryAncmt {
+                    Year = oldYear ?? year,
+                    DsNr = oldDsNr ?? dsnr,
+                    MgNr = oldMgNr ?? newMgNr,
+                    SortId = oldSortId ?? newSortId,
+                    Weight = vm.Weight!.Value,
+                    Type = oldType ?? "manual",
+                };
+
+                if (oldDsNr != null) {
+                    ctx.Update(a);
+                } else {
+                    ctx.Add(a);
+                }
+
+                await ctx.SaveChangesAsync();
+
+                if (oldDsNr != null && (oldYear != year || oldDsNr != dsnr || oldMgNr != newMgNr || oldSortId != newSortId)) {
+                    await ctx.Database.ExecuteSqlRawAsync($"UPDATE delivery_announcement SET year = {year}, dsnr = {dsnr}, mgnr = {newMgNr}, sortid = '{newSortId}' WHERE (year, dsnr, mgnr, sortid) = ({a.Year}, {a.DsNr}, {a.MgNr}, '{a.SortId}')");
+                }
+            }
+
+            App.HintContextChange();
+
+            return (year, dsnr, newMgNr, newSortId);
+        }
+
+        public static async Task GenerateDeliveryAncmtList(this DeliveryAncmtAdminViewModel vm, ExportSubject subject, ExportMode mode) {
+            using var ctx = new AppDbContext();
+            IQueryable<DeliveryAncmt> query;
+            List<string> filterNames = [];
+            if (subject == ExportSubject.FromSelectedSchedule) {
+                var s = vm.SelectedDeliverySchedule;
+                if (s == null) return;
+                query = ctx.DeliveryAnnouncements
+                    .Where(a => a.Year == s.Year && a.DsNr == s.DsNr);
+                filterNames.Add($"{s.Date:dd.MM.yyyy} – {s.Branch.Name} – {s.Description}");
+            } else {
+                throw new ArgumentException("Invalid value for ExportSubject");
+            }
+
+            query = query
+                .OrderBy(a => a.Schedule.DateString)
+                .ThenBy(a => a.Schedule.Branch.Name)
+                .ThenBy(a => a.Schedule.Description)
+                .ThenBy(a => a.Member.Name)
+                .ThenBy(a => a.Member.GivenName)
+                .ThenBy(a => a.Member.MgNr);
+
+            if (mode == ExportMode.SaveList) {
+                var d = new SaveFileDialog() {
+                    FileName = $"{DeliveryAncmtList.Name}.ods",
+                    DefaultExt = "ods",
+                    Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
+                    Title = $"{DeliveryAncmtList.Name} speichern unter - Elwig"
+                };
+                if (d.ShowDialog() == true) {
+                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    try {
+                        var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
+                        using var ods = new OdsFile(d.FileName);
+                        await ods.AddTable(data);
+                    } catch (Exception exc) {
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                    Mouse.OverrideCursor = null;
+                }
+            } else {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
+                    using var doc = new DeliveryAncmtList(string.Join(" / ", filterNames), data);
+                    await Utils.ExportDocument(doc, mode);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+                Mouse.OverrideCursor = null;
+            }
+        }
+
+        private static void AddToolTipCell(Grid grid, string text, int row, int col, int colSpan = 1, bool bold = false, bool alignRight = false, bool alignCenter = false) {
+            var tb = new TextBlock() {
+                Text = text,
+                TextAlignment = alignRight ? TextAlignment.Right : alignCenter ? TextAlignment.Center : TextAlignment.Left,
+                Margin = new(0, 12 * row, 0, 0),
+                FontWeight = bold ? FontWeights.Bold : FontWeights.Normal,
+            };
+            tb.SetValue(Grid.ColumnProperty, col);
+            tb.SetValue(Grid.ColumnSpanProperty, colSpan);
+            grid.Children.Add(tb);
+        }
+
+        private static void AddToolTipRow(Grid grid, int row, string? h1, string? h2, int weight, int? total1, int total2) {
+            var bold = h2 == null;
+            if (h1 != null) AddToolTipCell(grid, h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            if (h2 != null) AddToolTipCell(grid, h2 + ":", row, 1, 1, bold);
+            AddToolTipCell(grid, $"{weight:N0} kg", row, 2, 1, bold, true);
+            if (total1 != null && total1 != 0)
+                AddToolTipCell(grid, $"{weight * 100.0 / total1:N1} %", row, 3, 1, bold, true);
+            if (total2 != 0)
+                AddToolTipCell(grid, $"{weight * 100.0 / total2:N1} %", row, 4, 1, bold, true);
+        }
+
+        public static async Task<(string, Grid)> GenerateToolTip(IQueryable<DeliveryAncmt> deliveryAncmts) {
+            var grid = new Grid();
+            grid.ColumnDefinitions.Add(new() { Width = new(10) });
+            grid.ColumnDefinitions.Add(new() { Width = new(60) });
+            grid.ColumnDefinitions.Add(new() { Width = new(80) });
+            grid.ColumnDefinitions.Add(new() { Width = new(50) });
+            grid.ColumnDefinitions.Add(new() { Width = new(50) });
+            var text = "-";
+
+            var weight = await deliveryAncmts.SumAsync(p => p.Weight);
+            text = $"{weight:N0} kg";
+            AddToolTipRow(grid, 0, "Gewicht", null, weight, null, weight);
+
+            if (await deliveryAncmts.AnyAsync()) {
+                var attrGroups = await deliveryAncmts
+                    .GroupBy(a => new { Attr = a.Schedule.Attribute!.Name, Cult = a.Schedule.Cultivation!.Name })
+                    .Select(g => new {
+                        g.Key.Attr,
+                        g.Key.Cult,
+                        Weight = g.Sum(a => a.Weight)
+                    })
+                    .OrderByDescending(g => g.Weight)
+                    .ThenBy(g => g.Attr)
+                    .ThenBy(g => g.Cult)
+                    .ToListAsync();
+                var sortGroups = await deliveryAncmts
+                    .GroupBy(a => a.SortId)
+                    .Select(g => new {
+                        SortId = g.Key,
+                        Weight = g.Sum(a => a.Weight)
+                    })
+                    .OrderByDescending(g => g.Weight)
+                    .ThenBy(g => g.SortId)
+                    .ToListAsync();
+                var groups = await deliveryAncmts
+                    .GroupBy(a => new {
+                        Attr = a.Schedule.Attribute!.Name,
+                        Cult = a.Schedule.Cultivation!.Name,
+                        a.SortId,
+                    })
+                    .Select(g => new {
+                        g.Key.Attr,
+                        g.Key.Cult,
+                        g.Key.SortId,
+                        Weight = g.Sum(p => p.Weight)
+                    })
+                    .OrderByDescending(g => g.Weight)
+                    .ThenBy(g => g.Attr)
+                    .ThenBy(g => g.Cult)
+                    .ThenBy(g => g.SortId)
+                    .ToListAsync();
+
+                int rowNum = 1;
+                foreach (var attrG in attrGroups) {
+                    rowNum++;
+                    var name = attrG.Attr == null && attrG.Cult == null ? null : attrG.Attr + (attrG.Attr != null && attrG.Cult != null ? " / " : "") + attrG.Cult;
+                    AddToolTipRow(grid, rowNum++, name, null, attrG.Weight, attrG.Weight, weight);
+                    foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult).OrderByDescending(g => g.Weight).ThenBy(g => g.SortId)) {
+                        AddToolTipRow(grid, rowNum++, null, g.SortId, g.Weight, attrG.Weight, weight);
+                    }
+                }
+
+                if (attrGroups.Count == 1) {
+                    var g = attrGroups.First();
+                    var name = g.Attr == null && g.Cult == null ? null : g.Attr + (g.Attr != null && g.Cult != null ? " / " : "") + g.Cult;
+                    if (name != null) {
+                        text += $" [{name}]";
+                    }
+                    if (sortGroups.Count > 1 && sortGroups.Count <= 4) {
+                        text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / weight:0%})" + (g.SortId == null ? "" : $" [{g.SortId}]")))}";
+
+                    }
+                } else if (attrGroups.Count <= 4) {
+                    text += $" = {string.Join(" + ", attrGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / weight:0%})" + (g.Attr == null && g.Cult == null ? "" : $" [{g.Attr}{(g.Attr != null && g.Cult != null ? " / " : "")}{g.Cult}]")))}";
+                }
+            }
+
+            return (text, grid);
+        }
+    }
+}
--- a/Elwig/Services/DeliveryScheduleService.cs
+++ b/Elwig/Services/DeliveryScheduleService.cs
@ -0,0 +1,189 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Elwig.ViewModels;
+using LinqKit;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Services {
+    public static class DeliveryScheduleService {
+
+        public static void InitInputs(this DeliveryScheduleAdminViewModel vm) {
+            if (vm.BranchSource.Count() == 1)
+                vm.Branch = vm.BranchSource.First();
+            vm.AncmtFromTimeString = "00:00";
+            vm.AncmtToTimeString = "23:59";
+        }
+
+        public static void ClearInputs(this DeliveryScheduleAdminViewModel vm) {
+        }
+
+        public static async Task FillInputs(this DeliveryScheduleAdminViewModel vm, DeliverySchedule s) {
+            vm.Date = s.Date;
+            vm.Branch = (Branch?)ControlUtils.GetItemFromSourceWithPk(vm.BranchSource, s.ZwstId);
+            vm.Description = s.Description;
+            vm.MaxWeight = s.MaxWeight;
+            vm.IsCancelled = s.IsCancelled;
+            vm.MainVarieties.Clear();
+            foreach (var v in s.Varieties.Where(v => v.Priority == 1)) {
+                vm.MainVarieties.Add((WineVar)ControlUtils.GetItemFromSourceWithPk(vm.MainVarietiesSource, v.SortId)!);
+            }
+            vm.OtherVarieties.Clear();
+            foreach (var v in s.Varieties.Where(v => v.Priority != 1)) {
+                vm.OtherVarieties.Add((WineVar)ControlUtils.GetItemFromSourceWithPk(vm.OtherVarietiesSource, v.SortId)!);
+            }
+            vm.Attribute = ControlUtils.GetItemFromSourceWithPk(vm.AttributeSource, s.AttrId) as WineAttr;
+            vm.Cultivation = ControlUtils.GetItemFromSourceWithPk(vm.CultivationSource, s.CultId) as WineCult;
+            vm.AncmtFrom = s.AncmtFrom;
+            vm.AncmtTo = s.AncmtTo?.AddSeconds(-1);
+        }
+
+        public static async Task<(List<string>, IQueryable<DeliverySchedule>, List<string>)> GetFilters(this DeliveryScheduleAdminViewModel vm, AppDbContext ctx) {
+            List<string> filterNames = [];
+            IQueryable<DeliverySchedule> deliveryScheduleQuery = ctx.DeliverySchedules;
+            if (vm.FilterSeason != null) {
+                deliveryScheduleQuery = deliveryScheduleQuery.Where(s => s.Year == vm.FilterSeason);
+                filterNames.Add($"{vm.FilterSeason}");
+            }
+            if (vm.FilterOnlyUpcoming) {
+                deliveryScheduleQuery = deliveryScheduleQuery.Where(s => s.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0);
+                filterNames.Add($"ab {Utils.Today:dd.MM.yyyy}");
+            }
+
+            var filterVar = new List<string>();
+            var filterNotVar = new List<string>();
+            var filterZwst = new List<string>();
+            var filterDate = new List<(string?, string?)>();
+
+            var filter = vm.TextFilter;
+            if (filter.Count > 0) {
+                var var = await ctx.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
+                var zwst = await ctx.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(" ")[0], b => b);
+
+                for (int i = 0; i < filter.Count; i++) {
+                    var e = filter[i];
+                    if (e.ToLower() is "r" or "rot") {
+                        filterVar.AddRange(var.Values.Where(v => v.IsRed).Select(v => v.SortId));
+                        filter.RemoveAt(i--);
+                        filterNames.Add("Rotweinsorten");
+                    } else if (e.ToLower() is "w" or "weiß" or "weiss") {
+                        filterVar.AddRange(var.Values.Where(v => v.IsWhite).Select(v => v.SortId));
+                        filter.RemoveAt(i--);
+                        filterNames.Add("Weißweinsorten");
+                    } else if (e.Length == 2 && var.ContainsKey(e.ToUpper())) {
+                        filterVar.Add(e.ToUpper());
+                        filter.RemoveAt(i--);
+                        filterNames.Add(var[e.ToUpper()].Name);
+                    } else if (e.Length == 3 && e[0] == '!' && var.ContainsKey(e[1..].ToUpper())) {
+                        filterNotVar.Add(e[1..].ToUpper());
+                        filter.RemoveAt(i--);
+                        filterNames.Add("außer " + var[e[1..].ToUpper()].Name);
+                    } else if (zwst.ContainsKey(e.ToLower())) {
+                        var b = zwst[e.ToLower()];
+                        filterZwst.Add(b.ZwstId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"Zweigstelle {b.Name}");
+                    } else if (DateOnly.TryParse(e, out var date)) {
+                        var s = date.ToString("yyyy-MM-dd");
+                        filterDate.Add((s, s));
+                        filter.RemoveAt(i--);
+                        if (filterNames.Contains($"{vm.FilterSeason}") && vm.FilterSeason == date.Year)
+                            filterNames.Remove($"{vm.FilterSeason}");
+                        filterNames.Add(date.ToString("dd.MM.yyyy"));
+                    } else if (Utils.DateFromToRegex.IsMatch(e)) {
+                        var parts = e.Split("-");
+                        if (parts.Length == 1) {
+                            // single date
+                            var dParts = parts[0].Split('.');
+                            var s = $"{dParts[2]}-{dParts[1].PadLeft(2, '0')}-{dParts[0].PadLeft(2, '0')}";
+                            filterDate.Add((s, s));
+                            filter.RemoveAt(i--);
+                            var n = string.Join('.', s.Split('-').Reverse());
+                            if (dParts[2] == "") {
+                                filterNames.Remove($"{vm.FilterSeason}");
+                                filterNames.Add(n + $"{vm.FilterSeason}");
+                            } else {
+                                if ($"{vm.FilterSeason}" == dParts[2])
+                                    filterNames.Remove($"{vm.FilterSeason}");
+                                filterNames.Add(n);
+                            }
+                        } else if (parts.Length == 2) {
+                            // from/to date
+                            var d1Parts = parts[0].Split('.');
+                            var d2Parts = parts[1].Split('.');
+                            var s1 = d1Parts.Length < 2 ? null : $"{d1Parts.ElementAtOrDefault(2)}-{d1Parts[1].PadLeft(2, '0')}-{d1Parts[0].PadLeft(2, '0')}";
+                            var s2 = d2Parts.Length < 2 ? null : $"{d2Parts.ElementAtOrDefault(2)}-{d2Parts[1].PadLeft(2, '0')}-{d2Parts[0].PadLeft(2, '0')}";
+                            filterDate.Add((s1, s2));
+                            filter.RemoveAt(i--);
+                            var n1 = s1 == null ? null : string.Join('.', s1.Split('-').Reverse());
+                            var n2 = s2 == null ? null : string.Join('.', s2.Split('-').Reverse());
+                            if (n1 != null && n2 != null) {
+                                filterNames.Add($"{n1}–{n2}");
+                            } else if (n1 != null) {
+                                filterNames.Add($"ab dem {n1}");
+                            } else if (n2 != null) {
+                                filterNames.Add($"bis zum {n2}");
+                            }
+                        }
+                    } else if (e.Length > 2 && e.StartsWith('"') && e.EndsWith('"')) {
+                        filter[i] = e[1..^1];
+                    } else if (e.Length <= 2) {
+                        filter.RemoveAt(i--);
+                    }
+                }
+
+                if (filterDate.Count > 0) {
+                    var pr = PredicateBuilder.New<DeliverySchedule>(false);
+                    foreach (var (d1, d2) in filterDate)
+                        pr.Or(p => (d1 == null || d1.CompareTo(p.DateString.Substring(10 - d1.Length)) <= 0) && (d2 == null || d2.CompareTo(p.DateString.Substring(10 - d2.Length)) >= 0));
+                    deliveryScheduleQuery = deliveryScheduleQuery.Where(pr);
+                }
+                if (filterVar.Count > 0) deliveryScheduleQuery = deliveryScheduleQuery.Where(s => s.Varieties.Any(v => filterVar.Contains(v.SortId)));
+                if (filterNotVar.Count > 0) deliveryScheduleQuery = deliveryScheduleQuery.Where(s => s.Varieties.All(v => !filterNotVar.Contains(v.SortId)));
+                if (filterZwst.Count > 0) deliveryScheduleQuery = deliveryScheduleQuery.Where(s => filterZwst.Contains(s.Branch.ZwstId));
+            }
+
+            return (filterNames, deliveryScheduleQuery, filter);
+        }
+
+        public static async Task UpdateDeliverySchedule(this DeliveryScheduleAdminViewModel vm, int? oldYear, int? oldDsNr) {
+            int year = vm.Date!.Value.Year;
+
+            using (var ctx = new AppDbContext()) {
+                var s = new DeliverySchedule {
+                    Year = oldYear ?? year,
+                    DsNr = oldDsNr ?? await ctx.NextDsNr(year),
+                    DateString = $"{vm.Date:yyyy-MM-dd}",
+                    ZwstId = vm.Branch!.ZwstId,
+                    Description = vm.Description,
+                    AttrId = vm.Attribute?.AttrId,
+                    CultId = vm.Cultivation?.CultId,
+                    MaxWeight = vm.MaxWeight,
+                    IsCancelled = vm.IsCancelled,
+                    AncmtFrom = vm.AncmtFrom,
+                    AncmtTo = vm.AncmtTo?.AddMinutes(1),
+                };
+
+                if (oldDsNr != null) {
+                    ctx.Update(s);
+                } else {
+                    ctx.Add(s);
+                }
+
+                ctx.UpdateDeliveryScheduleWineVarieties(s, (await ctx.DeliveryScheduleWineVarieties
+                    .Where(v => v.Year == s.Year && v.DsNr == s.DsNr)
+                    .Select(v => new { v.Variety, v.Priority })
+                    .ToListAsync())
+                    .Select(v => (v.Variety, v.Priority))
+                    .ToList(), vm.MainVarieties.Select(v => (v, 1)).Union(vm.OtherVarieties.Select(v => (v, 2))).ToList());
+
+                await ctx.SaveChangesAsync();
+            }
+
+            App.HintContextChange();
+        }
+    }
+}
--- a/Elwig/Services/DeliveryService.cs
+++ b/Elwig/Services/DeliveryService.cs
@ -124,6 +124,7 @@ namespace Elwig.Services {
            var filterNotCult = new List<string>();
            var filterDate = new List<(string?, string?)>();
            var filterTime = new List<(string?, string?)>();
+            int filterWeightGt = 0, filterWeightLt = 0;
            int filterYearGt = 0, filterYearLt = 0;
            double filterKmwGt = 0, filterKmwLt = 0;
            double filterOeGt = 0, filterOeLt = 0;
@ -133,7 +134,7 @@ namespace Elwig.Services {
                var var = await ctx.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
                var qual = await ctx.WineQualityLevels.Where(q => !q.IsPredicate).ToDictionaryAsync(q => q.QualId, q => q);
                var mgnr = await ctx.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
-                var zwst = await ctx.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(" ")[0], b => b);
+                var zwst = await ctx.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(' ')[0], b => b);
                var attr = await ctx.WineAttributes.ToDictionaryAsync(a => a.Name.ToLower().Split(' ')[0], a => a);
                var cult = await ctx.WineCultivations.ToDictionaryAsync(c => c.Name.ToLower().Split(' ')[0], c => c);

@ -182,11 +183,11 @@ namespace Elwig.Services {
                    } else if (e.ToLower() == "!gerebelt") {
                        prd = prd.And(p => p.IsNetWeight == false);
                        filter.RemoveAt(i--);
-                        filterNames.Add("brutto Wiegung");
+                        filterNames.Add("nicht gerebelt gewogen");
                    } else if (e.ToLower() == "gerebelt") {
                        prd = prd.And(p => p.IsNetWeight == true);
                        filter.RemoveAt(i--);
-                        filterNames.Add("netto Wiegung");
+                        filterNames.Add("gerebelt gewogen");
                    } else if (e.Length >= 5 && e.Length <= 9 && "lesewagen".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
                        prd = prd.And(p => p.IsLesewagen == true);
                        filter.RemoveAt(i--);
@ -250,6 +251,15 @@ namespace Elwig.Services {
                        filterZwst.Add(b.ZwstId);
                        filter.RemoveAt(i--);
                        filterNames.Add($"Zweigstelle {b.Name}");
+                    } else if ((e.StartsWith('>') || e.StartsWith('<')) && e.EndsWith("kg")) {
+                        if (int.TryParse(e[1..^2], out var num)) {
+                            switch (e[0]) {
+                                case '>': filterWeightGt = num; break;
+                                case '<': filterWeightLt = num; break;
+                            }
+                            filter.RemoveAt(i--);
+                        }
+                        if (e.Length == 3) filter.RemoveAt(i--);
                    } else if (e.StartsWith('>') || e.StartsWith('<')) {
                        if (double.TryParse(e[1..], out var num)) {
                            switch ((e[0], num)) {
@ -347,6 +357,8 @@ namespace Elwig.Services {
                    }
                }

+                if (filterWeightGt > 0) prd = prd.And(p => p.Delivery.Parts.Sum(p => p.Weight) >= filterWeightGt);
+                if (filterWeightLt > 0) prd = prd.And(p => p.Delivery.Parts.Sum(p => p.Weight) <= filterWeightLt);
                if (filterYearGt > 0) prd = prd.And(p => p.Year >= filterYearGt);
                if (filterYearLt > 0) prd = prd.And(p => p.Year < filterYearLt);
                if (filterMgNr.Count > 0) prd = prd.And(p => filterMgNr.Contains(p.Delivery.MgNr));
@ -376,6 +388,13 @@ namespace Elwig.Services {
                if (filterOeGt > 0) prd = prd.And(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt);
                if (filterOeLt > 0) prd = prd.And(p => p.Kmw * (4.54 + 0.022 * p.Kmw) < filterOeLt);

+                if (filterWeightGt > 0 && filterWeightLt > 0) {
+                    filterNames.Add($"{filterWeightGt:N0}–{filterWeightLt:N0} kg");
+                } else if (filterWeightGt > 0) {
+                    filterNames.Add($"ab {filterWeightGt:N0} kg");
+                } else if (filterWeightLt > 0) {
+                    filterNames.Add($"bis {filterWeightLt:N0} kg");
+                }
                if (filterYearGt > 0 && filterYearLt > 0) {
                    filterNames.Insert(0, $"{filterYearGt}–{filterYearLt - 1}");
                } else if (filterYearGt > 0) {
@ -744,6 +763,7 @@ namespace Elwig.Services {
                    })
                    .OrderByDescending(g => g.Weight)
                    .ThenBy(g => g.Attr)
+                    .ThenBy(g => g.Cult)
                    .ToListAsync();
                var sortGroups = await deliveryParts
                    .GroupBy(p => p.SortId)
@ -772,8 +792,9 @@ namespace Elwig.Services {
                        Avg = g.Sum(p => p.Kmw * p.Weight) / g.Sum(p => p.Weight),
                        Max = g.Max(p => p.Kmw)
                    })
-                    .OrderByDescending(g => g.SortId)
+                    .OrderByDescending(g => g.Weight)
                    .ThenBy(g => g.Attr)
+                    .ThenBy(g => g.Cult)
                    .ThenBy(g => g.SortId)
                    .ToListAsync();

--- a/Elwig/Services/MemberService.cs
+++ b/Elwig/Services/MemberService.cs
@ -55,11 +55,13 @@ namespace Elwig.Services {
            vm.IsMemberSelected = true;
            vm.MgNrString = $"{m.MgNr}";
            vm.PredecessorMgNrString = $"{m.PredecessorMgNr}";
+            vm.IsJuridicalPerson = m.IsJuridicalPerson;
            vm.EnableMemberReferenceButton = m.PredecessorMgNr != null;
            vm.Prefix = m.Prefix;
            vm.GivenName = m.GivenName;
-            vm.FamilyName = m.FamilyName;
+            vm.Name = m.Name;
            vm.Suffix = m.Suffix;
+            vm.ForTheAttentionOf = m.ForTheAttentionOf;
            vm.Birthday = (m.Birthday != null) ? string.Join(".", m.Birthday.Split("-").Reverse()) : null;
            if (m.Birthday?.Length == 10) {
                vm.Age = Utils.GetAge(DateOnly.ParseExact(m.Birthday, "yyyy-MM-dd")).ToString();
@ -109,7 +111,7 @@ namespace Elwig.Services {

            var billingAddr = m.BillingAddress;
            if (billingAddr != null) {
-                vm.BillingName = billingAddr.Name;
+                vm.BillingName = billingAddr.FullName;
                vm.BillingAddress = billingAddr.Address;
                if (billingAddr.PostalDest.AtPlz is AT_PlzDest b) {
                    vm.BillingPlzString = $"{b.Plz}";
@ -150,8 +152,12 @@ namespace Elwig.Services {
                vm.StatusDeliveriesThisSeasonToolTip = d2Grid;

                var c = m.ActiveAreaCommitments(ctx, Utils.CurrentLastSeason);
-                var s = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year));
-                var (text, grid) = await AreaComService.GenerateToolTip(c, s?.MaxKgPerHa ?? 10_000);
+                int maxKgPerHa = 10_000;
+                try {
+                    var s = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year));
+                    if (s != null) maxKgPerHa = s.MaxKgPerHa;
+                } catch { }
+                var (text, grid) = await AreaComService.GenerateToolTip(c, maxKgPerHa);
                vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}";
                vm.StatusAreaCommitment = text;
                vm.StatusAreaCommitmentToolTip = grid;
@ -332,7 +338,7 @@ namespace Elwig.Services {
                var b = new Billing(year);
                await b.FinishSeason();
                await b.CalculateBuckets();
-                await App.HintContextChange();
+                App.HintContextChange();

                using var ctx = new AppDbContext();
                var data = await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, year, m);
@ -392,14 +398,14 @@ namespace Elwig.Services {
            } else if (vm.MemberListOrderByName) {
                query = query
                    .OrderBy(m => m.Branch!.Name)
-                    .ThenBy(m => m.FamilyName)
+                    .ThenBy(m => m.Name)
                    .ThenBy(m => m.GivenName)
                    .ThenBy(m => m.MgNr);
            } else if (vm.MemberListOrderByOrt) {
                query = query
                    .OrderBy(m => m.Branch!.Name)
                    .ThenBy(m => m.DefaultWbKg!.AtKg.Name)
-                    .ThenBy(m => m.FamilyName)
+                    .ThenBy(m => m.Name)
                    .ThenBy(m => m.GivenName)
                    .ThenBy(m => m.MgNr);
            }
@ -414,7 +420,7 @@ namespace Elwig.Services {
                if (d.ShowDialog() == true) {
                    Mouse.OverrideCursor = Cursors.AppStarting;
                    try {
-                        var data = await MemberListData.FromQuery(query, filterNames);
+                        var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
                        using var ods = new OdsFile(d.FileName);
                        await ods.AddTable(data);
                    } catch (Exception exc) {
@ -454,26 +460,30 @@ namespace Elwig.Services {
                try {
                    var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
                    var path = Path.Combine(App.TempPath, filename);
-                    var list = await query
+                    var members = await query
                        .OrderBy(m => m.MgNr)
                        .Include(m => m.BillingAddress)
                        .Include(m => m.TelephoneNumbers)
                        .Include(m => m.EmailAddresses)
                        .AsSplitQuery()
                        .ToListAsync();
-                    if (list.Count == 0) {
+                    var areaComs = await query
+                        .SelectMany(m => m.AreaCommitments)
+                        .Include(c => c.Rd)
+                        .ToListAsync();
+                    if (members.Count == 0) {
                        MessageBox.Show("Es wurden keine Mitglieder zum Hochladen ausgewählt!", "Mitglieder hochladen",
                            MessageBoxButton.OK, MessageBoxImage.Error);
                    } else {
-                        await ElwigData.Export(path, list, filterNames);
+                        await ElwigData.Export(path, members, areaComs, filterNames);
                        await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                        MessageBox.Show($"Hochladen von {list.Count} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
+                        MessageBox.Show($"Hochladen von {members.Count} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
                            MessageBoxButton.OK, MessageBoxImage.Information);
                    }
                } catch (HttpRequestException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                } catch (TaskCanceledException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
@ -481,7 +491,7 @@ namespace Elwig.Services {
            } else {
                Mouse.OverrideCursor = Cursors.AppStarting;
                try {
-                    var data = await MemberListData.FromQuery(query, filterNames);
+                    var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
                    using var doc = new MemberList(string.Join(" / ", filterNames), data);
                    await Utils.ExportDocument(doc, mode);
                } catch (Exception exc) {
@ -492,127 +502,131 @@ namespace Elwig.Services {
        }

        public static async Task<int> UpdateMember(this MemberAdminViewModel vm, int? oldMgNr) {
-            using var ctx = new AppDbContext();
            var newMgNr = (int)vm.MgNr!;
-            var m = new Member {
-                MgNr = oldMgNr ?? newMgNr,
-                PredecessorMgNr = vm.PredecessorMgNr,
-                Prefix = string.IsNullOrEmpty(vm.Prefix) ? null : vm.Prefix,
-                GivenName = vm.GivenName!,
-                FamilyName = vm.FamilyName!,
-                Suffix = string.IsNullOrEmpty(vm.Suffix) ? null : vm.Suffix,
-                Birthday = string.IsNullOrEmpty(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
-                IsDeceased = vm.IsDeceased,
-                CountryNum = 40,  // Austria AT AUT
-                PostalDestId = vm.Ort!.Id,
-                Address = vm.Address!,

-                Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
-                Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,
+            using (var ctx = new AppDbContext()) {
+                var m = new Member {
+                    MgNr = oldMgNr ?? newMgNr,
+                    PredecessorMgNr = vm.PredecessorMgNr,
+                    IsJuridicalPerson = vm.IsJuridicalPerson,
+                    Prefix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Prefix) ? null : vm.Prefix,
+                    GivenName = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.GivenName) ? null : vm.GivenName,
+                    Name = vm.Name!,
+                    Suffix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Suffix) ? null : vm.Suffix,
+                    ForTheAttentionOf = !vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.ForTheAttentionOf) ? null : vm.ForTheAttentionOf,
+                    Birthday = string.IsNullOrEmpty(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
+                    IsDeceased = vm.IsDeceased,
+                    CountryNum = 40,  // Austria AT AUT
+                    PostalDestId = vm.Ort!.Id,
+                    Address = vm.Address!,

-                UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
-                LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
-                IsBuchführend = vm.IsBuchführend,
-                IsOrganic = vm.IsOrganic,
+                    Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
+                    Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,

-                EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
-                ExitDateString = string.IsNullOrEmpty(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
-                BusinessShares = (int)vm.BusinessShares!,
-                AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
-                IsActive = vm.IsActive,
-                IsVollLieferant = vm.IsVollLieferant,
-                IsFunktionär = vm.IsFunktionär,
-                ZwstId = vm.Branch?.ZwstId,
-                DefaultKgNr = vm.DefaultKg?.KgNr,
-                Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
-                ContactViaPost = vm.ContactViaPost,
-                ContactViaEmail = vm.ContactViaEmail,
-            };
+                    UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
+                    LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
+                    IsBuchführend = vm.IsBuchführend,
+                    IsOrganic = vm.IsOrganic,

-            if (oldMgNr != null) {
-                ctx.Update(m);
-            } else {
-                ctx.Add(m);
-            }
+                    EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
+                    ExitDateString = string.IsNullOrEmpty(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
+                    BusinessShares = (int)vm.BusinessShares!,
+                    AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
+                    IsActive = vm.IsActive,
+                    IsVollLieferant = vm.IsVollLieferant,
+                    IsFunktionär = vm.IsFunktionär,
+                    ZwstId = vm.Branch?.ZwstId,
+                    DefaultKgNr = vm.DefaultKg?.KgNr,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
+                    ContactViaPost = vm.ContactViaPost,
+                    ContactViaEmail = vm.ContactViaEmail,
+                };

-            ctx.RemoveRange(ctx.BillingAddresses.Where(a => a.MgNr == oldMgNr));
-            if (vm.BillingOrt != null && vm.BillingName != null) {
-                var p = vm.BillingOrt;
-                ctx.Add(new BillingAddr {
-                    MgNr = m.MgNr,
-                    Name = vm.BillingName,
-                    Address = vm.BillingAddress ?? "",
-                    CountryNum = p.CountryNum,
-                    PostalDestId = p.Id,
-                });
-            }
+                if (oldMgNr != null) {
+                    ctx.Update(m);
+                } else {
+                    ctx.Add(m);
+                }

-            ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(t => t.MgNr == oldMgNr));
-            ctx.AddRange(vm.PhoneNrs
-                .Where(input => input.Number != null)
-                .Select((input, i) => new MemberTelNr {
-                    MgNr = m.MgNr,
-                    Nr = i + 1,
-                    Type = input.Type == -1 ? (input.Number!.StartsWith("+43 ") && input.Number![4] == '6' ? "mobile" : "landline") : vm.PhoneNrTypes[input.Type].Key,
-                    Number = input.Number!,
-                    Comment = input.Comment,
-                }));
+                ctx.RemoveRange(ctx.BillingAddresses.Where(a => a.MgNr == oldMgNr));
+                if (vm.BillingOrt != null && vm.BillingName != null) {
+                    var p = vm.BillingOrt;
+                    ctx.Add(new BillingAddr {
+                        MgNr = m.MgNr,
+                        FullName = vm.BillingName,
+                        Address = vm.BillingAddress ?? "",
+                        CountryNum = p.CountryNum,
+                        PostalDestId = p.Id,
+                    });
+                }

-            ctx.RemoveRange(ctx.MemberEmailAddrs.Where(e => e.MgNr == oldMgNr));
-            ctx.AddRange(vm.EmailAddresses
-                .Where(input => input != null && input != "")
-                .Select((input, i) => new MemberEmailAddr {
-                    MgNr = m.MgNr,
-                    Nr = i + 1,
-                    Address = input!,
-                    Comment = null,
-                }));
+                ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(t => t.MgNr == oldMgNr));
+                ctx.AddRange(vm.PhoneNrs
+                    .Where(input => input.Number != null && input.Number != "")
+                    .Select((input, i) => new MemberTelNr {
+                        MgNr = m.MgNr,
+                        Nr = i + 1,
+                        Type = input.Type == -1 ? (input.Number!.StartsWith("+43 ") && input.Number![4] == '6' ? "mobile" : "landline") : vm.PhoneNrTypes[input.Type].Key,
+                        Number = input.Number!,
+                        Comment = input.Comment,
+                    }));

-            await ctx.SaveChangesAsync();
+                ctx.RemoveRange(ctx.MemberEmailAddrs.Where(e => e.MgNr == oldMgNr));
+                ctx.AddRange(vm.EmailAddresses
+                    .Where(input => input != null && input != "")
+                    .Select((input, i) => new MemberEmailAddr {
+                        MgNr = m.MgNr,
+                        Nr = i + 1,
+                        Address = input!,
+                        Comment = null,
+                    }));

-            if (vm.TransferPredecessorAreaComs is int year && m.PredecessorMgNr is int predecessor) {
-                var areaComs = await ctx.AreaCommitments
-                    .Where(c => c.MgNr == predecessor && (c.YearTo == null || c.YearTo >= year))
-                    .ToListAsync();
-
-                var fbNr = await ctx.NextFbNr();
-                ctx.AddRange(areaComs.Select((c, i) => new AreaCom {
-                    FbNr = fbNr + i,
-                    MgNr = m.MgNr,
-                    VtrgId = c.VtrgId,
-                    CultId = c.CultId,
-                    Area = c.Area,
-                    KgNr = c.KgNr,
-                    GstNr = c.GstNr,
-                    RdNr = c.RdNr,
-                    YearFrom = year,
-                    YearTo = c.YearTo,
-                }));
-
-                foreach (var ac in areaComs)
-                    ac.YearTo = year - 1;
-                ctx.UpdateRange(areaComs);
                await ctx.SaveChangesAsync();
-            }
-            vm.TransferPredecessorAreaComs = null;

-            if (vm.CancelAreaComs is int yearTo) {
-                var areaComs = await ctx.AreaCommitments
-                    .Where(c => c.MgNr == m.MgNr && (c.YearTo == null || c.YearTo > yearTo))
-                    .ToListAsync();
+                if (vm.TransferPredecessorAreaComs is int year && m.PredecessorMgNr is int predecessor) {
+                    var areaComs = await ctx.AreaCommitments
+                        .Where(c => c.MgNr == predecessor && (c.YearTo == null || c.YearTo >= year))
+                        .ToListAsync();

-                foreach (var ac in areaComs)
-                    ac.YearTo = yearTo;
-                ctx.UpdateRange(areaComs);
-                await ctx.SaveChangesAsync();
-            }
-            vm.CancelAreaComs = null;
+                    var fbNr = await ctx.NextFbNr();
+                    ctx.AddRange(areaComs.Select((c, i) => new AreaCom {
+                        FbNr = fbNr + i,
+                        MgNr = m.MgNr,
+                        VtrgId = c.VtrgId,
+                        CultId = c.CultId,
+                        Area = c.Area,
+                        KgNr = c.KgNr,
+                        GstNr = c.GstNr,
+                        RdNr = c.RdNr,
+                        YearFrom = vm.MaintainAreaComYearTo ? c.YearFrom : year,
+                        YearTo = c.YearTo,
+                    }));

-            if (newMgNr != m.MgNr) {
-                await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
+                    foreach (var ac in areaComs)
+                        ac.YearTo = year - 1;
+                    ctx.UpdateRange(areaComs);
+                    await ctx.SaveChangesAsync();
+                }
+                vm.TransferPredecessorAreaComs = null;
+
+                if (vm.CancelAreaComs is int yearTo) {
+                    var areaComs = await ctx.AreaCommitments
+                        .Where(c => c.MgNr == m.MgNr && (c.YearTo == null || c.YearTo > yearTo))
+                        .ToListAsync();
+
+                    foreach (var ac in areaComs)
+                        ac.YearTo = yearTo;
+                    ctx.UpdateRange(areaComs);
+                    await ctx.SaveChangesAsync();
+                }
+                vm.CancelAreaComs = null;
+
+                if (newMgNr != m.MgNr) {
+                    await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
+                }
            }

-            await App.HintContextChange();
+            App.HintContextChange();

            return newMgNr;
        }
--- a/Elwig/ViewModels/DeliveryAncmtAdminViewModel.cs
+++ b/Elwig/ViewModels/DeliveryAncmtAdminViewModel.cs
@ -0,0 +1,85 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Elwig.Models.Entities;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.ViewModels {
+    public partial class DeliveryAncmtAdminViewModel : ObservableObject {
+
+        [ObservableProperty]
+        private string? _searchQuery = "";
+        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0)];
+
+        [ObservableProperty]
+        private bool _filterOnlyUpcoming;
+        [ObservableProperty]
+        private bool _filterFromAllSchedules;
+        [ObservableProperty]
+        private string? _filterSeasonString;
+        public int? FilterSeason {
+            get => int.TryParse(FilterSeasonString, out var year) ? year : null;
+            set => FilterSeasonString = $"{value}";
+        }
+
+        [ObservableProperty]
+        private DeliveryAncmt? _selectedDeliveryAncmt;
+        [ObservableProperty]
+        private IEnumerable<DeliveryAncmt> _deliveryAncmts = [];
+        [ObservableProperty]
+        private DeliverySchedule? _selectedDeliverySchedule;
+        [ObservableProperty]
+        private IEnumerable<DeliverySchedule> _deliverySchedules = [];
+        [ObservableProperty]
+        private bool _enableSearchInputs = true;
+
+        [ObservableProperty]
+        private string? _mgNrString;
+        public int? MgNr {
+            get => int.TryParse(MgNrString, out var mgnr) ? mgnr : null;
+            set => MgNrString = $"{value}";
+        }
+        [ObservableProperty]
+        private Member? _member;
+        [ObservableProperty]
+        private IEnumerable<Member> _memberSource = [];
+        [ObservableProperty]
+        private string? _memberAddress;
+
+        [ObservableProperty]
+        private DeliverySchedule? _deliverySchedule;
+        [ObservableProperty]
+        private IEnumerable<DeliverySchedule> _deliveryScheduleSource = [];
+        [ObservableProperty]
+        private string? _sortId;
+        [ObservableProperty]
+        private WineVar? _wineVariety;
+        [ObservableProperty]
+        private IEnumerable<WineVar> _wineVarietySource = [];
+
+        [ObservableProperty]
+        private string? _weightString;
+        public int? Weight {
+            get => int.TryParse(WeightString, out var w) ? w : null;
+            set => WeightString = $"{value}";
+        }
+
+        [ObservableProperty]
+        private string _statusAncmts = "-";
+        [ObservableProperty]
+        private string _statusWeight = "-";
+        [ObservableProperty]
+        private string _statusAncmtCreated = "-";
+        [ObservableProperty]
+        private string _statusAncmtModified = "-";
+
+        [ObservableProperty]
+        private Grid? _statusWeightToolTip;
+
+        [ObservableProperty]
+        private Visibility _controlButtonsVisibility = Visibility.Visible;
+        [ObservableProperty]
+        private Visibility _editingButtonsVisibility = Visibility.Hidden;
+    }
+}
--- a/Elwig/ViewModels/DeliveryScheduleAdminViewModel.cs
+++ b/Elwig/ViewModels/DeliveryScheduleAdminViewModel.cs
@ -0,0 +1,119 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Elwig.Models.Entities;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Windows;
+
+namespace Elwig.ViewModels {
+    public partial class DeliveryScheduleAdminViewModel : ObservableObject {
+
+        [ObservableProperty]
+        private string? _searchQuery = "";
+        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0)];
+
+        [ObservableProperty]
+        private bool _filterOnlyUpcoming;
+        [ObservableProperty]
+        private string? _filterSeasonString;
+        public int? FilterSeason {
+            get => int.TryParse(FilterSeasonString, out var year) ? year : null;
+            set => FilterSeasonString = $"{value}";
+        }
+
+        [ObservableProperty]
+        private DeliverySchedule? _selectedDeliverySchedule;
+        [ObservableProperty]
+        private IEnumerable<DeliverySchedule> _deliverySchedules = [];
+        [ObservableProperty]
+        private bool _enableSearchInputs = true;
+
+        [ObservableProperty]
+        private string _dateString = "";
+        public DateOnly? Date {
+            get => DateOnly.TryParseExact(DateString, "dd.MM.yyyy", out var d) ? d : null;
+            set => DateString = $"{value:dd.MM.yyyy}";
+        }
+        [ObservableProperty]
+        private Branch? _branch;
+        [ObservableProperty]
+        private IEnumerable<Branch> _branchSource = [];
+        [ObservableProperty]
+        private string _description = "";
+        [ObservableProperty]
+        private string? _maxWeightString = "";
+        public int? MaxWeight {
+            get => int.TryParse(MaxWeightString, out var w) ? w : null;
+            set => MaxWeightString = $"{value}";
+        }
+        [ObservableProperty]
+        private bool _isCancelled;
+        public ObservableCollection<WineVar> MainVarieties { get; set; } = [];
+        [ObservableProperty]
+        private IEnumerable<WineVar> _mainVarietiesSource = [];
+        public ObservableCollection<WineVar> OtherVarieties { get; set; } = [];
+        [ObservableProperty]
+        private IEnumerable<WineVar> _otherVarietiesSource = [];
+        [ObservableProperty]
+        private IEnumerable<object> _attributeSource = [];
+        [ObservableProperty]
+        private object? _attributeObj;
+        public WineAttr? Attribute {
+            get => AttributeObj as WineAttr;
+            set => AttributeObj = value ?? AttributeSource.FirstOrDefault();
+        }
+        [ObservableProperty]
+        private IEnumerable<object> _cultivationSource = [];
+        [ObservableProperty]
+        private object? _cultivationObj;
+        public WineCult? Cultivation {
+            get => CultivationObj as WineCult;
+            set => CultivationObj = value ?? CultivationSource.FirstOrDefault();
+        }
+
+        [ObservableProperty]
+        private string _ancmtFromDateString = "";
+        public DateOnly? AncmtFromDate {
+            get => DateOnly.TryParseExact(AncmtFromDateString, "dd.MM.yyyy", out var d) ? d : null;
+            set => AncmtFromDateString = $"{value:dd.MM.yyyy}";
+        }
+        [ObservableProperty]
+        private string _ancmtFromTimeString = "";
+        public TimeOnly? AncmtFromTime {
+            get => TimeOnly.TryParseExact(AncmtFromTimeString, "HH:mm", out var t) ? t : null;
+            set => AncmtFromTimeString = $"{value:HH:mm}";
+        }
+        public DateTime? AncmtFrom {
+            get => AncmtFromDate != null && AncmtFromTime != null ? AncmtFromDate.Value.ToDateTime(AncmtFromTime.Value) : null;
+            set {
+                AncmtFromDateString = $"{value:dd.MM.yyyy}";
+                AncmtFromTimeString = $"{value:HH:mm}";
+            }
+        }
+        [ObservableProperty]
+        private string _ancmtToDateString = "";
+        public DateOnly? AncmtToDate {
+            get => DateOnly.TryParseExact(AncmtToDateString, "dd.MM.yyyy", out var d) ? d : null;
+            set => AncmtToDateString = $"{value:dd.MM.yyyy}";
+        }
+        [ObservableProperty]
+        private string _ancmtToTimeString = "";
+        public TimeOnly? AncmtToTime {
+            get => TimeOnly.TryParseExact(AncmtToTimeString, "HH:mm", out var t) ? t : null;
+            set => AncmtToTimeString = $"{value:HH:mm}";
+        }
+        public DateTime? AncmtTo {
+            get => AncmtToDate != null && AncmtToTime != null ? AncmtToDate.Value.ToDateTime(AncmtToTime.Value) : null;
+            set {
+                AncmtToDateString = $"{value:dd.MM.yyyy}";
+                AncmtToTimeString = $"{value:HH:mm}";
+            }
+        }
+
+        [ObservableProperty]
+        private Visibility _controlButtonsVisibility = Visibility.Visible;
+        [ObservableProperty]
+        private Visibility _editingButtonsVisibility = Visibility.Hidden;
+    }
+}
--- a/Elwig/ViewModels/MemberAdminViewModel.cs
+++ b/Elwig/ViewModels/MemberAdminViewModel.cs
@ -11,6 +11,7 @@ namespace Elwig.ViewModels {
    public partial class MemberAdminViewModel : ObservableObject {

        public int? TransferPredecessorAreaComs = null;
+        public bool MaintainAreaComYearTo = false;
        public int? CancelAreaComs = null;

        public ObservableCollection<KeyValuePair<string, string>> PhoneNrTypes { get; set; } = new(Utils.PhoneNrTypes);
@ -38,7 +39,7 @@ namespace Elwig.ViewModels {
        [ObservableProperty]
        private bool _enableSearchInputs = true;
        [ObservableProperty]
-        public IEnumerable<bool> _memberHasDeliveries = [ .. Enumerable.Range(0, 9999).Select(i => false) ];
+        private IEnumerable<bool> _memberHasDeliveries = [ .. Enumerable.Range(0, 9999).Select(i => false) ];

        [ObservableProperty]
        private bool _memberListOrderByMgNr;
@ -54,14 +55,18 @@ namespace Elwig.ViewModels {
        private string? _predecessorMgNrString;
        public int? PredecessorMgNr => int.TryParse(PredecessorMgNrString, out var mgnr) ? mgnr : null;
        [ObservableProperty]
+        private bool _isJuridicalPerson;
+        [ObservableProperty]
        private string? _prefix;
        [ObservableProperty]
        private string? _givenName;
        [ObservableProperty]
-        private string? _familyName;
+        private string? _name;
        [ObservableProperty]
        private string? _suffix;
        [ObservableProperty]
+        private string? _forTheAttentionOf;
+        [ObservableProperty]
        private string? _birthday;
        [ObservableProperty]
        private string? _age;
@ -176,5 +181,9 @@ namespace Elwig.ViewModels {
        private Visibility _controlButtonsVisibility = Visibility.Visible;
        [ObservableProperty]
        private Visibility _editingButtonsVisibility = Visibility.Hidden;
+        [ObservableProperty]
+        private Visibility _personalNameVisibility = Visibility.Visible;
+        [ObservableProperty]
+        private Visibility _juridicalNameVisibility = Visibility.Hidden;
    }
 }
--- a/Elwig/Windows/AdministrationWindow.cs
+++ b/Elwig/Windows/AdministrationWindow.cs
@ -159,7 +159,10 @@ namespace Elwig.Windows {

        protected void ValidateRequiredInputs() {
            foreach (var input in RequiredInputs) {
-                if (input is TextBox tb && tb.Text.Length == 0) {
+                if (input is Control c && c.Visibility != Visibility.Visible) {
+                    ControlUtils.ClearInputState(input);
+                    Valid[input] = true;
+                } else if (input is TextBox tb && tb.Text.Length == 0) {
                    ControlUtils.SetInputInvalid(input);
                    Valid[input] = false;
                } else if (input is ComboBox cb && cb.SelectedItem == null && cb.ItemsSource != null && cb.ItemsSource.Cast<object>().Any()) {
@ -402,7 +405,7 @@ namespace Elwig.Windows {

        protected bool InputLostFocus(TextBox input, ValidationResult res, string? msg = null) {
            if (DoShowWarningWindows && !res.IsValid && !IsClosing && (IsEditing || IsCreating))
-                MessageBox.Show(res.ErrorContent.ToString(), msg ?? res.ErrorContent.ToString(), MessageBoxButton.OK, MessageBoxImage.Warning);
+                MessageBox.Show(res.ErrorContent?.ToString(), msg ?? res.ErrorContent?.ToString(), MessageBoxButton.OK, MessageBoxImage.Warning);
            return res.IsValid;
        }

--- a/Elwig/Windows/AreaComAdminWindow.xaml
+++ b/Elwig/Windows/AreaComAdminWindow.xaml
@ -1,4 +1,5 @@
-<local:AdministrationWindow x:Class="Elwig.Windows.AreaComAdminWindow"
+<local:AdministrationWindow
+        x:Class="Elwig.Windows.AreaComAdminWindow"
        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"
@ -255,7 +256,7 @@
            </GroupBox>
        </Grid>

-        <StatusBar Grid.Row="5" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
+        <StatusBar Grid.Row="2" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
            <StatusBar.ItemsPanel>
                <ItemsPanelTemplate>
                    <Grid>
--- a/Elwig/Windows/AreaComAdminWindow.xaml.cs
+++ b/Elwig/Windows/AreaComAdminWindow.xaml.cs
@ -117,7 +117,7 @@ namespace Elwig.Windows {
            FinishInputFilling();
        }

-        private async void InitInputs() {
+        private async Task InitInputs() {
            ClearOriginalValues();
            ClearDefaultValues();
            await ViewModel.InitInputs();
@ -133,7 +133,7 @@ namespace Elwig.Windows {
                return;
            }
            ViewModel.FilterMember = m;
-            ViewModel.Title = $"Lieferungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
+            ViewModel.Title = $"Flächenbindungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";

            ControlUtils.RenewItemsSource(KgInput, await ctx.WbKgs
                .Include(k => k.AtKg.WbKg!.Rds)
@ -159,14 +159,14 @@ namespace Elwig.Windows {
            NewAreaCommitmentButton_Click(null, null);
        }

-        private void NewAreaCommitmentButton_Click(object? sender, RoutedEventArgs? evt) {
+        private async void NewAreaCommitmentButton_Click(object? sender, RoutedEventArgs? evt) {
            IsCreating = true;
            AreaCommitmentList.IsEnabled = false;
            AreaCommitmentList.SelectedItem = null;
            HideAreaCommitmentNewEditDeleteButtons();
            ShowAreaCommitmentSaveResetCancelButtons();
            UnlockInputs();
-            InitInputs();
+            await InitInputs();
            LockSearchInputs();
        }

@ -197,17 +197,25 @@ namespace Elwig.Windows {
        }

        private async void DeleteAreaCommitmentButton_Click(object? sender, RoutedEventArgs? evt) {
-            AreaCom a = (AreaCom)AreaCommitmentList.SelectedItem;
-            if (a == null) return;
-
+            if (AreaCommitmentList.SelectedItem is not AreaCom a)
+                return;
            var r = MessageBox.Show(
                $"Soll die Flächenbindung {a.GstNr} ({a.Area} m²) wirklich unwiderruflich gelöscht werden?",
                "Flächenbindung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
            if (r == MessageBoxResult.OK) {
-                using var ctx = new AppDbContext();
-                ctx.Remove(a);
-                await ctx.SaveChangesAsync();
-                await RefreshList();
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    using (var ctx = new AppDbContext()) {
+                        ctx.Remove(a);
+                        await ctx.SaveChangesAsync();
+                    }
+                    App.HintContextChange();
+                } catch (Exception exc) {
+                    var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                    MessageBox.Show(str, "Flächenbindung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+                Mouse.OverrideCursor = null;
            }
        }

@ -246,11 +254,11 @@ namespace Elwig.Windows {
            AreaCommitmentResetButton_Click(null, null);
        }

-        private void AreaCommitmentResetButton_Click(object? sender, RoutedEventArgs? evt) {
+        private async void AreaCommitmentResetButton_Click(object? sender, RoutedEventArgs? evt) {
            if (IsEditing) {
                RefreshInputs();
            } else if (IsCreating) {
-                InitInputs();
+                await InitInputs();
            }
            UpdateButtons();
        }
--- a/Elwig/Windows/BaseDataWindow.xaml.Season.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.Season.cs
@ -196,7 +196,7 @@ namespace Elwig.Windows {
                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                    MessageBox.Show(str, "Saison anlegen", MessageBoxButton.OK, MessageBoxImage.Error);
                }
-                await App.HintContextChange();
+                App.HintContextChange();
                Mouse.OverrideCursor = null;
                SeasonList.SelectedIndex = 0;
            }
@ -219,7 +219,7 @@ namespace Elwig.Windows {
                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                    MessageBox.Show(str, "Saison löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                }
-                await App.HintContextChange();
+                App.HintContextChange();
                Mouse.OverrideCursor = null;
            }
        }
--- a/Elwig/Windows/BaseDataWindow.xaml.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.cs
@ -340,7 +340,7 @@ namespace Elwig.Windows {
                LockInputs();
            }

-            await App.HintContextChange();
+            App.HintContextChange();
        }

        private void FillInputs(ClientParameters p, Season? s) {
--- a/Elwig/Windows/ChartWindow.xaml
+++ b/Elwig/Windows/ChartWindow.xaml
@ -132,18 +132,20 @@
            <GroupBox Header="Datenpunkt" Grid.Row="0" Margin="0,5,5,5">
                <Grid>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="85"/>
+                        <ColumnDefinition Width="65"/>
                        <ColumnDefinition Width="*"/>
                    </Grid.ColumnDefinitions>

                    <Label Content="Oechsle:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <ctrl:UnitTextBox x:Name="OechsleInput" Unit="°Oe" TextChanged="OechsleInput_TextChanged" IsEnabled="False" LostFocus="OechsleInput_LostFocus"
-                                      Grid.Column="1" Width="90" Margin="0,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-
+                    <ctrl:UnitTextBox x:Name="OechsleInput" Unit="°Oe" TextChanged="OechsleInput_TextChanged" IsEnabled="False"
+                                      Grid.Column="1" Width="52" Margin="0,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                    <CheckBox x:Name="GebInput" Content="Geb." IsEnabled="False"
+                              Grid.Column="1" Margin="0,15,10,0" HorizontalAlignment="Right" VerticalAlignment="Top"
+                              Checked="GebInput_Changed" Unchecked="GebInput_Changed"/>

                    <Label Content="Preis:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <ctrl:UnitTextBox x:Name="PriceInput" Unit="€/kg" TextChanged="PriceInput_TextChanged" IsEnabled="False" LostFocus="PriceInput_LostFocus"
-                                      Grid.Column="1" Width="90" Margin="0,40,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                    <ctrl:UnitTextBox x:Name="PriceInput" Unit="€/kg" TextChanged="PriceInput_TextChanged" IsEnabled="False"
+                                      Grid.Column="1" Margin="0,40,10,0" HorizontalAlignment="Stretch" VerticalAlignment="Top"/>
                </Grid>
            </GroupBox>

--- a/Elwig/Windows/ChartWindow.xaml.cs
+++ b/Elwig/Windows/ChartWindow.xaml.cs
@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using Elwig.Controls;
 using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using Elwig.Models.Entities;
@ -22,8 +21,10 @@ namespace Elwig.Windows {
        public readonly int Year;
        public readonly int AvNr;
        public Season Season;
+        public string CurrencySymbol;
        private PaymentVar PaymentVar;
        private bool HasChanged = false;
+        private bool Updating = false;

        private Scatter DataPlot;
        private Scatter? GebundenPlot;
@ -72,6 +73,9 @@ namespace Elwig.Windows {
            AvNr = avnr;
            using var ctx = new AppDbContext();
            Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("Season not found");
+            CurrencySymbol = Season.Currency.Symbol ?? Season.Currency.Code;
+            PriceInput.Unit = $"{CurrencySymbol}/kg";
+            GebundenFlatBonus.Unit = $"{CurrencySymbol}/kg";
            PaymentVar = ctx.PaymentVariants.Find(year, avnr) ?? throw new ArgumentException("PaymentVar not found");
            Title = $"{PaymentVar?.Name} - Lese {year} - Elwig";
            LockContext = true;
@ -99,6 +103,9 @@ namespace Elwig.Windows {
        private async Task RefreshGraphList(AppDbContext ctx) {
            PaymentVar = await ctx.PaymentVariants.FindAsync(Year, AvNr) ?? throw new ArgumentException("PaymentVar not found");
            Season = await ctx.Seasons.FindAsync(Year) ?? throw new ArgumentException("Season not found");
+            CurrencySymbol = Season.Currency.Symbol ?? Season.Currency.Code;
+            PriceInput.Unit = $"{CurrencySymbol}/kg";
+            GebundenFlatBonus.Unit = $"{CurrencySymbol}/kg";

            try {
                var data = EditBillingData.FromJson(PaymentVar.Data, Utils.GetVaributes(ctx, Year));
@ -146,6 +153,8 @@ namespace Elwig.Windows {
            if (SelectedGraphEntry != null) {
                CopyButton.IsEnabled = true;
                DeleteButton.IsEnabled = true;
+                EnableTextBox(OechsleInput);
+                GebInput.IsEnabled = SelectedGraphEntry?.GebundenGraph != null;
                GebundenTypeFixed.IsEnabled = true;
                GebundenTypeGraph.IsEnabled = true;
                GebundenTypeNone.IsEnabled = true;
@ -156,15 +165,15 @@ namespace Elwig.Windows {
            } else {
                CopyButton.IsEnabled = false;
                DeleteButton.IsEnabled = false;
-                DisableUnitTextBox(OechsleInput);
+                DisableTextBox(OechsleInput);
+                GebInput.IsEnabled = false;
                DisableOptionButtons();
            }
            if (!PaymentVar.TestVariant) {
                AddButton.IsEnabled = false;
                CopyButton.IsEnabled = false;
                DeleteButton.IsEnabled = false;
-                DisableUnitTextBox(OechsleInput);
-                DisableUnitTextBox(PriceInput);
+                DisableTextBox(PriceInput);
                GebundenTypeFixed.IsEnabled = false;
                GebundenTypeGraph.IsEnabled = false;
                GebundenTypeNone.IsEnabled = false;
@ -388,26 +397,23 @@ namespace Elwig.Windows {
            OechslePricePlot.Plot.Legend.ManualItems.Clear();
        }

-        private void OechsleInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            if (ActiveGraph == null || SelectedGraphEntry == null) {
+        private void UpdateSelectedPoint() {
+            if (ActiveGraph == null || SelectedGraphEntry == null)
                return;
-            }
-
-            bool success = int.TryParse(OechsleInput.Text, out int oechsle);

            SecondaryMarkedPoint = -1;
            ChangeMarker(SecondaryMarkedPointPlot, false);

-            if (success) { 
-                if (oechsle >= ActiveGraph.MinX && oechsle <= ActiveGraph.MaxX) {
-                    PrimaryMarkedPoint = oechsle - ActiveGraph.MinX;
+            if (int.TryParse(OechsleInput.Text, out int oe)) {
+                if (oe >= ActiveGraph.MinX && oe <= ActiveGraph.MaxX) {
+                    PrimaryMarkedPoint = oe - ActiveGraph.MinX;
                    ChangeMarker(PrimaryMarkedPointPlot, true, ActiveGraph.GetOechsleAt(PrimaryMarkedPoint), ActiveGraph.GetPriceAt(PrimaryMarkedPoint));

                    PriceInput.Text = Math.Round(ActiveGraph.GetPriceAt(PrimaryMarkedPoint), Season.Precision).ToString();

                    EnableActionButtons();
                    OechslePricePlot.Refresh();
-                    EnableUnitTextBox(PriceInput);
+                    EnableTextBox(PriceInput);
                    return;
                }
            }
@ -416,9 +422,21 @@ namespace Elwig.Windows {
            ChangeMarker(PrimaryMarkedPointPlot, false);
            DisableActionButtons();
            PriceInput.Text = "";
-            DisableUnitTextBox(PriceInput);
+            DisableTextBox(PriceInput);
            OechslePricePlot.Refresh();
-            DisableUnitTextBox(PriceInput);
+            DisableTextBox(PriceInput);
+        }
+
+        private void OechsleInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            UpdateSelectedPoint();
+        }
+
+        private void GebInput_Changed(object sender, RoutedEventArgs evt) {
+            if (Updating)
+                return;
+            var sel = GebInput.IsChecked == true ? SelectedGraphEntry?.GebundenGraph : SelectedGraphEntry?.DataGraph;
+            if (sel != ActiveGraph) ChangeActiveGraph(sel);
+            UpdateSelectedPoint();
        }

        private void PriceInput_TextChanged(object sender, TextChangedEventArgs evt) {
@ -479,31 +497,34 @@ namespace Elwig.Windows {
        }

        private void OechslePricePlot_MouseDown(object sender, MouseEventArgs e) {
-            if (GraphList.SelectedItem == null) {
+            if (GraphList.SelectedItem == null)
                return;
-            }

            if (HoverActive) {
                if (PaymentVar.TestVariant && Keyboard.IsKeyDown(System.Windows.Input.Key.LeftCtrl)) {
-                    if (PrimaryMarkedPoint == -1 || ActiveGraph == null || ActiveGraph != Highlighted.Graph) {
+                    if (SecondaryMarkedPoint == -1 || ActiveGraph == null || ActiveGraph != Highlighted.Graph)
                        return;
-                    }
                    SecondaryMarkedPoint = Highlighted.Index;
-
                    ChangeMarker(SecondaryMarkedPointPlot, true, ActiveGraph.GetOechsleAt(SecondaryMarkedPoint), ActiveGraph.GetPriceAt(SecondaryMarkedPoint));
-
                    InterpolateButton.IsEnabled = true;
-
                    return;
                }

+                Updating = true;
                PrimaryMarkedPoint = Highlighted.Index;
-                if (ActiveGraph != Highlighted.Graph) ChangeActiveGraph(Highlighted.Graph);
+                if (ActiveGraph != Highlighted.Graph)
+                    ChangeActiveGraph(Highlighted.Graph);
+                Updating = false;
+                if (PrimaryMarkedPoint == -1 || ActiveGraph == null)
+                    return;

-                ChangeMarker(PrimaryMarkedPointPlot, true, ActiveGraph!.GetOechsleAt(PrimaryMarkedPoint), ActiveGraph.GetPriceAt(PrimaryMarkedPoint));
+                ChangeMarker(PrimaryMarkedPointPlot, true, ActiveGraph.GetOechsleAt(PrimaryMarkedPoint), ActiveGraph.GetPriceAt(PrimaryMarkedPoint));

+                Updating = true;
                OechsleInput.Text = Highlighted.Graph!.GetOechsleAt(Highlighted.Index).ToString();
+                GebInput.IsChecked = Highlighted.Graph == SelectedGraphEntry?.GebundenGraph;
                PriceInput.Text = Math.Round(Highlighted.Graph.GetPriceAt(Highlighted.Index), Season.Precision).ToString();
+                Updating = false;

                EnableActionButtons();
            } else {
@ -516,8 +537,9 @@ namespace Elwig.Windows {
                ChangeMarker(SecondaryMarkedPointPlot, false);

                OechsleInput.Text = "";
+                GebInput.IsChecked = false;
                PriceInput.Text = "";
-                DisableUnitTextBox(PriceInput);
+                DisableTextBox(PriceInput);

                DisableActionButtons();
            }
@ -531,28 +553,39 @@ namespace Elwig.Windows {
            MouseChange(e);
        }

+        private Coordinates GetMouseCoordinates(Point p) {
+            Pixel px = new(p.X, p.Y);
+            var source = PresentationSource.FromVisual(this);
+            if (source?.CompositionTarget != null) {
+                var matrix = source.CompositionTarget.TransformToDevice;
+                px.X *= (float)matrix.M11;
+                px.Y *= (float)matrix.M22;
+            }
+            return OechslePricePlot.Plot.GetCoordinates(px);
+        }
+
        private void MouseChange(MouseEventArgs e) {
            if (GraphList.SelectedItem == null) {
                return;
            }

-            (double x, double y, int index)? mouseOnData = MouseOnPlot(DataPlot, e.GetPosition(OechslePricePlot));
-            (double x, double y, int index)? mouseOnGebunden = MouseOnPlot(GebundenPlot, e.GetPosition(OechslePricePlot));
+            var mouseOnData = MouseOnPlot(DataPlot, GetMouseCoordinates(e.GetPosition(OechslePricePlot)));
+            var mouseOnGebunden = MouseOnPlot(GebundenPlot, GetMouseCoordinates(e.GetPosition(OechslePricePlot)));

            Highlighted = LastHighlighted;

            if (mouseOnData != null) {
-                ChangeMarker(HighlightedPointPlot, true, mouseOnData.Value.x, mouseOnData.Value.y);
+                ChangeMarker(HighlightedPointPlot, true, mouseOnData.Value.X, mouseOnData.Value.Y);
                HighlightedPointPlot.IsVisible = true;
                HoverChanged = true ^ HoverActive;
                HoverActive = true;
-                HandleTooltip(mouseOnData.Value.x, mouseOnData.Value.y, mouseOnData.Value.index, SelectedGraphEntry!.DataGraph, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
+                HandleTooltip(mouseOnData.Value.X, mouseOnData.Value.Y, mouseOnData.Value.Index, SelectedGraphEntry!.DataGraph, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
            } else if (mouseOnGebunden != null) {
-                ChangeMarker(HighlightedPointPlot, true, mouseOnGebunden.Value.x, mouseOnGebunden.Value.y);
+                ChangeMarker(HighlightedPointPlot, true, mouseOnGebunden.Value.X, mouseOnGebunden.Value.Y);
                HighlightedPointPlot.IsVisible = true;
                HoverChanged = true ^ HoverActive;
                HoverActive = true;
-                HandleTooltip(mouseOnGebunden.Value.x, mouseOnGebunden.Value.y, mouseOnGebunden.Value.index, SelectedGraphEntry!.GebundenGraph!, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
+                HandleTooltip(mouseOnGebunden.Value.X, mouseOnGebunden.Value.Y, mouseOnGebunden.Value.Index, SelectedGraphEntry!.GebundenGraph!, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
            } else {
                ChangeMarker(HighlightedPointPlot, false);
                HoverChanged = false ^ HoverActive;
@ -562,30 +595,20 @@ namespace Elwig.Windows {
            }
        }

-        private (double, double, int)? MouseOnPlot(Scatter? plot, Point p) {
-            if (plot == null) {
+        private (double X, double Y, int Index)? MouseOnPlot(Scatter? plot, Coordinates c) {
+            if (plot == null)
                return null;
-            }
-
            OechslePricePlot.Refresh();
-            Pixel mousePixel = new(p.X, p.Y);
-            Coordinates mouseLocation = OechslePricePlot.Plot.GetCoordinates(mousePixel);
-            DataPoint nearestPoint = plot.Data.GetNearest(mouseLocation, OechslePricePlot.Plot.LastRender, 3);
-
-            if (nearestPoint.IsReal) {
-                return (nearestPoint.X, nearestPoint.Y, nearestPoint.Index);
-            } else {
-                return null;
-            }
+            DataPoint nearestPoint = plot.Data.GetNearest(c, OechslePricePlot.Plot.LastRender, 5);
+            return nearestPoint.IsReal ? (nearestPoint.X, nearestPoint.Y, nearestPoint.Index) : null;
        }

        private void HandleTooltip(double pointX, double pointY, int pointIndex, Graph g, Point p, bool force) {
            if (force || LastHighlighted != Highlighted || HoverChanged) {
                OechslePricePlot.Plot.PlottableList.Remove(TooltipPlot);
                if (TooltipInput.IsChecked == true) {
-                    Pixel mousePixel = new(p.X, p.Y - 30);
-                    Coordinates mouseLocation = OechslePricePlot.Plot.GetCoordinates(mousePixel);
-                    TooltipPlot = OechslePricePlot.Plot.Add.Text($"Oechsle: {pointX:N2}, Preis: {Math.Round(pointY, Season.Precision)}€/kg", mouseLocation.X, mouseLocation.Y);
+                    Coordinates mouseLocation = GetMouseCoordinates(new(p.X, p.Y - 30));
+                    TooltipPlot = OechslePricePlot.Plot.Add.Text($"Oechsle: {pointX:N2}, Preis: {Math.Round(pointY, Season.Precision)} {CurrencySymbol}/kg", mouseLocation.X, mouseLocation.Y);
                    TooltipPlot.LabelFontSize = 12;
                    TooltipPlot.LabelBold = true;
                    TooltipPlot.LabelBorderColor = Colors.Black;
@ -639,16 +662,17 @@ namespace Elwig.Windows {

        private async void SaveButton_Click(object sender, RoutedEventArgs e) {
            try {
-                using var ctx = new AppDbContext();
-                var origData = BillingData.FromJson(PaymentVar.Data);
-                var data = BillingData.FromGraphEntries(GraphEntries, origData, Utils.GetVaributes(ctx, Year),
-                    AllVaributesAssigned, AllVaributesAssignedAbgew);
+                using (var ctx = new AppDbContext()) {
+                    var origData = BillingData.FromJson(PaymentVar.Data);
+                    var data = BillingData.FromGraphEntries(GraphEntries, origData, Utils.GetVaributes(ctx, Year),
+                        AllVaributesAssigned, AllVaributesAssignedAbgew);

-                PaymentVar.Data = data.ToJsonString();
-                ctx.Update(PaymentVar);
-                await ctx.SaveChangesAsync();
+                    PaymentVar.Data = data.ToJsonString();
+                    ctx.Update(PaymentVar);
+                    await ctx.SaveChangesAsync();
+                }
                LockContext = false;
-                await App.HintContextChange();
+                App.HintContextChange();
            } catch (Exception exc) {
                var str = "Der Eintrag konnte nicht in der Datenbank gespeichert werden!\n\n" + exc.Message;
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@ -658,31 +682,37 @@ namespace Elwig.Windows {
            SetHasChanged(false);
        }

-        private void EnableUnitTextBox(UnitTextBox u) {
-            if (PaymentVar.TestVariant) {
+        private void EnableTextBox(TextBox u) {
+            if (PaymentVar.TestVariant || u == OechsleInput) {
                u.IsEnabled = true;
                u.IsReadOnly = false;
            }
        }

-        private void DisableUnitTextBox(UnitTextBox u) {
+        private void DisableTextBox(TextBox u) {
            u.IsEnabled = false;
            u.IsReadOnly = true;
        }

        private void ChangeActiveGraph(Graph? g) {
            if (g != null && g == SelectedGraphEntry?.DataGraph) {
-                EnableUnitTextBox(OechsleInput);
+                EnableTextBox(OechsleInput);
                if (SelectedGraphEntry?.GebundenGraph != null) ChangeLineWidth(DataPlot, 4);
                ChangeLineWidth(GebundenPlot, 1);
+                GebInput.IsEnabled = SelectedGraphEntry?.GebundenGraph != null;
+                GebInput.IsChecked = false;
            } else if (g != null && g == SelectedGraphEntry?.GebundenGraph) {
-                EnableUnitTextBox(OechsleInput);
+                EnableTextBox(OechsleInput);
                ChangeLineWidth(GebundenPlot, 4);
                ChangeLineWidth(DataPlot, 1);
+                GebInput.IsEnabled = SelectedGraphEntry?.GebundenGraph != null;
+                GebInput.IsChecked = true;
            } else {
-                DisableUnitTextBox(OechsleInput);
-                DisableUnitTextBox(PriceInput);
+                DisableTextBox(OechsleInput);
+                DisableTextBox(PriceInput);
                OechsleInput.Text = "";
+                GebInput.IsEnabled = false;
+                GebInput.IsChecked = false;
                PriceInput.Text = "";
                ChangeLineWidth(DataPlot, 1);
                ChangeLineWidth(GebundenPlot, 1);
@ -700,14 +730,6 @@ namespace Elwig.Windows {
            RefreshInputs();
        }

-        private void PriceInput_LostFocus(object sender, RoutedEventArgs e) {
-
-        }
-
-        private void OechsleInput_LostFocus(object sender, RoutedEventArgs e) {
-
-        }
-
        private void GebundenFlatBonus_TextChanged(object sender, TextChangedEventArgs e) {
            if (FillingInputs) return;
            var r = Validator.CheckDecimal(GebundenFlatBonus, true, 2, Season.Precision);
@ -778,19 +800,19 @@ namespace Elwig.Windows {
        private void GebundenType_Checked(object sender, RoutedEventArgs e) {
            if (FillingInputs) return;
            if (SelectedGraphEntry == null) {
-                DisableUnitTextBox(GebundenFlatBonus);
+                DisableTextBox(GebundenFlatBonus);
                return;
            }
            if (GebundenTypeNone.IsChecked == true) {
                SelectedGraphEntry.RemoveGebundenGraph();
-                DisableUnitTextBox(GebundenFlatBonus);
+                DisableTextBox(GebundenFlatBonus);
            } else if (GebundenTypeFixed.IsChecked == true) {
                SelectedGraphEntry.GebundenFlatBonus = double.TryParse(GebundenFlatBonus.Text, out var val) ? val : 0.1;
                SelectedGraphEntry.AddGebundenGraph();
-                EnableUnitTextBox(GebundenFlatBonus);
+                EnableTextBox(GebundenFlatBonus);
            } else if (GebundenTypeGraph.IsChecked == true) {
                SelectedGraphEntry.AddGebundenGraph();
-                DisableUnitTextBox(GebundenFlatBonus);
+                DisableTextBox(GebundenFlatBonus);
            }
            SetHasChanged();
            RefreshInputs();
@ -801,11 +823,11 @@ namespace Elwig.Windows {
            if (SelectedGraphEntry?.GebundenFlatBonus is double bonus) {
                GebundenTypeFixed.IsChecked = true;
                GebundenFlatBonus.Text = $"{bonus}";
-                EnableUnitTextBox(GebundenFlatBonus);
+                EnableTextBox(GebundenFlatBonus);
            } else if (SelectedGraphEntry?.GebundenGraph != null) {
                GebundenTypeGraph.IsChecked = true;
                GebundenFlatBonus.Text = "";
-                DisableUnitTextBox(GebundenFlatBonus);
+                DisableTextBox(GebundenFlatBonus);
            }
            FillingInputs = false;
        }
--- a/Elwig/Windows/DeliveryAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml
@ -6,7 +6,7 @@
        xmlns:local="clr-namespace:Elwig.Windows"
        xmlns:vm="clr-namespace:Elwig.ViewModels"
        xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="{Binding Title}" Height="720" Width="1100" MinHeight="720" MinWidth="1000"
+        Title="{Binding Title}" Height="720" Width="1150" MinHeight="720" MinWidth="1000"
        Loaded="Window_Loaded">
    <Window.DataContext>
        <vm:DeliveryAdminViewModel/>
@ -176,6 +176,7 @@
                        <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
                        <Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
                        <Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
+                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ... (gilt für Gewicht der gesamten Lieferung)<LineBreak/>
                        <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...<LineBreak/>
                        <Bold>Uhrzeit</Bold>: z.B. 06:00-08:00, 18:00-, ...<LineBreak/>
                        <Bold>Handwiegung</Bold>: handw[iegung], !Handw[iegung] (alle ohne Handwiegung)<LineBreak/>
@ -605,7 +606,7 @@
            </GroupBox>
        </Grid>

-        <StatusBar Grid.Row="5" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
+        <StatusBar Grid.Row="2" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
            <StatusBar.ItemsPanel>
                <ItemsPanelTemplate>
                    <Grid>
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@ -434,7 +434,7 @@ namespace Elwig.Windows {
                .Where(m => m.IsActive || !IsCreating)
                .Include(m => m.PostalDest.AtPlz!.Ort)
                .Include(m => m.DefaultWbKg!.AtKg)
-                .OrderBy(m => m.FamilyName)
+                .OrderBy(m => m.Name)
                .ThenBy(m => m.GivenName)
                .ToListAsync());
            ControlUtils.RenewItemsSource(BranchInput, await ctx.Branches.OrderBy(b => b.Name).ToListAsync());
@ -690,7 +690,7 @@ namespace Elwig.Windows {
        private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
            FinishButton.IsEnabled = false;
            NewDeliveryPartButton.IsEnabled = false;
-            NewDeliveryPartButton.Cursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
            DeliveryPartList.IsEnabled = false;
            var p = await ViewModel.UpdateDeliveryPart(
                (DeliveryList.SelectedItem as Delivery)?.Year,
@ -703,9 +703,10 @@ namespace Elwig.Windows {
            EmptyScale();
            await RefreshList();
            await RefreshDeliveryParts();
-            NewDeliveryPartButton.Cursor = null;
+            Mouse.OverrideCursor = null;
            ControlUtils.SelectItem(DeliveryList, p?.Delivery);
            DeliveryPartList.SelectedItem = null;
+            DeliveryPartList.ScrollIntoView(DeliveryPartList.ItemsSource.Cast<object>().Last());
            RefreshInputs();
            InitialInputs();
        }
@ -713,7 +714,7 @@ namespace Elwig.Windows {
        private async void FinishButton_Click(object sender, RoutedEventArgs evt) {
            FinishButton.IsEnabled = false;
            NewDeliveryPartButton.IsEnabled = false;
-            FinishButton.Cursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
            DeliveryPartList.IsEnabled = false;
            var p = await ViewModel.UpdateDeliveryPart(
                (DeliveryList.SelectedItem as Delivery)?.Year,
@ -727,7 +728,6 @@ namespace Elwig.Windows {
            await RefreshList();
            await RefreshDeliveryParts();
            if (p?.Delivery != null) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
                try {
                    using var ctx = new AppDbContext();
                    using var doc = new DeliveryNote((await ctx.Deliveries.FindAsync(p.Year, p.DId))!, ctx);
@ -740,9 +740,8 @@ namespace Elwig.Windows {
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
-                Mouse.OverrideCursor = null;
            }
-            FinishButton.Cursor = null;
+            Mouse.OverrideCursor = null;
            DeliveryList.SelectedItem = null;
            await RenewContext();
            RefreshInputs();
@ -764,7 +763,7 @@ namespace Elwig.Windows {
                .Where(m => m.IsActive || !ViewModel.IsReceipt)
                .Include(m => m.PostalDest.AtPlz!.Ort)
                .Include(m => m.DefaultWbKg!.AtKg)
-                .OrderBy(m => m.FamilyName)
+                .OrderBy(m => m.Name)
                .ThenBy(m => m.GivenName)
                .ToListAsync());
            if (DeliveryList.SelectedItem is not Delivery d) {
@ -810,7 +809,7 @@ namespace Elwig.Windows {
                .Where(m => m.IsActive || !ViewModel.IsReceipt)
                .Include(m => m.PostalDest.AtPlz!.Ort)
                .Include(m => m.DefaultWbKg!.AtKg)
-                .OrderBy(m => m.FamilyName)
+                .OrderBy(m => m.Name)
                .ThenBy(m => m.GivenName)
                .ToListAsync());
            IsCreating = true;
@ -937,7 +936,7 @@ namespace Elwig.Windows {

        private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
            SaveButton.IsEnabled = false;
-            SaveButton.Cursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;

            IsEditing = false;
            IsCreating = false;
@ -953,7 +952,7 @@ namespace Elwig.Windows {
                !InputIsNotDefault(TimeInput)
            );

-            SaveButton.Cursor = null;
+            Mouse.OverrideCursor = null;

            HideSaveResetCancelButtons();
            ShowNewEditDeleteButtons();
@ -1243,7 +1242,7 @@ namespace Elwig.Windows {

        private void WineVarietyInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
            if (WineVarietyInput.SelectedItem is WineVar s)
-                    ViewModel.SortId = s.SortId;
+                ViewModel.SortId = s.SortId;
        }

        private void UpdateWineQualityLevels() {
--- a/Elwig/Windows/DeliveryAncmtAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryAncmtAdminWindow.xaml
@ -0,0 +1,368 @@
+<local:AdministrationWindow
+        x:Class="Elwig.Windows.DeliveryAncmtAdminWindow"
+        AutomationProperties.AutomationId="DeliveryAncmtWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Windows"
+        xmlns:vm="clr-namespace:Elwig.ViewModels"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        Title="Traubenanmeldungen - Elwig" Height="700" Width="980" MinWidth="600" MinHeight="400"
+        Loaded="Window_Loaded">
+    <Window.DataContext>
+        <vm:DeliveryAncmtAdminViewModel/>
+    </Window.DataContext>
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="ctrl:UnitTextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="ComboBox">
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+        </Style>
+        <Style TargetType="ctrl:CheckComboBox">
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="9,3"/>
+            <Setter Property="Height" Value="27"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="19"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="24"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1.25*" MinWidth="250"/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition Width="1*" MinWidth="300"/>
+        </Grid.ColumnDefinitions>
+
+        <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
+            <MenuItem Header="Anmeldeliste">
+                <MenuItem x:Name="Menu_DeliveryAncmtList_SaveSelected" Header="...von ausgewähltem Leseplan speichern... (Excel)"
+                          Click="Menu_DeliveryAncmtList_SaveSelected_Click"/>
+                <MenuItem x:Name="Menu_DeliveryAncmtList_ShowSelected" Header="...von ausgewähltem Leseplan anzeigen (PDF)"
+                          Click="Menu_DeliveryAncmtList_ShowSelected_Click" InputGestureText="Strg+P"/>
+                <MenuItem x:Name="Menu_DeliveryAncmtList_SavePdfSelected" Header="...von ausgewähltem Leseplan speichern... (PDF)"
+                          Click="Menu_DeliveryAncmtList_SavePdfSelected_Click"/>
+                <MenuItem x:Name="Menu_DeliveryAncmtList_PrintSelected" Header="...von ausgewähltem Leseplan drucken"
+                          Click="Menu_DeliveryAncmtList_PrintSelected_Click" InputGestureText="Strg+Shift+P"/>
+            </MenuItem>
+        </Menu>
+
+        <Grid Grid.Row="1" Margin="5,0,0,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="42"/>
+                <RowDefinition Height="1*" MinHeight="100"/>
+                <RowDefinition Height="5"/>
+                <RowDefinition Height="1*" MinHeight="100"/>
+                <RowDefinition Height="42"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <TextBox x:Name="SearchInput" Text="{Binding SearchQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding EnableSearchInputs}"
+                     Grid.ColumnSpan="3" Margin="5,10,174,0" IsReadOnly="False"
+                     TextChanged="SearchInput_TextChanged">
+                <TextBox.ToolTip>
+                    <TextBlock>
+                        <Bold>Strg+F</Bold><LineBreak/><LineBreak/>
+                        Traubenanmeldungen filtern und durchsuchen. Die Filter sind beliebig kombinierbar.<LineBreak/>
+                        Groß- und Kleinschreibung ist in den meisten Fällen egal.<LineBreak/>
+                        <LineBreak/>
+                        Filtern nach:<LineBreak/>
+                        <Bold>Sorte</Bold>: z.B. GV, ZW, rr, sa, !gv (ausgenommen GV), ...<LineBreak/>
+                        <Bold>Rot/Weiß</Bold>: z.B. r, Rot, w, weiß, ...<LineBreak/>
+                        <Bold>Mitglied</Bold>: z.B. 1234, 987, ...<LineBreak/>
+                        <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
+                        <Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
+                        <Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
+                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ...<LineBreak/>
+                        <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...
+                    </TextBlock>
+                </TextBox.ToolTip>
+            </TextBox>
+            <ctrl:IntegerUpDown x:Name="SeasonInput" Text="{Binding FilterSeasonString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding EnableSearchInputs}"
+                                Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1900" Maximum="9999"
+                                Margin="5,10,113,0" VerticalAlignment="Top" HorizontalAlignment="Right"
+                                TextChanged="SeasonInput_TextChanged"/>
+            <CheckBox x:Name="OnlyUpcomingInput" Content="Nur zukünftige" IsChecked="{Binding FilterOnlyUpcoming, Mode=TwoWay}" IsEnabled="{Binding EnableSearchInputs}"
+                      HorizontalAlignment="Right" Margin="0,7,10,0" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3"
+                      Checked="OnlyUpcomingInput_Changed" Unchecked="OnlyUpcomingInput_Changed"/>
+            <CheckBox x:Name="FromAllSchedulesInput" Content="Alle Lesepläne" IsChecked="{Binding FilterFromAllSchedules, Mode=TwoWay}" IsEnabled="{Binding EnableSearchInputs}"
+                      HorizontalAlignment="Right" Margin="0,24,13.5,0" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3"
+                      Checked="FromAllSchedulesInput_Changed" Unchecked="FromAllSchedulesInput_Changed"/>
+
+            <ListBox x:Name="DeliveryScheduleList" SelectedItem="{Binding SelectedDeliverySchedule, Mode=TwoWay}" ItemsSource="{Binding DeliverySchedules, Mode=TwoWay}"
+                     Grid.Row="1" Grid.ColumnSpan="3" Margin="5,0,5,5" VerticalAlignment="Stretch" IsEnabled="{Binding EnableSearchInputs}"
+                     SelectionChanged="DeliveryScheduleList_SelectionChanged">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{Binding Date, StringFormat='ddd.'}" Width="24"/>
+                            <TextBlock Text="{Binding Date, StringFormat='dd.MM.'}" Width="32"/>
+                            <TextBlock Text="{Binding ZwstId}" Width="25" TextAlignment="Center"/>
+                            <TextBlock Text="{Binding Description}" Width="200" TextDecorations="{Binding TextDecoration}"/>
+                            <TextBlock TextAlignment="Right">
+                                <TextBlock Text="{Binding AnnouncedWeight, StringFormat='{}{0:N0}'}" Width="42" TextAlignment="Right"/> kg
+                                / <TextBlock Text="{Binding MaxWeight, StringFormat='{}{0:N0}'}" Width="42" TextAlignment="Right"/> kg
+                                (<TextBlock Text="{Binding Percent, StringFormat='{}{0:N0}'}" Width="20" TextAlignment="Right"/>%)
+                            </TextBlock>
+                        </StackPanel>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+
+            <GridSplitter Grid.Row="2" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+
+            <DataGrid x:Name="DeliveryAncmtList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
+                      ItemsSource="{Binding DeliveryAncmts, Mode=TwoWay}" SelectedItem="{Binding SelectedDeliveryAncmt, Mode=TwoWay}"
+                      CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
+                      SelectionChanged="DeliveryAncmtList_SelectionChanged"
+                      Margin="5,5,5,0" Grid.Row="3" FontSize="14" Grid.ColumnSpan="3">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="Datum" Binding="{Binding Schedule.Date, StringFormat='{}{0:dd.MM.yy}'}" Width="60">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="MgNr." Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="50">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Mitglied" Binding="{Binding Member.AdministrativeName}" Width="160"/>
+                    <DataGridTextColumn Header="Sorte" Binding="{Binding SortId}" Width="50">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Gewicht" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="75">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Angemeldet" Binding="{Binding CreatedTimestamp, StringFormat='{}{0:HH:mm, dd.MM.}'}" Width="100">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+
+            <Button x:Name="NewDeliveryAncmtButton" Content="Neu" Visibility="{Binding ControlButtonsVisibility}"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="4"
+                    Click="NewDeliveryAncmtButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Alt+Einfg</TextBlock>
+                </Button.ToolTip>
+            </Button>
+            <Button x:Name="EditDeliveryAncmtButton" Content="Bearbeiten" IsEnabled="False" Visibility="{Binding ControlButtonsVisibility}"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="4"
+                    Click="EditDeliveryAncmtButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+B</TextBlock>
+                </Button.ToolTip>
+            </Button>
+            <Button x:Name="DeleteDeliveryAncmtButton" Content="Löschen" IsEnabled="False" Visibility="{Binding ControlButtonsVisibility}"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="4"
+                    Click="DeleteDeliveryAncmtButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Alt+Entf</TextBlock>
+                </Button.ToolTip>
+            </Button>
+
+            <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False" Visibility="{Binding EditingButtonsVisibility}"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="4"
+                    Click="SaveButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+S</TextBlock>
+                </Button.ToolTip>
+            </Button>
+            <Button x:Name="ResetButton" Content="Zurücksetzen" IsEnabled="False" Visibility="{Binding EditingButtonsVisibility}"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="4"
+                    Click="ResetButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+Z</TextBlock>
+                </Button.ToolTip>
+            </Button>
+            <Button x:Name="CancelButton" Content="Abbrechen" IsEnabled="False" Visibility="{Binding EditingButtonsVisibility}" IsCancel="True"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="4"
+                    Click="CancelButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Esc</TextBlock>
+                </Button.ToolTip>
+            </Button>
+        </Grid>
+
+        <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+
+        <Grid Grid.Column="2" Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="2*"/>
+                <RowDefinition Height="3*"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <GroupBox Header="Mitglied" Grid.Row="0" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="70"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="Mitglied:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="MgNrInput" Text="{Binding MgNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Width="48" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus" KeyUp="Input_KeyUp"/>
+                    <ComboBox x:Name="MemberInput" SelectedItem="{Binding Member, Mode=TwoWay}" ItemsSource="{Binding MemberSource, Mode=TwoWay}"
+                              Grid.Column="1" Margin="53,10,40,10" IsEditable="True"
+                              ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
+                              SelectionChanged="MemberInput_SelectionChanged" KeyUp="Input_KeyUp"/>
+                    <Button x:Name="MemberReferenceButton" Grid.Column="1" Height="25" Width="25" FontFamily="Segoe MDL2 Assets" Content="&#xEE35;" Padding="0,0,0,0"
+                            Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Right" ToolTip="Zu Mitglied springen"
+                            Click="MemberReferenceButton_Click"/>
+
+                    <Label Content="Wohnort:" Margin="10,38,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="MemberAddressField" Text="{Binding MemberAddress}"
+                             Grid.Column="1" Margin="0,40,10,10" FontSize="12" Height="22"
+                             IsReadOnly="True" IsTabStop="False"/>
+                </Grid>
+            </GroupBox>
+
+            <GroupBox Header="Anmeldung" Grid.Row="1" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="70"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="Leseplan:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="DeliveryScheduleInput" SelectedItem="{Binding DeliverySchedule, Mode=TwoWay}" ItemsSource="{Binding DeliveryScheduleSource, Mode=TwoWay}"
+                              Grid.Column="1" Margin="0,10,10,10"
+                              TextSearch.TextPath="Name"
+                              SelectionChanged="DeliveryScheduleInput_SelectionChanged">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Text="{Binding Date, StringFormat='ddd.'}" Width="28"/>
+                                    <TextBlock Text="{Binding Date, StringFormat='dd.MM.'}" Width="35"/>
+                                    <TextBlock Text="{Binding ZwstId}" Width="30" TextAlignment="Center"/>
+                                    <TextBlock Text="{Binding Description}" TextDecorations="{Binding TextDecoration}"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+
+                    <Label Content="Sorte:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="SortIdInput" Text="{Binding SortId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Width="36" Grid.Row="1" Grid.Column="1" Margin="0,40,0,0" HorizontalAlignment="Left"
+                             TextChanged="SortIdInput_TextChanged" LostFocus="SortIdInput_LostFocus" KeyUp="Input_KeyUp"/>
+                    <ComboBox x:Name="WineVarietyInput" SelectedItem="{Binding WineVariety, Mode=TwoWay}" ItemsSource="{Binding WineVarietySource, Mode=TwoWay}"
+                              Grid.Column="1" Margin="41,40,10,10"
+                              TextSearch.TextPath="Name"
+                              SelectionChanged="WineVarietyInput_SelectionChanged" KeyUp="Input_KeyUp">
+                        <ComboBox.ItemTemplateSelector>
+                            <ctrl:WineVarietyTemplateSelector/>
+                        </ComboBox.ItemTemplateSelector>
+                    </ComboBox>
+
+                    <Label Content="Gewicht:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <ctrl:UnitTextBox x:Name="WeightInput" Unit="kg" Text="{Binding WeightString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                      Grid.Column="1" Margin="0,70,10,10" Width="61" HorizontalAlignment="Left"
+                                      TextChanged="WeightInput_TextChanged" KeyUp="Input_KeyUp"/>
+                </Grid>
+            </GroupBox>
+
+            <Button x:Name="DeliveryScheduleButton" Content="Leseplanung"
+                    Grid.Row="2" Margin="10,10,10,10" Width="120" HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                    Click="DeliveryScheduleButton_Click"/>
+        </Grid>
+
+        <StatusBar Grid.Row="2" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
+            <StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="0.5*" MinWidth="120"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="1.75*" MinWidth="150"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="2*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="2*"/>
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+            <StatusBarItem>
+                <TextBlock>
+                    Anmeldungen: <Run Text="{Binding StatusAncmts}"/>
+                </TextBlock>
+            </StatusBarItem>
+            <Separator Grid.Column="1"/>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock ToolTip="{Binding StatusWeightToolTip}">
+                    Gewicht: <Run Text="{Binding StatusWeight}"/>
+                </TextBlock>
+            </StatusBarItem>
+            <Separator Grid.Column="3"/>
+            <StatusBarItem Grid.Column="4">
+                <TextBlock>
+                    Anmldg. erstellt: <Run Text="{Binding StatusAncmtCreated}"/>
+                </TextBlock>
+            </StatusBarItem>
+            <Separator Grid.Column="5"/>
+            <StatusBarItem Grid.Column="6">
+                <TextBlock>
+                    Anmldg. geändert: <Run Text="{Binding StatusAncmtModified}"/>
+                </TextBlock>
+            </StatusBarItem>
+        </StatusBar>
+    </Grid>
+</local:AdministrationWindow>
--- a/Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs
@ -0,0 +1,498 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Elwig.ViewModels;
+using System.Linq;
+using System;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using Elwig.Services;
+using Microsoft.EntityFrameworkCore;
+
+namespace Elwig.Windows {
+    public partial class DeliveryAncmtAdminWindow : AdministrationWindow {
+
+        public DeliveryAncmtAdminViewModel ViewModel => (DeliveryAncmtAdminViewModel)DataContext;
+
+        private readonly RoutedCommand CtrlF = new("CtrlF", typeof(DeliveryAncmtAdminWindow), [new KeyGesture(Key.F, ModifierKeys.Control)]);
+        private readonly RoutedCommand CtrlP = new("CtrlP", typeof(DeliveryAncmtAdminWindow), [new KeyGesture(Key.P, ModifierKeys.Control)]);
+        private readonly RoutedCommand CtrlShiftP = new("CtrlShiftP", typeof(DeliveryAncmtAdminWindow), [new KeyGesture(Key.P, ModifierKeys.Control | ModifierKeys.Shift)]);
+
+        public DeliveryAncmtAdminWindow() {
+            InitializeComponent();
+            CommandBindings.Add(new CommandBinding(CtrlF, FocusSearchInput));
+            CommandBindings.Add(new CommandBinding(CtrlP, Menu_DeliveryAncmtList_ShowSelected_Click));
+            CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_DeliveryAncmtList_PrintSelected_Click));
+            ExemptInputs = [
+                SearchInput, SeasonInput, OnlyUpcomingInput, FromAllSchedulesInput, DeliveryScheduleList, DeliveryAncmtList,
+            ];
+            RequiredInputs = [
+                MgNrInput, MemberInput, DeliveryScheduleInput, SortIdInput, WineVarietyInput, WeightInput,
+            ];
+
+            DoShowWarningWindows = false;
+
+            InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
+            SearchInput.TextChanged -= SearchInput_TextChanged;
+            ViewModel.FilterSeason = Utils.CurrentLastSeason;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            ViewModel.FilterOnlyUpcoming = true;
+            LockInputs();
+        }
+
+        private void Input_KeyUp(object sender, KeyEventArgs evt) {
+            if (sender is not Control ctrl) return;
+            if (evt.Key != Key.Enter) return;
+            if (ctrl == MgNrInput || ctrl == MemberInput) {
+                SortIdInput.Focus();
+                SortIdInput.SelectAll();
+            } else if (ctrl == SortIdInput || ctrl == WineVarietyInput) {
+                WeightInput.Focus();
+                WeightInput.SelectAll();
+            } else if (ctrl == WeightInput) {
+                ShortcutSave();
+            }
+        }
+
+        private async void Menu_DeliveryAncmtList_SaveSelected_Click(object sender, RoutedEventArgs evt) {
+            if (DeliveryScheduleList.SelectedItem is not DeliverySchedule s)
+                return;
+            await ViewModel.GenerateDeliveryAncmtList(DeliveryAncmtService.ExportSubject.FromSelectedSchedule, ExportMode.SaveList);
+        }
+
+        private async void Menu_DeliveryAncmtList_ShowSelected_Click(object sender, RoutedEventArgs evt) {
+            if (DeliveryScheduleList.SelectedItem is not DeliverySchedule s)
+                return;
+            await ViewModel.GenerateDeliveryAncmtList(DeliveryAncmtService.ExportSubject.FromSelectedSchedule, ExportMode.Show);
+        }
+
+        private async void Menu_DeliveryAncmtList_SavePdfSelected_Click(object sender, RoutedEventArgs evt) {
+            if (DeliveryScheduleList.SelectedItem is not DeliverySchedule s)
+                return;
+            await ViewModel.GenerateDeliveryAncmtList(DeliveryAncmtService.ExportSubject.FromSelectedSchedule, ExportMode.SavePdf);
+        }
+
+        private async void Menu_DeliveryAncmtList_PrintSelected_Click(object sender, RoutedEventArgs evt) {
+            if (DeliveryScheduleList.SelectedItem is not DeliverySchedule s)
+                return;
+            await ViewModel.GenerateDeliveryAncmtList(DeliveryAncmtService.ExportSubject.FromSelectedSchedule, ExportMode.Print);
+        }
+
+        private async Task RefreshDeliveryScheduleList() {
+            using var ctx = new AppDbContext();
+            var deliverySchedules = await ctx.DeliverySchedules
+                .Where(s => s.Year == ViewModel.FilterSeason)
+                .Include(s => s.Branch)
+                .Include(s => s.Announcements)
+                .OrderBy(s => s.DateString)
+                .ThenBy(s => s.Branch.Name)
+                .ThenBy(s => s.Description)
+                .ToListAsync();
+            ControlUtils.RenewItemsSource(DeliveryScheduleList, deliverySchedules
+                .Where(s => !ViewModel.FilterOnlyUpcoming || s.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0)
+                .ToList(), DeliveryScheduleList_SelectionChanged, ViewModel.FilterFromAllSchedules ? ControlUtils.RenewSourceDefault.None : ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(DeliveryScheduleInput, deliverySchedules, DeliveryScheduleInput_SelectionChanged);
+        }
+
+        private async Task RefreshList(bool updateSort = false) {
+            using var ctx = new AppDbContext();
+            var (_, deliveryAncmtQuery, filter) = await ViewModel.GetFilters(ctx);
+            var deliveryAncmts = await deliveryAncmtQuery
+                .Include(a => a.Member.BillingAddress)
+                .Include(a => a.Schedule)
+                .AsSplitQuery()
+                .ToListAsync();
+
+            if (filter.Count > 0 && deliveryAncmts.Count > 0) {
+                var dict = deliveryAncmts.AsParallel()
+                    .ToDictionary(a => a, a => a.SearchScore(filter))
+                    .OrderByDescending(a => a.Value)
+                    .ThenBy(a => a.Key.Schedule.DateString)
+                    .ThenBy(a => a.Key.Member.Name)
+                    .ThenBy(a => a.Key.Member.GivenName)
+                    .ThenBy(a => a.Key.Member.MgNr);
+                var threshold = dict.Select(a => a.Value).Max() * 3 / 4;
+                deliveryAncmts = dict
+                    .Where(a => a.Value > threshold)
+                    .Select(a => a.Key)
+                    .ToList();
+            } else {
+                deliveryAncmts = deliveryAncmts
+                    .OrderBy(a => a.Schedule.DateString)
+                    .ThenBy(a => a.Member.Name)
+                    .ThenBy(a => a.Member.GivenName)
+                    .ThenBy(a => a.Member.MgNr)
+                    .ToList();
+            }
+
+            ControlUtils.RenewItemsSource(DeliveryAncmtList, deliveryAncmts,
+                DeliveryAncmtList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
+            if (updateSort && DeliveryAncmtList.SelectedItem != null)
+                DeliveryAncmtList.ScrollIntoView(DeliveryAncmtList.SelectedItem);
+
+            ViewModel.StatusAncmts = $"{deliveryAncmts.Count:N0}";
+            if (filter.Count == 0) {
+                var (text, grid) = await DeliveryAncmtService.GenerateToolTip(deliveryAncmtQuery);
+                ViewModel.StatusWeight = text;
+                ViewModel.StatusWeightToolTip = grid;
+            } else {
+                ViewModel.StatusWeight = $"{deliveryAncmts.Sum(a => a.Weight):N0} kg";
+                ViewModel.StatusWeightToolTip = null;
+            }
+        }
+
+        private async Task RefreshInputs(bool validate = false) {
+            ClearInputStates();
+            if (ViewModel.SelectedDeliveryAncmt is DeliveryAncmt a) {
+                EditDeliveryAncmtButton.IsEnabled = true;
+                DeleteDeliveryAncmtButton.IsEnabled = true;
+                await FillInputs(a);
+            } else {
+                EditDeliveryAncmtButton.IsEnabled = false;
+                DeleteDeliveryAncmtButton.IsEnabled = false;
+                ClearOriginalValues();
+                ClearDefaultValues();
+                ClearInputs(validate);
+                ClearInputStates();
+            }
+            GC.Collect();
+        }
+
+        private void InitInputs() {
+            ClearOriginalValues();
+            ClearDefaultValues();
+            ViewModel.InitInputs();
+            ValidateRequiredInputs();
+        }
+
+        protected override async Task OnRenewContext(AppDbContext ctx) {
+            await base.OnRenewContext(ctx);
+
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
+                .Where(m => m.IsActive || !IsCreating)
+                .Include(m => m.PostalDest.AtPlz!.Ort)
+                .Include(m => m.DefaultWbKg!.AtKg)
+                .OrderBy(m => m.Name)
+                .ThenBy(m => m.GivenName)
+                .ThenBy(m => m.MgNr)
+                .ToListAsync());
+            ControlUtils.RenewItemsSource(WineVarietyInput, await ctx.WineVarieties.OrderBy(v => v.Name).ToListAsync());
+
+            await RefreshDeliveryScheduleList();
+            await RefreshList();
+        }
+
+        private async void DeliveryAncmtList_SelectionChanged(object sender, RoutedEventArgs evt) {
+            await RefreshInputs();
+        }
+
+        private async void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
+            await RefreshList();
+            if (DeliveryScheduleList.SelectedItem is DeliverySchedule s) {
+                Menu_DeliveryAncmtList_SaveSelected.IsEnabled = !IsEditing && !IsCreating;
+                Menu_DeliveryAncmtList_ShowSelected.IsEnabled = !IsEditing && !IsCreating;
+                Menu_DeliveryAncmtList_SavePdfSelected.IsEnabled = !IsEditing && !IsCreating;
+                Menu_DeliveryAncmtList_PrintSelected.IsEnabled = !IsEditing && !IsCreating;
+                ViewModel.FilterFromAllSchedules = false;
+            } else {
+                Menu_DeliveryAncmtList_SaveSelected.IsEnabled = false;
+                Menu_DeliveryAncmtList_ShowSelected.IsEnabled = false;
+                Menu_DeliveryAncmtList_SavePdfSelected.IsEnabled = false;
+                Menu_DeliveryAncmtList_PrintSelected.IsEnabled = false;
+                ViewModel.FilterFromAllSchedules = true;
+            }
+        }
+
+        private void DeliveryScheduleInput_SelectionChanged(object sender, RoutedEventArgs evt) {
+
+        }
+
+        private async void OnlyUpcomingInput_Changed(object sender, RoutedEventArgs evt) {
+            await RefreshDeliveryScheduleList();
+            await RefreshList(true);
+        }
+
+        private async void FromAllSchedulesInput_Changed(object sender, RoutedEventArgs evt) {
+            if (ViewModel.FilterFromAllSchedules) {
+                DeliveryScheduleList.SelectedItem = null;
+            } else if (DeliveryScheduleList.SelectedItem == null) {
+                ViewModel.FilterFromAllSchedules = true;
+            }
+            await RefreshList(true);
+        }
+
+        private async void SearchInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            await RefreshList(true);
+        }
+
+        private async void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            if (ViewModel.FilterSeason == null) return;
+            ViewModel.FilterOnlyUpcoming = false;
+            await RefreshDeliveryScheduleList();
+            await RefreshList();
+        }
+
+        private void MgNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            var valid = InputTextChanged((TextBox)sender, Validator.CheckMgNr);
+            var text = MgNrInput.Text;
+            var caret = MgNrInput.CaretIndex;
+            ControlUtils.SelectItemWithPk(MemberInput, valid ? ViewModel.MgNr : null);
+            MgNrInput.Text = text;
+            MgNrInput.CaretIndex = caret;
+        }
+
+        private void MgNrInput_LostFocus(object sender, RoutedEventArgs evt) {
+            var valid = InputLostFocus((TextBox)sender, Validator.CheckMgNr);
+            ControlUtils.SelectItemWithPk(MemberInput, valid ? ViewModel.MgNr : null);
+        }
+
+        private void MemberInput_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
+            var m = MemberInput.SelectedItem as Member;
+            ViewModel.MgNr = m?.MgNr;
+            ViewModel.MemberAddress = m?.FullAddress;
+        }
+
+        protected override void ShortcutNew() {
+            if (!NewDeliveryAncmtButton.IsEnabled || NewDeliveryAncmtButton.Visibility != Visibility.Visible)
+                return;
+            NewDeliveryAncmtButton_Click(null, null);
+        }
+
+        private async void NewDeliveryAncmtButton_Click(object? sender, RoutedEventArgs? evt) {
+            IsCreating = true;
+            DeliveryAncmtList.IsEnabled = false;
+            var mgnr = ViewModel.MgNr;
+            ViewModel.SelectedDeliveryAncmt = null;
+
+            using var ctx = new AppDbContext();
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
+                .Where(m => m.IsActive || !IsCreating)
+                .Include(m => m.PostalDest.AtPlz!.Ort)
+                .Include(m => m.DefaultWbKg!.AtKg)
+                .OrderBy(m => m.Name)
+                .ThenBy(m => m.GivenName)
+                .ThenBy(m => m.MgNr)
+                .ToListAsync());
+
+            HideNewEditDeleteButtons();
+            ShowSaveResetCancelButtons();
+            UnlockInputs();
+            InitInputs();
+            ViewModel.MgNr = mgnr;
+            ViewModel.EnableSearchInputs = false;
+
+            MgNrInput.Focus();
+            MgNrInput.SelectAll();
+        }
+
+        protected override void ShortcutEdit() {
+            if (!EditDeliveryAncmtButton.IsEnabled || EditDeliveryAncmtButton.Visibility != Visibility.Visible)
+                return;
+            EditDeliveryAncmtButton_Click(null, null);
+        }
+
+        private void EditDeliveryAncmtButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (ViewModel.SelectedDeliveryAncmt == null) return;
+            IsEditing = true;
+            DeliveryAncmtList.IsEnabled = false;
+            HideNewEditDeleteButtons();
+            ShowSaveResetCancelButtons();
+            UnlockInputs();
+            ViewModel.EnableSearchInputs = false;
+        }
+
+        protected override void ShortcutDelete() {
+            if (!DeleteDeliveryAncmtButton.IsEnabled || DeleteDeliveryAncmtButton.Visibility != Visibility.Visible)
+                return;
+            DeleteDeliveryAncmtButton_Click(null, null);
+        }
+
+        private async void DeleteDeliveryAncmtButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (ViewModel.SelectedDeliveryAncmt is not DeliveryAncmt a)
+                return;
+            var r = MessageBox.Show(
+                $"Soll die Traubenanmeldung wirklich unwiderruflich gelöscht werden?",
+                "Traubenanmeldung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+            if (r == MessageBoxResult.OK) {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    using (var ctx = new AppDbContext()) {
+                        ctx.Remove(a);
+                        await ctx.SaveChangesAsync();
+                    }
+                    App.HintContextChange();
+                } catch (Exception exc) {
+                    var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                    MessageBox.Show(str, "Traubenanmeldung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+                Mouse.OverrideCursor = null;
+            }
+        }
+
+        protected override void ShortcutSave() {
+            if (!SaveButton.IsEnabled || SaveButton.Visibility != Visibility.Visible)
+                return;
+            SaveButton_Click(null, null);
+        }
+
+        private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            int year = -1, dsnr = -1, mgnr = -1;
+            string? sortid = null;
+            try {
+                var s = ViewModel.SelectedDeliveryAncmt;
+                (year, dsnr, mgnr, sortid) = await ViewModel.UpdateDeliveryAncmt(s?.Year, s?.DsNr, s?.MgNr, s?.SortId, s?.Type);
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Traubenanmeldung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            Mouse.OverrideCursor = null;
+            IsEditing = false;
+            IsCreating = false;
+            DeliveryAncmtList.IsEnabled = true;
+            HideSaveResetCancelButtons();
+            ShowNewEditDeleteButtons();
+            LockInputs();
+            ViewModel.EnableSearchInputs = true;
+            FinishInputFilling();
+            await RefreshList();
+            await RefreshInputs();
+            ViewModel.SearchQuery = "";
+            ControlUtils.SelectItemWithPk(DeliveryScheduleList, year, dsnr);
+            if (sortid != null)
+                ControlUtils.SelectItemWithPk(DeliveryAncmtList, year, dsnr, mgnr, sortid);
+        }
+
+        protected override void ShortcutReset() {
+            if (!ResetButton.IsEnabled || ResetButton.Visibility != Visibility.Visible)
+                return;
+            ResetButton_Click(null, null);
+        }
+
+        private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (IsEditing) {
+                await RefreshInputs();
+            } else if (IsCreating) {
+                ClearInputs();
+                InitInputs();
+            }
+            UpdateButtons();
+        }
+
+        private async void CancelButton_Click(object? sender, RoutedEventArgs? evt) {
+            IsEditing = false;
+            IsCreating = false;
+            DeliveryAncmtList.IsEnabled = true;
+
+            using var ctx = new AppDbContext();
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
+                .Where(m => m.IsActive || !IsCreating)
+                .Include(m => m.PostalDest.AtPlz!.Ort)
+                .Include(m => m.DefaultWbKg!.AtKg)
+                .OrderBy(m => m.Name)
+                .ThenBy(m => m.GivenName)
+                .ThenBy(m => m.MgNr)
+                .ToListAsync());
+
+            HideSaveResetCancelButtons();
+            ShowNewEditDeleteButtons();
+            await RefreshInputs();
+            LockInputs();
+            ViewModel.EnableSearchInputs = true;
+        }
+
+        private async Task FillInputs(DeliveryAncmt a) {
+            ClearOriginalValues();
+            ClearDefaultValues();
+            await ViewModel.FillInputs(a);
+            FinishInputFilling();
+        }
+
+        private void UpdateWineVariety(bool valid) {
+            if (valid) {
+                ViewModel.SortId = ViewModel.SortId![0..2];
+                ControlUtils.SelectItemWithPk(WineVarietyInput, ViewModel.SortId);
+            } else {
+                WineVarietyInput.SelectedItem = null;
+            }
+        }
+
+        private void SortIdInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            UpdateWineVariety(InputTextChanged((TextBox)sender, Validator.CheckSortId));
+        }
+
+        private void SortIdInput_LostFocus(object sender, RoutedEventArgs evt) {
+            UpdateWineVariety(InputLostFocus((TextBox)sender, Validator.CheckSortId));
+        }
+
+        private void WineVarietyInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            if (WineVarietyInput.SelectedItem is WineVar s)
+                ViewModel.SortId = s.SortId;
+        }
+
+        new protected void ClearInputs(bool validate = false) {
+            ViewModel.ClearInputs();
+            base.ClearInputs(validate);
+        }
+
+        protected override void UpdateButtons() {
+            if (!IsEditing && !IsCreating) return;
+            bool ch = HasChanged, v = IsValid;
+            ResetButton.IsEnabled = ch;
+            SaveButton.IsEnabled = v && ch;
+        }
+
+        private void FocusSearchInput(object sender, RoutedEventArgs evt) {
+            if (!IsEditing && !IsCreating) {
+                SearchInput.Focus();
+                SearchInput.SelectAll();
+            }
+        }
+
+        private void ShowSaveResetCancelButtons() {
+            SaveButton.IsEnabled = false;
+            ResetButton.IsEnabled = false;
+            CancelButton.IsEnabled = true;
+            ViewModel.EditingButtonsVisibility = Visibility.Visible;
+        }
+
+        private void HideSaveResetCancelButtons() {
+            SaveButton.IsEnabled = false;
+            ResetButton.IsEnabled = false;
+            CancelButton.IsEnabled = false;
+            ViewModel.EditingButtonsVisibility = Visibility.Hidden;
+        }
+
+        private void ShowNewEditDeleteButtons() {
+            NewDeliveryAncmtButton.IsEnabled = true;
+            EditDeliveryAncmtButton.IsEnabled = ViewModel.SelectedDeliveryAncmt != null;
+            DeleteDeliveryAncmtButton.IsEnabled = ViewModel.SelectedDeliveryAncmt != null;
+            ViewModel.ControlButtonsVisibility = Visibility.Visible;
+        }
+
+        private void HideNewEditDeleteButtons() {
+            NewDeliveryAncmtButton.IsEnabled = false;
+            EditDeliveryAncmtButton.IsEnabled = false;
+            DeleteDeliveryAncmtButton.IsEnabled = false;
+            ViewModel.ControlButtonsVisibility = Visibility.Hidden;
+        }
+
+        private void WeightInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckInteger((TextBox)sender, false, 5));
+        }
+
+        private void MemberReferenceButton_Click(object sender, RoutedEventArgs evt) {
+            if (MemberInput.SelectedItem is not Member m) return;
+            App.FocusMember(m.MgNr);
+        }
+
+        private void DeliveryScheduleButton_Click(object sender, RoutedEventArgs evt) {
+            App.FocusDeliverySchedule();
+        }
+    }
+}
--- a/Elwig/Windows/DeliveryScheduleAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryScheduleAdminWindow.xaml
@ -0,0 +1,297 @@
+<local:AdministrationWindow
+        x:Class="Elwig.Windows.DeliveryScheduleAdminWindow"
+        AutomationProperties.AutomationId="DeliveryScheduleAdminWindow"
+        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:local="clr-namespace:Elwig.Windows"
+        xmlns:vm="clr-namespace:Elwig.ViewModels"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        Title="Leseplanung - Elwig" Height="600" Width="850" MinHeight="450" MinWidth="800"
+        Loaded="Window_Loaded">
+    <Window.DataContext>
+        <vm:DeliveryScheduleAdminViewModel/>
+    </Window.DataContext>
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="ctrl:UnitTextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="ComboBox">
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+        </Style>
+        <Style TargetType="ctrl:CheckComboBox">
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="9,3"/>
+            <Setter Property="Height" Value="27"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="19"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="24"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*" MinWidth="350"/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition Width="1*" MinWidth="400"/>
+        </Grid.ColumnDefinitions>
+
+        <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
+        </Menu>
+
+        <Grid Grid.Row="1" Margin="5,0,0,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="35"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="42"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <TextBox x:Name="SearchInput" Text="{Binding SearchQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding EnableSearchInputs}"
+                     Grid.ColumnSpan="3" Margin="5,5,174,0" IsReadOnly="False"
+                     TextChanged="SearchInput_TextChanged">
+                <TextBox.ToolTip>
+                    <TextBlock>
+                        <Bold>Strg+F</Bold><LineBreak/><LineBreak/>
+                        Lesepläne filtern und durchsuchen. Die Filter sind beliebig kombinierbar.<LineBreak/>
+                        Groß- und Kleinschreibung ist in den meisten Fällen egal.<LineBreak/>
+                        <LineBreak/>
+                        Filtern nach:<LineBreak/>
+                        <Bold>Sorte</Bold>: z.B. GV, ZW, rr, sa, !gv (ausgenommen GV), ...<LineBreak/>
+                        <Bold>Rot/Weiß</Bold>: z.B. r, Rot, w, weiß, ...<LineBreak/>
+                        <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
+                        <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...<LineBreak/>
+                        <Bold>Beschreibung</Bold>: z.B. Bio, ...
+                    </TextBlock>
+                </TextBox.ToolTip>
+            </TextBox>
+            <ctrl:IntegerUpDown x:Name="SeasonInput" Text="{Binding FilterSeasonString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding EnableSearchInputs}"
+                                Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1900" Maximum="9999"
+                                Margin="5,5,113,0" VerticalAlignment="Top" HorizontalAlignment="Right"
+                                TextChanged="SeasonInput_TextChanged"/>
+            <CheckBox x:Name="OnlyUpcomingInput" Content="Nur zukünftige" IsChecked="{Binding FilterOnlyUpcoming, Mode=TwoWay}" IsEnabled="{Binding EnableSearchInputs}"
+                      HorizontalAlignment="Right" Margin="0,10,10,0" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3"
+                      Checked="OnlyUpcomingInput_Changed" Unchecked="OnlyUpcomingInput_Changed"/>
+
+            <DataGrid x:Name="DeliveryScheduleList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
+                      ItemsSource="{Binding DeliverySchedules, Mode=TwoWay}" SelectedItem="{Binding SelectedDeliverySchedule, Mode=TwoWay}"
+                      CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
+                      SelectionChanged="DeliveryScheduleList_SelectionChanged"
+                      Margin="5,0,5,0" Grid.Row="1" FontSize="14" Grid.ColumnSpan="3">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="Datum" Binding="{Binding Date, StringFormat='dd.MM.yy'}" Width="70">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Z." Binding="{Binding ZwstId}" Width="25">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Beschreibung" Binding="{Binding Description}" Width="200"/>
+                    <DataGridTextColumn Header="Max. Gew." Binding="{Binding MaxWeight, StringFormat='{}{0:N0} kg'}" Width="80">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+
+            <Button x:Name="NewDeliveryScheduleButton" Content="Neu" Visibility="{Binding ControlButtonsVisibility}"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
+                    Click="NewDeliveryScheduleButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Alt+Einfg</TextBlock>
+                </Button.ToolTip>
+            </Button>
+            <Button x:Name="EditDeliveryScheduleButton" Content="Bearbeiten" IsEnabled="False" Visibility="{Binding ControlButtonsVisibility}"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
+                    Click="EditDeliveryScheduleButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+B</TextBlock>
+                </Button.ToolTip>
+            </Button>
+            <Button x:Name="DeleteDeliveryScheduleButton" Content="Löschen" IsEnabled="False" Visibility="{Binding ControlButtonsVisibility}"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
+                    Click="DeleteDeliveryScheduleButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Alt+Entf</TextBlock>
+                </Button.ToolTip>
+            </Button>
+
+            <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False" Visibility="{Binding EditingButtonsVisibility}"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
+                    Click="SaveButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+S</TextBlock>
+                </Button.ToolTip>
+            </Button>
+            <Button x:Name="ResetButton" Content="Zurücksetzen" IsEnabled="False" Visibility="{Binding EditingButtonsVisibility}"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
+                    Click="ResetButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+Z</TextBlock>
+                </Button.ToolTip>
+            </Button>
+            <Button x:Name="CancelButton" Content="Abbrechen" IsEnabled="False" Visibility="{Binding EditingButtonsVisibility}" IsCancel="True"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
+                    Click="CancelButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Esc</TextBlock>
+                </Button.ToolTip>
+            </Button>
+        </Grid>
+
+        <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+
+        <Grid Grid.Column="2" Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+
+            <GroupBox Header="Leseplan" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="110"/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="Datum/Zwst.:" Margin="10,10,0,10"/>
+                    <TextBox x:Name="DateInput" Text="{Binding DateString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,10,10,10" Width="77" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="ScheduleDateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                    <ComboBox x:Name="BranchInput" SelectedItem="{Binding Branch, Mode=TwoWay}" ItemsSource="{Binding BranchSource, Mode=TwoWay}"
+                              DisplayMemberPath="Name" TextSearch.TextPath="Name"
+                              Margin="82,10,10,10" Width="150" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Left"/>
+
+                    <Label Content="Beschreibung:" Margin="10,40,0,10"/>
+                    <TextBox x:Name="DescriptionInput" Text="{Binding Description, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,40,10,10" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="TextBox_TextChanged"/>
+
+                    <Label Content="Max. Gewicht:" Margin="10,70,0,10"/>
+                    <ctrl:UnitTextBox x:Name="MaxWeightInput" Unit="kg" Text="{Binding MaxWeightString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                      Margin="0,70,10,10" Grid.Column="1" Grid.ColumnSpan="2" Width="68" HorizontalAlignment="Left"
+                                      TextChanged="MaxWeightInput_TextChanged"/>
+
+                    <CheckBox x:Name="CancelledInput" Content="Abgesagt" IsChecked="{Binding IsCancelled, Mode=TwoWay}"
+                              Grid.Column="1" Grid.ColumnSpan="2" Margin="80,75,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+
+                    <Label Content="Sorten:" Margin="10,100,0,10"/>
+                    <ctrl:CheckComboBox x:Name="MainWineVarietiesInput" SelectedItems="{Binding MainVarieties}" ItemsSource="{Binding MainVarietiesSource, Mode=TwoWay}"
+                                        Grid.Column="1" Grid.ColumnSpan="2" Margin="0,100,10,10"
+                                        Delimiter=", " AllItemsSelectedContent="Alle Sorten" ListDisplayMemberPath="SortId" TextSearch.TextPath="Name">
+                        <ctrl:CheckComboBox.ItemTemplateSelector>
+                            <ctrl:WineVarietyTemplateSelector/>
+                        </ctrl:CheckComboBox.ItemTemplateSelector>
+                    </ctrl:CheckComboBox>
+
+                    <Label Content="Weitere Sorten:" Margin="10,130,0,10"/>
+                    <ctrl:CheckComboBox x:Name="OtherWineVarietiesInput" SelectedItems="{Binding OtherVarieties}" ItemsSource="{Binding OtherVarietiesSource, Mode=TwoWay}"
+                                        Grid.Column="1" Grid.ColumnSpan="2" Margin="0,130,10,10"
+                                        Delimiter=", " AllItemsSelectedContent="Alle Sorten" ListDisplayMemberPath="SortId" TextSearch.TextPath="Name">
+                        <ctrl:CheckComboBox.ItemTemplateSelector>
+                            <ctrl:WineVarietyTemplateSelector/>
+                        </ctrl:CheckComboBox.ItemTemplateSelector>
+                    </ctrl:CheckComboBox>
+
+                    <Label Content="Attribut/Bewirt.:" Margin="10,160,0,10"/>
+                    <ComboBox x:Name="AttributeInput" SelectedItem="{Binding AttributeObj, Mode=TwoWay}" ItemsSource="{Binding AttributeSource, Mode=TwoWay}"
+                              Grid.Column="1" Margin="0,160,5,10"
+                              DisplayMemberPath="Name"/>
+                    <ComboBox x:Name="CultivationInput" SelectedItem="{Binding CultivationObj, Mode=TwoWay}" ItemsSource="{Binding CultivationSource, Mode=TwoWay}"
+                              Grid.Column="2" Margin="0,160,10,10"
+                              DisplayMemberPath="Name"/>
+                </Grid>
+            </GroupBox>
+
+            <GroupBox Header="Anmeldungen" Margin="5,5,5,5" Grid.Row="1" Width="249" Height="98"
+                      VerticalAlignment="Top" HorizontalAlignment="Left">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="ab frühestens:" Margin="10,10,0,10"/>
+                    <TextBox x:Name="AncmtFromDateInput" Text="{Binding AncmtFromDateString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Width="77" Margin="0,10,10,10" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                    <TextBox x:Name="AncmtFromTimeInput" Text="{Binding AncmtFromTimeString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Width="44" Margin="83,10,10,10" Grid.Column="1" HorizontalAlignment="Left"
+                             TextChanged="TimeInput_TextChanged" LostFocus="TimeInput_LostFocus"/>
+
+                    <Label Content="bis spätestens:" Margin="10,40,0,10"/>
+                    <TextBox x:Name="AncmtToDateInput" Text="{Binding AncmtToDateString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Width="77" Margin="0,40,10,10" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                    <TextBox x:Name="AncmtToTimeInput" Text="{Binding AncmtToTimeString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Width="44" Margin="83,40,10,10" Grid.Column="1" HorizontalAlignment="Left"
+                             TextChanged="TimeInput_TextChanged" LostFocus="TimeInput_LostFocus"/>
+                </Grid>
+            </GroupBox>
+        </Grid>
+
+        <StatusBar Grid.Row="2" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
+            <StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="200"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+            <StatusBarItem>
+
+            </StatusBarItem>
+        </StatusBar>
+    </Grid>
+</local:AdministrationWindow>
--- a/Elwig/Windows/DeliveryScheduleAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryScheduleAdminWindow.xaml.cs
@ -0,0 +1,317 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Elwig.Services;
+using Elwig.ViewModels;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Elwig.Windows {
+    public partial class DeliveryScheduleAdminWindow : AdministrationWindow {
+
+        public DeliveryScheduleAdminViewModel ViewModel => (DeliveryScheduleAdminViewModel)DataContext;
+
+        private readonly RoutedCommand CtrlF = new("CtrlF", typeof(DeliveryScheduleAdminWindow), [new KeyGesture(Key.F, ModifierKeys.Control)]);
+
+        public DeliveryScheduleAdminWindow() {
+            InitializeComponent();
+            CommandBindings.Add(new CommandBinding(CtrlF, FocusSearchInput));
+            ExemptInputs = [
+                SearchInput, SeasonInput, OnlyUpcomingInput, DeliveryScheduleList,
+            ];
+            RequiredInputs = [
+                DateInput, BranchInput, DescriptionInput, MainWineVarietiesInput,
+            ];
+
+            InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
+            SearchInput.TextChanged -= SearchInput_TextChanged;
+            ViewModel.FilterSeason = Utils.CurrentLastSeason;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            ViewModel.FilterOnlyUpcoming = true;
+            LockInputs();
+        }
+
+        private async Task RefreshList(bool updateSort = false) {
+            using var ctx = new AppDbContext();
+            var (_, deliveryScheduleQuery, filter) = await ViewModel.GetFilters(ctx);
+            var deliverySchedules = await deliveryScheduleQuery
+                .Include(s => s.Varieties)
+                .Include(s => s.Branch)
+                .AsSplitQuery()
+                .ToListAsync();
+
+            if (filter.Count > 0 && deliverySchedules.Count > 0) {
+                var dict = deliverySchedules.AsParallel()
+                    .ToDictionary(s => s, s => s.SearchScore(filter))
+                    .OrderByDescending(a => a.Value)
+                    .ThenBy(a => a.Key.DateString)
+                    .ThenBy(a => a.Key.Branch.Name)
+                    .ThenBy(a => a.Key.Description);
+                var threshold = dict.Select(a => a.Value).Max() * 3 / 4;
+                deliverySchedules = dict
+                    .Where(a => a.Value > threshold)
+                    .Select(a => a.Key)
+                    .ToList();
+            } else {
+                deliverySchedules = deliverySchedules
+                    .OrderBy(s => s.DateString)
+                    .ThenBy(s => s.Branch.Name)
+                    .ThenBy(s => s.Description)
+                    .ToList();
+            }
+
+            ControlUtils.RenewItemsSource(DeliveryScheduleList, deliverySchedules,
+                DeliveryScheduleList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
+            if (updateSort && DeliveryScheduleList.SelectedItem != null)
+                DeliveryScheduleList.ScrollIntoView(DeliveryScheduleList.SelectedItem);
+        }
+
+        private async Task RefreshInputs(bool validate = false) {
+            ClearInputStates();
+            if (ViewModel.SelectedDeliverySchedule is DeliverySchedule s) {
+                EditDeliveryScheduleButton.IsEnabled = true;
+                DeleteDeliveryScheduleButton.IsEnabled = true;
+                await FillInputs(s);
+            } else {
+                EditDeliveryScheduleButton.IsEnabled = false;
+                DeleteDeliveryScheduleButton.IsEnabled = false;
+                ClearOriginalValues();
+                ClearDefaultValues();
+                ClearInputs(validate);
+                ClearInputStates();
+            }
+            GC.Collect();
+        }
+
+        private void InitInputs() {
+            ClearOriginalValues();
+            ClearDefaultValues();
+            ViewModel.InitInputs();
+            ValidateRequiredInputs();
+        }
+
+        protected override async Task OnRenewContext(AppDbContext ctx) {
+            await base.OnRenewContext(ctx);
+
+            ControlUtils.RenewItemsSource(BranchInput, await ctx.Branches.OrderBy(b => b.Name).ToListAsync());
+            var varieties = await ctx.WineVarieties.OrderBy(v => v.Name).ToListAsync();
+            ControlUtils.RenewItemsSource(MainWineVarietiesInput, varieties);
+            ControlUtils.RenewItemsSource(OtherWineVarietiesInput, varieties);
+            var attrList = await ctx.WineAttributes.OrderBy(a => a.Name).Cast<object>().ToListAsync();
+            attrList.Insert(0, new NullItem("- Keine Angabe -"));
+            ControlUtils.RenewItemsSource(AttributeInput, attrList, null, ControlUtils.RenewSourceDefault.First);
+            var cultList = await ctx.WineCultivations.OrderBy(a => a.Name).Cast<object>().ToListAsync();
+            cultList.Insert(0, new NullItem("- Kein Angabe -"));
+            ControlUtils.RenewItemsSource(CultivationInput, cultList, null, ControlUtils.RenewSourceDefault.First);
+
+            await RefreshList();
+        }
+
+        private async void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
+            await RefreshInputs();
+        }
+
+        private async void OnlyUpcomingInput_Changed(object sender, RoutedEventArgs evt) {
+            await RefreshList();
+        }
+
+        private async void SearchInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            await RefreshList(true);
+        }
+
+        private async void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            if (ViewModel.FilterSeason == null) return;
+            ViewModel.FilterOnlyUpcoming = false;
+            await RefreshList();
+        }
+
+        protected override void ShortcutNew() {
+            if (!NewDeliveryScheduleButton.IsEnabled || NewDeliveryScheduleButton.Visibility != Visibility.Visible)
+                return;
+            NewDeliveryScheduleButton_Click(null, null);
+        }
+
+        private void NewDeliveryScheduleButton_Click(object? sender, RoutedEventArgs? evt) {
+            IsCreating = true;
+            DeliveryScheduleList.IsEnabled = false;
+            ViewModel.SelectedDeliverySchedule = null;
+            HideNewEditDeleteButtons();
+            ShowSaveResetCancelButtons();
+            UnlockInputs();
+            InitInputs();
+            ViewModel.EnableSearchInputs = false;
+        }
+
+        protected override void ShortcutEdit() {
+            if (!EditDeliveryScheduleButton.IsEnabled || EditDeliveryScheduleButton.Visibility != Visibility.Visible)
+                return;
+            EditDeliveryScheduleButton_Click(null, null);
+        }
+
+        private void EditDeliveryScheduleButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (ViewModel.SelectedDeliverySchedule == null) return;
+            IsEditing = true;
+            DeliveryScheduleList.IsEnabled = false;
+            HideNewEditDeleteButtons();
+            ShowSaveResetCancelButtons();
+            UnlockInputs();
+            ViewModel.EnableSearchInputs = false;
+        }
+
+        protected override void ShortcutDelete() {
+            if (!DeleteDeliveryScheduleButton.IsEnabled || DeleteDeliveryScheduleButton.Visibility != Visibility.Visible)
+                return;
+            DeleteDeliveryScheduleButton_Click(null, null);
+        }
+
+        private async void DeleteDeliveryScheduleButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (ViewModel.SelectedDeliverySchedule is not DeliverySchedule s)
+                return;
+            var r = MessageBox.Show(
+                $"Soll der Leseplan \"{s.Description}\" vom {s.Date:dd.MM.yyyy} wirklich unwiderruflich gelöscht werden?",
+                "Leseplan löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+            if (r == MessageBoxResult.OK) {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    using (var ctx = new AppDbContext()) {
+                        ctx.Remove(s);
+                        await ctx.SaveChangesAsync();
+                    }
+                    App.HintContextChange();
+                } catch (Exception exc) {
+                    var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                    MessageBox.Show(str, "Leseplan löschen", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+                Mouse.OverrideCursor = null;
+            }
+        }
+
+        protected override void ShortcutSave() {
+            if (!SaveButton.IsEnabled || SaveButton.Visibility != Visibility.Visible)
+                return;
+            SaveButton_Click(null, null);
+        }
+
+        private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                await ViewModel.UpdateDeliverySchedule(ViewModel.SelectedDeliverySchedule?.Year, ViewModel.SelectedDeliverySchedule?.DsNr);
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Leseplan aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            Mouse.OverrideCursor = null;
+            IsEditing = false;
+            IsCreating = false;
+            DeliveryScheduleList.IsEnabled = true;
+            HideSaveResetCancelButtons();
+            ShowNewEditDeleteButtons();
+            LockInputs();
+            ViewModel.EnableSearchInputs = true;
+            FinishInputFilling();
+            await RefreshList();
+            await RefreshInputs();
+            ViewModel.SearchQuery = "";
+        }
+
+        protected override void ShortcutReset() {
+            if (!ResetButton.IsEnabled || ResetButton.Visibility != Visibility.Visible)
+                return;
+            ResetButton_Click(null, null);
+        }
+
+        private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
+            if (IsEditing) {
+                await RefreshInputs();
+            } else if (IsCreating) {
+                ClearInputs();
+                InitInputs();
+            }
+            UpdateButtons();
+        }
+
+        private async void CancelButton_Click(object? sender, RoutedEventArgs? evt) {
+            IsEditing = false;
+            IsCreating = false;
+            DeliveryScheduleList.IsEnabled = true;
+            HideSaveResetCancelButtons();
+            ShowNewEditDeleteButtons();
+            await RefreshInputs();
+            LockInputs();
+            ViewModel.EnableSearchInputs = true;
+        }
+
+        private async Task FillInputs(DeliverySchedule s) {
+            ClearOriginalValues();
+            ClearDefaultValues();
+            await ViewModel.FillInputs(s);
+            FinishInputFilling();
+        }
+
+        new protected void ClearInputs(bool validate = false) {
+            ViewModel.ClearInputs();
+            base.ClearInputs(validate);
+        }
+
+        protected override void UpdateButtons() {
+            if (!IsEditing && !IsCreating) return;
+            bool ch = HasChanged, v = IsValid;
+            ResetButton.IsEnabled = ch;
+            SaveButton.IsEnabled = v && ch;
+        }
+
+        private void FocusSearchInput(object sender, RoutedEventArgs evt) {
+            if (!IsEditing && !IsCreating) {
+                SearchInput.Focus();
+                SearchInput.SelectAll();
+            }
+        }
+
+        private void ShowSaveResetCancelButtons() {
+            SaveButton.IsEnabled = false;
+            ResetButton.IsEnabled = false;
+            CancelButton.IsEnabled = true;
+            ViewModel.EditingButtonsVisibility = Visibility.Visible;
+        }
+
+        private void HideSaveResetCancelButtons() {
+            SaveButton.IsEnabled = false;
+            ResetButton.IsEnabled = false;
+            CancelButton.IsEnabled = false;
+            ViewModel.EditingButtonsVisibility = Visibility.Hidden;
+        }
+
+        private void ShowNewEditDeleteButtons() {
+            NewDeliveryScheduleButton.IsEnabled = true;
+            EditDeliveryScheduleButton.IsEnabled = ViewModel.SelectedDeliverySchedule != null;
+            DeleteDeliveryScheduleButton.IsEnabled = ViewModel.SelectedDeliverySchedule != null;
+            ViewModel.ControlButtonsVisibility = Visibility.Visible;
+        }
+
+        private void HideNewEditDeleteButtons() {
+            NewDeliveryScheduleButton.IsEnabled = false;
+            EditDeliveryScheduleButton.IsEnabled = false;
+            DeleteDeliveryScheduleButton.IsEnabled = false;
+            ViewModel.ControlButtonsVisibility = Visibility.Hidden;
+        }
+
+        private void ScheduleDateInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            DateInput_TextChanged(sender, evt);
+            if (ViewModel.Date is DateOnly date) {
+                ViewModel.AncmtToDate = date.AddDays(-2);
+            }
+        }
+
+        private void MaxWeightInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckInteger((TextBox)sender, false, 6));
+        }
+    }
+}
--- a/Elwig/Windows/MailWindow.xaml
+++ b/Elwig/Windows/MailWindow.xaml
@ -108,36 +108,67 @@
                        <RadioButton GroupName="Recipients" x:Name="RecipientsAreaComMembersInput" Content="Mitglieder mit Flächenbindung"
                                     Margin="10,30,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                        <RadioButton GroupName="Recipients" x:Name="RecipientsDeliveryMembersInput" Content="Lieferanten der Saison"
+                        <RadioButton GroupName="Recipients" x:Name="RecipientsDeliveryAncmtMembersInput" Content="Mitglieder mit Anmeldung"
                                     Margin="10,50,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                        <RadioButton GroupName="Recipients" x:Name="RecipientsNonDeliveryMembersInput" Content="Nicht-Lieferanten der Saison"
+                        <RadioButton GroupName="Recipients" x:Name="RecipientsDeliveryMembersInput" Content="Lieferanten der Saison"
                                     Margin="10,70,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                        <RadioButton GroupName="Recipients" x:Name="RecipientsCustomInput" Content="Benutzerdefiniert"
+                        <RadioButton GroupName="Recipients" x:Name="RecipientsNonDeliveryMembersInput" Content="Nicht-Lieferanten der Saison"
                                     Margin="10,90,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
+                        <RadioButton GroupName="Recipients" x:Name="RecipientsCustomInput" Content="Benutzerdefiniert"
+                                     Margin="10,110,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>

-                        <Label Content="Zwst.:" x:Name="MemberBranchLabel" Margin="10,120,0,10"/>
+                        <Label Content="Zwst.:" x:Name="MemberBranchLabel" Margin="10,140,0,10"/>
                        <ctrl:CheckComboBox x:Name="MemberBranchInput" AllItemsSelectedContent="Alle Stammzweigstellen" Delimiter=", " DisplayMemberPath="Name"
-                                            Margin="50,120,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                            Margin="50,140,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                            SelectionChanged="MemberInput_SelectionChanged"/>

-                        <Label Content="Gem.:" x:Name="MemberKgLabel" Margin="10,150,0,10"/>
+                        <Label Content="Gem.:" x:Name="MemberKgLabel" Margin="10,170,0,10"/>
                        <ctrl:CheckComboBox x:Name="MemberKgInput" AllItemsSelectedContent="Alle Stammgemeinden" Delimiter=", " DisplayMemberPath="Name"
                                            IsSelectAllActive="True" SelectAllContent="Alle Stammgemeinden"
-                                            Margin="50,150,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                            Margin="50,170,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                            SelectionChanged="MemberInput_SelectionChanged"/>

-                        <Label Content="Vtrg.:" x:Name="MemberAreaComLabel" Margin="10,180,0,10"/>
+                        <Label Content="Bio-Betrieb:" x:Name="MemberOrganicLabel" Margin="10,200,0,10"/>
+                        <RadioButton x:Name="MemberOrganicYesInput" Content="Ja" GroupName="MemberOrganic"
+                                     Margin="80,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                     Checked="MemberInput_Checked"/>
+                        <RadioButton x:Name="MemberOrganicNoInput" Content="Nein" GroupName="MemberOrganic"
+                                     Margin="125,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                     Checked="MemberInput_Checked"/>
+                        <RadioButton x:Name="MemberOrganicIndifferentInput" Content="Egal" GroupName="MemberOrganic"
+                                     Margin="180,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                     Checked="MemberInput_Checked"/>
+
+                        <Label Content="Funktionär:" x:Name="MemberFunktionärLabel" Margin="10,230,0,10"/>
+                        <RadioButton x:Name="MemberFunktionärYesInput" Content="Ja" GroupName="MemberFunktionär"
+                                     Margin="80,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                     Checked="MemberInput_Checked"/>
+                        <RadioButton x:Name="MemberFunktionärNoInput" Content="Nein" GroupName="MemberFunktionär"
+                                     Margin="125,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                     Checked="MemberInput_Checked"/>
+                        <RadioButton x:Name="MemberFunktionärIndifferentInput" Content="Egal" GroupName="MemberFunktionär"
+                                     Margin="180,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                     Checked="MemberInput_Checked"/>
+
+                        <Label Content="Vtrg.:" x:Name="MemberAreaComLabel" Margin="10,260,0,10"/>
                        <ctrl:CheckComboBox x:Name="MemberAreaComInput" AllItemsSelectedContent="Alle Vertragsarten" Delimiter=", " DisplayMemberPath="VtrgId"
                                            IsSelectAllActive="True" SelectAllContent="Alle Vertragsarten"
-                                            Margin="50,180,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                            Margin="50,260,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                            SelectionChanged="MemberInput_SelectionChanged"/>
+
+                        <Label Content="Tag:" x:Name="MemberDeliveryAncmtLabel" Margin="10,260,0,10"/>
+                        <ctrl:CheckComboBox x:Name="MemberDeliveryAncmtInput" AllItemsSelectedContent="Alle Lesepläne" Delimiter=", " DisplayMemberPath="Identifier"
+                                            IsSelectAllActive="True" SelectAllContent="Alle Lesepläne"
+                                            Margin="50,260,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                            SelectionChanged="MemberInput_SelectionChanged"/>

                        <ctrl:CheckComboBox x:Name="MemberCustomInput" AllItemsSelectedContent="Alle Mitglieder" Delimiter=", " DisplayMemberPath="AdministrativeName"
                                            IsSelectAllActive="True" SelectAllContent="Alle Mitglieder"
-                                            Margin="10,120,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                            Margin="10,140,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                            SelectionChanged="MemberInput_SelectionChanged"/>
                    </Grid>
                </GroupBox>
--- a/Elwig/Windows/MailWindow.xaml.cs
+++ b/Elwig/Windows/MailWindow.xaml.cs
@ -116,6 +116,9 @@ namespace Elwig.Windows {
            CreditNoteFooterInput.Visibility = Visibility.Hidden;
            RecipientsActiveMembersInput.IsChecked = true;

+            MemberOrganicIndifferentInput.IsChecked = true;
+            MemberFunktionärIndifferentInput.IsChecked = true;
+
            DeliveryConfirmationFooterInput.Text = App.Client.TextDeliveryConfirmation;
            CreditNoteFooterInput.Text = App.Client.TextCreditNote;

@ -164,9 +167,20 @@ namespace Elwig.Windows {
                MemberAreaComInput.SelectAll();
                MemberAreaComInput.SelectionChanged += MemberInput_SelectionChanged;
            }
+            ControlUtils.RenewItemsSource(MemberDeliveryAncmtInput, await ctx.DeliverySchedules
+                .Where(s => s.Year == Year)
+                .OrderBy(s => s.DateString)
+                .ThenBy(s => s.Branch.Name)
+                .ThenBy(s => s.Description)
+                .ToListAsync(), MemberInput_SelectionChanged);
+            if (MemberDeliveryAncmtInput.SelectedItems.Count == 0) {
+                MemberDeliveryAncmtInput.SelectionChanged -= MemberInput_SelectionChanged;
+                MemberDeliveryAncmtInput.SelectAll();
+                MemberDeliveryAncmtInput.SelectionChanged += MemberInput_SelectionChanged;
+            }
            ControlUtils.RenewItemsSource(MemberCustomInput, await ctx.Members
                .Where(m => m.IsActive)
-                .OrderBy(m => m.FamilyName)
+                .OrderBy(m => m.Name)
                .ThenBy(m => m.GivenName)
                .Include(m => m.Branch)
                .Include(m => m.DefaultWbKg!.AtKg)
@ -291,8 +305,18 @@ namespace Elwig.Windows {
            MemberBranchInput.Visibility = vis;
            MemberKgLabel.Visibility = vis;
            MemberKgInput.Visibility = vis;
+            MemberOrganicLabel.Visibility = vis;
+            MemberOrganicYesInput.Visibility = vis;
+            MemberOrganicNoInput.Visibility = vis;
+            MemberOrganicIndifferentInput.Visibility = vis;
+            MemberFunktionärLabel.Visibility = vis;
+            MemberFunktionärYesInput.Visibility = vis;
+            MemberFunktionärNoInput.Visibility = vis;
+            MemberFunktionärIndifferentInput.Visibility = vis;
            MemberAreaComInput.Visibility = RecipientsAreaComMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
            MemberAreaComLabel.Visibility = RecipientsAreaComMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
+            MemberDeliveryAncmtInput.Visibility = RecipientsDeliveryAncmtMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
+            MemberDeliveryAncmtLabel.Visibility = RecipientsDeliveryAncmtMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
            MemberCustomInput.Visibility = RecipientsCustomInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
            using var ctx = new AppDbContext();
            await UpdateRecipients(ctx);
@ -303,6 +327,11 @@ namespace Elwig.Windows {
            await UpdateRecipients(ctx);
        }

+        private async void MemberInput_Checked(object sender, RoutedEventArgs evt) {
+            using var ctx = new AppDbContext();
+            await UpdateRecipients(ctx);
+        }
+
        private void Date_TextChanged(object sender, RoutedEventArgs evt) {
            Validator.CheckDate((TextBox)sender, true);
        }
@ -325,10 +354,23 @@ namespace Elwig.Windows {
                    var kgs = MemberKgInput.SelectedItems.Cast<AT_Kg>().Select(k => k.KgNr).ToList();
                    query = query.Where(m => kgs.Contains((int)m.DefaultKgNr!));
                }
+                if (MemberOrganicYesInput.IsChecked == true) {
+                    query = query.Where(m => m.IsOrganic);
+                } else if (MemberOrganicNoInput.IsChecked == true) {
+                    query = query.Where(m => !m.IsOrganic);
+                }
+                if (MemberFunktionärYesInput.IsChecked == true) {
+                    query = query.Where(m => m.IsFunktionär);
+                } else if (MemberFunktionärNoInput.IsChecked == true) {
+                    query = query.Where(m => !m.IsFunktionär);
+                }

                if (RecipientsAreaComMembersInput.IsChecked == true) {
                    var vtrg = MemberAreaComInput.SelectedItems.Cast<AreaComType>().Select(a => a.VtrgId).ToList();
                    query = query.Where(m => m.IsActive && m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Year)).Any(c => vtrg.Contains(c.VtrgId)));
+                } else if (RecipientsDeliveryAncmtMembersInput.IsChecked == true) {
+                    var dsnrs = MemberDeliveryAncmtInput.SelectedItems.Cast<DeliverySchedule>().Select(s => s.DsNr).ToList();
+                    query = query.Where(m => m.Announcements.Any(a => a.Year == Year && dsnrs.Contains(a.DsNr)));
                } else if (RecipientsDeliveryMembersInput.IsChecked == true) {
                    query = query.Where(m => m.Deliveries.Any(d => d.Year == Year));
                } else if (RecipientsNonDeliveryMembersInput.IsChecked == true) {
@ -438,7 +480,7 @@ namespace Elwig.Windows {
                    .ToList();
            } else if (OrderNameInput.IsChecked == true) {
                recipients = recipients
-                    .OrderBy(m => m.FamilyName)
+                    .OrderBy(m => m.Name)
                    .ThenBy(m => m.GivenName)
                    .ThenBy(m => m.MgNr)
                    .ToList();
@ -447,7 +489,7 @@ namespace Elwig.Windows {
                    recipients = recipients
                        .OrderBy(m => m.BillingAddress?.PostalDest.AtPlz?.Plz ?? m.PostalDest.AtPlz?.Plz)
                        .ThenBy(m => m.BillingAddress?.PostalDest.AtPlz?.Ort.Name ?? m.PostalDest.AtPlz?.Ort.Name)
-                        .ThenBy(m => m.FamilyName)
+                        .ThenBy(m => m.Name)
                        .ThenBy(m => m.GivenName)
                        .ThenBy(m => m.MgNr)
                        .ToList();
@ -455,7 +497,7 @@ namespace Elwig.Windows {
                    recipients = recipients
                        .OrderBy(m => m.PostalDest.AtPlz?.Plz)
                        .ThenBy(m => m.PostalDest.AtPlz?.Ort.Name)
-                        .ThenBy(m => m.FamilyName)
+                        .ThenBy(m => m.Name)
                        .ThenBy(m => m.GivenName)
                        .ThenBy(m => m.MgNr)
                        .ToList();
@ -473,7 +515,7 @@ namespace Elwig.Windows {
                        var b = new Billing(year);
                        await b.FinishSeason();
                        await b.CalculateBuckets();
-                        await App.HintContextChange();
+                        App.HintContextChange();

                        dcData[year] = await DeliveryConfirmationDeliveryData.ForSeason(ctx.DeliveryParts, year);
                    } catch (Exception exc) {
--- a/Elwig/Windows/MainWindow.xaml
+++ b/Elwig/Windows/MainWindow.xaml
@ -25,6 +25,9 @@
                <MenuItem Header="Abfragen stellen" Click="Menu_Database_Query_Click"/>
                <MenuItem Header="Speicherort öffnen..." Click="Menu_Database_Open_Click"/>
            </MenuItem>
+            <MenuItem Header="Waage">
+                <MenuItem Header="Datum und Uhrzeit setzen" Click="Menu_Scale_SetDateTime_Click"/>
+            </MenuItem>
            <MenuItem x:Name="HelpMenu" Header="Hilfe">
                <MenuItem Header="Über"/>
                <MenuItem x:Name="Menu_Help_Update" Header="Nach Updates suchen" Click="Menu_Help_Update_Click"/>
@ -64,7 +67,7 @@
                Margin="205,210,0,0"/>
        <Button x:Name="BaseDataButton" Content="Stammdaten" Click="BaseDataButton_Click"
                Margin="0,250,205,0"/>
-        <Button x:Name="RegistrationButton" Content="Anmeldungen" IsEnabled="False"
+        <Button x:Name="DeliveryAncmtButton" Content="Anmeldungen" Click="DeliveryAncmtButton_Click"
                Margin="205,250,0,0"/>

        <Button x:Name="DownloadButton" Click="DownloadButton_Click"
--- a/Elwig/Windows/MainWindow.xaml.cs
+++ b/Elwig/Windows/MainWindow.xaml.cs
@ -13,6 +13,7 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@ -37,13 +38,21 @@ namespace Elwig.Windows {
        }

        private void Window_Closing(object sender, CancelEventArgs evt) {
-            if (App.NumWindows > 1 && !App.ForceShutdown && !App.Current.Windows.Cast<Window>().Any(w => ((w as AdministrationWindow)?.IsEditing ?? false) || ((w as AdministrationWindow)?.IsCreating ?? false))) {
-                var res = MessageBox.Show("Es sind noch weitere Fenster geöffnet.\nSollen alle Fenster geschlossen werden?",
-                    "Elwig beenden", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
-                if (res != MessageBoxResult.Yes) {
-                    evt.Cancel = true;
-                } else {
-                    Application.Current.Shutdown();
+            if (App.NumWindows > 1 && !App.ForceShutdown) {
+                foreach (var w in App.Current.Windows.Cast<Window>().Where(w => ((w as AdministrationWindow)?.IsEditing ?? false) || ((w as AdministrationWindow)?.IsCreating ?? false))) {
+                    try {
+                        w.Close();
+                    } catch { }
+                }
+                Thread.Sleep(100);
+                if (App.NumWindows > 1 && !App.Current.Windows.Cast<Window>().Any(w => ((w as AdministrationWindow)?.IsEditing ?? false) || ((w as AdministrationWindow)?.IsCreating ?? false))) {
+                    var res = MessageBox.Show("Es sind noch weitere Fenster geöffnet.\nSollen alle Fenster geschlossen werden?",
+                        "Elwig beenden", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+                    if (res != MessageBoxResult.Yes) {
+                        evt.Cancel = true;
+                    } else {
+                        Application.Current.Shutdown();
+                    }
                }
            }
        }
@ -81,6 +90,21 @@ namespace Elwig.Windows {
            } catch { }
        }

+        private async void Menu_Scale_SetDateTime_Click(object sender, RoutedEventArgs evt) {
+            if (App.CommandScales.Count == 0) {
+                MessageBox.Show("Es sind keine geeigneten Waagen verfügbar!", "Datum und Uhrzeit setzen", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+            foreach (var s in App.CommandScales) {
+                try {
+                    await s.SetDateAndTime(DateTime.Now);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+            MessageBox.Show("Datum und Uhrzeit auf entsprechenden Waagen gesetzt!", "Datum und Uhrzeit setzen", MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+
        private void Menu_Database_Query_Click(object sender, RoutedEventArgs evt) {
            var w = new QueryWindow();
            w.Show();
@ -204,6 +228,10 @@ namespace Elwig.Windows {
            w.Show();
        }

+        private void DeliveryAncmtButton_Click(object sender, RoutedEventArgs evt) {
+            App.FocusDeliveryAncmt();
+        }
+
        private void BaseDataButton_Click(object sender, RoutedEventArgs evt) {
            App.FocusBaseData();
        }
@ -259,7 +287,7 @@ namespace Elwig.Windows {
                var b = new Billing(year);
                await b.FinishSeason();
                await b.CalculateBuckets();
-                await App.HintContextChange();
+                App.HintContextChange();

                using var ctx = new AppDbContext();
                var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, year);
@ -298,7 +326,7 @@ namespace Elwig.Windows {
                var b = new Billing(year);
                await b.FinishSeason();
                await b.CalculateBuckets();
-                await App.HintContextChange();
+                App.HintContextChange();

                using var ctx = new AppDbContext();
                using var ods = new OdsFile(d.FileName);
--- a/Elwig/Windows/MemberAdminWindow.xaml
+++ b/Elwig/Windows/MemberAdminWindow.xaml
@ -199,7 +199,7 @@
                            </Style>
                        </DataGridTextColumn.CellStyle>
                    </DataGridTextColumn>
-                    <DataGridTextColumn Header="Nachname" Binding="{Binding FamilyName}" Width="140"/>
+                    <DataGridTextColumn Header="Nachname" Binding="{Binding Name}" Width="140"/>
                    <DataGridTextColumn Header="Vorname" Binding="{Binding GivenName}" Width="140"/>
                    <DataGridTextColumn Header="GA" Binding="{Binding BusinessShares, StringFormat='{}{0} '}" Width="40">
                        <DataGridTextColumn.CellStyle>
@ -208,7 +208,7 @@
                            </Style>
                        </DataGridTextColumn.CellStyle>
                    </DataGridTextColumn>
-                    <DataGridTextColumn Header="Rechnungsadresse" Binding="{Binding BillingAddress.Name}" Width="200"/>
+                    <DataGridTextColumn Header="Rechnungsadresse" Binding="{Binding BillingAddress.FullName}" Width="200"/>
                </DataGrid.Columns>
            </DataGrid>

@ -285,6 +285,9 @@
                    <TextBox x:Name="MgNrInput" Text="{Binding MgNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                             Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
                             TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus"/>
+                    <CheckBox x:Name="JuridicalPersonInput" Content="Juristische Person" IsChecked="{Binding IsJuridicalPerson}"
+                              Checked="JuridicalPersonInput_Changed" Unchecked="JuridicalPersonInput_Changed"
+                              Margin="53,15,0,0" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"/>

                    <Label Content="Vorg.:" Margin="10,10,0,0" Grid.Column="2"/>
                    <TextBox x:Name="PredecessorMgNrInput" Text="{Binding PredecessorMgNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
@ -294,27 +297,33 @@
                            Margin="53,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left" IsEnabled="{Binding EnableMemberReferenceButton}" ToolTip="Zu Vorgänger springen"
                            Click="MemberReferenceButton_Click"/>

-                    <Label Content="Präfix:" Margin="10,40,0,0" Grid.Column="2"/>
-                    <TextBox x:Name="PrefixInput" Text="{Binding Prefix, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                    <Label Content="Präfix:" Margin="10,40,0,0" Grid.Column="2" Visibility="{Binding PersonalNameVisibility}"/>
+                    <TextBox x:Name="PrefixInput" Text="{Binding Prefix, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding PersonalNameVisibility}"
                             Margin="0,40,10,0" Grid.Column="3"
                             TextChanged="TextBox_TextChanged"/>

-                    <Label Content="Vorname:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="GivenNameInput" Text="{Binding GivenName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                    <Label Content="Name:" Margin="10,40,0,0" Grid.Column="0" Visibility="{Binding JuridicalNameVisibility}"/>
+                    <Label Content="Vorname:" Margin="10,40,0,0" Grid.Column="0" Visibility="{Binding PersonalNameVisibility}"/>
+                    <TextBox x:Name="GivenNameInput" Text="{Binding GivenName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding PersonalNameVisibility}"
                             Margin="0,40,0,0" Grid.Column="1"
                             TextChanged="TextBox_TextChanged"/>

-                    <Label Content="Nachname:" Margin="10,70,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="FamilyNameInput" Text="{Binding FamilyName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                    <Label Content="Nachname:" Margin="10,70,0,0" Grid.Column="0" Visibility="{Binding PersonalNameVisibility}"/>
+                    <TextBox x:Name="NameInput" Text="{Binding Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                             Margin="0,70,0,0" Grid.Column="1"
                             TextChanged="TextBox_TextChanged"/>

-                    <Label Content="Suffix:" Margin="10,70,0,0" Grid.Column="2"/>
-                    <TextBox x:Name="SuffixInput" Text="{Binding Suffix, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                    <Label Content="Zu Handen:" Margin="10,70,0,0" Grid.Column="0" Visibility="{Binding JuridicalNameVisibility}"/>
+                    <TextBox x:Name="AttnInput" Text="{Binding ForTheAttentionOf, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding JuridicalNameVisibility}"
+                             Margin="0,70,10,0" Grid.Column="1" Grid.ColumnSpan="3"
+                             TextChanged="TextBox_TextChanged"/>
+
+                    <Label Content="Suffix:" Margin="10,70,0,0" Grid.Column="2" Visibility="{Binding PersonalNameVisibility}"/>
+                    <TextBox x:Name="SuffixInput" Text="{Binding Suffix, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding PersonalNameVisibility}"
                             Margin="0,70,10,0" Grid.Column="3"
                             TextChanged="TextBox_TextChanged"/>

-                    <Label Content="Geburtstag:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <Label x:Name="BirthdayLabel" Content="Geburtstag:" Margin="10,100,0,0" Grid.Column="0"/>
                    <TextBox x:Name="BirthdayInput" Text="{Binding Birthday, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                             Margin="0,100,0,0" Grid.Column="1" Width="78" TextAlignment="Right" HorizontalAlignment="Left"
                             TextChanged="PartialDateInput_TextChanged" LostFocus="PartialDateInput_LostFocus"/>
@ -637,7 +646,7 @@
            </GroupBox>
        </Grid>

-        <StatusBar Grid.Row="5" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
+        <StatusBar Grid.Row="2" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
            <StatusBar.ItemsPanel>
                <ItemsPanelTemplate>
                    <Grid>
--- a/Elwig/Windows/MemberAdminWindow.xaml.cs
+++ b/Elwig/Windows/MemberAdminWindow.xaml.cs
@ -41,7 +41,7 @@ namespace Elwig.Windows {
                SearchInput, ActiveMemberInput, MemberList,
            ];
            RequiredInputs = [
-                MgNrInput, GivenNameInput, FamilyNameInput,
+                MgNrInput, GivenNameInput, NameInput,
                AddressInput, PlzInput, OrtInput, BillingOrtInput,
                BusinessSharesInput, BranchInput, DefaultKgInput
            ];
@ -130,8 +130,9 @@ namespace Elwig.Windows {
                var dict = members.AsParallel()
                    .ToDictionary(m => m, m => m.SearchScore(filter))
                    .OrderByDescending(a => a.Value)
-                    .ThenBy(a => a.Key.FamilyName)
-                    .ThenBy(a => a.Key.GivenName);
+                    .ThenBy(a => a.Key.Name)
+                    .ThenBy(a => a.Key.GivenName)
+                    .ThenBy(a => a.Key.MgNr);
                var threshold = dict.Select(a => a.Value).Max() * 3 / 4;
                members = dict
                    .Where(a => a.Value > threshold)
@ -139,8 +140,9 @@ namespace Elwig.Windows {
                    .ToList();
            } else {
                members = members
-                    .OrderBy(m => m.FamilyName)
+                    .OrderBy(m => m.Name)
                    .ThenBy(m => m.GivenName)
+                    .ThenBy(m => m.MgNr)
                    .ToList();
            }

@ -148,6 +150,9 @@ namespace Elwig.Windows {
                MemberList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
            if (updateSort && MemberList.SelectedItem != null)
                MemberList.ScrollIntoView(MemberList.SelectedItem);
+
+            ViewModel.StatusMembers = $"{members.Count:N0} ({await ctx.Members.CountAsync():N0})";
+            ViewModel.StatusBusinessShares = $"{members.Sum(m => m.BusinessShares):N0} ({await ctx.Members.SumAsync(m => m.BusinessShares):N0})";
        }

        private async Task RefreshInputs(bool validate = false) {
@ -167,7 +172,7 @@ namespace Elwig.Windows {
            GC.Collect();
        }

-        private async void InitInputs() {
+        private async Task InitInputs() {
            ClearOriginalValues();
            ClearDefaultValues();
            await ViewModel.InitInputs();
@ -235,7 +240,6 @@ namespace Elwig.Windows {
            var mM = Math.Max(mA.Length, Math.Max(mI.Length, mT.Length));
            var mS = mM > 3;
            if (mS) mM--;
-            ViewModel.StatusMembers = $"{mA} ({mT})";
            ViewModel.StatusMembersToolTip =
                $"{new string(s1, Math.Max(0, mM - mA.Length))}{(mS && mA.Length < 4 ? s2 : "")}{mA} aktive Mitglieder\n" +
                $"{new string(s1, Math.Max(0, mM - mI.Length))}{(mS && mI.Length < 4 ? s2 : "")}{mI} nicht aktive Mitglieder\n" +
@ -247,7 +251,6 @@ namespace Elwig.Windows {
            var bM = Math.Max(bA.Length, Math.Max(bI.Length, bT.Length));
            var bS = bM > 3;
            if (bS) bM--;
-            ViewModel.StatusBusinessShares = $"{bA} ({bT})";
            ViewModel.StatusBusinessSharesToolTip =
                $"{new string(s1, Math.Max(0, bM - bA.Length))}{(bS && bA.Length < 4 ? s2 : "")}{bA} Geschäftsanteile von aktiven Mitgliedern\n" +
                $"{new string(s1, Math.Max(0, bM - bI.Length))}{(bS && bI.Length < 4 ? s2 : "")}{bI} Geschäftsanteile von nicht aktiven Mitgliedern\n" +
@ -301,7 +304,7 @@ namespace Elwig.Windows {
            NewMemberButton_Click(null, null);
        }

-        private void NewMemberButton_Click(object? sender, RoutedEventArgs? evt) {
+        private async void NewMemberButton_Click(object? sender, RoutedEventArgs? evt) {
            IsCreating = true;
            MemberList.IsEnabled = false;
            ViewModel.SelectedMember = null;
@ -311,7 +314,7 @@ namespace Elwig.Windows {
            ShowSaveResetCancelButtons();
            UnlockInputs();
            UpdateContactInfoVisibility(true);
-            InitInputs();
+            await InitInputs();
            ViewModel.EnableSearchInputs = false;
        }

@ -371,7 +374,7 @@ namespace Elwig.Windows {
                        ctx.Remove(l);
                        await ctx.SaveChangesAsync();
                    }
-                    await App.HintContextChange();
+                    App.HintContextChange();
                } catch (Exception exc) {
                    var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@ -425,7 +428,7 @@ namespace Elwig.Windows {
                await RefreshInputs();
            } else if (IsCreating) {
                ClearInputs();
-                InitInputs();
+                await InitInputs();
            }
            UpdateButtons();
        }
@ -726,7 +729,7 @@ namespace Elwig.Windows {
        private async void PredecessorMgNrInput_LostFocus(object sender, RoutedEventArgs evt) {
            var valid = InputLostFocus((TextBox)sender, Validator.CheckPredecessorMgNr);
            if (valid && ViewModel.PredecessorMgNr is int mgnr && (IsEditing || IsCreating)) {
-                if (MemberList.SelectedItem is not Member m || m.MgNr == mgnr)
+                if (ViewModel.MgNr == mgnr)
                    return;
                using var ctx = new AppDbContext();
                var areaComs = await ctx.AreaCommitments
@ -736,11 +739,17 @@ namespace Elwig.Windows {
                    return;

                var oldMember = (await ctx.Members.FindAsync(mgnr))!;
-                var d = new AreaComDialog(oldMember.AdministrativeName, m.AdministrativeName, areaComs.Count, areaComs.Sum(c => c.Area));
+                var newName = $"{ViewModel.Name?.Replace('ß', 'ẞ').ToUpper()} " +
+                    $"{ViewModel.Prefix}{(!string.IsNullOrEmpty(ViewModel.Prefix) ? " " : "")}" +
+                    $"{ViewModel.GivenName}{(!string.IsNullOrEmpty(ViewModel.GivenName) ? " " : "")}" +
+                    $"{ViewModel.Suffix}{(!string.IsNullOrEmpty(ViewModel.Suffix) ? " " : "")}";
+                var d = new AreaComDialog(oldMember.AdministrativeName, newName, areaComs.Count, areaComs.Sum(c => c.Area));
                if (d.ShowDialog() != true)
                    return;
                ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason;
-                SetOriginalValue(PredecessorMgNrInput, -1);  // hack to allow user to save
+                ViewModel.MaintainAreaComYearTo = d.MaintainYearTo;
+                if (IsEditing)
+                    SetOriginalValue(PredecessorMgNrInput, -1);  // hack to allow user to save
                UpdateButtons();
            }
        }
@ -760,6 +769,7 @@ namespace Elwig.Windows {
        }

        private void ContactEmailInput_Changed(object sender, RoutedEventArgs evt) {
+            CheckBox_Changed(sender, evt);
            EmailAddressInput_TextChanged(EmailAddress1Input, new TextChangedEventArgs(evt.RoutedEvent, UndoAction.None));
        }

@ -775,7 +785,7 @@ namespace Elwig.Windows {
            if (ViewModel.SelectedMember is not Member m) return;
            var url = "https://www.easy-cert.com/htm/suchergebnis.htm?" +
                //$"CustomerNumber={m.LfbisNr}&" +
-                $"Name={(m.BillingAddress?.Name ?? m.Name).Replace(' ', '+')}&" +
+                $"Name={(m.BillingAddress?.FullName ?? m.FullName).Replace(' ', '+')}&" +
                $"PostalCode={(m.BillingAddress?.PostalDest ?? m.PostalDest).AtPlz?.Plz}";
            Process.Start(new ProcessStartInfo(url) {
                UseShellExecute = true,
@ -804,5 +814,26 @@ namespace Elwig.Windows {
            }
            CheckBox_Changed(sender, evt);
        }
+
+        private void JuridicalPersonInput_Changed(object sender, RoutedEventArgs evt) {
+            CheckBox_Changed(sender, evt);
+            if (ViewModel.IsJuridicalPerson) {
+                ViewModel.PersonalNameVisibility = Visibility.Hidden;
+                ViewModel.JuridicalNameVisibility = Visibility.Visible;
+                NameInput.Margin = new(0, 40, 10, 0);
+                NameInput.SetValue(Grid.ColumnSpanProperty, 3);
+                BirthdayLabel.Content = "Gründung:";
+                DeceasedInput.Content = "Aufgelöst";
+            } else {
+                ViewModel.JuridicalNameVisibility = Visibility.Hidden;
+                ViewModel.PersonalNameVisibility = Visibility.Visible;
+                NameInput.Margin = new(0, 70, 0, 0);
+                NameInput.SetValue(Grid.ColumnSpanProperty, 1);
+                BirthdayLabel.Content = "Geburtstag:";
+                DeceasedInput.Content = "Verstorben";
+            }
+            ValidateRequiredInputs();
+            UpdateButtons();
+        }
    }
 }
--- a/Elwig/Windows/OriginHierarchyWindow.xaml.cs
+++ b/Elwig/Windows/OriginHierarchyWindow.xaml.cs
@ -191,7 +191,7 @@ namespace Elwig.Windows {
                    }
                    await ctx.SaveChangesAsync();
                }
-                await App.HintContextChange();
+                App.HintContextChange();
                ControlUtils.SelectItemWithPk(WbGlKgs, k.KgNr);
            } catch (Exception exc) {
                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@ -211,7 +211,7 @@ namespace Elwig.Windows {
                    ctx.Remove(k.WbKg);
                    await ctx.SaveChangesAsync();
                }
-                await App.HintContextChange();
+                App.HintContextChange();
                ControlUtils.SelectItemWithPk(WbKgs, k.KgNr);
            } catch (Exception exc) {
                await HintContextChange();
--- a/Elwig/Windows/PaymentAdjustmentWindow.xaml
+++ b/Elwig/Windows/PaymentAdjustmentWindow.xaml
@ -6,7 +6,7 @@
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        xmlns:local="clr-namespace:Elwig.Windows"
        xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="Auszahlung anpassen - Elwig" Height="600" Width="1000" MinHeight="400" MinWidth="850">
+        Title="Auszahlung anpassen - Elwig" Height="600" Width="1000" MinHeight="560" MinWidth="850">
    <Window.Resources>
        <ctrl:UnitConverter x:Key="CurrencyConverter" Precision="2" Unit="€"/>
        <ctrl:UnitConverter x:Key="WeightConverter" Precision="0" Unit="kg"/>
@ -74,7 +74,7 @@
                            </Style>
                        </DataGridTextColumn.CellStyle>
                    </DataGridTextColumn>
-                    <DataGridTextColumn Header="Nachname" Binding="{Binding FamilyName}" Width="100"/>
+                    <DataGridTextColumn Header="Nachname" Binding="{Binding Name}" Width="100"/>
                    <DataGridTextColumn Header="Vorname" Binding="{Binding GivenName}" Width="90"/>
                    <DataGridTextColumn Header="GA" Binding="{Binding BusinessShares, StringFormat='{}{0:N0} '}" Width="35">
                        <DataGridTextColumn.CellStyle>
@ -83,6 +83,20 @@
                            </Style>
                        </DataGridTextColumn.CellStyle>
                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Abs." Binding="{Binding ModAbs, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="65">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Rel." Binding="{Binding ModRel, StringFormat='{}{0:P2} '}" Width="65">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
                    <DataGridTextColumn Header="Ü.-/U.-Lfrg." Binding="{Binding OverUnder, Converter={StaticResource WeightConverter},StringFormat='{}{0} '}" Width="70">
                        <DataGridTextColumn.CellStyle>
                            <Style>
@ -118,7 +132,7 @@
                            </Style>
                        </DataGridTextColumn.CellStyle>
                    </DataGridTextColumn>
-                    <DataGridTextColumn Header="Weitere" Binding="{Binding Custom, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="65">
+                    <DataGridTextColumn Header="Weitere" Binding="{Binding CustomAmount, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="65">
                        <DataGridTextColumn.CellStyle>
                            <Style>
                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@ -139,7 +153,7 @@
        <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>

        <Grid Grid.Column="2" Grid.Row="1">
-            <GroupBox Header="Benutzerdefinierte Zu-/Abschläge" Margin="5,10,10,10" Height="180" Width="365"
+            <GroupBox Header="Benutzerdefinierte Zu-/Abschläge" Margin="5,10,10,10" Height="270" Width="365"
                      VerticalAlignment="Top" HorizontalAlignment="Left">
                <Grid>
                    <Label Content="Mitglied:" Margin="10,10,10,10"/>
@ -153,12 +167,23 @@
                            Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Right" ToolTip="Zu Mitglied springen"
                            Click="MemberReferenceButton_Click"/>

-                    <Label Content="Betrag:" Margin="10,40,10,10"/>
-                    <ctrl:UnitTextBox x:Name="CustomAmountInput" Width="80" Margin="70,40,10,10" Unit="€"
+                    <Label Content="Vor MwSt." Margin="70,37.5,10,10"/>
+                    <Label Content="Betrag:" Margin="10,60,10,10"/>
+                    <ctrl:UnitTextBox x:Name="CustomModAbsInput" Width="80" Margin="70,60,10,10" Unit="€"
+                                      TextChanged="CustomModAbsInput_TextChanged"/>
+                    <ctrl:UnitTextBox x:Name="CustomModRelInput" Width="60" Margin="155,60,10,10" Unit="%"
+                                      TextChanged="CustomModRelInput_TextChanged"/>
+
+                    <Label Content="Freitext:" Margin="10,90,10,10"/>
+                    <TextBox x:Name="CustomModCommentInput" Margin="70,90,10,10"/>
+
+                    <Label Content="Nach MwSt." Margin="70,117.5,10,10"/>
+                    <Label Content="Betrag:" Margin="10,140,10,10"/>
+                    <ctrl:UnitTextBox x:Name="CustomAmountInput" Width="80" Margin="70,140,10,10" Unit="€"
                                      TextChanged="CustomAmountInput_TextChanged"/>

-                    <Label Content="Freitext:" Margin="10,70,10,10"/>
-                    <TextBox x:Name="CustomCommentInput" Margin="70,70,10,10"/>
+                    <Label Content="Freitext:" Margin="10,170,10,10"/>
+                    <TextBox x:Name="CustomCommentInput" Margin="70,170,10,10"/>

                    <Button x:Name="SaveCustomButton" Content="Speichern" Margin="0,0,125,10" Width="120"
                            HorizontalAlignment="Center" VerticalAlignment="Bottom"
--- a/Elwig/Windows/PaymentAdjustmentWindow.xaml.cs
+++ b/Elwig/Windows/PaymentAdjustmentWindow.xaml.cs
@ -45,12 +45,12 @@ namespace Elwig.Windows {
            var members = await ctx.Members
                .Select(m => new {
                    m.MgNr,
-                    m.FamilyName,
+                    m.Name,
                    m.GivenName,
                    m.BusinessShares,
                    m.IsActive,
                })
-                .OrderBy(m => m.FamilyName)
+                .OrderBy(m => m.Name)
                .ThenBy(m => m.GivenName)
                .ThenBy(m => m.MgNr)
                .ToListAsync();
@ -70,7 +70,7 @@ namespace Elwig.Windows {

            var list = members
                .Select(m => new {
-                    m.MgNr, m.FamilyName, m.GivenName,
+                    m.MgNr, m.Name, m.GivenName,
                    m.IsActive,
                    BusinessShares = m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0),
                    DeliveryObligation = (m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0)) * season.MinKgPerBusinessShare,
@ -78,7 +78,7 @@ namespace Elwig.Windows {
                    Adjust = history.TryGetValue(m.MgNr, out int v2) ? (int?)v2 : null,
                })
                .Select(m => new {
-                    m.MgNr, m.FamilyName, m.GivenName,
+                    m.MgNr, m.Name, m.GivenName,
                    m.BusinessShares,
                    Weight = weight.GetValueOrDefault(m.MgNr, 0),
                    OverUnder = weight.TryGetValue(m.MgNr, out int v1) ?
@ -89,7 +89,7 @@ namespace Elwig.Windows {
                    AdjustAmount = m.Adjust * -season.BusinessShareValue,
                })
                .Select(m => new {
-                    m.MgNr, m.FamilyName, m.GivenName,
+                    m.MgNr, m.Name, m.GivenName,
                    m.BusinessShares, m.Weight, m.OverUnder,
                    PenaltyBs = m.OverUnder != null && m.OverUnder < 0 ?
                        (season.PenaltyPerKg * m.OverUnder ?? 0) +
@ -103,34 +103,36 @@ namespace Elwig.Windows {
                        }).Sum() : (decimal?)null,
                    m.Adjust,
                    m.AdjustAmount,
-                    Custom = CustomPayments!.GetValueOrDefault(m.MgNr, null)?.Amount,
+                    Custom = CustomPayments!.GetValueOrDefault(m.MgNr, null),
                })
                .Select(m => new {
-                    m.MgNr, m.FamilyName, m.GivenName,
+                    m.MgNr, m.Name, m.GivenName,
                    m.BusinessShares, m.Weight, m.OverUnder,
                    PenaltyBs = m.PenaltyBs == null || m.PenaltyBs == 0 ? (decimal?)null : Math.Round((decimal)m.PenaltyBs, 2),
                    PenaltyAc = m.PenaltyAc == null ? (decimal?)null : Math.Round((decimal)m.PenaltyAc, 2),
                    m.Adjust,
                    AdjustAmount = m.AdjustAmount == null ? (decimal?)null : Math.Round((decimal)m.AdjustAmount, 2),
-                    m.Custom
+                    CustomAmount = m.Custom?.Amount,
+                    ModAbs = m.Custom?.ModAbs,
+                    ModRel = m.Custom?.ModRel,
                })
                .Select(m => new {
-                    m.MgNr, m.FamilyName, m.GivenName,
+                    m.MgNr, m.Name, m.GivenName,
                    m.BusinessShares, m.Weight, m.OverUnder,
-                    m.PenaltyBs, m.PenaltyAc, m.Adjust, m.AdjustAmount, m.Custom,
-                    Total = (m.PenaltyBs ?? 0) + (m.PenaltyAc ?? 0) + (m.AdjustAmount ?? 0) + (m.Custom ?? 0),
+                    m.PenaltyBs, m.PenaltyAc, m.Adjust, m.AdjustAmount, m.CustomAmount, m.ModAbs, m.ModRel,
+                    Total = (m.PenaltyBs ?? 0) + (m.PenaltyAc ?? 0) + (m.AdjustAmount ?? 0) + (m.CustomAmount ?? 0),
                })
                .Select(m => new {
-                    m.MgNr, m.FamilyName, m.GivenName,
+                    m.MgNr, m.Name, m.GivenName,
                    m.BusinessShares, m.Weight, m.OverUnder,
-                    m.PenaltyBs, m.PenaltyAc, m.Adjust, m.AdjustAmount, m.Custom,
+                    m.PenaltyBs, m.PenaltyAc, m.Adjust, m.AdjustAmount, m.CustomAmount, m.ModAbs, m.ModRel,
                    m.Total,
                    Background = m.Weight == 0 ? Brushes.Orange : m.Weight / 2 < -m.Total ? Brushes.Red : Brushes.White,
                    Foreground = m.Total == 0 ? Brushes.Gray : Brushes.Black,
                })
-                .Where(m => m.OverUnder != null || m.Adjust != null || m.PenaltyBs != null || m.PenaltyAc != null || m.Custom != null)
+                .Where(m => m.OverUnder != null || m.Adjust != null || m.PenaltyBs != null || m.PenaltyAc != null || m.CustomAmount != null || m.ModAbs != null || m.ModRel != null)
                .OrderByDescending(m => m.OverUnder ?? 0)
-                .ThenBy(m => m.FamilyName)
+                .ThenBy(m => m.Name)
                .ThenBy(m => m.GivenName)
                .ThenBy(m => m.MgNr)
                .ToList();
@ -141,12 +143,12 @@ namespace Elwig.Windows {
            PenaltyBusinessShares.Text = $"{list.Count(r => r.PenaltyBs != null && r.PenaltyBs != 0)} Mg. / {list.Sum(r => r.PenaltyBs):N2} {sym}";
            PenaltyAreaCommitments.Text = $"{list.Count(r => r.PenaltyAc != null && r.PenaltyAc != 0)} Mg. / {list.Sum(r => r.PenaltyAc):N2} {sym}";
            AutoBusinessShareAdjustment.Text = $"{list.Count(r => r.Adjust > 0)} Mg. / {list.Sum(r => r.Adjust)} GA / {list.Sum(r => r.AdjustAmount):N2} {sym}";
-            CustomModifiers.Text = $"{list.Count(r => r.Custom != null)} Mg. / {list.Sum(r => r.Custom):N2} {sym}";
+            CustomModifiers.Text = $"{list.Count(r => r.CustomAmount != null)} Mg. / {list.Sum(r => r.CustomAmount):N2} {sym}";
            TotalModifiers.Text = $"{list.Count(r => r.Total != 0)} Mg. / {list.Sum(r => r.Total):N2} {sym}";
            NonDeliveries.Text = $"{list.Count(r => r.Weight == 0):N0}";

            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
-                .OrderBy(m => m.FamilyName)
+                .OrderBy(m => m.Name)
                .ThenBy(m => m.GivenName)
                .ThenBy(m => m.MgNr)
                .ToListAsync());
@ -171,7 +173,7 @@ namespace Elwig.Windows {

                var b = new Billing(Year);
                await b.AutoAdjustBusinessShares(new DateOnly(Year, 11, 30), kg ?? default, bs ?? default, kgPerBs ?? default, percent / 100.0 ?? default, minBs ?? default);
-                await App.HintContextChange();
+                App.HintContextChange();
            } catch (Exception exc) {
                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@ -185,7 +187,7 @@ namespace Elwig.Windows {
            try {
                var b = new Billing(Year);
                await b.UnAdjustBusinessShares();
-                await App.HintContextChange();
+                App.HintContextChange();
            } catch (Exception exc) {
                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@ -239,13 +241,22 @@ namespace Elwig.Windows {
                    MemberList.ScrollIntoView(MemberList.SelectedItem);

                if (CustomPayments?.TryGetValue(m.MgNr, out var p) == true) {
+                    CustomModAbsInput.Text = $"{p.ModAbs:N2}";
+                    CustomModRelInput.Text = $"{p.ModRel * 100:N2}";
+                    CustomModCommentInput.Text = p.ModComment ?? "";
                    CustomAmountInput.Text = $"{p.Amount:N2}";
                    CustomCommentInput.Text = p.Comment ?? "";
                } else {
+                    CustomModAbsInput.Text = "";
+                    CustomModRelInput.Text = "";
+                    CustomModCommentInput.Text = "";
                    CustomAmountInput.Text = "";
                    CustomCommentInput.Text = "";
                }
            } else {
+                CustomModAbsInput.Text = "";
+                CustomModRelInput.Text = "";
+                CustomModCommentInput.Text = "";
                CustomAmountInput.Text = "";
                CustomCommentInput.Text = "";
            }
@ -256,6 +267,14 @@ namespace Elwig.Windows {
            App.FocusMember(m.MgNr);
        }

+        private void CustomModAbsInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            Validator.CheckDecimal((TextBox)sender, false, 4, 2, true);
+        }
+
+        private void CustomModRelInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            Validator.CheckDecimal((TextBox)sender, false, 3, 2, true);
+        }
+
        private void CustomAmountInput_TextChanged(object sender, TextChangedEventArgs evt) {
            Validator.CheckDecimal((TextBox)sender, false, 4, 2, true);
        }
@ -268,12 +287,19 @@ namespace Elwig.Windows {
                if (CustomPayments?.TryGetValue(m.MgNr, out var p) == true) {
                    ctx.Remove(p);
                }
-                if (sender == SaveCustomButton && decimal.TryParse(CustomAmountInput.Text, out var num)) {
+                if (sender == SaveCustomButton) {
+                    var modAbs = decimal.TryParse(CustomModAbsInput.Text, out var n1) ? (decimal?)n1 : null;
+                    var modRel = decimal.TryParse(CustomModRelInput.Text, out var n2) ? (decimal?)n2 / 100 : null;
+                    var amount = decimal.TryParse(CustomAmountInput.Text, out var n3) ? (decimal?)n3 : null;
+                    var modText = CustomModCommentInput.Text.Trim();
                    var text = CustomCommentInput.Text.Trim();
                    ctx.Add(new PaymentCustom {
                        MgNr = m.MgNr,
                        Year = Year,
-                        Amount = num,
+                        ModAbs = modAbs,
+                        ModRel = modRel,
+                        ModComment = modText == "" ? null : modText,
+                        Amount = amount,
                        Comment = text == "" ? null : text,
                    });
                }
@ -283,7 +309,7 @@ namespace Elwig.Windows {
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                MessageBox.Show(str, "Benutzerdefinierten Zu-/Abschlag speichern", MessageBoxButton.OK, MessageBoxImage.Error);
            }
-            await App.HintContextChange();
+            App.HintContextChange();
            Mouse.OverrideCursor = null;
        }
    }
--- a/Elwig/Windows/PaymentVariantsWindow.xaml
+++ b/Elwig/Windows/PaymentVariantsWindow.xaml
@ -128,6 +128,12 @@
                              HorizontalAlignment="Left" VerticalAlignment="Top"
                              TextChanged="WeightModifierInput_TextChanged" LostFocus="WeightModifierInput_LostFocus"/>

+            <TextBlock x:Name="MatzenNote" Grid.ColumnSpan="2" Margin="20,170,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
+                Ob ein Mitglied den Treuebonus<LineBreak/>
+                bekommt ist in der Buchungsliste<LineBreak/>
+                (Spalte Zuschlag) ersichtlich.
+            </TextBlock>
+
            <Label Content="Berücksichtigen:" Margin="90,70,10,10" Grid.Column="1"/>
            <CheckBox x:Name="ConsiderModifiersInput" Content="Zu-/Abschläge bei Lieferungen"
                      Margin="110,95,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
--- a/Elwig/Windows/PaymentVariantsWindow.xaml.cs
+++ b/Elwig/Windows/PaymentVariantsWindow.xaml.cs
@ -44,6 +44,11 @@ namespace Elwig.Windows {
            if (!App.Config.Debug) {
                DataInput.Visibility = Visibility.Hidden;
            }
+            if (App.Client.IsMatzen) {
+                ConsiderCustomInput.Content = ConsiderCustomInput.Content.ToString()?.Replace("Benutzerdefinierte", "Bentz.def.").Replace("Mitglied", "Mg.") + " (inkl. Treuebonus)";
+            } else {
+                MatzenNote.Visibility = Visibility.Hidden;
+            }
        }

        protected override async Task OnRenewContext(AppDbContext ctx) {
@ -220,19 +225,22 @@ namespace Elwig.Windows {

        private async void AddButton_Click(object sender, RoutedEventArgs evt) {
            try {
-                using var ctx = new AppDbContext();
-                var v = new PaymentVar {
-                    Year = Year,
-                    AvNr = await ctx.NextAvNr(Year),
-                    Name = "Neue Auszahlungsvariante",
-                    TestVariant = true,
-                    DateString = $"{DateTime.Today:yyyy-MM-dd}",
-                    Data = "{\"mode\": \"elwig\", \"version\": 1, \"payment\": {}, \"curves\": []}",
-                };
+                PaymentVar? v;
+                using (var ctx = new AppDbContext()) {
+                    v = new PaymentVar {
+                        Year = Year,
+                        AvNr = await ctx.NextAvNr(Year),
+                        Name = "Neue Auszahlungsvariante",
+                        TestVariant = true,
+                        DateString = $"{DateTime.Today:yyyy-MM-dd}",
+                        Data = "{\"mode\": \"elwig\", \"version\": 1, \"payment\": {}, \"curves\": []}",
+                    };

-                ctx.Add(v);
-                await ctx.SaveChangesAsync();
-                await App.HintContextChange();
+                    ctx.Add(v);
+                    await ctx.SaveChangesAsync();
+                }
+
+                App.HintContextChange();

                ControlUtils.SelectItem(PaymentVariantList, v);
            } catch (Exception exc) {
@ -245,19 +253,22 @@ namespace Elwig.Windows {
        private async void CopyButton_Click(object sender, RoutedEventArgs evt) {
            if (PaymentVariantList.SelectedItem is not PaymentVar orig) return;
            try {
-                using var ctx = new AppDbContext();
-                var n = new PaymentVar {
-                    Year = orig.Year,
-                    AvNr = await ctx.NextAvNr(Year),
-                    Name = $"{orig.Name} (Kopie)",
-                    TestVariant = true,
-                    DateString = $"{DateTime.Today:yyyy-MM-dd}",
-                    Data = orig.Data,
-                };
+                PaymentVar? n;
+                using (var ctx = new AppDbContext()) {
+                    n = new PaymentVar {
+                        Year = orig.Year,
+                        AvNr = await ctx.NextAvNr(Year),
+                        Name = $"{orig.Name} (Kopie)",
+                        TestVariant = true,
+                        DateString = $"{DateTime.Today:yyyy-MM-dd}",
+                        Data = orig.Data,
+                    };

-                ctx.Add(n);
-                await ctx.SaveChangesAsync();
-                await App.HintContextChange();
+                    ctx.Add(n);
+                    await ctx.SaveChangesAsync();
+                }
+
+                App.HintContextChange();

                ControlUtils.SelectItem(PaymentVariantList, n);
            } catch (Exception exc) {
@ -270,10 +281,11 @@ namespace Elwig.Windows {
        private async void DeleteButton_Click(object sender, RoutedEventArgs evt) {
            if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant) return;
            try {
-                using var ctx = new AppDbContext();
-                ctx.Remove(v);
-                await ctx.SaveChangesAsync();
-                await App.HintContextChange();
+                using (var ctx = new AppDbContext()) {
+                    ctx.Remove(v);
+                    await ctx.SaveChangesAsync();
+                }
+                App.HintContextChange();
            } catch (Exception exc) {
                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@ -292,7 +304,7 @@ namespace Elwig.Windows {
            } catch (Exception exc) {
                MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
            }
-            await App.HintContextChange();
+            App.HintContextChange();
            Mouse.OverrideCursor = null;
            CalculateButton.IsEnabled = true;
        }
@ -387,7 +399,7 @@ namespace Elwig.Windows {
            }
            Mouse.OverrideCursor = null;
            RevertButton.IsEnabled = true;
-            await App.HintContextChange();
+            App.HintContextChange();
        }

        private async void RevertButton_Click(object sender, RoutedEventArgs evt) {
@ -403,7 +415,7 @@ namespace Elwig.Windows {
            Mouse.OverrideCursor = Cursors.AppStarting;
            var b = new BillingVariant(v.Year, v.AvNr);
            await b.Revert();
-            await App.HintContextChange();
+            App.HintContextChange();
            Mouse.OverrideCursor = null;
            CommitButton.IsEnabled = true;
        }
@ -495,7 +507,7 @@ namespace Elwig.Windows {
                    await ctx.SaveChangesAsync();
                }

-                await App.HintContextChange();
+                App.HintContextChange();
                CommentInput_TextChanged(null, null);
                ConsiderModifiersInput_Changed(null, null);
                ConsiderPenaltiesInput_Changed(null, null);
--- a/Tests/DocumentTests/DeliveryAncmtListTest.cs
+++ b/Tests/DocumentTests/DeliveryAncmtListTest.cs
@ -0,0 +1,30 @@
+using Elwig.Documents;
+using Elwig.Helpers;
+using Elwig.Models.Dtos;
+
+namespace Tests.DocumentTests {
+    [TestFixture]
+    public class DeliveryAncmtListTest {
+
+        [Test]
+        public async Task Test_01_AllAnnouncements2020() {
+            using var ctx = new AppDbContext();
+            var filter = "01.10.2020 – Matzen – GV Kabinettaktion";
+            var data = await DeliveryAncmtListData.FromQuery(ctx.DeliveryAnnouncements.Where(a => a.Year == 2020 && a.DsNr == 1), [filter]);
+            using var doc = new DeliveryAncmtList(filter, data);
+            var text = await Utils.GeneratePdfText(doc, true);
+            var table = Utils.ExtractTable(text);
+            Assert.Multiple(() => {
+                Assert.That(text, Contains.Substring("Anmeldeliste"));
+                Assert.That(text, Contains.Substring("01.10.2020 – Matzen – GV Kabinettaktion"));
+                Assert.That(table, Is.EqualTo(new string[][] {
+                    ["01.10.2020", "101 MUSTERMANN Max",       "Grüner Veltliner", "-",  "5 000"],
+                    ["01.10.2020", "102 WEINBAUER Wernhardt",  "Grüner Veltliner", "-", "10 000"],
+                    ["01.10.2020", "103 MUSTERBAUER Matthäus", "Grüner Veltliner", "-",  "8 000"],
+                    ["01.10.2020", "104 WINZER Waltraud",      "Grüner Veltliner", "-",  "2 000"],
+                    ["Gesamt:",        "Anmeldungen: 4",                                "25 000"],
+                }));
+            });
+        }
+    }
+}
--- a/Tests/DocumentTests/MemberListTest.cs
+++ b/Tests/DocumentTests/MemberListTest.cs
@ -9,7 +9,7 @@ namespace Tests.DocumentTests {
        [Test]
        public async Task Test_01_TwoMembers() {
            using var ctx = new AppDbContext();
-            var data = await MemberListData.FromQuery(ctx.Members, []);
+            var data = await MemberListData.FromQuery(ctx.Members, [], []);
            using var doc = new MemberList("Alle Mitglieder", data);
            var text = await Utils.GeneratePdfText(doc, true);
            var table = Utils.ExtractTable(text);
--- a/Tests/DocumentTests/Utils.cs
+++ b/Tests/DocumentTests/Utils.cs
@ -21,7 +21,7 @@ namespace Tests.DocumentTests {
        public static string[][] ExtractTable(string text) {
            return text.Split('\n')
                .Select(row => Regex.Split(row, @"\s{2,}").Select(c => c.Trim()).Where(c => c.Length > 0).ToArray())
-                .Where(row => row.Length > 3)
+                .Where(row => row.Length >= 3)
                .Skip(1)
                .ToArray();
        }
--- a/Tests/E2ETests/MemberAdminWindowTest.cs
+++ b/Tests/E2ETests/MemberAdminWindowTest.cs
@ -36,7 +36,7 @@ namespace Tests.E2ETests {
            Window.FindElement(By.WpfId("MgNrInput")).SendKeys("9999");

            Window.FindElement(By.WpfId("GivenNameInput")).SendKeys("Norbert");
-            Window.FindElement(By.WpfId("FamilyNameInput")).SendKeys("Neuling");
+            Window.FindElement(By.WpfId("NameInput")).SendKeys("Neuling");
            Window.FindElement(By.WpfId("PrefixInput")).SendKeys("Ing.");
            Window.FindElement(By.WpfId("SuffixInput")).SendKeys("jun.");
            Window.FindElement(By.WpfId("BirthdayInput")).SendKeys("1987");
--- a/Tests/HelperTests/BillingTest.cs
+++ b/Tests/HelperTests/BillingTest.cs
@ -80,17 +80,17 @@ namespace Tests.HelperTests {
        }

        private Task<Dictionary<string, AreaComBucket>> GetMemberAreaCommitmentBuckets(int year, int mgnr) {
-            var ctx = new AppDbContext();
+            using var ctx = new AppDbContext();
            return ctx.GetMemberAreaCommitmentBuckets(year, mgnr, Connection);
        }

        private Task<Dictionary<string, int>> GetMemberDeliveryBuckets(int year, int mgnr) {
-            var ctx = new AppDbContext();
+            using var ctx = new AppDbContext();
            return ctx.GetMemberDeliveryBuckets(year, mgnr, Connection);
        }

        private Task<Dictionary<string, int>> GetMemberPaymentBuckets(int year, int mgnr) {
-            var ctx = new AppDbContext();
+            using var ctx = new AppDbContext();
            return ctx.GetMemberPaymentBuckets(year, mgnr, Connection);
        }

--- a/Tests/Resources/Sql/DocumentDelete.sql
+++ b/Tests/Resources/Sql/DocumentDelete.sql
@ -1,5 +1,6 @@
 -- deletes for DocumentTests

+DELETE FROM delivery_schedule;
 DELETE FROM payment_variant;
 DELETE FROM delivery;
 DELETE FROM season;
--- a/Tests/Resources/Sql/DocumentInsert.sql
+++ b/Tests/Resources/Sql/DocumentInsert.sql
@ -9,6 +9,18 @@ INSERT INTO wine_attribute (attrid, name, active, max_kg_per_ha, strict, fill_lo
 INSERT INTO season (year, currency, min_kg_per_bs, max_kg_per_bs, penalty_per_kg, penalty_amount, penalty_none, start_date, end_date) VALUES
 (2020, 'EUR', 1000, 2000, NULL, NULL, NULL, NULL, NULL);

+INSERT INTO delivery_schedule (year, dsnr, date, zwstid, description, max_weight, ancmt_from, ancmt_to) VALUES
+(2020, 1, '2020-10-01', 'X', 'GV Kabinettaktion', 100000, NULL, NULL);
+
+INSERT INTO delivery_schedule_wine_variety (year, dsnr, sortid, priority) VALUES
+(2020, 1, 'GV', 1);
+
+INSERT INTO delivery_announcement (year, dsnr, mgnr, sortid, weight, type) VALUES
+(2020, 1, 101, 'GV',  5000, 'manual'),
+(2020, 1, 102, 'GV', 10000, 'manual'),
+(2020, 1, 103, 'GV',  8000, 'manual'),
+(2020, 1, 104, 'GV',  2000, 'manual');
+
 INSERT INTO modifier (year, modid, ordering, name, abs, rel, active) VALUES
 (2020, 'S', 0, 'Geschädigte Trauben', NULL, -0.1, TRUE),
 (2020, 'A', 0, 'Keine Voranmeldung', -1000, NULL, TRUE);
--- a/Tests/Resources/Sql/Insert.sql
+++ b/Tests/Resources/Sql/Insert.sql
@ -66,7 +66,7 @@ INSERT INTO wb_kg (kgnr, glnr) VALUES
 (15216, 2),
 (15224, 2);

-INSERT INTO member (mgnr, given_name, family_name, zwstid, volllieferant, buchführend, country, postal_dest, address, default_kgnr, iban, lfbis_nr, ustid_nr) VALUES
+INSERT INTO member (mgnr, given_name, name, zwstid, volllieferant, buchführend, country, postal_dest, address, default_kgnr, iban, lfbis_nr, ustid_nr) VALUES
 (101, 'Max',       'Mustermann',  'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 1',    06109, 'AT811234567890123457', '0123463',         NULL ),
 (102, 'Wernhardt', 'Weinbauer',   'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 2',    06109, 'AT541234567890123458', '0123471', 'ATU12345684'),
 (103, 'Matthäus',  'Musterbauer', 'X', FALSE, FALSE, 40, 212005138, 'Brünner Straße 10', 15224, 'AT271234567890123459', '0123480',         NULL ),
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@ -19,12 +19,12 @@
  </Target>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
    <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
-    <PackageReference Include="NReco.PdfRenderer" Version="1.5.3" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
+    <PackageReference Include="NReco.PdfRenderer" Version="1.5.4" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/Tests/fetch-resources.bat
+++ b/Tests/fetch-resources.bat
@ -1 +1 @@
-curl --fail -s -L "https://elwig.at/files/create.sql?v=25" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
+curl --fail -s -L "https://elwig.at/files/create.sql?v=30" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
Author	SHA1	Message	Date
Lorenz Stechauner	5dc725620b	Bump version to 0.11.1 All checks were successful Test / Run tests (push) Successful in 2m2s Details Deploy / Build and Deploy (push) Successful in 2m7s Details	2024-09-19 12:35:25 +02:00
Lorenz Stechauner	27d8a5cfb6	DeliveryAncmtAdminWindow: Add more filters and tooltip for weight All checks were successful Test / Run tests (push) Successful in 1m47s Details	2024-09-19 11:56:45 +02:00
Lorenz Stechauner	642fb3a625	DeliveryService: Small fixes	2024-09-19 11:54:57 +02:00
Lorenz Stechauner	3f7cd2a6ff	DeliveryAncmtAdminWindow: Focus MgNrInput when creating new ancmt All checks were successful Test / Run tests (push) Successful in 2m8s Details	2024-09-19 09:34:44 +02:00
Lorenz Stechauner	21a1b11d68	AreaCom: Make YearFrom nullable All checks were successful Test / Run tests (push) Successful in 1m48s Details	2024-09-18 18:26:16 +02:00
Lorenz Stechauner	d8beb03b96	Tests: Update dependencies All checks were successful Test / Run tests (push) Successful in 1m53s Details	2024-09-17 23:18:51 +02:00
Lorenz Stechauner	eee90c784b	Elwig: Update dependencies	2024-09-17 23:18:41 +02:00
Lorenz Stechauner	74200083ab	DeliveryAncmtAdminWindow: Mark cancelled schedules with Strikethrough All checks were successful Test / Run tests (push) Successful in 1m38s Details	2024-09-17 23:08:22 +02:00
Lorenz Stechauner	871bc299bd	Utils: Fix SplitName() for double names All checks were successful Test / Run tests (push) Successful in 1m46s Details	2024-09-17 19:18:43 +02:00
Lorenz Stechauner	a18b58f438	DeliveryAncmtAdminWindow: Make delivery schedule list bigger All checks were successful Test / Run tests (push) Successful in 2m10s Details	2024-09-17 19:07:59 +02:00
Lorenz Stechauner	cadb5515ea	Bump version to 0.11.0 All checks were successful Deploy / Build and Deploy (push) Successful in 2m9s Details	2024-09-16 11:17:23 +02:00
Lorenz Stechauner	d8a10152b3	DeliveryScheduleAdminWindow: Add Attribute, Cultivation and IsCancelled All checks were successful Test / Run tests (push) Successful in 1m37s Details	2024-09-16 10:10:31 +02:00
Lorenz Stechauner	f09c43c1bd	App: Make HintContextChange() synchronous by using MainDispatcher All checks were successful Test / Run tests (push) Successful in 2m37s Details	2024-09-12 11:40:32 +02:00
Lorenz Stechauner	5c08f61963	MailWindow: Add feature to address members with ancmts on specific day All checks were successful Test / Run tests (push) Successful in 2m28s Details	2024-09-08 15:55:10 +02:00
Lorenz Stechauner	7a15050575	Bump version to 0.10.8 All checks were successful Test / Run tests (push) Successful in 2m9s Details Deploy / Build and Deploy (push) Successful in 2m52s Details	2024-09-05 23:32:23 +02:00
Lorenz Stechauner	8d9172f91e	AppDbContext: Move all calls to App.HintContextChange() outside of any AppDbContext block All checks were successful Test / Run tests (push) Successful in 2m44s Details	2024-09-05 17:21:00 +02:00
Lorenz Stechauner	7437187630	DeliveryAncmtAdminWindow: Add date column	2024-09-05 15:28:55 +02:00
Lorenz Stechauner	a38cdaa8af	DeliveryAdminWindow: Slightly increase default width All checks were successful Test / Run tests (push) Successful in 2m2s Details	2024-09-04 18:18:19 +02:00
Lorenz Stechauner	a5638135a3	DeliveryAncmtAdminWindow: Add option to search in all delivery schedules and init mgnr with selected All checks were successful Test / Run tests (push) Successful in 2m2s Details	2024-09-04 18:11:56 +02:00
Lorenz Stechauner	a04c7d538e	MemberDataSheet: Add VAT to 'Buchführend' All checks were successful Test / Run tests (push) Successful in 2m2s Details	2024-09-04 17:32:34 +02:00
Lorenz Stechauner	26235f8c0a	BusinessDocument: Add ':' in aside block All checks were successful Test / Run tests (push) Successful in 2m6s Details	2024-09-04 17:23:22 +02:00
Lorenz Stechauner	f43d9c020c	DeliveryAncmtList: Center 'Anmldg.' column All checks were successful Test / Run tests (push) Successful in 2m54s Details	2024-09-04 17:18:36 +02:00
Lorenz Stechauner	22514715c1	DeliveryService: Small text fix	2024-09-04 17:16:14 +02:00
Lorenz Stechauner	5eda25ed14	Bump version to 0.10.7 All checks were successful Test / Run tests (push) Successful in 2m2s Details Deploy / Build and Deploy (push) Successful in 3m42s Details	2024-09-02 23:42:00 +02:00
Lorenz Stechauner	543185d48e	DeliveryAdminWindow: Add weight filter All checks were successful Test / Run tests (push) Successful in 2m58s Details	2024-09-02 23:28:55 +02:00
Lorenz Stechauner	141086673f	DeliveryAncmtList: Add status to indicate late ancmts	2024-09-02 23:10:37 +02:00
Lorenz Stechauner	6627ab6d12	App: Try to fix auto context renewal 2 All checks were successful Test / Run tests (push) Successful in 2m57s Details	2024-09-01 11:44:38 +02:00
Lorenz Stechauner	7ef3faa39e	Bump version to 0.10.6 All checks were successful Deploy / Build and Deploy (push) Successful in 3m12s Details	2024-08-30 22:35:10 +02:00
Lorenz Stechauner	8c8c0a8c2b	App: Try to fix auto context renewal All checks were successful Test / Run tests (push) Successful in 2m23s Details	2024-08-30 22:26:49 +02:00
Lorenz Stechauner	78a72c641f	MemberAdminWindow: Fix checking and unchecking of ContactEmailInput All checks were successful Test / Run tests (push) Successful in 2m3s Details	2024-08-30 21:40:01 +02:00
Lorenz Stechauner	e18bc58b6c	DeliveryAncmtAdminWindow: Fix bug when pressing Enter in weight input All checks were successful Test / Run tests (push) Successful in 2m55s Details	2024-08-30 21:33:58 +02:00
Lorenz Stechauner	21f68caf4c	DeliveryAncmtAdminWindow: Increase window width	2024-08-30 21:33:16 +02:00
Lorenz Stechauner	2ef10b4bb2	DeliveryAdminWindow: Scroll DeliveryPartList down when adding new delivery parts	2024-08-30 21:31:44 +02:00
Lorenz Stechauner	5321be46c7	[#33 ] ChartWindow: Add CheckBox to indicate which graph (gebunden, normal) is currently selected All checks were successful Test / Run tests (push) Successful in 2m54s Details	2024-08-28 11:14:51 +02:00
Lorenz Stechauner	0f24f9da08	[#33 ] ChartWindow: Fix scaling bug	2024-08-28 10:20:21 +02:00
Lorenz Stechauner	8ce8492c74	MainWindow: Use 'Waage' instead of 'Waagen' All checks were successful Test / Run tests (push) Successful in 4m42s Details	2024-08-26 23:00:24 +02:00
Lorenz Stechauner	ee1315929c	AreaComAdminWindow: Fix window title All checks were successful Test / Run tests (push) Successful in 2m59s Details	2024-08-26 22:12:37 +02:00
Lorenz Stechauner	9930e6173c	Dtos: Rewrite SQL queries to be more efficient All checks were successful Test / Run tests (push) Successful in 2m28s Details	2024-08-24 16:37:41 +02:00
Lorenz Stechauner	b5c1bfb08f	Bump version to 0.10.5 All checks were successful Test / Run tests (push) Successful in 2m4s Details Deploy / Build and Deploy (push) Successful in 2m47s Details	2024-08-24 14:00:49 +02:00
Lorenz Stechauner	cd2b482b5a	Weighing: Add SetDateAndTime() All checks were successful Test / Run tests (push) Successful in 2m22s Details	2024-08-24 13:54:59 +02:00
Lorenz Stechauner	bec1b165bf	MemberAdminWindow: Allow user to keep AreaCom YearTo when transfering All checks were successful Test / Run tests (push) Successful in 2m49s Details	2024-08-24 13:35:14 +02:00
Lorenz Stechauner	2ae2564647	DeliveryAncmtAdminWinodw: Do not show warning windows All checks were successful Test / Run tests (push) Successful in 2m31s Details	2024-08-23 14:49:05 +02:00
Lorenz Stechauner	adbe418b7c	DeliveryAncmtAdminWindow: Change status bar spacing All checks were successful Test / Run tests (push) Successful in 2m51s Details	2024-08-23 08:53:48 +02:00
Lorenz Stechauner	94db0723c5	Bump version to 0.10.4 All checks were successful Test / Run tests (push) Successful in 2m2s Details Deploy / Build and Deploy (push) Successful in 2m48s Details	2024-08-22 13:36:38 +02:00
Lorenz Stechauner	f54677d429	DeliveryAncmtAdminWindow: Display stats in status bar All checks were successful Test / Run tests (push) Successful in 2m27s Details	2024-08-22 13:32:08 +02:00
Lorenz Stechauner	49e4b65c27	MemberAdminWindow: Display currently shown member count and business shares All checks were successful Test / Run tests (push) Successful in 2m25s Details	2024-08-22 12:29:41 +02:00
Lorenz Stechauner	ada5085cae	Validator: Add some syntax sugar All checks were successful Test / Run tests (push) Successful in 2m51s Details	2024-08-22 11:04:24 +02:00
Lorenz Stechauner	85931e62e8	DeliveryAncmtAdminWindow: Show weekday also in ComboBox All checks were successful Test / Run tests (push) Successful in 11m7s Details	2024-08-21 16:57:21 +02:00
Lorenz Stechauner	39956cbcbd	Bump version to 0.10.3 All checks were successful Test / Run tests (push) Successful in 2m25s Details Deploy / Build and Deploy (push) Successful in 3m20s Details	2024-08-21 00:01:47 +02:00
Lorenz Stechauner	84d8d0cecb	DeliveryScheduleAdminWindow: Fix AncmtToDateInput input bug All checks were successful Test / Run tests (push) Successful in 2m3s Details	2024-08-20 23:39:08 +02:00
Lorenz Stechauner	fe7f9d675b	DeliveryAncmtAdminWindow: Add day of week to delivery schedule list All checks were successful Test / Run tests (push) Successful in 3m0s Details	2024-08-20 23:31:37 +02:00
Lorenz Stechauner	9d1ee8638c	Bump version to 0.10.2 All checks were successful Test / Run tests (push) Successful in 1m59s Details Deploy / Build and Deploy (push) Successful in 2m41s Details	2024-08-16 21:31:43 +02:00
Lorenz Stechauner	cd40075702	ElwigData: Allow legacy field family_name to be used and other fixes All checks were successful Test / Run tests (push) Successful in 2m50s Details	2024-08-16 21:24:04 +02:00
Lorenz Stechauner	204dfe8745	MemberService: Include area commitments when uploading export data	2024-08-16 21:23:32 +02:00
Lorenz Stechauner	f97dfc3c72	Bump version to 0.10.1 All checks were successful Test / Run tests (push) Successful in 2m7s Details Deploy / Build and Deploy (push) Successful in 2m59s Details	2024-08-14 12:02:36 +02:00
Lorenz Stechauner	d3839c288a	MemberList: Allow filtering area commitments	2024-08-14 11:57:19 +02:00
Lorenz Stechauner	2764a0ca21	Dtos: Fix error when given_name is null	2024-08-14 11:57:04 +02:00
Lorenz Stechauner	48970de652	Billing: Fix error when no deliveries exist in season	2024-08-14 11:56:25 +02:00
Lorenz Stechauner	367c3ac357	Bump version to 0.10.0 All checks were successful Test / Run tests (push) Successful in 2m8s Details Deploy / Build and Deploy (push) Successful in 2m37s Details	2024-08-13 15:23:58 +02:00
Lorenz Stechauner	4d89a17e80	Billing: Allow users to add custom member modifiers before VAT All checks were successful Test / Run tests (push) Successful in 2m8s Details	2024-08-13 14:43:12 +02:00
Lorenz Stechauner	f52c11b91e	PaymentVariantSummary: Subtract member modifiers from sum All checks were successful Test / Run tests (push) Successful in 2m20s Details	2024-08-12 15:44:04 +02:00
Lorenz Stechauner	f48c6a02cb	[#54 ] Member: Add IsJuridicalPerson All checks were successful Test / Run tests (push) Successful in 2m49s Details	2024-08-12 15:18:34 +02:00
Lorenz Stechauner	025ff08d84	[#14 ] Documents: Add DeliveryAncmtList All checks were successful Test / Run tests (push) Successful in 2m35s Details	2024-08-10 15:45:37 +02:00
Lorenz Stechauner	b091bd0ec3	[#14 ] Windows: Add DeliveryAncmtWindow All checks were successful Test / Run tests (push) Successful in 2m5s Details	2024-08-09 22:11:47 +02:00
Lorenz Stechauner	804a17911c	[#14 ] Windows: Add DeliveryScheduleAdminWindow All checks were successful Test / Run tests (push) Successful in 2m58s Details	2024-08-09 17:45:14 +02:00
Lorenz Stechauner	170cfda37e	Windows: Minor cleanups	2024-08-09 17:44:48 +02:00
Lorenz Stechauner	2d737e2780	[#14 ] Models: Add DeliveryAncmt	2024-08-09 17:44:21 +02:00
Lorenz Stechauner	2333077aa5	Billing: Include predecessors in Treuebonus for WGM All checks were successful Test / Run tests (push) Successful in 2m29s Details	2024-08-08 19:09:38 +02:00
Lorenz Stechauner	9127cd3f03	MemberAdminWindow: Fix area commitment transfer for new members All checks were successful Test / Run tests (push) Successful in 2m5s Details	2024-08-08 17:35:58 +02:00
Lorenz Stechauner	036a0dc978	App: Use Version class All checks were successful Test / Run tests (push) Successful in 2m28s Details	2024-08-02 20:48:53 +02:00
Lorenz Stechauner	7749f6ab45	Bump version to 0.9.3 All checks were successful Test / Run tests (push) Successful in 2m29s Details Deploy / Build and Deploy (push) Successful in 2m38s Details	2024-08-02 12:22:52 +02:00
Lorenz Stechauner	cf05a0c658	DeliveryJournalData: Add delivery and member branch to excel export All checks were successful Test / Run tests (push) Successful in 2m52s Details	2024-08-02 11:42:27 +02:00
Lorenz Stechauner	5567d9f25a	Bump version to 0.9.2 All checks were successful Test / Run tests (push) Successful in 2m7s Details Deploy / Build and Deploy (push) Successful in 2m50s Details	2024-08-01 16:06:13 +02:00
Lorenz Stechauner	4403754ada	MemberAdminWindow: Fix error when saving telephone numbers All checks were successful Test / Run tests (push) Successful in 2m23s Details	2024-08-01 15:57:49 +02:00
Lorenz Stechauner	8db6007264	MainWindow: Fix closing behaviour when other windows are open All checks were successful Test / Run tests (push) Successful in 2m24s Details	2024-08-01 13:49:04 +02:00