Bump version to 0.4.2

Elwig/App.xaml.cs

@@ -127,7 +127,7 @@ namespace Elwig {
                     ZwstId = entry.Item1;
                     BranchName = entry.Item2;
                     BranchPlz = entry.Item3;
-                    BranchLocation = entry.Item4;
+                    BranchLocation = entry.Item4?.Split(" im ")[0];  // FIXME
                     BranchAddress = entry.Item5;
                     BranchPhoneNr = entry.Item6;
                     BranchFaxNr = entry.Item7;
@@ -138,7 +138,7 @@ namespace Elwig {
                 ZwstId = entry.Item1;
                 BranchName = entry.Item2;
                 BranchPlz = entry.Item3;
-                BranchLocation = entry.Item4;
+                BranchLocation = entry.Item4?.Split(" im ")[0];  // FIXME
                 BranchAddress = entry.Item5;
                 BranchPhoneNr = entry.Item6;
                 BranchFaxNr = entry.Item7;
@@ -157,9 +157,12 @@ namespace Elwig {
 
         protected void OnPrintingReadyChanged(EventArgs evt) {
             foreach (Window w in Windows) {
-                foreach (var b in ControlUtils.FindAllChildren<Button>(w).Where(b => "Print".Equals(b.Tag))) {
+                foreach (var b in ControlUtils.FindAllChildren<Button>(w).Where(b => b.Tag?.ToString() == "Print")) {
                     b.IsEnabled = IsPrintingReady;
                 }
+                foreach (var i in ControlUtils.FindAllChildren<MenuItem>(w).Where(i => i.Tag?.ToString() == "Print")) {
+                    i.IsEnabled = IsPrintingReady;
+                }
             }
         }
     }

Elwig/Dialogs/DeliveryConfirmationsDialog.xaml

@@ -0,0 +1,37 @@
+<local:ContextWindow x:Class="Elwig.Dialogs.DeliveryConfirmationsDialog"
+                     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"
+                     mc:Ignorable="d"
+                     ResizeMode="NoResize"
+                     Loaded="Window_Loaded"
+                     Title="Anlieferungsbestätingungen - Elwig" Height="400" Width="600">
+    <Grid>
+        <GroupBox Header="Sortieren nach" Margin="10,10,10,10" Width="180" Height="80" VerticalAlignment="Top" HorizontalAlignment="Left">
+            <StackPanel Margin="5,5,0,5">
+                <RadioButton GroupName="Order" x:Name="OrderMgNrInput" Content="Mitgliedsnummer" IsChecked="True"/>
+                <RadioButton GroupName="Order" x:Name="OrderNameInput" Content="Name"/>
+                <RadioButton GroupName="Order" x:Name="OrderPlzInput" Content="PLZ, Ort, Name"/>
+            </StackPanel>
+        </GroupBox>
+
+        <CheckBox x:Name="AllMembersInput" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,100,10,10">
+            <TextBlock>Auch Mitglieder ohne<LineBreak/>Lieferungen miteinbeziehen</TextBlock>
+        </CheckBox>
+
+        <TextBox x:Name="TextElement" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible" AcceptsReturn="True"
+                 HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="200,10,10,10" Height="Auto"/>
+
+        <Button x:Name="TestButton" Content="Stichprobe" FontSize="14" Width="180" Margin="10,10,10,74" Height="27" Tag="Print" IsEnabled="False"
+                Click="TestButton_Click"
+                VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+        <Button x:Name="ShowButton" Content="Vorschau" FontSize="14" Width="180" Margin="10,10,10,42" Height="27" Tag="Print" IsEnabled="False"
+                Click="ShowButton_Click"
+                VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+        <Button x:Name="PrintButton" Content="Drucken" FontSize="14" Width="180" Margin="10,10,10,10" Height="27" Tag="Print" IsEnabled="False"
+                Click="PrintButton_Click"
+                VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+    </Grid>
+</local:ContextWindow>

Elwig/Dialogs/DeliveryConfirmationsDialog.xaml.cs

@@ -0,0 +1,113 @@
+using Elwig.Documents;
+using Elwig.Models;
+using Elwig.Windows;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+
+namespace Elwig.Dialogs {
+    public partial class DeliveryConfirmationsDialog : ContextWindow {
+
+        public readonly int Year;
+
+        public DeliveryConfirmationsDialog(int year) {
+            InitializeComponent();
+            Year = year;
+            Title = $"Anlieferungsbestätigungen - Lese {Year} - Elwig";
+            TextElement.Text = App.Client.TextDeliveryConfirmation;
+            if (!App.Config.Debug) {
+                TestButton.Visibility = Visibility.Hidden;
+            }
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            TestButton.IsEnabled = App.IsPrintingReady;
+            ShowButton.IsEnabled = App.IsPrintingReady;
+            PrintButton.IsEnabled = App.IsPrintingReady;
+        }
+
+        protected override async Task OnRenewContext() { }
+
+        private async Task UpdateTextParameter() {
+            var text = TextElement.Text;
+            if (text.Length == 0) text = null;
+            if (text != App.Client.TextDeliveryConfirmation) {
+                App.Client.TextDeliveryConfirmation = text;
+                await App.Client.UpdateValues();
+            }
+        }
+
+        private async Task Generate(int mode) {
+
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            await UpdateTextParameter();
+
+            IQueryable<Member> members;
+            if (AllMembersInput.IsChecked == true) {
+                members = Context.Members.Where(m => m.IsActive);
+            } else {
+                members = Context.Members.FromSqlRaw($"""
+                    SELECT m.*
+                    FROM member m
+                        INNER JOIN delivery d ON d.mgnr = m.mgnr
+                    WHERE d.year = {Year}
+                    GROUP BY m.mgnr
+                    """);
+            }
+
+            if (OrderMgNrInput.IsChecked == true) {
+                members = members
+                    .OrderBy(m => m.MgNr);
+            } else if (OrderNameInput.IsChecked == true) {
+                members = members
+                    .OrderBy(m => m.FamilyName)
+                    .ThenBy(m => m.GivenName)
+                    .ThenBy(m => m.MgNr);
+            } else if (OrderPlzInput.IsChecked == true) {
+                members = members
+                    .OrderBy(m => m.PostalDest.AtPlz.Plz)
+                    .ThenBy(m => m.PostalDest.AtPlz.Ort.Name)
+                    .ThenBy(m => m.FamilyName)
+                    .ThenBy(m => m.GivenName)
+                    .ThenBy(m => m.MgNr);
+            }
+
+            IEnumerable<Member> list = await members.ToListAsync();
+            if (mode == 0) {
+                var r = new Random().Next(0, 10);
+                list = list.Where((_, n) => n % 10 == r);
+            }
+
+            using var doc = await Document.Merge(list.Select(m => new DeliveryConfirmation(Context, Year, m))); ;
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+
+            if (mode < 2) {
+                doc.Show();
+                return;
+            }
+            if (App.Config.Debug) {
+                doc.Show();
+            } else {
+                await doc.Print();
+            }
+            Close();
+        }
+
+        private async void TestButton_Click(object sender, RoutedEventArgs evt) {
+            await Generate(0);
+        }
+
+        private async void ShowButton_Click(object sender, RoutedEventArgs evt) {
+            await Generate(1);
+        }
+
+        private async void PrintButton_Click(object sender, RoutedEventArgs evt) {
+            await Generate(2);
+        }
+    }
+}

Elwig/Documents/BusinessDocument.cshtml.cs

@@ -1,3 +1,4 @@
+using Elwig.Helpers;
 using Elwig.Models;
 
 namespace Elwig.Documents {
@@ -26,14 +27,9 @@ namespace Elwig.Documents {
 
         public string Address {
             get {
-                var b = Member.BillingAddress;
-                if (b != null && UseBillingAddress) {
-                    var plz = b.PostalDest.AtPlz;
-                    return $"{b.Name}\n{Member.AdministrativeName}\n{b.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich";
-                } else {
-                    var plz = Member.PostalDest.AtPlz;
-                    return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich";
-                }
+                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}";
             }
         }
     }

Elwig/Documents/CreditNote.cshtml

@@ -4,7 +4,7 @@
 @{ Layout = "BusinessDocument"; }
 <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-creditnote.css"/>
 @{
-    var bucketNum = Model.BucketNames.Length;
+    var binNum = Model.BinNames.Length;
 }
 <main>
     <h1>@Model.Title</h1>
@@ -30,7 +30,7 @@
                 <th rowspan="3" style="text-align: left;">Attribut(e)</th>
                 <th rowspan="2" colspan="2">Gradation</th>
                 <th colspan="2">Zu-/Abschläge</th>
-                <th colspan="2">@Raw(string.Join("<br/>", Model.BucketNames))</th>
+                <th colspan="2">@Raw(string.Join("<br/>", Model.BinNames))</th>
                 <th rowspan="2">Betrag</th>
             </tr>
             <tr>
@@ -61,21 +61,23 @@
                 var pmt = part.Payment;
                 var abs = pmt?.ModAbs == null || pmt?.ModAbs == 0 ? "-" : pmt?.ModAbs.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)));
                 var rel = pmt?.ModRel == null || pmt?.ModRel == 0 ? "-" : $"{pmt?.ModRel * 100:0.00##}";
-                <tr class="first @(bucketNum <= 1 ? "last" : "") @(last != null && last != part.SortId ? "new" : "")">
-                    <td rowspan="@bucketNum" class="lsnr">@part.Delivery.LsNr</td>
-                    <td rowspan="@bucketNum" class="dpnr">@part.DPNr</td>
-                    <td rowspan="@bucketNum" class="variant">@part.Variant.Name</td>
-                    <td rowspan="@bucketNum" class="attribute">@string.Join(" / ", part.PartAttributes.Select(a => a.AttrId))</td>
-                    <td rowspan="@bucketNum" class="oe">@($"{part.Oe:N0}")</td>
-                    <td rowspan="@bucketNum" class="kmw">@($"{part.Kmw:N1}")</td>
-                    <td rowspan="@bucketNum" class="abs">@abs</td>
-                    <td rowspan="@bucketNum" class="rel">@rel</td>
-                    @Raw(FormatRow(pmt?.Buckets?.ElementAtOrDefault(0), pmt?.Prices?.ElementAtOrDefault(0)))
-                    <td rowspan="@bucketNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
+                <tr class="first @(binNum <= 1 ? "last" : "") @(last != null && last != part.SortId ? "new" : "")">
+                    <td rowspan="@binNum" class="lsnr">@part.Delivery.LsNr</td>
+                    <td rowspan="@binNum" class="dpnr">@part.DPNr</td>
+                    <td rowspan="@binNum" class="variant">@part.Variant.Name</td>
+                    <td rowspan="@binNum" class="attribute">@string.Join(" / ", part.PartAttributes.Select(a => a.AttrId))</td>
+                    <td rowspan="@binNum" class="oe">@($"{part.Oe:N0}")</td>
+                    <td rowspan="@binNum" class="kmw">@($"{part.Kmw:N1}")</td>
+                    <td rowspan="@binNum" class="abs">@abs</td>
+                    <td rowspan="@binNum" class="rel">@rel</td>
+                    <!--FIXME price-->
+                    @Raw(FormatRow(pmt?.DeliveryPart.Bins?.ElementAtOrDefault(0)?.Value, 0))
+                    <td rowspan="@binNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
                 </tr>
-                @for (int i = 1; i < bucketNum; i++) {
-                    <tr class="@(i == bucketNum - 1 ? "last" : "")">
-                        @Raw(FormatRow(pmt?.Buckets?.ElementAtOrDefault(i), pmt?.Prices?.ElementAtOrDefault(i)))
+                @for (int i = 1; i < binNum; i++) {
+                    <tr class="@(i == binNum - 1 ? "last" : "")">
+                        <!--FIXME price-->
+                        @Raw(FormatRow(pmt?.DeliveryPart.Bins?.ElementAtOrDefault(i)?.Value, 0))
                     </tr>
                 }
                 last = part.SortId;

Elwig/Documents/CreditNote.cshtml.cs

@@ -10,7 +10,7 @@ namespace Elwig.Documents {
         public Credit Credit;
         public string? Text;
         public string CurrencySymbol;
-        public string[] BucketNames;
+        public string[] BinNames;
         public int Precision;
         public IEnumerable<DeliveryPart> Parts;
 
@@ -27,7 +27,7 @@ namespace Elwig.Documents {
             Text = App.Client.TextDeliveryNote;
             DocumentId = $"Tr.-Gutschr. {c.TgId}";
             CurrencySymbol = c.Payment.Variant.Season.Currency.Symbol ?? c.Payment.Variant.Season.Currency.Code;
-            BucketNames = c.Payment.Variant.BucketNames;
+            BinNames = new string[0]; // FIXME
             Precision = c.Payment.Variant.Season.Precision;
             Parts = ctx.DeliveryParts.FromSql($"""
                 SELECT p.*

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -0,0 +1,166 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.DeliveryConfirmation>
+@model Elwig.Documents.DeliveryConfirmation
+@{ Layout = "BusinessDocument"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-deliveryconfirmation.css"/>
+<main>
+    <h1>@Model.Title</h1>
+    <table class="delivery-confirmation">
+        <colgroup>
+            <col style="width: 25mm;"/>
+            <col style="width: 5mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 21mm;"/>
+            <col style="width: 19mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 12mm;"/>
+            <col style="width: 14mm;"/>
+            <col style="width: 14mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
+                <th rowspan="2">Pos.</th>
+                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th rowspan="2" style="text-align: left;">Attribut(e)</th>
+                <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
+                <th colspan="2">Gradation</th>
+                <th colspan="2">Flächenbindung</th>
+                <th>Gewicht</th>
+                <th>Davon<br/>abzuwerten</th>
+            </tr>
+            <tr>
+                <th>[°Oe]</th>
+                <th>[°KMW]</th>
+                <th colspan="2">[kg]</th>
+                <th>[kg]</th>
+                <th>[kg]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @{
+                var lastSortId = "";
+            }
+            @foreach (var p in Model.Deliveries) {
+                var bins = p.Bins.Where(b => b.Value > 0).OrderByDescending(b => b.BinNr).ToArray();
+                var rowsBins = bins.Length;
+                var mods = p.Modifiers.Select(m => m.Name).ToArray();
+                var rowsMod = mods.Length + 1;
+                var rows = Math.Max(rowsBins, rowsMod);
+                var first = true;
+                @for (int i = 0; i < rows; i++) {
+                    <tr class="@(first ? "first" : "") @(p.SortId != lastSortId && lastSortId != "" ? "new": "") @(rows > i + 1 ? "trailing" : "")">
+                        @if (first) {
+                            <td rowspan="@rows">@p.Delivery.LsNr</td>
+                            <td rowspan="@rows">@p.DPNr</td>
+                            <td class="small">@p.Variant.Name</td>
+                            <td class="small">@p.AttributesString</td>
+                            <td class="small">@p.Quality.Name</td>
+                            <td rowspan="@rows" class="grad">@($"{p.Oe:N0}")</td>
+                            <td rowspan="@rows" class="grad">@($"{p.Kmw:N1}")</td>
+                        }
+                        @if (i > 0 && i <= mods.Length) {
+                            <td colspan="3" class="mod">@(mods[i - 1])</td>
+                        } else if (i > 0) {
+                            <td colspan="3"></td>
+                        }
+                        @if (i < bins.Length) {
+                            var bin = bins[i];
+                            <td class="geb">@(bin.Discr == "_" ? "ungeb." : $"geb. {p.SortId}{bin.Discr}"):</td>
+                            <td class="weight">@($"{bin.Value:N0}")</td>
+                        } else {
+                            <td colspan="2"></td>
+                        }
+                        @if (i == bins.Length - 1) {
+                            <td class="weight">@($"{p.Weight:N0}")</td>
+                        } else {
+                            <td></td>
+                        }
+                        @if (first) {
+                            <td rowspan="@rows" class="weight"></td>
+                            first = false;
+                        }
+                    </tr>
+                    lastSortId = p.SortId;
+                }
+            }
+            <tr class="sum">
+                <td colspan="8">Gesamt:</td>
+                <td colspan="2" class="weight">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>
+                <td></td>
+            </tr>
+        </tbody>
+    </table>
+    <table class="delivery-confirmation-stats">
+        <colgroup>
+            <col style="width: 45mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 19mm;"/>
+            <col style="width: 16mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 17mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th><b>Lese @Model.Year</b> per @($"{Model.Date:dd.MM.yyyy}") [kg]</th>
+                <th>Lieferpflicht</th>
+                <th>Lieferrecht</th>
+                <th>Unterliefert</th>
+                <th>Noch lieferbar</th>
+                <th>Überliefert</th>
+                <th>Zugeteilt</th>
+                <th>Geliefert</th>
+            </tr>
+        </thead>
+        <tbody>
+            @{
+                string FormatRow(int mode, int obligation, int right, int sum, int? payment = null) {
+                    var isGa = mode == 0;
+                    payment ??= sum;
+                    return $"<td>{(mode == 1 ? "" : obligation == 0 ? "-" : $"{obligation:N0}")}</td>" +
+                        $"<td>{(mode == 1 ? "" : right == 0 ? "-" : $"{right:N0}")}</td>" +
+                        $"<td>{(mode == 1 ? "" : payment < obligation ? $"<b>{obligation - payment:N0}\x3c/b>" : "-")}</td>" +
+                        $"<td>{(mode == 1 ? "" : payment >= obligation && sum <= right ? $"{right - sum:N0}" : "-")}</td>" +
+                        $"<td>{(mode == 1 ? "" : obligation == 0 && right == 0 ? "-" : (sum > right ? ((isGa ? "<b>" : "") + $"{sum - right:N0}" + (isGa ? "</b>" : "")) : "-"))}</td>" +
+                        $"<td>{(mode != 2 ? "" : obligation == 0 && right == 0 ? "-" : $"{payment:N0}")}</td>" +
+                        $"<td>{sum:N0}</td>";
+                }
+                var mBins = Model.MemberBins.Where(b => b.Value.Item2 > 0 || b.Value.Item3 > 0 || b.Value.Item4 > 0).ToList();
+                var fbVars = mBins.Where(b => b.Value.Item2 > 0 || b.Value.Item3 > 0).Select(b => b.Key.Replace("_", "")).Order().ToArray();
+                var fbs = mBins.Where(b => fbVars.Contains(b.Key)).OrderBy(b => b.Value.Item1);
+                var rem = mBins.Where(b => !fbVars.Contains(b.Key)).OrderBy(b => b.Value.Item1);
+            }
+            <tr>
+                <th>Gesamtlieferung lt. gez. GA</th>
+                @Raw(FormatRow(0, Model.Member.DeliveryObligation, Model.Member.DeliveryRight, Model.Member.Deliveries.Where(d => d.Year == Model.Year).Sum(d => d.Weight)))
+            </tr>
+            @if (rem.Any()) {
+                <tr class="subheading"><th colspan="8">Sortenaufteilung:</th></tr>
+            }
+            @foreach (var (id, (name, right, obligation, sum, payment)) in rem) {
+                <tr>
+                    <th>@name</th>
+                    @Raw(FormatRow(1, obligation, right, sum, payment))
+                </tr>
+            }
+            @if (fbs.Any()){
+                <tr class="subheading"><th colspan="8">Flächenbindungen:</th></tr>
+            }
+            @foreach (var (id, (name, right, obligation, sum, payment)) in fbs) {
+                <tr>
+                    <th>@name</th>
+                    @Raw(FormatRow(2, obligation, right, sum, payment))
+                </tr>
+            }
+        </tbody>
+    </table>
+    <div class="text" style="margin-top: 2em;">
+        @if (Model.Text != null) {
+            <p class="comment" style="white-space: pre-wrap; break-inside: avoid;">@Model.Text</p>
+        }
+    </div>
+</main>

Elwig/Documents/DeliveryConfirmation.cshtml.cs

@@ -0,0 +1,36 @@
+using Elwig.Helpers;
+using Elwig.Models;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Elwig.Documents {
+    public class DeliveryConfirmation : BusinessDocument {
+
+        public int Year;
+        public IEnumerable<DeliveryPart> Deliveries;
+        public string? Text = App.Client.TextDeliveryConfirmation;
+        public Dictionary<string, (string, int, int, int, int)> MemberBins;
+
+        public DeliveryConfirmation(AppDbContext ctx, int year, Member m) :
+            base($"Anlieferungsbestätigung {year}", m) {
+            Year = year;
+            ShowDateAndLocation = true;
+            UseBillingAddress = true;
+            IncludeSender = true;
+            // FIXME footer in merged documents
+            //DocumentId = $"Anl.-Best. {Year}/{m.MgNr}";
+            Deliveries = ctx.DeliveryParts.FromSqlRaw($"""
+                SELECT p.*
+                FROM v_delivery v
+                    JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)
+                WHERE (v.year, v.mgnr) = ({Year}, {m.MgNr})
+                ORDER BY v.sortid, v.abgewertet ASC,
+                         COALESCE(LENGTH(v.attributes), 0) ASC, attribute_prio DESC, COALESCE(v.attributes, '~'),
+                         v.kmw DESC, v.lsnr, v.dpnr
+                """)
+                .ToList();
+            MemberBins = ctx.GetMemberBins(Year, m.MgNr).GetAwaiter().GetResult();
+        }
+    }
+}

Elwig/Documents/DeliveryJournal.cshtml.cs

@@ -1,5 +1,6 @@
 using Elwig.Helpers;
 using Elwig.Models;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,11 +16,18 @@ namespace Elwig.Documents {
             Deliveries = deliveries;
         }
 
+        public DeliveryJournal(string filter, IQueryable<DeliveryPart> deliveries) :
+            this(filter, deliveries
+                .Include(p => p.Delivery).ThenInclude(d => d.Member)
+                .Include(p => p.Variant)
+                .ToList()) { }
+
         public DeliveryJournal(AppDbContext ctx, DateOnly date) :
             this(date.ToString("dd.MM.yyyy"), ctx.DeliveryParts
                 .Where(p => p.Delivery.DateString == date.ToString("yyy-MM-dd"))
-                .OrderBy(p => p.Delivery.LsNr)
-                .ThenBy(p => p.DPNr)
-                .ToList()) { }
+                .OrderBy(p => p.Delivery.DateString)
+                .ThenBy(p => p.Delivery.TimeString)
+                .ThenBy(p => p.Delivery.LsNr)
+                .ThenBy(p => p.DPNr)) { }
     }
 }

Elwig/Documents/DeliveryNote.cshtml

@@ -5,44 +5,6 @@
 <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-deliverynote.css" />
 <main>
 <h1>@Model.Title</h1>
-@{
-    bool displayStats = true;  // Model.Delivery.Year == Model.CurrentNextSeason
-}
-<script>
-    document.addEventListener("DOMContentLoaded", () => {
-        const hidden = document.getElementsByClassName("hidden")[0];
-        const table = document.getElementsByClassName("delivery")[0];
-        const stats = document.getElementById("delivery-stats");
-        const mm = px2mm(0, hidden.offsetTop + hidden.offsetHeight);
-        const heightTable = px2mm(table.offsetTop, hidden.offsetTop + hidden.offsetHeight);
-
-        if (mm >= heightA4 - heightFooter) {
-            if (heightTable + 10 >= heightMain) {
-                // force page break in table
-                const tblOff = px2mm(0, table.offsetTop);
-                let last = null;
-                for (const tr of table.getElementsByTagName("tr")) {
-                    if (!tr.classList.contains("main")) continue;
-                    const mm2 = tblOff + px2mm(0, tr.offsetTop);
-                    if (mm2 >= heightA4 - heightFooter) {
-                        last.classList.add("page-break");
-                        break;
-                    }
-                    last = tr;
-                }
-            } else {
-                // force page break
-                const hr = document.createElement("hr");
-                hr.classList.add("page-break");
-                table.before(hr);
-
-                const p = document.createElement("p");
-                p.innerText = "Siehe nächste Seite."
-                hr.before(p);
-            }
-        }
-    });
-</script>
 <table class="delivery">
     <colgroup>
         <col style="width: 10.00mm;"/>
@@ -113,61 +75,64 @@
 @if (Model.Delivery.Comment != null) {
     <p class="comment">Amerkung zur Lieferung: @Model.Delivery.Comment</p>
 }
-@if (displayStats) {
-    <div id="delivery-stats">
-        <table class="delivery-stats">
-            <colgroup>
-                <col style="width: 45mm;"/>
-                <col style="width: 20mm;"/>
-                <col style="width: 20mm;"/>
-                <col style="width: 20mm;"/>
-                <col style="width: 20mm;"/>
-                <col style="width: 20mm;"/>
-                <col style="width: 20mm;"/>
-            </colgroup>
-            <thead>
-                <tr>
-                    <th><b>Lese @Model.Delivery.Year</b> per @($"{Model.Date:dd.MM.yyyy}") [kg]</th>
-                    <th>Lieferpflicht</th>
-                    <th>Lieferrecht</th>
-                    <th>Unterliefert</th>
-                    <th>Noch zu liefern</th>
-                    <th>Überliefert</th>
-                    <th>Geliefert</th>
-                </tr>
-            </thead>
-            <tbody>
-                @{
-                    string FormatRow(int obligation, int right, int sum) {
-                        return $"<td>{obligation:N0}</td>" +
-                            $"<td>{right:N0}</td>" +
-                            $"<td>{(sum < obligation ? $"{obligation - sum:N0}" : "-")}</td>" +
-                            $"<td>{(sum >= obligation && sum <= right ? $"{right - sum:N0}" : "-")}</td>" +
-                            $"<td>{(sum > right ? $"{sum - right:N0}" : "-")}</td>" +
-                            $"<td>{sum:N0}</td>";
-                    }
-                    var sortids = Model.Delivery.Parts.Select(p => p.SortId).ToList();
-                    var buckets = Model.MemberBuckets.GroupBy(b => b.Item1[..2]).ToDictionary(g => g.Key, g => g.Count());
+@if (Model.DisplayStats > 0) {
+    <table class="delivery-note-stats @(Model.DisplayStats > 2 ? "expanded" : "")">
+        <colgroup>
+            <col style="width: 45mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th><b>Lese @Model.Delivery.Year</b> per @($"{Model.Date:dd.MM.yyyy}") [kg]</th>
+                <th>Lieferpflicht</th>
+                <th>Lieferrecht</th>
+                <th>Unterliefert</th>
+                <th>Noch lieferbar</th>
+                <th>Überliefert</th>
+                <th>Geliefert</th>
+            </tr>
+        </thead>
+        <tbody>
+            @{
+                string FormatRow(int obligation, int right, int sum) {
+                    return $"<td>{obligation:N0}</td>" +
+                        $"<td>{right:N0}</td>" +
+                        $"<td>{(sum < obligation ? $"{obligation - sum:N0}" : "-")}</td>" +
+                        $"<td>{(sum >= obligation && sum <= right ? $"{right - sum:N0}" : "-")}</td>" +
+                        $"<td>{(sum > right ? $"{sum - right:N0}" : "-")}</td>" +
+                        $"<td>{sum:N0}</td>";
                 }
-                <tr>
-                    <th>Gesamtlieferung</th>
-                    @Raw(FormatRow(Model.Member.DeliveryObligation, Model.Member.DeliveryRight, Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)))
+                var sortids = Model.Delivery.Parts.Select(p => p.SortId).ToList();
+                var bins = Model.MemberBins.GroupBy(b => b.Key[..2]).ToDictionary(g => g.Key, g => g.Count());
+            }
+            <tr>
+                <th>Gesamtlieferung lt. gez. GA</th>
+                @Raw(FormatRow(Model.Member.DeliveryObligation, Model.Member.DeliveryRight, Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)))
+            </tr>
+            @if (Model.DisplayStats > 1) {
+                <tr class="subheading">
+                    <th>Flächenbindungen:</th>
                 </tr>
-                @foreach (var (id, name, right, obligation, sum) in Model.MemberBuckets.OrderBy(b => b.Item1)) {
-                    if (right > 0 || obligation > 0 || (sum > 0 && buckets[id[..2]] > 1 && !id.EndsWith('_'))) {
+                @foreach (var (id, (name, right, obligation, sum, _)) in Model.MemberBins.OrderBy(b => b.Key)) {
+                    if (right > 0 || obligation > 0 || (sum > 0 && bins[id[..2]] > 1 && !id.EndsWith('_'))) {
                         <tr class="@(sortids.Contains(id[..2]) ? "" : "optional")">
                             <th>@name</th>
                             @Raw(FormatRow(obligation, right, sum))
                         </tr>
                     }
                 }
-            </tbody>
-        </table>
-    </div>
+            }
+        </tbody>
+    </table>
 }
 </main>
 @for (int i = 0; i < 2; i++) {
-    <div class="@(i == 0 ? "hidden" : "bottom")">
+    <div class="text @(i == 0 ? "hidden" : "bottom")">
         @if (Model.Text != null) {
             <p class="comment">@Model.Text</p>
         }

Elwig/Documents/DeliveryNote.cshtml.cs

@@ -7,7 +7,13 @@ namespace Elwig.Documents {
 
         public Delivery Delivery;
         public string? Text;
-        public IEnumerable<(string, string, int, int, int)> MemberBuckets;
+        public Dictionary<string, (string, int, int, int, int)> MemberBins;
+
+        // 0 - none
+        // 1 - GA only
+        // 2 - GA only and area commitments of varieties from delivery note
+        // 3 - full
+        public int DisplayStats = App.Client.ModeDeliveryNoteStats;
 
         public DeliveryNote(Delivery d, AppDbContext ctx) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
             UseBillingAddress = true;
@@ -21,7 +27,7 @@ namespace Elwig.Documents {
                 $"</tbody></table>";
             Text = App.Client.TextDeliveryNote;
             DocumentId = d.LsNr;
-            MemberBuckets = ctx.GetMemberBuckets(d.Member, d.Year).GetAwaiter().GetResult();
+            MemberBins = ctx.GetMemberBins(d.Year, d.Member.MgNr).GetAwaiter().GetResult();
         }
     }
 }

Elwig/Documents/Document.cshtml

@@ -7,13 +7,6 @@
     <title>@Model.Title</title>
     <meta name="author" value="@Model.Author"/>
     <meta charset="UTF-8"/>
-    <script>
-        const heightA4 = 297, widhtA4 = 210, heightFooter = 35, heightHeader = 25;
-        const heightMain = heightA4 - heightFooter - heightHeader;
-        function px2mm(px1, px2) {
-            return (px2 - px1 + 1) * 2.54 / 96 * window.devicePixelRatio * 10;
-        }
-    </script>
     <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style.css"/>
     <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-page.css"/>
 </head>

Elwig/Documents/Document.cshtml.cs

@@ -2,11 +2,15 @@ using System;
 using System.Threading.Tasks;
 using System.IO;
 using Elwig.Helpers;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using System.Linq;
 
 namespace Elwig.Documents {
-    public abstract class Document : IDisposable {
+    public abstract partial class Document : IDisposable {
 
-        private TempFile? PdfFile = null;
+        private TempFile? _pdfFile = null;
+        private string? _renderedHtml = null;
 
         public bool ShowFoldMarks = App.Config.Debug;
 
@@ -25,7 +29,7 @@ namespace Elwig.Documents {
             CurrentNextSeason = Utils.CurrentNextSeason;
             Title = title;
             Author = c.NameFull;
-            Header = $"<div class='name'>{c.Name}</div><div class='suffix'>{c.NameSuffix}</div>";
+            Header = $"<div class='name'>{c.Name}</div><div class='suffix'>{c.NameSuffix}</div><div class='type'>{c.NameTypeFull}</div>";
             Footer = Utils.GenerateFooter("<br/>", " \u00b7 ")
                 .Item(c.NameFull).NextLine()
                 .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
@@ -35,17 +39,56 @@ namespace Elwig.Documents {
             Date = DateTime.Today;
         }
 
+        [GeneratedRegex(@"</body>.*?</footer>\s*</div>", RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled)]
+        private static partial Regex GeneratedDocumentHeaderRegex();
+        private static readonly Regex DocumentHeaderRegex = GeneratedDocumentHeaderRegex();
+
+        [GeneratedRegex(@"<style>.*?/style>", RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled)]
+        private static partial Regex GeneratedHtmlStyleRegex();
+        private static readonly Regex HtmlStyleRegex = GeneratedHtmlStyleRegex();
+
+        [GeneratedRegex(@"<link[^>]*>", RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled)]
+        private static partial Regex GeneratedHtmlLinkRegex();
+        private static readonly Regex HtmlLinkRegex = GeneratedHtmlLinkRegex();
+
         ~Document() {
             Dispose();
         }
 
         public void Dispose() {
-            PdfFile?.Dispose();
-            PdfFile = null;
+            _pdfFile?.Dispose();
+            _pdfFile = null;
             GC.SuppressFinalize(this);
         }
 
-        private Task<string> Render() {
+        public static async Task<Document> Merge(IEnumerable<Document> docs) {
+            string html = "";
+            var styles = new List<string>();
+            foreach (var d in docs) {
+                var h = await d.Render();
+                var s = HtmlStyleRegex.Matches(h).Select(m => m.Value).ToList();
+                var l = HtmlLinkRegex.Matches(h).Select(m => m.Value).ToList();
+                if (s.All(styles.Contains)) {
+                    h = HtmlStyleRegex.Replace(h, "");
+                } else {
+                    styles.AddRange(s);
+                }
+                if (l.All(styles.Contains)) {
+                    h = HtmlLinkRegex.Replace(h, "");
+                } else {
+                    styles.AddRange(l);
+                }
+                html += h;
+            }
+            html = DocumentHeaderRegex.Replace(html, "<div class='document-break'/>");
+            return new InternalDocument("Mehrere Dokumente") {
+                _renderedHtml = html,
+            };
+        }
+
+        private async Task<string> Render() {
+            if (_renderedHtml != null)
+                return _renderedHtml;
             string name;
             if (this is BusinessLetter) {
                 name = "BusinessLetter";
@@ -55,14 +98,19 @@ namespace Elwig.Documents {
                 name = "CreditNote";
             } else if (this is DeliveryJournal) {
                 name = "DeliveryJournal";
+            } else if (this is Letterhead) {
+                name = "Letterhead";
+            } else if (this is DeliveryConfirmation) {
+                name = "DeliveryConfirmation";
             } else {
                 throw new InvalidOperationException("Invalid document object");
             }
-            return Render(name);
+            return await Render(name);
         }
 
-        private Task<string> Render(string name) {
-            return Html.CompileRenderAsync(name, this);
+        private async Task<string> Render(string name) {
+            _renderedHtml = await Html.CompileRenderAsync(name, this);
+            return _renderedHtml;
         }
 
         public async Task Generate() {
@@ -71,22 +119,26 @@ namespace Elwig.Documents {
                 await File.WriteAllTextAsync(tmpHtml.FilePath, await Render(), Utils.UTF8);
                 await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath);
             }
-            PdfFile = pdf;
+            _pdfFile = pdf;
         }
 
         public void SaveTo(string pdfPath) {
-            if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            File.Copy(PdfFile.FilePath, pdfPath);
+            if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
+            File.Copy(_pdfFile.FilePath, pdfPath);
         }
 
         public async Task Print(int copies = 1) {
-            if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            await Pdf.Print(PdfFile.FilePath, copies);
+            if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
+            await Pdf.Print(_pdfFile.FilePath, copies);
         }
 
         public void Show() {
-            if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            Pdf.Show(PdfFile.NewReference(), Title);
+            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}" : ""));
+        }
+
+        private class InternalDocument : Document {
+            public InternalDocument(string title) : base(title) { }
         }
     }
 }

Elwig/Documents/Html.cs

@@ -20,6 +20,8 @@ namespace Elwig.Documents {
             await e.CompileTemplateAsync("DeliveryNote");
             await e.CompileTemplateAsync("CreditNote");
             await e.CompileTemplateAsync("DeliveryJournal");
+            await e.CompileTemplateAsync("Letterhead");
+            await e.CompileTemplateAsync("DeliveryConfirmation");
 
             Engine = e;
             evtHandler();

Elwig/Documents/Letterhead.cshtml

@@ -0,0 +1,9 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.Letterhead>
+@model Elwig.Documents.Letterhead
+@{ Layout = "BusinessDocument"; }
+<style>
+    header, .footer-wrapper {
+        visibility: hidden;
+    }
+</style>

Elwig/Documents/Letterhead.cshtml.cs

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

Elwig/Documents/Pdf.cs

@@ -59,6 +59,7 @@ namespace Elwig.Documents {
         public static async Task Print(string path, int copies = 1) {
             var p = new Process() { StartInfo = new() { FileName = PdfToPrinter } };
             p.StartInfo.ArgumentList.Add(path);
+            p.StartInfo.ArgumentList.Add("/s");
             p.StartInfo.ArgumentList.Add($"copies={copies}");
             p.Start();
             await p.WaitForExitAsync();

Elwig/Documents/style-deliveryconfirmation.css

@@ -0,0 +1,113 @@
+
+table.delivery-confirmation {
+    font-size: 10pt;
+    margin-bottom: 5mm;
+}
+
+table.delivery-confirmation thead {
+    font-size: 8pt;
+}
+
+table.delivery-confirmation thead th {
+    font-weight: normal;
+    font-style: italic;
+}
+
+table.delivery-confirmation td {
+    overflow: hidden;
+    white-space: nowrap;
+}
+
+table.delivery-confirmation td[rowspan] {
+    vertical-align: top;
+}
+
+table.delivery-confirmation .weight {
+    text-align: right;
+}
+
+table.delivery-confirmation .grad {
+    text-align: center;
+}
+
+table.delivery-confirmation .geb {
+    font-size: 8pt;
+}
+
+table.delivery-confirmation .mod {
+    font-size: 8pt;
+    padding-left: 5mm;
+}
+
+table.delivery-confirmation .small {
+    font-size: 8pt;
+}
+
+table.delivery-confirmation tr.new td {
+    border-top: 0.5pt solid black;
+}
+
+table.delivery-confirmation tr:not(.first) {
+    break-before: avoid;
+}
+
+table.delivery-confirmation tr:not(.first) td {
+    padding-top: 0;
+}
+
+table.delivery-confirmation tr.trailing td {
+    padding-bottom: 0;
+}
+
+table.delivery-confirmation tr.sum {
+    border-top: 0.5pt solid black;
+    break-before: avoid;
+    font-weight: bold;
+    font-size: 12pt;
+}
+
+table.delivery-confirmation tr.sum td {
+    padding-top: 1mm;
+}
+
+table.delivery-confirmation-stats {
+    font-size: 10pt;
+    break-inside: avoid;
+}
+
+table.delivery-confirmation-stats th,
+table.delivery-confirmation-stats td {
+    padding: 0.125mm 0;
+    overflow: hidden;
+    white-space: nowrap;
+}
+
+table.delivery-confirmation-stats tr.subheading th {
+    text-align: left;
+}
+
+table.delivery-confirmation-stats thead th {
+    font-weight: normal;
+    font-style: italic;
+    text-align: right;
+    font-size: 8pt;
+}
+
+table.delivery-confirmation-stats thead th:first-child {
+    text-align: left;
+}
+
+table.delivery-confirmation-stats td {
+    text-align: right;
+}
+
+table.delivery-confirmation-stats tbody th {
+    font-weight: normal;
+    font-style: italic;
+    text-align: left;
+}
+
+table.delivery-confirmation-stats tr.subheading th {
+    font-weight: bold;
+    border-top: 0.5pt solid black;
+}

Elwig/Documents/style-deliverynote.css

@@ -39,11 +39,9 @@ table.delivery tr.tight.first td {
     padding-bottom: 0;
 }
 
-/* FIXME update version of WeasyPrint
 table.delivery tr.tight:has(+ tr:not(.tight)) td {
-padding-bottom: 0.5mm !important;
+    padding-bottom: 0.5mm !important;
 }
-*/
 
 table.delivery tr.sum {
     border-top: 0.5pt solid black;
@@ -54,45 +52,45 @@ table.delivery tr.sum td {
     padding-top: 1mm;
 }
 
-table.delivery-stats {
+table.delivery-note-stats {
     font-size: 8pt;
     break-inside: avoid;
     break-after: avoid;
 }
 
-table.delivery-stats.expanded th,
-table.delivery-stats.expanded td {
-    padding: 0.25mm 0;
-}
-
-table.delivery-stats:not(.expanded) th,
-table.delivery-stats:not(.expanded) td {
+table.delivery-note-stats th,
+table.delivery-note-stats td {
     padding: 0.125mm 0;
 }
 
-table.delivery-stats:not(.expanded) tr.optional {
+table.delivery-note-stats:not(.expanded) tr.optional {
     display: none;
 }
 
-table.delivery-stats thead th {
+table.delivery-note-stats tr.subheading th {
+    text-align: left;
+}
+
+table.delivery-note-stats.expanded tr.subheading:not(:has(~ tr)),
+table.delivery-note-stats tr.subheading:not(:has(~ tr:not(.optional))) {
+    display: none;
+}
+
+table.delivery-note-stats thead th {
     font-weight: normal;
     font-style: italic;
     text-align: right;
 }
 
-table.delivery-stats thead th:first-child {
+table.delivery-note-stats thead th:first-child {
     text-align: left;
 }
 
-table.delivery-stats.expanded tbody {
-    font-size: 10pt;
-}
-
-table.delivery-stats td {
+table.delivery-note-stats td {
     text-align: right;
 }
 
-table.delivery-stats tbody th {
+table.delivery-note-stats tbody th {
     font-weight: normal;
     font-style: italic;
     text-align: left;

Elwig/Documents/style-page.css

@@ -20,6 +20,9 @@
 hr.page-break {
     display: none;
 }
+.document-break {
+    break-before: page;
+}
 
 @page {
     size: A4;

Elwig/Documents/style.css

@@ -40,15 +40,20 @@ header {
 
 header .name {
     font-size: 18pt;
-    margin-top: 10mm;
+    margin-top: 8mm;
     font-weight: bold;
 }
 
 header .suffix {
-    font-size: 12pt;
+    font-size: 14pt;
     font-weight: bold;
 }
 
+header .type {
+    font-size: 12pt;
+    font-weight: normal;
+}
+
 .footer-wrapper {
     position: running(page-footer);
     width: 165mm;

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>elwig.ico</ApplicationIcon>
-    <Version>0.3.2</Version>
+    <Version>0.4.2</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 
@@ -19,6 +19,7 @@
     <PackageReference Include="Balbarak.WeasyPrint" Version="2.0.2" />
     <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
     <PackageReference Include="ini-parser" Version="2.5.2" />
+    <PackageReference Include="LinqKit" Version="1.2.4" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.22" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.11" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.11" />

Elwig/Helpers/AppDbContext.cs

@@ -53,6 +53,10 @@ namespace Elwig.Helpers {
 
         public static string ConnectionString => $"Data Source=\"{App.Config.DatabaseFile}\"; Foreign Keys=True; Mode=ReadWrite; Cache=Default";
 
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, (int, int)>>> _memberRightsAndObligations = new();
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBins = new();
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberPaymentBins = new();
+
         public AppDbContext() {
             if (App.Config.DatabaseLog != null) {
                 try {
@@ -206,26 +210,101 @@ namespace Elwig.Helpers {
             }
         }
 
-        public async Task<IEnumerable<(string, string, int, int, int)>> GetMemberBuckets(Member m, int year) {
-            using var cnx = await ConnectAsync();
-            var (rights, obligations) = await Billing.Billing.GetMemberRightsObligations(m.MgNr, year, cnx);
-            var buckets = await Billing.Billing.GetMemberBucketWeights(m.MgNr, year, cnx);
-
-            var list = new List<(string, string, int, int, int)>();
-            foreach (var id in rights.Keys.Union(obligations.Keys).Union(buckets.Keys)) {
-                var s = await WineVarieties.FindAsync(id[..2]);
-                var attrIds = id[2..];
-                var a = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync();
-                var name = (s?.Name ?? "") + (a.Count > 0 ? $" ({string.Join(" / ", a.Select(a => a.Name))})" : "");
-                list.Add((
-                    id, name,
-                    rights.TryGetValue(id, out var v1) ? v1 : 0,
-                    obligations.TryGetValue(id, out var v2) ? v2 : 0,
-                    buckets.TryGetValue(id, out var v3) ? v3 : 0
-                ));
+        private async Task FetchMemberRightsAndObligations(int year, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var bins = new Dictionary<int, Dictionary<string, (int, int)>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bin, min_kg, max_kg FROM v_area_commitment_bin WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var vtrgid = reader.GetString(1);
+                    if (!bins.ContainsKey(mgnr)) bins[mgnr] = new();
+                    bins[mgnr][vtrgid] = (reader.GetInt32(3), reader.GetInt32(2));
+                }
             }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberRightsAndObligations[year] = bins;
+        }
 
-            return list;
+        private async Task FetchMemberDeliveryBins(int year, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var bins = new Dictionary<int, Dictionary<string, int>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bin, weight FROM v_delivery_bin WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var bin = reader.GetString(1);
+                    if (!bins.ContainsKey(mgnr)) bins[mgnr] = new();
+                    bins[mgnr][bin] = reader.GetInt32(2);
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberDeliveryBins[year] = bins;
+        }
+
+        private async Task FetchMemberPaymentBins(int year, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var bins = new Dictionary<int, Dictionary<string, int>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bin, weight FROM v_payment_bin WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var bin = reader.GetString(1);
+                    if (!bins.ContainsKey(mgnr)) bins[mgnr] = new();
+                    bins[mgnr][bin] = reader.GetInt32(2);
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberPaymentBins[year] = bins;
+        }
+
+        public async Task<Dictionary<string, (int, int)>> GetMemberRightsAndObligations(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberRightsAndObligations.ContainsKey(year))
+                await FetchMemberRightsAndObligations(year, cnx);
+            return _memberRightsAndObligations[year].GetValueOrDefault(mgnr, new());
+        }
+
+        public async Task<Dictionary<string, int>> GetMemberDeliveryBins(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberDeliveryBins.ContainsKey(year))
+                await FetchMemberDeliveryBins(year, cnx);
+            return _memberDeliveryBins[year].GetValueOrDefault(mgnr, new());
+        }
+
+        public async Task<Dictionary<string, int>> GetMemberPaymentBins(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberPaymentBins.ContainsKey(year))
+                await FetchMemberPaymentBins(year, cnx);
+            return _memberPaymentBins[year].GetValueOrDefault(mgnr, new());
+        }
+
+        public async Task<Dictionary<string, (string, int, int, int, int)>> GetMemberBins(int year, int mgnr, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var rightsAndObligations = await GetMemberRightsAndObligations(year, mgnr, cnx);
+            var deliveryBins = await GetMemberDeliveryBins(year, mgnr, cnx);
+            var paymentBins = await GetMemberPaymentBins(year, mgnr, cnx);
+            if (ownCnx) await cnx.DisposeAsync();
+
+            var bins = new Dictionary<string, (string, int, int, int, int)>();
+            foreach (var id in rightsAndObligations.Keys.Union(deliveryBins.Keys).Union(paymentBins.Keys)) {
+                var variety = await WineVarieties.FindAsync(id[..2]);
+                var attrIds = id[2..];
+                var attrs = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync();
+                var name = (variety?.Name ?? "") + (attrIds == "_" ? " (kein Qual.Wein)" : attrs.Count > 0 ? $" ({string.Join(" / ", attrs.Select(a => a.Name))})" : "");
+                bins[id] = (
+                    name,
+                    rightsAndObligations.GetValueOrDefault(id).Item1,
+                    rightsAndObligations.GetValueOrDefault(id).Item2,
+                    deliveryBins.GetValueOrDefault(id),
+                    paymentBins.GetValueOrDefault(id)
+                );
+            }
+            return bins;
         }
     }
 }

Elwig/Helpers/AppDbUpdater.cs

@@ -4,11 +4,11 @@ using System;
 namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
-        public static readonly int RequiredSchemaVersion = 2;
+        public static readonly int RequiredSchemaVersion = 4;
 
         private static int _versionOffset = 0;
         private static readonly Action<SqliteConnection>[] _updaters = new[] {
-            UpdateDbSchema_1_To_2, UpdateDbSchema_2_To_3
+            UpdateDbSchema_1_To_2, UpdateDbSchema_2_To_3, UpdateDbSchema_3_To_4
         };
 
         private static void ExecuteNonQuery(SqliteConnection cnx, string sql) {
@@ -80,6 +80,138 @@ namespace Elwig.Helpers {
             ExecuteNonQuery(cnx, "ALTER TABLE delivery_part ADD COLUMN weighing_reason TEXT CHECK(NOT (manual_weighing = FALSE AND weighing_reason IS NOT NULL))");
         }
 
-        private static void UpdateDbSchema_2_To_3(SqliteConnection cnx) { }
+        private static void UpdateDbSchema_2_To_3(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, """
+                CREATE TABLE delivery_part_bin (
+                    year     INTEGER NOT NULL,
+                    did      INTEGER NOT NULL,
+                    dpnr     INTEGER NOT NULL,
+                    binnr    INTEGER NOT NULL,
+
+                    discr    TEXT    NOT NULL,
+                    value    INTEGER NOT NULL,
+
+                    CONSTRAINT pk_delivery_part_bin PRIMARY KEY (year, did, dpnr, binnr),
+                    CONSTRAINT fk_delivery_part_bin_delivery_part FOREIGN KEY (year, did, dpnr) REFERENCES delivery_part (year, did, dpnr)
+                        ON UPDATE CASCADE
+                        ON DELETE CASCADE
+                ) STRICT;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
+                SELECT year, did, dpnr, 0, '_', bucket_2 + bucket_3
+                FROM payment_delivery_part
+                WHERE COALESCE(bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9) IS NOT NULL
+                ON CONFLICT DO NOTHING;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
+                SELECT d.year, d.did, d.dpnr, 1, COALESCE(attributes, ''), bucket_1
+                FROM payment_delivery_part p
+                    JOIN v_delivery d ON (d.year, d.did, d.dpnr) = (p.year, p.did, p.dpnr)
+                WHERE COALESCE(bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9) IS NOT NULL
+                ON CONFLICT DO NOTHING;
+                """);
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_1");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_2");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_3");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_4");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_5");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_6");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_7");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_8");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_9");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_1_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_2_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_3_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_4_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_5_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_6_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_7_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_8_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_9_name");
+
+            ExecuteNonQuery(cnx, "ALTER TABLE delivery_part ADD COLUMN gebunden INTEGER CHECK (gebunden IN (TRUE, FALSE)) DEFAULT NULL");
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_delivery");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery AS
+                SELECT s.*, GROUP_CONCAT(o.modid) AS modifiers
+                FROM (SELECT p.year, p.did, p.dpnr,
+                             d.date, d.time, d.zwstid, d.lnr, d.lsnr,
+                             m.mgnr, m.family_name, m.given_name,
+                             p.sortid, p.weight, p.kmw, ROUND(p.kmw * (4.54 + 0.022 * p.kmw), 0) AS oe, p.qualid, p.hkid, p.kgnr, p.rdnr,
+                             p.gerebelt, p.gebunden,
+                             p.qualid IN (SELECT l.qualid FROM wine_quality_level l WHERE NOT l.predicate AND (p.kmw >= l.min_kmw OR l.min_kmw IS NULL) ORDER BY l.min_kmw DESC LIMIT 1,100) AS abgewertet,
+                             p.qualid NOT IN ('WEI', 'RSW', 'LDW') AS min_quw,
+                             GROUP_CONCAT(a.attrid) AS attributes,
+                             COALESCE(SUM(a.fill_lower_bins), 0) AS attribute_prio,
+                             d.comment, p.comment AS part_comment
+                    FROM delivery_part p
+                        JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
+                        JOIN member m ON m.mgnr = d.mgnr
+                        LEFT JOIN delivery_part_attribute pa ON (pa.year, pa.did, pa.dpnr) = (p.year, p.did, p.dpnr)
+                        LEFT JOIN wine_attribute a ON a.attrid = pa.attrid
+                    GROUP BY p.year, p.did, p.dpnr
+                    ORDER BY p.year, p.did, p.dpnr, a.attrid) s
+                LEFT JOIN delivery_part_modifier o ON (o.year, o.did, o.dpnr) = (s.year, s.did, s.dpnr)
+                GROUP BY s.year, s.lsnr, s.dpnr
+                ORDER BY s.year, s.lsnr, s.dpnr, o.modid;
+                """);
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_bucket");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery_bin AS
+                SELECT year, mgnr,
+                       sortid || IIF(min_quw, REPLACE(COALESCE(attributes, ''), ',', ''), '_') AS bin,
+                       SUM(weight) AS weight
+                FROM v_delivery
+                GROUP BY year, mgnr, bin
+                ORDER BY year, mgnr, LENGTH(bin) DESC, bin;
+                """);
+
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_payment_bin AS
+                SELECT d.year, d.mgnr,
+                       sortid || discr AS bin,
+                       SUM(value) AS weight
+                FROM v_delivery d
+                    JOIN delivery_part_bin b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
+                GROUP BY d.year, d.mgnr, bin
+                HAVING SUM(value) > 0
+                ORDER BY d.year, d.mgnr, bin;
+                """);
+
+            ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute ADD COLUMN fill_lower_bins INTEGER NOT NULL CHECK (fill_lower_bins IN (0, 1, 2)) DEFAULT 0");
+        }
+
+        private static void UpdateDbSchema_3_To_4(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, "DROP VIEW v_payment_bin");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_payment_bin AS
+                SELECT d.year, d.mgnr,
+                       sortid || discr AS bin,
+                       SUM(value) AS weight
+                FROM v_delivery d
+                    JOIN delivery_part_bin b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
+                GROUP BY d.year, d.mgnr, bin
+                HAVING SUM(value) > 0
+                ORDER BY d.year, d.mgnr, LENGTH(bin) DESC, bin;
+                """);
+
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_area_commitment_bin AS
+                SELECT s.year, c.mgnr,
+                       c.vtrgid AS bin,
+                       CAST(ROUND(SUM(COALESCE(area * min_kg_per_ha, 0)) / 10000.0, 0) AS INTEGER) AS min_kg,
+                       CAST(ROUND(SUM(COALESCE(area * max_kg_per_ha, 0)) / 10000.0, 0) AS INTEGER) AS max_kg
+                FROM area_commitment c, season s
+                    JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
+                WHERE (year_from IS NULL OR year_from <= s.year) AND
+                      (year_to IS NULL OR year_to >= s.year)
+                GROUP BY s.year, c.mgnr, c.vtrgid
+                ORDER BY s.year, c.mgnr, LENGTH(c.vtrgid) DESC, c.vtrgid;
+                """);
+        }
     }
 }

Elwig/Helpers/Billing/Billing.cs

@@ -1,4 +1,5 @@
 using Microsoft.Data.Sqlite;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -6,125 +7,199 @@ using System.Threading.Tasks;
 namespace Elwig.Helpers.Billing {
     public class Billing {
 
-        private readonly int Year;
-        private readonly int AvNr;
-        private readonly AppDbContext Context;
-        private readonly Dictionary<string, string> Attributes;
-        private readonly Dictionary<string, (decimal?, decimal?)> Modifiers;
-        private readonly Dictionary<string, (string, string?, string?, string?, int?, int?, decimal?)> AreaComTypes;
+        protected readonly int Year;
+        protected readonly AppDbContext Context;
+        protected readonly Dictionary<string, string> Attributes;
+        protected readonly Dictionary<string, (decimal?, decimal?)> Modifiers;
+        protected readonly Dictionary<string, (string, string?, string?, string?, int?, int?, decimal?)> AreaComTypes;
 
-        public Billing(int year, int avnr) {
+        public Billing(int year) {
             Year = year;
-            AvNr = avnr;
             Context = new AppDbContext();
             Attributes = Context.WineAttributes.ToDictionary(a => a.AttrId, a => a.Name);
             Modifiers = Context.Modifiers.Where(m => m.Year == Year).ToDictionary(m => m.ModId, m => (m.Abs, m.Rel));
             AreaComTypes = Context.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId1, v.AttrId2, v.Discriminator, v.MinKgPerHa, v.MaxKgPerHa, v.PenaltyAmount));
         }
 
-        protected async Task DeleteInDb() {
+        public async Task FinishSeason() {
             using var cnx = await AppDbContext.ConnectAsync();
-            using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"DELETE FROM payment_delivery_part WHERE (year, avnr) = ({Year}, {AvNr})";
-                await cmd.ExecuteNonQueryAsync();
-            }
-            using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"DELETE FROM payment_member WHERE (year, avnr) = ({Year}, {AvNr})";
-                await cmd.ExecuteNonQueryAsync();
-            }
-        }
-
-        public async Task Calculate() {
-            await DeleteInDb();
-            var tasks = new List<Task>();
-            foreach (var mgnr in Context.Members.Select(m => m.MgNr)) {
-                tasks.Add(Task.Run(() => CalculateMember(mgnr)));
-            }
-            await Task.WhenAll(tasks);
-        }
-
-        public static async Task<(Dictionary<string, int>, Dictionary<string, int>)> GetMemberRightsObligations(int mgnr, int year, SqliteConnection cnx) {
-            var rights = new Dictionary<string, int>();
-            var obligations = new Dictionary<string, int>();
-
-            using var cmd = cnx.CreateCommand();
-            cmd.CommandText = $"""
-                SELECT t.vtrgid,
-                       SUM(COALESCE(area * min_kg_per_ha, 0)) / 10000 AS min_kg,
-                       SUM(COALESCE(area * max_kg_per_ha, 0)) / 10000 AS max_kg
-                FROM area_commitment c
-                JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
-                WHERE mgnr = {mgnr} AND (year_from IS NULL OR year_from <= {year}) AND (year_to IS NULL OR year_to >= {year})
-                GROUP BY t.vtrgid
-                ORDER BY LENGTH(t.vtrgid) DESC, t.vtrgid
-                """;
-
-            var reader = await cmd.ExecuteReaderAsync();
-            while (await reader.ReadAsync()) {
-                var vtrgid = reader.GetString(0);
-                obligations[vtrgid] = reader.GetInt32(1);
-                rights[vtrgid] = reader.GetInt32(2);
-            }
-
-            return (rights, obligations);
-        }
-
-        public static async Task<Dictionary<string, int>> GetMemberBucketWeights(int mgnr, int year, SqliteConnection cnx) {
-            var buckets = new Dictionary<string, int>();
-
-            using var cmd = cnx.CreateCommand();
-            cmd.CommandText = $"""
-                SELECT bucket, weight
-                FROM v_bucket
-                WHERE (year, mgnr) = ({year}, {mgnr})
-                """;
-
-            var reader = await cmd.ExecuteReaderAsync();
-            while (await reader.ReadAsync()) {
-                var bucket = reader.GetString(0);
-                buckets[bucket] = reader.GetInt32(1);
-            }
-
-            return buckets;
-        }
-
-        protected async Task CalculateMember(int mgnr) {
-            using var cnx = await AppDbContext.ConnectAsync();
-            var (rights, obligations) = await GetMemberRightsObligations(mgnr, Year, cnx);
-
-            var deliveries = new List<(int, int, string, int, double, string, string[], string[])>();
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"""
-                    SELECT did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers
-                    FROM v_delivery
-                    WHERE (year, mgnr) = ({Year}, {mgnr})
-                    ORDER BY kmw DESC, weight DESC, did, dpnr
+                    UPDATE season
+                    SET (start_date, end_date) = (SELECT MIN(date), MAX(date) FROM delivery WHERE year = {Year})
+                    WHERE year = {Year}
                     """;
-                var reader = await cmd.ExecuteReaderAsync();
+                await cmd.ExecuteNonQueryAsync();
+            }
+
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"DELETE FROM delivery_part_bin WHERE year = {Year}";
+                await cmd.ExecuteNonQueryAsync();
+            }
+        }
+
+        public async Task CalculateBins(bool allowAttrsIntoLowerBins, bool avoidUnderDeliveries, bool honorGebunden) {
+            var attrVals = Context.WineAttributes.ToDictionary(a => a.AttrId, a => a.FillLowerBins);
+            var attrForced = attrVals.Where(a => a.Value == 0).Select(a => a.Key).ToArray();
+            using var cnx = await AppDbContext.ConnectAsync();
+            await Context.GetMemberRightsAndObligations(Year, 0, cnx);
+            var inserts = new List<(int, int, int, string, int)>();
+
+            var deliveries = new List<(int, int, int, string, int, double, string, string[], string[], bool?)>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT mgnr, did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers, gebunden
+                    FROM v_delivery
+                    WHERE year = {Year}
+                    ORDER BY mgnr, sortid, abgewertet ASC, {(honorGebunden ? "gebunden IS NOT NULL DESC, gebunden DESC," : "")}
+                             COALESCE(LENGTH(attributes), 0) ASC, attribute_prio DESC, COALESCE(attributes, '~'),
+                             kmw DESC, lsnr, dpnr
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
                 while (await reader.ReadAsync()) {
                     deliveries.Add((
-                        reader.GetInt32(0), reader.GetInt32(1), reader.GetString(2), reader.GetInt32(3),
-                        reader.GetDouble(4), reader.GetString(5), reader.GetString(6).Split(","), reader.GetString(7).Split(",")
+                        reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetString(3), reader.GetInt32(4),
+                        reader.GetDouble(5), reader.GetString(6),
+                        reader.IsDBNull(7) ? Array.Empty<string>() : reader.GetString(7).Split(",").Order().ToArray(),
+                        reader.IsDBNull(8) ? Array.Empty<string>() : reader.GetString(8).Split(",").Order().ToArray(),
+                        reader.IsDBNull(9) ? null : reader.GetBoolean(9)
                     ));
                 }
             }
 
-            foreach (var (did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers) in deliveries) {
-                if (qualid == "WEI" || qualid == "RSW" || qualid == "LDW") {
+            int lastMgNr = 0;
+            Dictionary<string, (int, int)>? rightsAndObligations = null;
+            Dictionary<string, int> used = new();
+            foreach (var (mgnr, did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers, gebunden) in deliveries) {
+                if (lastMgNr != mgnr) {
+                    rightsAndObligations = await Context.GetMemberRightsAndObligations(Year, mgnr);
+                    used = new();
+                }
+                if ((honorGebunden && gebunden == false) ||
+                    rightsAndObligations == null || rightsAndObligations.Count == 0 ||
+                    qualid == "WEI" || qualid == "RSW" || qualid == "LDW")
+                {
+                    // Explizit als ungebunden markiert,
+                    // Mitglied hat keine Flächenbindungen, oder
                     // Nicht mindestens Qualitätswein (QUW)
-                    using var cmd = cnx.CreateCommand();
-                    // TODO
-                    cmd.CommandText = $"""
-                        INSERT INTO payment_delivery_part (year, did, dpnr, avnr, mod_abs, mod_rel, )
-                        VALUES ({Year}, {did}, {dpnr}, {AvNr}, )
-                        """;
-                    await cmd.ExecuteNonQueryAsync();
+                    // -> ungebunden
+                    inserts.Add((did, dpnr, 0, "_", weight));
                     continue;
                 }
 
-                // TODO
+                if (attributes.Length > 2)
+                    throw new NotSupportedException();
+
+                int w = weight;
+                foreach (var p in Utils.Permutate(attributes, attributes.Intersect(attrForced))) {
+                    var c = p.Count();
+                    var key = sortid + string.Join("", p);
+                    if (rightsAndObligations.ContainsKey(key)) {
+                        int i = 4;
+                        if (c == 1) {
+                            i = (p.ElementAt(0) == attributes[0]) ? 2 : 3;
+                        } else if (c == 0) {
+                            i = 1;
+                        }
+                        var u = used.GetValueOrDefault(key, 0);
+                        var vr = Math.Max(0, Math.Min(rightsAndObligations[key].Item1 - u, w));
+                        var vo = Math.Max(0, Math.Min(rightsAndObligations[key].Item2 - u, w));
+                        var v = (attributes.Length == 0 || attributes.Select(a => attrVals[a]).Min() == 2) ? vr : vo;
+                        used[key] = u + v;
+                        inserts.Add((did, dpnr, i, key[2..], v));
+                        w -= v;
+                    }
+                    if (w == 0 || !allowAttrsIntoLowerBins) break;
+                }
+                inserts.Add((did, dpnr, 0, "_", w));
+                lastMgNr = mgnr;
             }
 
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    INSERT INTO delivery_part_bin (year, did, dpnr, binnr, 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 cmd.ExecuteNonQueryAsync();
+            }
+
+            if (!avoidUnderDeliveries)
+                return;
+
+            var underDeliveries = new Dictionary<(int, string), int>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT c.mgnr, c.bin, COALESCE(p.weight, 0) - c.min_kg AS diff
+                    FROM v_area_commitment_bin c
+                        LEFT JOIN v_payment_bin p ON (p.year, p.mgnr, p.bin) = (c.year, c.mgnr, c.bin)
+                    WHERE c.year = {Year} AND LENGTH(c.bin) = 2 AND diff < 0
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    underDeliveries[(reader.GetInt32(0), reader.GetString(1))] = reader.GetInt32(2);
+                }
+            }
+
+            var fittingBins = new Dictionary<(int, string), int>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT c.mgnr, c.bin, COALESCE(p.weight, 0) - c.min_kg AS diff
+                    FROM v_area_commitment_bin c
+                        LEFT JOIN v_payment_bin p ON (p.year, p.mgnr, p.bin) = (c.year, c.mgnr, c.bin)
+                    WHERE c.year = {Year} AND LENGTH(c.bin) = 3 AND diff > 0
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    fittingBins[(reader.GetInt32(0), reader.GetString(1))] = reader.GetInt32(2);
+                }
+            }
+
+            foreach (var item in fittingBins) {
+                var mgnr = item.Key.Item1;
+                var id = item.Key.Item2[..2];
+                var attr = item.Key.Item2[2..];
+                var available = item.Value;
+                var needed = -underDeliveries.GetValueOrDefault((mgnr, id), 0);
+                if (needed <= 0) continue;
+
+                var fittingDeliveries = new List<(int, int, int, int)>();
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                        SELECT d.did, d.dpnr, d.weight, b.value
+                        FROM v_delivery d
+                            JOIN delivery_part_bin b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr) AND b.discr = '{attr}'
+                        WHERE d.year = {Year} AND mgnr = {mgnr} AND sortid = '{id}' AND attributes = '{attr}'
+                        ORDER BY kmw ASC, lsnr DESC, d.dpnr DESC
+                        """;
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        fittingDeliveries.Add((
+                            reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetInt32(3)
+                        ));
+                    }
+                }
+
+                var changes = new List<(int, int, int, int)>();
+                foreach (var (did, dpnr, _, w) in fittingDeliveries) {
+                    int v = Math.Min(needed, w);
+                    needed -= v;
+                    changes.Add((did, dpnr, 1, v));
+                    changes.Add((did, dpnr, 2, w - v));
+                    if (needed == 0) break;
+                }
+
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                        INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
+                        VALUES {string.Join(",\n       ", changes.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
+                        ON CONFLICT DO UPDATE
+                        SET value = excluded.value
+                        """;
+                    await cmd.ExecuteNonQueryAsync();
+                }
+            }
         }
     }
 }

Elwig/Helpers/Billing/BillingVariant.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Billing {
+    public class BillingVariant : Billing {
+
+        private readonly int AvNr;
+
+        public BillingVariant(int year, int avnr) : base(year) {
+            AvNr = avnr;
+        }
+
+        protected async Task DeleteInDb() {
+            using var cnx = await AppDbContext.ConnectAsync();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"DELETE FROM payment_delivery_part WHERE (year, avnr) = ({Year}, {AvNr})";
+                await cmd.ExecuteNonQueryAsync();
+            }
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"DELETE FROM payment_member WHERE (year, avnr) = ({Year}, {AvNr})";
+                await cmd.ExecuteNonQueryAsync();
+            }
+        }
+
+        public async Task CalculatePrices() {
+            await DeleteInDb();
+            var tasks = new List<Task>();
+            foreach (var mgnr in Context.Members.Select(m => m.MgNr)) {
+                tasks.Add(Task.Run(() => CalculateMemberPrices(mgnr)));
+            }
+            await Task.WhenAll(tasks);
+        }
+
+        protected async Task CalculateMemberPrices(int mgnr) {
+
+        }
+    }
+}

Elwig/Helpers/ClientParameters.cs

@@ -20,6 +20,10 @@ namespace Elwig.Helpers {
         public string Name;
         public string? NameSuffix;
         public string NameType;
+        public string NameTypeFull => NameType.Replace(".", "").Replace(" ", "").ToLower() switch {
+            "reggenmbh" => "registrierte Genossenschaft mit beschränkter Haftung",
+            _ => NameType,
+        };
         public string NameFull => NameSuffix == null ? $"{Name} {NameType}" : $"{Name}, {NameSuffix}, {NameType}";
         public Type? Client;
 
@@ -51,7 +55,10 @@ namespace Elwig.Helpers {
         public decimal VatReduced;
         public decimal VatFlatRate;
 
+        public int ModeDeliveryNoteStats;
+
         public string? TextDeliveryNote;
+        public string? TextDeliveryConfirmation;
 
         public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
 
@@ -85,14 +92,31 @@ namespace Elwig.Helpers {
                 VatReduced = decimal.Parse((parameters["VAT_REDUCED"] ?? "").Replace(".", ","));
                 VatFlatRate = decimal.Parse((parameters["VAT_FLATRATE"] ?? "").Replace(".", ","));
 
+                switch (parameters.GetValueOrDefault("MODE_DELIVERYNOTE_STATS", "SHORT")?.ToUpper()) {
+                    case "NONE": ModeDeliveryNoteStats = 0; break;
+                    case "GA_ONLY": ModeDeliveryNoteStats = 1; break;
+                    case "SHORT": ModeDeliveryNoteStats = 2; break;
+                    case "FULL": ModeDeliveryNoteStats = 3; break;
+                }
+
                 Sender2 = parameters.GetValueOrDefault("DOCUMENT_SENDER") ?? "";
                 TextDeliveryNote = parameters.GetValueOrDefault("TEXT_DELIVERYNOTE");
+                if (TextDeliveryNote == "") TextDeliveryNote = null;
+                TextDeliveryConfirmation = parameters.GetValueOrDefault("TEXT_DELIVERYCONFIRMATION");
+                if (TextDeliveryConfirmation == "") TextDeliveryConfirmation = null;
             } catch {
                 throw new KeyNotFoundException();
             }
         }
 
         private IEnumerable<(string, string?)> GetParamValues() {
+            string deliveryNoteStats = "SHORT";
+            switch (ModeDeliveryNoteStats) {
+                case 0: deliveryNoteStats = "NONE"; break;
+                case 1: deliveryNoteStats = "GA_ONLY"; break;
+                case 2: deliveryNoteStats = "SHORT"; break;
+                case 3: deliveryNoteStats = "FULL"; break;
+            }
             return new (string, string?)[] {
                 ("CLIENT_NAME_TOKEN", NameToken),
                 ("CLIENT_NAME_SHORT", NameShort),
@@ -115,8 +139,10 @@ namespace Elwig.Helpers {
                 ("VAT_NORMAL", VatNormal.ToString().Replace(",", ".")),
                 ("VAT_REDUCED", VatReduced.ToString().Replace(",", ".")),
                 ("VAT_FLATRATE", VatFlatRate.ToString().Replace(",", ".")),
+                ("MODE_DELIVERYNOTE_STATS", deliveryNoteStats),
                 ("DOCUMENT_SENDER", Sender2),
                 ("TEXT_DELIVERYNOTE", TextDeliveryNote),
+                ("TEXT_DELIVERYCONFIRMATION", TextDeliveryConfirmation),
             };
         }
 

Elwig/Helpers/ControlUtils.cs

@@ -58,7 +58,8 @@ namespace Elwig.Helpers {
                     continue;
                 } else if (child is T t) {
                     yield return t;
-                } else if (child is DependencyObject childDepOpj) {
+                }
+                if (child is DependencyObject childDepOpj) {
                     foreach (T childOfChild in FindAllChildren<T>(childDepOpj)) {
                         yield return childOfChild;
                     }

Elwig/Helpers/Utils.cs

@@ -24,7 +24,7 @@ namespace Elwig.Helpers {
 
         public static readonly Regex SerialRegex = GeneratedSerialRegex();
         public static readonly Regex TcpRegex = GeneratedTcpRegex();
-        public static readonly Regex PartialDateRegex = GeneratedPartialDateRegex();
+        public static readonly Regex DateFromToRegex = GeneratedFromToDateRegex();
         public static readonly Regex FromToRegex = GeneratedFromToRegex();
         public static readonly Regex FromToTimeRegex = GeneratedFromToTimeRegex();
         public static readonly Regex AddressRegex = GeneratedAddressRegex();
@@ -35,8 +35,8 @@ namespace Elwig.Helpers {
         [GeneratedRegex("^tcp://([A-Za-z0-9._-]+):([0-9]+)$", RegexOptions.Compiled)]
         private static partial Regex GeneratedTcpRegex();
 
-        [GeneratedRegex(@"^(0?[1-9]|[12][0-9]|3[01])\.(0?[1-9]|1[0-2])\.$", RegexOptions.Compiled)]
-        private static partial Regex GeneratedPartialDateRegex();
+        [GeneratedRegex(@"^(-?(0?[1-9]|[12][0-9]|3[01])\.(0?[1-9]|1[0-2])\.([0-9]{4})?-?){1,2}$", RegexOptions.Compiled)]
+        private static partial Regex GeneratedFromToDateRegex();
 
         [GeneratedRegex(@"^([0-9]+([\.,][0-9]+)?)?-([0-9]+([\.,][0-9]+)?)?$", RegexOptions.Compiled)]
         private static partial Regex GeneratedFromToRegex();
@@ -157,8 +157,12 @@ namespace Elwig.Helpers {
         }
 
         public static void MailTo(string emailAddress) {
+            MailTo(new string[] { emailAddress });
+        }
+
+        public static void MailTo(IEnumerable<string> emailAddresses) {
             Process.Start(new ProcessStartInfo() {
-                FileName = $"mailto:{emailAddress}",
+                FileName = $"mailto:{string.Join(",%20", emailAddresses)}",
                 UseShellExecute = true,
             });
         }
@@ -322,5 +326,20 @@ namespace Elwig.Helpers {
                 return (familyName, fullName.Replace(familyName, "").Replace("  ", " ").Trim());
             }
         }
+
+        public static IEnumerable<IEnumerable<T>> Permutate<T>(IEnumerable<T> input, IEnumerable<T>? forced = null) {
+            HashSet<IEnumerable<T>> output = new();
+            for (int i = 0; i < Math.Pow(2, input.Count()); i++) {
+                List<T> t = new();
+                for (int j = 0; j < 30; j++) {
+                    var e = input.ElementAtOrDefault(j);
+                    if (e != null && ((forced?.Contains(e) ?? false) || (i & (1 << j)) != 0)) {
+                        t.Add(e);
+                    }
+                }
+                output.Add(t);
+            }
+            return output.OrderByDescending(l => l.Count());
+        }
     }
 }

Elwig/Helpers/Validator.cs

@@ -521,6 +521,36 @@ namespace Elwig.Helpers {
             return new(true, null);
         }
 
+        public static ValidationResult CheckTime(TextBox input, bool required) {
+            string text = "";
+            int pos = input.CaretIndex;
+            int v = 0;
+            for (int i = 0; i < input.Text.Length; i++) {
+                char ch = input.Text[i];
+                if (v >= 0 && v < 5 && v != 2 && char.IsAsciiDigit(ch)) {
+                    if ((v == 0 && ch <= '2') || (v == 1 && (text[0] < '2' || ch <= '3')) || (v == 3 && ch <= '5') || v == 4) {
+                        text += ch;
+                        v++;
+                    }
+                } else if (v == 2 && ch == ':') {
+                    text += ch;
+                    v++;
+                }
+                if (i == input.CaretIndex - 1)
+                    pos = text.Length;
+            }
+            input.Text = text;
+            input.CaretIndex = pos;
+
+            if (text.Length == 0) {
+                return required ? new(false, "Wert ist nicht optional") : new(true, null);
+            } else if (v != 5) {
+                return new(false, "Zeit ist ungültig");
+            } else {
+                return new(true, null);
+            }
+        }
+
         public static ValidationResult CheckFbNr(TextBox input, bool required, AppDbContext ctx, AreaCom? c) {
             var res = CheckInteger(input, required);
             if (!res.IsValid) {

Elwig/Models/AT_PlzDest.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("AT_plz_dest"), PrimaryKey("Id"), Index("Plz", "Okz", IsUnique = true)]

Elwig/Models/AreaComType.cs

@@ -1,6 +1,7 @@
 using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("area_commitment_type"), PrimaryKey("VtrgId"), Index("SortId", "AttrId1", "AttrId2", "Discriminator")]

Elwig/Models/Country.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("country"), PrimaryKey("Num"), Index("Alpha2", IsUnique = true), Index("Alpha3", IsUnique = true)]

Elwig/Models/Credit.cs

@@ -2,6 +2,7 @@ using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("credit"), PrimaryKey("Year", "TgNr"), Index("Year", "AvNr", "MgNr", IsUnique = true)]

Elwig/Models/Delivery.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("delivery"), PrimaryKey("Year", "DId"), Index("DateString", "ZwstId", "LNr", IsUnique = true), Index("LsNr", IsUnique = true)]

Elwig/Models/DeliveryPart.cs

@@ -75,6 +75,9 @@ namespace Elwig.Models {
         [Column("lesewagen")]
         public bool? IsLesewagen { get; set; }
 
+        [Column("gebunden")]
+        public bool? IsGebunden { get; set; }
+
         [Column("temperature")]
         public double? Temperature { get; set; }
 
@@ -99,6 +102,9 @@ namespace Elwig.Models {
         [NotMapped]
         public IEnumerable<WineAttr> Attributes => PartAttributes.Select(a => a.Attr);
 
+        [NotMapped]
+        public string AttributesString => string.Join(" / ", Attributes);
+
         [InverseProperty("Part")]
         public virtual ISet<DeliveryPartModifier> PartModifiers { get; private set; }
 
@@ -110,5 +116,8 @@ namespace Elwig.Models {
 
         [NotMapped]
         public string OriginString => Origin.OriginString + "\n" + (Kg?.Gl != null ? $" / {Kg.Gl.Name}" : "") + (Kg != null ? $" / {Kg.AtKg.Gem.Name} / KG {Kg.AtKg.Name}" : "") + (Rd != null ? $" / Ried {Rd.Name}" : "");
+
+        [InverseProperty("Part")]
+        public virtual ISet<DeliveryPartBin> Bins { get; private set; }
     }
 }

Elwig/Models/DeliveryPartBin.cs

@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models {
+    [Table("delivery_part_bin"), PrimaryKey("Year", "DId", "DPNr", "BinNr")]
+    public class DeliveryPartBin {
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("did")]
+        public int DId { get; set; }
+
+        [Column("dpnr")]
+        public int DPNr { get; set; }
+
+        [Column("binnr")]
+        public int BinNr { get; set; }
+
+        [Column("discr")]
+        public string Discr { get; set; }
+
+        [Column("value")]
+        public int Value { get; set; }
+
+        [ForeignKey("Year, DId, DPNr")]
+        public virtual DeliveryPart Part { get; private set; }
+    }
+}

Elwig/Models/PaymentDeliveryPart.cs

@@ -1,7 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
 
 namespace Elwig.Models {
     [Table("payment_delivery_part"), PrimaryKey("Year", "DId", "DPNr", "AvNr")]
@@ -34,109 +32,6 @@ namespace Elwig.Models {
             set => ModRelValue = (double)value;
         }
 
-        [Column("bucket_1")]
-        public int? Bucket1 { get; set; }
-
-        [Column("bucket_2")]
-        public int? Bucket2 { get; set; }
-
-        [Column("bucket_3")]
-        public int? Bucket3 { get; set; }
-
-        [Column("bucket_4")]
-        public int? Bucket4 { get; set; }
-
-        [Column("bucket_5")]
-        public int? Bucket5 { get; set; }
-
-        [Column("bucket_6")]
-        public int? Bucket6 { get; set; }
-
-        [Column("bucket_7")]
-        public int? Bucket7 { get; set; }
-
-        [Column("bucket_8")]
-        public int? Bucket8 { get; set; }
-
-        [Column("bucket_9")]
-        public int? Bucket9 { get; set; }
-
-        [NotMapped]
-        public int[] Buckets => (new int?[] { Bucket1, Bucket2, Bucket3, Bucket4, Bucket5, Bucket6, Bucket7, Bucket8, Bucket9 })
-            .Where(b => b != null).Select(b => b.Value).ToArray();
-
-        [Column("price_1")]
-        public long? Price1Value { get; set; }
-        [NotMapped]
-        public decimal? Price1 {
-            get => Price1Value != null ? Variant.Season.DecFromDb(Price1Value.Value) : null;
-            set => Price1Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-        }
-
-        [Column("price_2")]
-        public long? Price2Value { get; set; }
-        [NotMapped]
-        public decimal? Price2 {
-			get => Price2Value != null ? Variant.Season.DecFromDb(Price2Value.Value) : null;
-			set => Price2Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_3")]
-        public long? Price3Value { get; set; }
-        [NotMapped]
-        public decimal? Price3 {
-			get => Price3Value != null ? Variant.Season.DecFromDb(Price3Value.Value) : null;
-			set => Price3Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_4")]
-        public long? Price4Value { get; set; }
-        [NotMapped]
-        public decimal? Price4 {
-			get => Price4Value != null ? Variant.Season.DecFromDb(Price4Value.Value) : null;
-			set => Price4Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_5")]
-        public long? Price5Value { get; set; }
-        [NotMapped]
-        public decimal? Price5 {
-			get => Price5Value != null ? Variant.Season.DecFromDb(Price5Value.Value) : null;
-			set => Price5Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_6")]
-        public long? Price6Value { get; set; }
-        [NotMapped]
-        public decimal? Price6 {
-			get => Price6Value != null ? Variant.Season.DecFromDb(Price6Value.Value) : null;
-			set => Price6Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_7")]
-        public long? Price7Value { get; set; }
-        [NotMapped]
-        public decimal? Price7 {
-			get => Price7Value != null ? Variant.Season.DecFromDb(Price7Value.Value) : null;
-			set => Price7Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_8")]
-        public long? Price8Value { get; set; }
-        [NotMapped]
-        public decimal? Price8 {
-			get => Price8Value != null ? Variant.Season.DecFromDb(Price8Value.Value) : null;
-			set => Price8Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_9")]
-        public long? Price9Value { get; set; }
-        [NotMapped]
-        public decimal? Price9 {
-			get => Price9Value != null ? Variant.Season.DecFromDb(Price9Value.Value) : null;
-			set => Price9Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
         [Column("amount")]
         public long? AmountValue { get; set; }
         [NotMapped]
@@ -145,10 +40,6 @@ namespace Elwig.Models {
             set => AmountValue = value != null ? Variant.Season.DecToDb(value.Value) : null;
         }
 
-        [NotMapped]
-        public decimal[] Prices => (new decimal?[] { Price1, Price2, Price3, Price4, Price5, Price6, Price7, Price8, Price9 })
-            .Where(p => p != null).Select(p => p.Value).ToArray();
-
         [ForeignKey("Year, AvNr")]
         public virtual PaymentVar Variant { get; private set; }
 

Elwig/Models/PaymentDeliveryPartBin.cs

@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models {
+    [Table("payment_delivery_part_bin"), PrimaryKey("Year", "DId", "DPNr", "BinNr", "AvNr")]
+    public class PaymentDeliveryPartBin {
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("did")]
+        public int DId { get; set; }
+
+        [Column("dpnr")]
+        public int DPNr { get; set; }
+
+        [Column("binnr")]
+        public int BinNr { get; set; }
+
+        [Column("avnr")]
+        public int AvNr { get; set; }
+
+        [Column("price")]
+        public long PriceValue { get; set; }
+        [NotMapped]
+        public decimal Price {
+            get => Variant.Season.DecFromDb(PriceValue);
+            set => PriceValue = Variant.Season.DecToDb(value);
+        }
+
+        [Column("amount")]
+        public long AmountValue { get; set; }
+        [NotMapped]
+        public decimal Amount {
+            get => Variant.Season.DecFromDb(AmountValue);
+            set => AmountValue = Variant.Season.DecToDb(value);
+        }
+
+        [ForeignKey("Year, AvNr")]
+        public virtual PaymentVar Variant { get; private set; }
+
+        [ForeignKey("Year, DId, DPNr")]
+        public virtual DeliveryPart DeliveryPart { get; private set; }
+    }
+}

Elwig/Models/PaymentVar.cs

@@ -40,37 +40,6 @@ namespace Elwig.Models {
         [Column("calc_time")]
         public int? CalcTime { get; set; }
 
-        [Column("bucket_1_name")]
-        public string? Bucket1Name { get; set; }
-
-        [Column("bucket_2_name")]
-        public string? Bucket2Name { get; set; }
-
-        [Column("bucket_3_name")]
-        public string? Bucket3Name { get; set; }
-
-        [Column("bucket_4_name")]
-        public string? Bucket4Name { get; set; }
-
-        [Column("bucket_5_name")]
-        public string? Bucket5Name { get; set; }
-
-        [Column("bucket_6_name")]
-        public string? Bucket6Name { get; set; }
-
-        [Column("bucket_7_name")]
-        public string? Bucket7Name { get; set; }
-
-        [Column("bucket_8_name")]
-        public string? Bucket8Name { get; set; }
-
-        [Column("bucket_9_name")]
-        public string? Bucket9Name { get; set; }
-
-        [NotMapped]
-        public string[] BucketNames => (new string?[] { Bucket1Name, Bucket2Name, Bucket3Name, Bucket4Name, Bucket5Name, Bucket6Name, Bucket7Name, Bucket8Name, Bucket9Name })
-			.Where(n => n != null).Select(n => n ?? "").ToArray();
-
         [Column("comment")]
         public string? Comment { get; set; }
 

Elwig/Models/WineAttr.cs

@@ -13,6 +13,9 @@ namespace Elwig.Models {
         [Column("max_kg_per_ha")]
         public int? MaxKgPerHa { get; set; }
 
+        [Column("fill_lower_bins")]
+        public int FillLowerBins { get; set; }
+
         [Column("active")]
         public bool IsActive { get; set; }
         public override string ToString() {

Elwig/Models/WineOrigin.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("wine_origin"), PrimaryKey("HkId"), Index("Name", IsUnique = true)]

Elwig/Windows/AdministrationWindow.cs

@@ -482,6 +482,14 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckDate);
         }
 
+        protected void TimeInput_TextChanged(object sender, RoutedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckTime);
+        }
+
+        protected void TimeInput_LostFocus(object sender, RoutedEventArgs evt) {
+            InputLostFocus((TextBox)sender, Validator.CheckTime);
+        }
+
         protected void PlzInput_TextChanged(object sender, RoutedEventArgs evt) {
             var plz = (TextBox)sender;
             InputTextChanged(plz, Validator.CheckPlz);

Elwig/Windows/AreaComAdminWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         mc:Ignorable="d"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        Title="Flächenbindungen - Elwig" Height="480" Width="850"
+        Title="Flächenbindungen - Elwig" Height="480" Width="1100"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -52,7 +52,7 @@
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="330"/>
+            <ColumnDefinition Width="340"/>
         </Grid.ColumnDefinitions>
 
         <Menu Grid.ColumnSpan="2" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
@@ -74,13 +74,15 @@
                     <DataGridTextColumn Header="Katastralgemeinde"  Binding="{Binding Kg.AtKg.Name}"  Width="6*"/>
                     <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"       Width="4*"/>
                     <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="4*"/>
-                    <DataGridTextColumn Header="Fläche"             Binding="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="4*">
+                    <DataGridTextColumn Header="Fläche"             Binding="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="3*">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
+                    <DataGridTextColumn Header="Sorte"           Binding="{Binding AreaComType.WineVar.Name}" Width="4*"/>
+                    <DataGridTextColumn Header="Attribut"           Binding="{Binding AreaComType.WineAttr1.Name}" Width="3*"/>
                 </DataGrid.Columns>
             </DataGrid>
 

Elwig/Windows/BaseDataWindow.xaml

@@ -215,7 +215,45 @@
 
             </TabItem>
             <TabItem Header="Textelemente">
+                <ScrollViewer VerticalScrollBarVisibility="Visible">
+                    <StackPanel>
+                        <GroupBox Header="Lieferschein" Margin="10,10,10,10" Height="180">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="370"/>
+                                </Grid.ColumnDefinitions>
 
+                                <TextBox x:Name="TextElementDeliveryNote" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible"
+                                         HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" Height="Auto"
+                                         TextChanged="TextBox_TextChanged"/>
+                                <GroupBox Grid.Column="1" Header="Tabelle zur Gesamtlieferung" Margin="10,10,10,10" VerticalAlignment="Center">
+                                    <StackPanel Margin="5,5,0,5">
+                                        <RadioButton GroupName="ModeDeliveryNote" x:Name="ModeDeliveryNoteNone" Content="Verbergen"
+                                                     Checked="RadioButton_Changed" Unchecked="RadioButton_Changed"/>
+                                        <RadioButton GroupName="ModeDeliveryNote" x:Name="ModeDeliveryNoteGaOnly" Content="Nur Gesamtlieferung lt. Geschäftsanteilen anzeigen"
+                                                     Checked="RadioButton_Changed" Unchecked="RadioButton_Changed"/>
+                                        <RadioButton GroupName="ModeDeliveryNote" x:Name="ModeDeliveryNoteShort" Content="Nur Gesamtlieferung und Flächenbindungen von auf dem&#xA;Lieferschein angeführten Sorten anzeigen"
+                                                     Checked="RadioButton_Changed" Unchecked="RadioButton_Changed"/>
+                                        <RadioButton GroupName="ModeDeliveryNote" x:Name="ModeDeliveryNoteFull" Content="Vollständig anzeigen"
+                                                     Checked="RadioButton_Changed" Unchecked="RadioButton_Changed"/>
+                                    </StackPanel>
+                                </GroupBox>
+                            </Grid>
+                        </GroupBox>
+                        <GroupBox Header="Anlieferungsbestätigung" Margin="10,10,10,10" Height="250">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <TextBox x:Name="TextElementDeliveryConfirmation" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible" AcceptsReturn="True"
+                                         HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" Height="Auto"
+                                         TextChanged="TextBox_TextChanged"/>
+                            </Grid>
+                        </GroupBox>
+                    </StackPanel>
+                </ScrollViewer>
             </TabItem>
         </TabControl>
 

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -201,6 +201,15 @@ namespace Elwig.Windows {
             ClientEmailAddressInput.Text = p.EmailAddress;
             ClientWebsiteInput.Text = p.Website;
 
+            TextElementDeliveryNote.Text = p.TextDeliveryNote;
+            switch (p.ModeDeliveryNoteStats) {
+                case 0: ModeDeliveryNoteNone.IsChecked = true; break;
+                case 1: ModeDeliveryNoteGaOnly.IsChecked = true; break;
+                case 2: ModeDeliveryNoteShort.IsChecked = true; break;
+                case 3: ModeDeliveryNoteFull.IsChecked = true; break;
+            }
+            TextElementDeliveryConfirmation.Text = p.TextDeliveryConfirmation;
+
             FinishInputFilling();
         }
 
@@ -222,6 +231,10 @@ namespace Elwig.Windows {
             p.EmailAddress = ClientEmailAddressInput.Text.Length > 0 ? ClientEmailAddressInput.Text : null;
             p.Website = ClientWebsiteInput.Text.Length > 0 ? ClientWebsiteInput.Text : null;
 
+            p.TextDeliveryNote = TextElementDeliveryNote.Text.Length > 0 ? TextElementDeliveryNote.Text : null;
+            p.ModeDeliveryNoteStats = (ModeDeliveryNoteNone.IsChecked == true) ? 0 : (ModeDeliveryNoteGaOnly.IsChecked == true) ? 1 : (ModeDeliveryNoteShort.IsChecked == true) ? 2 : (ModeDeliveryNoteFull.IsChecked == true) ? 3 : 2;
+            p.TextDeliveryConfirmation = TextElementDeliveryConfirmation.Text.Length > 0 ? TextElementDeliveryConfirmation.Text : null;
+
             await p.UpdateValues();
         }
 

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        Title="Lieferungen - Elwig" Height="720" Width="1100" MinHeight="700" MinWidth="1000"
+        Title="Lieferungen - Elwig" Height="720" Width="1100" MinHeight="720" MinWidth="1000"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -43,40 +43,42 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="19"/>
-            <RowDefinition Height="0.625*"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="*"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="24"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*" MinWidth="400"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition Width="2*" MinWidth="560"/>
         </Grid.ColumnDefinitions>
 
         <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
-            <MenuItem Header="Lieferung">
-            </MenuItem>
             <MenuItem Header="Drucken">
                 <MenuItem x:Name="Menu_Print_ShowDeliveryNote" Header="Lieferschein anzeigen" IsEnabled="False"
                           Click="Menu_Print_ShowDeliveryNote_Click"/>
                 <MenuItem x:Name="Menu_Print_PrintDeliveryNote" Header="Lieferschein drucken" IsEnabled="False"
                           Click="Menu_Print_PrintDeliveryNote_Click"/>
-                <MenuItem x:Name="Menu_Print_ShowDeliveryJournalToday" Header="Lieferjournal anzeigen (heute)"
-                          Click="Menu_Print_ShowDeliveryJournalToday_Click"/>
-                <MenuItem x:Name="Menu_Print_ShowDeliveryJournalYesterday" Header="Lieferjournal anzeigen (gestern)"
-                          Click="Menu_Print_ShowDeliveryJournalYesterday_Click"/>
+                <MenuItem x:Name="Menu_Print_DeliveryJournal" Header="Lieferjournal">
+                    <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowToday" Header="von heute anzeigen" IsEnabled="False" Tag="Print"
+                              Click="Menu_Print_DeliveryJournal_ShowToday_Click"/>
+                    <MenuItem x:Name="Menu_Print_DeliveryJournal_PrintToday" Header="von heute drucken" IsEnabled="False" Tag="Print"
+                              Click="Menu_Print_DeliveryJournal_PrintToday_Click"/>
+                    <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowFilter" Header="aus Filtern anzeigen" IsEnabled="False" Tag="Print"
+                              Click="Menu_Print_DeliveryJournal_ShowFilter_Click"/>
+                    <MenuItem x:Name="Menu_Print_DeliveryJournal_PrintFilter" Header="aus Filtern drucken" IsEnabled="False" Tag="Print"
+                              Click="Menu_Print_DeliveryJournal_PrintFilter_Click"/>
+                </MenuItem>
             </MenuItem>
             <MenuItem Header="Exportieren">
                 <MenuItem x:Name="Menu_Export_Bki" Header="Traubentransportscheinliste (BKI)"/>
             </MenuItem>
-            <MenuItem Header="Werkzeuge">
-                <MenuItem Header="Alle Lieferscheine überprüfen"/>
+            <MenuItem Header="Einstellungen">
+                <MenuItem x:Name="Menu_Settings_EnableFreeEditing" Header="Freie Bearbeitung aktivieren"
+                          IsCheckable="True" Checked="Menu_Settings_EnableFreeEditing_Checked" Unchecked="Menu_Settings_EnableFreeEditing_Unchecked"/>
             </MenuItem>
         </Menu>
 
-        <Grid Grid.RowSpan="4" Grid.Row="1" Margin="5,0,5,0">
+        <Grid Grid.Row="1" Margin="5,0,0,0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="42"/>
                 <RowDefinition Height="*"/>
@@ -89,7 +91,8 @@
             </Grid.ColumnDefinitions>
 
             <TextBox x:Name="SearchInput" Grid.ColumnSpan="3" Margin="5,10,161,0" IsReadOnly="False"
-                     TextChanged="SearchInput_TextChanged"/>
+                     TextChanged="SearchInput_TextChanged"
+                     ToolTip="Lieferungen filtern und durchsuchen. Die Filter sind beliebig kombinierbar.&#xA;&#xA;Filtern nach:&#xA;Sorte: z.B. GV, ZW, rr, sa, !gv (ausgenommen GV), ...&#xA;Qualitätsstufe: z.B. QUW, kab, ldw, ...&#xA;Gradation: z.B. &gt;73, &lt;15, 17-18, 15-, &gt;17,5, 62-75, ...&#xA;Mitglied: z.B. 1234, 987, ...&#xA;Saison: z.B. 2020, &gt;2015, 2017-2019, &lt;2005, 2019-, ...&#xA;Zweigstelle: z.B. musterort, ...&#xA;Attribute: z.B. kabinett, !kabinett (alle außer kabinett), ...&#xA;Datum: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...&#xA;Uhrzeit: z.B. 06:00-08:00, 18:00-, ...&#xA;Freitext: z.B. Lieferscheinnummern, &quot;quw&quot; (sucht nach dem Text &quot;quw&quot;)"/>
             <xctk:IntegerUpDown Name="SeasonInput" Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1000" Maximum="9999"
                                 Margin="0,10,100,0" VerticalAlignment="Top" HorizontalAlignment="Right"
                                 ValueChanged="SeasonInput_ValueChanged"/>
@@ -104,17 +107,50 @@
                       CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
                       Margin="5,0,5,0" Grid.Row="1" FontSize="14" Grid.ColumnSpan="3">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="MgNr."   Binding="{Binding MgNr}" Width="70"/>
-                    <DataGridTextColumn Header="Datum"   Binding="{Binding Date, StringFormat='dd.MM.yy'}" Width="70"/>
-                    <DataGridTextColumn Header="Zeit"    Binding="{Binding Time, StringFormat='HH:mm'}" Width="70"/>
-                    <DataGridTextColumn Header="Sorte"   Binding="{Binding SortIdString}" Width="60"/>
-                    <DataGridTextColumn Header="Gewicht" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}"  Width="70">
+                    <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="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="Zeit" Binding="{Binding Time, StringFormat='HH:mm'}" Width="50">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Sorte" Binding="{Binding SortIdString}" 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="Gradation" Binding="{Binding Kmw, StringFormat='{}{0:N1}° '}" Width="50">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="LsNr." Binding="{Binding LsNr}" Width="120"/>
+                    <DataGridTextColumn Header="Mitglied" Binding="{Binding Member.AdministrativeName}" Width="180"/>
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -155,237 +191,260 @@
                     Click="CancelButton_Click"/>
         </Grid>
 
-        <GroupBox Header="Mitglied" Grid.Column="1" Grid.Row="1" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="70"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+        <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
 
-                <Label Content="Mitglied:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="MgNrInput" 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" Grid.Column="1" Margin="53,10,10,10" IsEditable="True"
-                          ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
-                          SelectionChanged="MemberInput_SelectionChanged" KeyUp="Input_KeyUp"/>
+        <Grid Grid.Row="1" Grid.Column="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="0.625*"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
 
-                <Label Content="Wohnort:" Margin="10,38,0,0" Grid.Column="0"/>
-                <TextBox x:Name="MemberAddressField" Grid.Column="1" Margin="0,40,10,10" FontSize="12" Height="22"
-                         IsReadOnly="True" IsTabStop="False"/>
-            </Grid>
-        </GroupBox>
+            <GroupBox Header="Mitglied" Grid.Column="0" Grid.Row="0" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="70"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-        <GroupBox Header="Lieferung" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+                    <Label Content="Mitglied:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="MgNrInput" 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" Grid.Column="1" Margin="53,10,10,10" IsEditable="True"
+                              ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
+                              SelectionChanged="MemberInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 
-                <Label Content="LieferscheinNr.:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="LsNrInput" Width="126" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
-                         IsReadOnly="True" IsTabStop="False"/>
-
-                <Label Content="Datum/Uhrzeit:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="DateInput" Width="77" Grid.Column="1" HorizontalAlignment="Left" Margin="0,40,0,0"
-                         IsReadOnly="True" IsTabStop="False"
-                         TextChanged="DateInput_TextChanged"/>
-                <TextBox x:Name="TimeInput" Width="44" Grid.Column="1" HorizontalAlignment="Left" Margin="82,40,0,0"
-                         IsReadOnly="True" IsTabStop="False"/>
-
-                <Label Content="Zweigstelle:" Margin="10,70,0,0" Grid.Column="0"/>
-                <ComboBox x:Name="BranchInput" Width="126" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Left"
-                          IsEnabled="False"
-                          DisplayMemberPath="Name" TextSearch.TextPath="Name"/>
-
-                <Label Content="Anmerkung:" Margin="10,100,0,10"/>
-                <TextBox x:Name="CommentInput" Grid.Column="1" Margin="0,100,10,10"
-                         TextChanged="TextBox_TextChanged"/>
-            </Grid>
-        </GroupBox>
-
-        <GroupBox Header="Sorte" Grid.Column="2" Grid.Row="1" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="70"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-
-                <Label Content="Sorte:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="SortIdInput" Width="36" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left"
-                         TextChanged="SortIdInput_TextChanged" LostFocus="SortIdInput_LostFocus" KeyUp="Input_KeyUp"/>
-                <ComboBox x:Name="WineVarietyInput" Grid.Row="1" Grid.Column="1" Margin="41,10,10,10"
-                          ItemTemplate="{StaticResource WineVarietyTemplate}" TextSearch.TextPath="Name" 
-                          SelectionChanged="WineVarietyInput_SelectionChanged" KeyUp="Input_KeyUp"/>
-
-                <Label Content="Attribute:" Margin="10,40,0,0" Grid.Column="0"/>
-                <xctk:CheckComboBox x:Name="AttributesInput" Grid.Row="1" Grid.Column="1" Margin="0,40,10,10"
-                                    DisplayMemberPath="Name" Delimiter=", " AllItemsSelectedContent="Alle"
-                                    ItemSelectionChanged="AttributesInput_SelectionChanged" KeyUp="Input_KeyUp"/>
-            </Grid>
-        </GroupBox>
-
-        <GroupBox Header="Gradation" Grid.Column="2" Grid.Row="2" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-                <Label Content="Gradation:" Margin="10,10,10,10"/>
-                <Grid Grid.Column="1" Width="54" Height="25" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
-                    <TextBox x:Name="GradationOeInput"  TextAlignment="Right" Padding="2,2,23,2"
-                             TextChanged="GradationOeInput_TextChanged" LostFocus="GradationOeInput_LostFocus" KeyUp="Input_KeyUp"/>
-                    <Label Content="°Oe" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
+                    <Label Content="Wohnort:" Margin="10,38,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="MemberAddressField" Grid.Column="1" Margin="0,40,10,10" FontSize="12" Height="22"
+                             IsReadOnly="True" IsTabStop="False"/>
                 </Grid>
-                <Label Content="=" Margin="60,10,10,10" Grid.Column="1"/>
-                <Grid Grid.Column="1" Width="68" Height="25" Margin="78,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
-                    <TextBox x:Name="GradationKmwInput" TextAlignment="Right" Padding="2,2,34,2" SnapsToDevicePixels="True"
-                             TextChanged="GradationKmwInput_TextChanged" LostFocus="GradationKmwInput_LostFocus" KeyUp="Input_KeyUp"/>
-                    <Label Content="°KMW" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
+            </GroupBox>
+
+            <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="LieferscheinNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="LsNrInput" Width="126" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
+                             IsReadOnly="True" IsTabStop="False"
+                             TextChanged="TextBox_TextChanged"/>
+
+                    <Label Content="Datum/Uhrzeit:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="DateInput" Width="77" Grid.Column="1" HorizontalAlignment="Left" Margin="0,40,0,0"
+                             IsReadOnly="True"
+                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                    <TextBox x:Name="TimeInput" Width="44" Grid.Column="1" HorizontalAlignment="Left" Margin="82,40,0,0"
+                             IsReadOnly="True"
+                             TextChanged="TimeInput_TextChanged" LostFocus="TimeInput_LostFocus"/>
+
+                    <Label Content="Zweigstelle:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="BranchInput" Width="126" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Left"
+                              IsEnabled="False"
+                              SelectionChanged="BranchInput_SelectionChanged"
+                              DisplayMemberPath="Name" TextSearch.TextPath="Name"/>
+
+                    <Label Content="Anmerkung:" Margin="10,100,0,10"/>
+                    <TextBox x:Name="CommentInput" Grid.Column="1" Margin="0,100,10,10"
+                             TextChanged="TextBox_TextChanged"/>
                 </Grid>
+            </GroupBox>
 
-                <Label Content="Qualitätsstufe:" Margin="10,40,10,10"/>
-                <ComboBox x:Name="WineQualityLevelInput" Width="146" Margin="0,40,10,10" Grid.Column="1" HorizontalAlignment="Left"
-                          ItemTemplate="{StaticResource WineQualityLevelTemplate}"
-                          SelectionChanged="WineQualityLevelInput_SelectionChanged" KeyUp="Input_KeyUp"/>
+            <GroupBox Header="Sorte" Grid.Column="1" Grid.Row="0" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="70"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <CheckBox x:Name="AbgewertetInput" Content="Abgewertet" IsEnabled="False"
-                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"/>
-            </Grid>
-        </GroupBox>
+                    <Label Content="Sorte:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="SortIdInput" Width="36" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left"
+                             TextChanged="SortIdInput_TextChanged" LostFocus="SortIdInput_LostFocus" KeyUp="Input_KeyUp"/>
+                    <ComboBox x:Name="WineVarietyInput" Grid.Row="1" Grid.Column="1" Margin="41,10,10,10"
+                              ItemTemplate="{StaticResource WineVarietyTemplate}" TextSearch.TextPath="Name" 
+                              SelectionChanged="WineVarietyInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 
-        <GroupBox Header="Gewicht" Grid.Column="2" Grid.Row="3" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="70"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-
-                <Label Content="Gewicht:" Margin="10,10,10,10"/>
-                <Grid Grid.Column="1" Width="70" Height="25" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
-                    <TextBox x:Name="WeightInput" TextAlignment="Right" Padding="2,2,17,2" IsReadOnly="True"
-                             TextChanged="WeightInput_TextChanged"/>
-                    <Label Content="kg" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
+                    <Label Content="Attribute:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <xctk:CheckComboBox x:Name="AttributesInput" Grid.Row="1" Grid.Column="1" Margin="0,40,10,10"
+                                        DisplayMemberPath="Name" Delimiter=", " AllItemsSelectedContent="Alle"
+                                        ItemSelectionChanged="AttributesInput_SelectionChanged" KeyUp="Input_KeyUp"/>
                 </Grid>
+            </GroupBox>
 
-                <CheckBox x:Name="ManualWeighingInput" Content="Handwiegung" IsEnabled="False"
-                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,45,10,10" Grid.Column="0" Grid.ColumnSpan="2"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+            <GroupBox Header="Gradation" Grid.Column="1" Grid.Row="1" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Label Content="Gradation:" Margin="10,10,10,10"/>
+                    <Grid Grid.Column="1" Width="54" Height="25" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
+                        <TextBox x:Name="GradationOeInput"  TextAlignment="Right" Padding="2,2,23,2"
+                                 TextChanged="GradationOeInput_TextChanged" LostFocus="GradationOeInput_LostFocus" KeyUp="Input_KeyUp"/>
+                        <Label Content="°Oe" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
+                    </Grid>
+                    <Label Content="=" Margin="60,10,10,10" Grid.Column="1"/>
+                    <Grid Grid.Column="1" Width="68" Height="25" Margin="78,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
+                        <TextBox x:Name="GradationKmwInput" TextAlignment="Right" Padding="2,2,34,2" SnapsToDevicePixels="True"
+                                 TextChanged="GradationKmwInput_TextChanged" LostFocus="GradationKmwInput_LostFocus" KeyUp="Input_KeyUp"/>
+                        <Label Content="°KMW" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
+                    </Grid>
 
-                <CheckBox x:Name="GerebeltGewogenInput" Content="Gerebelt gewogen"
-                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+                    <Label Content="Qualitätsstufe:" Margin="10,40,10,10"/>
+                    <ComboBox x:Name="WineQualityLevelInput" Width="146" Margin="0,40,10,10" Grid.Column="1" HorizontalAlignment="Left"
+                              ItemTemplate="{StaticResource WineQualityLevelTemplate}"
+                              SelectionChanged="WineQualityLevelInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 
-                <Button x:Name="WeighingAButton" Content="Wiegen A" Width="120"
-                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,10,10,10" Grid.Column="2"/>
-                <Button x:Name="WeighingBButton" Content="Wiegen B" Width="120"
-                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,42,10,10" Grid.Column="2"/>
-                <Button x:Name="WeighingCButton" Content="Wiegen C" Width="120"
-                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,74,10,10" Grid.Column="2"/>
-                <Button x:Name="WeighingDButton" Content="Wiegen D" Width="120"
-                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,106,10,10" Grid.Column="2"/>
-                <Button x:Name="WeighingManualButton" Content="Handwiegung" Width="120"
-                        Click="WeighingManualButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,138,10,10" Grid.Column="2"/>
-            </Grid>
-        </GroupBox>
-
-        <GroupBox Header="Sonstiges" Grid.Column="2" Grid.Row="4" Margin="5,5,5,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"/>
-                    <ColumnDefinition Width="65"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-
-                <Label Content="Zu-/Abschläge:" Margin="10,10,0,10"/>
-                <xctk:CheckComboBox x:Name="ModifiersInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
-                                    ItemTemplate="{StaticResource ModifierTemplate}" Delimiter=", " AllItemsSelectedContent="Alle"
-                                    ItemSelectionChanged="ModifiersInput_SelectionChanged"/>
-
-                <Label Content="Anmerkung:" Margin="10,40,0,10"/>
-                <TextBox x:Name="PartCommentInput" Grid.Column="1" Margin="0,40,10,10" Grid.ColumnSpan="2"
-                         TextChanged="TextBox_TextChanged"/>
-
-                <Label Content="Temperatur:" Margin="10,70,0,10"/>
-                <Grid Grid.Column="1" Height="25" Margin="0,70,10,10" VerticalAlignment="Top">
-                    <TextBox x:Name="TemperatureInput" TextAlignment="Right" Padding="2,2,16,2"
-                             TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"/>
-                    <Label Content="°C" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
+                    <CheckBox x:Name="AbgewertetInput" Content="Abgewertet" IsEnabled="False"
+                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"/>
                 </Grid>
+            </GroupBox>
 
-                <Label Content="Säure:" Margin="10,100,0,10"/>
-                <Grid Grid.Column="1" Height="25" Margin="0,100,10,10" VerticalAlignment="Top">
-                    <TextBox x:Name="AcidInput" TextAlignment="Right" Padding="2,2,19,2"
-                             TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"/>
-                    <Label Content="g/l" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
+            <GroupBox Header="Gewicht" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="70"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="Gewicht:" Margin="10,10,10,10"/>
+                    <Grid Grid.Column="1" Width="70" Height="25" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
+                        <TextBox x:Name="WeightInput" TextAlignment="Right" Padding="2,2,17,2" IsReadOnly="True"
+                                 TextChanged="WeightInput_TextChanged"/>
+                        <Label Content="kg" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
+                    </Grid>
+
+                    <CheckBox x:Name="ManualWeighingInput" Content="Handwiegung" IsEnabled="False"
+                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,45,10,10" Grid.Column="0" Grid.ColumnSpan="2"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+
+                    <CheckBox x:Name="GerebeltGewogenInput" Content="Gerebelt gewogen"
+                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+
+                    <Button x:Name="WeighingAButton" Content="Wiegen A" Width="120"
+                            Click="WeighingButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,10,10,10" Grid.Column="2"/>
+                    <Button x:Name="WeighingBButton" Content="Wiegen B" Width="120"
+                            Click="WeighingButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,42,10,10" Grid.Column="2"/>
+                    <Button x:Name="WeighingCButton" Content="Wiegen C" Width="120"
+                            Click="WeighingButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,74,10,10" Grid.Column="2"/>
+                    <Button x:Name="WeighingDButton" Content="Wiegen D" Width="120"
+                            Click="WeighingButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,106,10,10" Grid.Column="2"/>
+                    <Button x:Name="WeighingManualButton" Content="Handwiegung" Width="120"
+                            Click="WeighingManualButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,138,10,10" Grid.Column="2"/>
                 </Grid>
+            </GroupBox>
 
-                <CheckBox x:Name="LesewagenInput" Content="Lesewagen" Margin="10,75,0,0" Grid.Column="2"
-                          VerticalAlignment="Top" HorizontalAlignment="Left"
-                          Checked="LesewagenInput_Changed" Unchecked="LesewagenInput_Changed"/>
-                <CheckBox x:Name="HandPickedInput" Content="Handlese" Margin="10,105,0,0" Grid.Column="2" IsThreeState="True"
-                          VerticalAlignment="Top" HorizontalAlignment="Left"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
-            </Grid>
-        </GroupBox>
+            <GroupBox Header="Sonstiges" Grid.Column="1" Grid.Row="3" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition Width="65"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-        <GroupBox Header="Teillieferungen" Grid.Column="1" Grid.Row="3" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-                <ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
-                         SelectionChanged="DeliveryPartList_SelectionChanged">
-                    <ListBox.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{Binding DPNr}" Width="20"/>
-                                <TextBlock Text="{Binding SortId}" Width="30"/>
-                                <TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
-                                <TextBlock Text="{Binding QualId}" Width="30"/>
-                                <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right"/>
-                            </StackPanel>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                </ListBox>
+                    <Label Content="Zu-/Abschläge:" Margin="10,10,0,10"/>
+                    <xctk:CheckComboBox x:Name="ModifiersInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
+                                        ItemTemplate="{StaticResource ModifierTemplate}" Delimiter=", " AllItemsSelectedContent="Alle"
+                                        ItemSelectionChanged="ModifiersInput_SelectionChanged"/>
 
-                <Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
-                        ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
-                        HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
-                        Click="ExtractDeliveryPartButton_Click"/>
-                <Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
-                        HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"
-                        Click="DeleteDeliveryPartButton_Click"/>
-            </Grid>
-        </GroupBox>
+                    <Label Content="Anmerkung:" Margin="10,40,0,10"/>
+                    <TextBox x:Name="PartCommentInput" Grid.Column="1" Margin="0,40,10,10" Grid.ColumnSpan="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-        <GroupBox Header="Herkunft" Grid.Column="1" Grid.Row="4" Margin="5,5,5,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+                    <Label Content="Temperatur:" Margin="10,70,0,10"/>
+                    <Grid Grid.Column="1" Height="25" Margin="0,70,10,10" VerticalAlignment="Top">
+                        <TextBox x:Name="TemperatureInput" TextAlignment="Right" Padding="2,2,16,2"
+                                 TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"/>
+                        <Label Content="°C" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
+                    </Grid>
 
-                <Label Content="Weinbaugebiet:" Margin="10,10,0,10" Grid.Column="0"/>
-                <ComboBox x:Name="WineOriginInput" Margin="0,10,10,10" Grid.Column="1"
-                          ItemTemplate="{StaticResource WineOriginTemplate}"/>
+                    <Label Content="Säure:" Margin="10,100,0,10"/>
+                    <Grid Grid.Column="1" Height="25" Margin="0,100,10,10" VerticalAlignment="Top">
+                        <TextBox x:Name="AcidInput" TextAlignment="Right" Padding="2,2,19,2"
+                                 TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"/>
+                        <Label Content="g/l" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
+                    </Grid>
 
-                <Label Content="Weinbau-KG:" Margin="10,40,0,10" Grid.Column="0"/>
-                <ComboBox x:Name="WineKgInput" Margin="0,40,10,10" Grid.Column="1"
-                          DisplayMemberPath="Name"
-                          SelectionChanged="WineKgInput_SelectionChanged"/>
+                    <CheckBox x:Name="LesewagenInput" Content="Lesewagen" Margin="10,75,0,0" Grid.Column="2"
+                              VerticalAlignment="Top" HorizontalAlignment="Left"
+                              Checked="LesewagenInput_Changed" Unchecked="LesewagenInput_Changed"/>
+                    <CheckBox x:Name="HandPickedInput" Content="Handlese" Margin="10,105,0,0" Grid.Column="2" IsThreeState="True"
+                              VerticalAlignment="Top" HorizontalAlignment="Left"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+                </Grid>
+            </GroupBox>
 
-                <Label Content="Ried:" Margin="10,70,0,10" Grid.Column="0"/>
-                <ComboBox x:Name="WineRdInput" Margin="0,70,10,10" Grid.Column="1"
-                          DisplayMemberPath="Name"/>
-            </Grid>
-        </GroupBox>
+            <GroupBox Header="Teillieferungen" Grid.Column="0" Grid.Row="2" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
+                             SelectionChanged="DeliveryPartList_SelectionChanged">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Text="{Binding DPNr}" Width="20"/>
+                                    <TextBlock Text="{Binding SortId}" Width="30"/>
+                                    <TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
+                                    <TextBlock Text="{Binding QualId}" Width="30"/>
+                                    <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
+                                    <TextBlock Text="{Binding AttributesString}" Width="100"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+
+                    <Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
+                            ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
+                            HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
+                            Click="ExtractDeliveryPartButton_Click"/>
+                    <Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
+                            HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"
+                            Click="DeleteDeliveryPartButton_Click"/>
+                </Grid>
+            </GroupBox>
+
+            <GroupBox Header="Herkunft" Grid.Column="0" Grid.Row="3" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="Weinbaugebiet:" Margin="10,10,0,10" Grid.Column="0"/>
+                    <ComboBox x:Name="WineOriginInput" Margin="0,10,10,10" Grid.Column="1"
+                              ItemTemplate="{StaticResource WineOriginTemplate}"/>
+
+                    <Label Content="Weinbau-KG:" Margin="10,40,0,10" Grid.Column="0"/>
+                    <ComboBox x:Name="WineKgInput" Margin="0,40,10,10" Grid.Column="1"
+                              DisplayMemberPath="Name"
+                              SelectionChanged="WineKgInput_SelectionChanged"/>
+
+                    <Label Content="Ried:" Margin="10,70,0,10" Grid.Column="0"/>
+                    <ComboBox x:Name="WineRdInput" Margin="0,70,10,10" Grid.Column="1"
+                              DisplayMemberPath="Name"/>
+
+                    <CheckBox x:Name="GebundenInput" Content="Gebunden" Margin="10,105,0,0" Grid.Column="0" Grid.ColumnSpan="2" IsThreeState="True"
+                              VerticalAlignment="Top" HorizontalAlignment="Left"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+                </Grid>
+            </GroupBox>
+        </Grid>
 
         <StatusBar Grid.Row="5" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
             <StatusBar.ItemsPanel>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -2,6 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Helpers.Export;
 using Elwig.Models;
+using LinqKit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.Win32;
@@ -94,6 +95,11 @@ namespace Elwig.Windows {
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            Menu_Print_DeliveryJournal_ShowToday.IsEnabled = App.IsPrintingReady;
+            Menu_Print_DeliveryJournal_PrintToday.IsEnabled = App.IsPrintingReady;
+            Menu_Print_DeliveryJournal_ShowFilter.IsEnabled = App.IsPrintingReady;
+            Menu_Print_DeliveryJournal_PrintFilter.IsEnabled = App.IsPrintingReady;
+
             OnSecondPassed(null, null);
             Timer.Start();
             LockInputs();
@@ -108,16 +114,16 @@ namespace Elwig.Windows {
 
         private async void Menu_Print_ShowDeliveryNote_Click(object sender, RoutedEventArgs evt) {
             if (DeliveryList.SelectedItem is not Delivery d) return;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             using var doc = new DeliveryNote(d, Context);
             await doc.Generate();
-            doc.Show();
             Mouse.OverrideCursor = null;
+            doc.Show();
         }
 
         private async void Menu_Print_PrintDeliveryNote_Click(object sender, RoutedEventArgs evt) {
             if (DeliveryList.SelectedItem is not Delivery d) return;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             using var doc = new DeliveryNote(d, Context);
             await doc.Generate();
             Mouse.OverrideCursor = null;
@@ -134,34 +140,71 @@ namespace Elwig.Windows {
                 Title = $"Traubentransportscheinliste (BKI) speichern unter - Elwig"
             };
             if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 using var file = new Bki(d.FileName);
                 await file.ExportAsync(year);
                 Mouse.OverrideCursor = null;
             }
         }
 
-        private async void Menu_Print_ShowDeliveryJournalToday_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+        private async void Menu_Print_DeliveryJournal_ShowToday_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.AppStarting;
             var doc = new DeliveryJournal(Context, DateOnly.FromDateTime(Utils.Today));
             await doc.Generate();
             Mouse.OverrideCursor = null;
             doc.Show();
         }
 
-        private async void Menu_Print_ShowDeliveryJournalYesterday_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
-            var doc = new DeliveryJournal(Context, DateOnly.FromDateTime(Utils.Today.AddDays(-1)));
+        private async void Menu_Print_DeliveryJournal_PrintToday_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            var doc = new DeliveryJournal(Context, DateOnly.FromDateTime(Utils.Today));
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            await doc.Print();
+        }
+
+        private async void Menu_Print_DeliveryJournal_ShowFilter_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            var (f, _, d, _) = await GetFilters();
+            var doc = new DeliveryJournal(string.Join(" / ", f), d);
             await doc.Generate();
             Mouse.OverrideCursor = null;
             doc.Show();
         }
 
+        private async void Menu_Print_DeliveryJournal_PrintFilter_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            var (f, _, d, _) = await GetFilters();
+            var doc = new DeliveryJournal(string.Join(" / ", f), d);
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            doc.Show();
+        }
+
+        private void Menu_Settings_EnableFreeEditing_Checked(object sender, RoutedEventArgs evt) {
+            if (IsEditing || IsCreating) {
+                DateInput.IsReadOnly = false;
+                TimeInput.IsReadOnly = false;
+                BranchInput.IsEnabled = true;
+                if (IsCreating) TimeInput.Text = "";
+                OnSecondPassed(null, null);
+            }
+        }
+
+        private void Menu_Settings_EnableFreeEditing_Unchecked(object sender, RoutedEventArgs evt) {
+            DateInput.IsReadOnly = true;
+            TimeInput.IsReadOnly = true;
+            BranchInput.IsEnabled = false;
+            OnSecondPassed(null, null);
+        }
+
         private void OnSecondPassed(object? sender, EventArgs? evt) {
-            if (IsReceipt && IsCreating) {
+            if (IsReceipt && IsCreating && !Menu_Settings_EnableFreeEditing.IsChecked) {
                 var now = DateTime.Now;
                 TimeInput.Text = now.ToString("HH:mm");
                 DateInput.Text = now.ToString("dd.MM.yyyy");
+                SetDefaultValue(TimeInput);
+                SetDefaultValue(DateInput);
             }
         }
 
@@ -184,6 +227,15 @@ namespace Elwig.Windows {
                 GerebeltGewogenInput.IsEnabled = true;
                 UnsetDefaultValue(GerebeltGewogenInput);
             }
+            if (App.Client.IsMatzen || App.Client.IsWinzerkeller) {
+                GebundenInput.IsChecked = null;
+                GebundenInput.IsEnabled = false;
+                SetDefaultValue(GebundenInput);
+            } else {
+                GebundenInput.IsChecked = null;
+                GebundenInput.IsEnabled = true;
+                UnsetDefaultValue(GebundenInput);
+            }
 
             WineQualityLevelInput.IsEnabled = false;
 
@@ -227,50 +279,83 @@ namespace Elwig.Windows {
             await RefreshDeliveryListQuery();
         }
 
-        private async Task RefreshDeliveryListQuery(bool updateSort = false) {
+        private async Task<(List<string>, IQueryable<Delivery>, IQueryable<DeliveryPart>, List<string>)> GetFilters() {
+            List<string> filterNames = new();
             IQueryable<Delivery> deliveryQuery = Context.Deliveries;
             if (Member != null) {
                 deliveryQuery = deliveryQuery.Where(d => d.MgNr == Member.MgNr);
+                filterNames.Add(Member.AdministrativeName);
             }
             if (TodayOnlyInput.IsChecked == true) {
                 deliveryQuery = deliveryQuery
-                    .Where(d => (d.DateString == Utils.Today.ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") > 0) || 
-                                (d.DateString == Utils.Today.AddDays(1).ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") <= 0));
+                    .Where(d => (d.DateString == Utils.Today.ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo("03:00:00") > 0)) ||
+                                (d.DateString == Utils.Today.AddDays(1).ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo("03:00:00") <= 0)));
+                filterNames.Add(Utils.Today.ToString("dd.MM.yyyy"));
             } else if (AllSeasonsInput.IsChecked == false) {
                 deliveryQuery = deliveryQuery.Where(d => d.Year == SeasonInput.Value);
+                filterNames.Add(SeasonInput.Value.ToString() ?? "");
             }
+            IQueryable<DeliveryPart> dpq = deliveryQuery
+                .SelectMany(d => d.Parts)
+                .OrderBy(p => p.Delivery.DateString)
+                .ThenBy(p => p.Delivery.TimeString)
+                .ThenBy(p => p.Delivery.LsNr)
+                .ThenBy(p => p.DPNr);
 
             var filterVar = new List<string>();
+            var filterNotVar = new List<string>();
             var filterQual = new List<string>();
             var filterMgNr = new List<int>();
-            var filterDate = new List<string>();
-            var filterPartDate = new List<string>();
-            string? filterTimeGt = null;
-            string? filterTimeLt = null;
-            int filterYearGt = 0;
-            int filterYearLt = 0;
-            double filterKmwGt = 0;
-            double filterKmwLt = 0;
-            double filterOeGt = 0;
-            double filterOeLt = 0;
+            var filterZwst = new List<string>();
+            var filterAttr = new List<string>();
+            var filterNotAttr = new List<string>();
+            var filterDate = new List<(string?, string?)>();
+            var filterTime = new List<(string?, string?)>();
+            int filterYearGt = 0, filterYearLt = 0;
+            double filterKmwGt = 0, filterKmwLt = 0;
+            double filterOeGt = 0, filterOeLt = 0;
 
             var filter = TextFilter.ToList();
             if (filter.Count > 0) {
-                var var = await Context.WineVarieties.Select(v => v.SortId).ToListAsync();
-                var qual = await Context.WineQualityLevels.Select(q => q.QualId).ToListAsync();
-                var mgnr = await Context.Members.Select(m => m.MgNr.ToString()).ToListAsync();
+                var var = await Context.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
+                var qual = await Context.WineQualityLevels.Where(q => !q.IsPredicate).ToDictionaryAsync(q => q.QualId, q => q);
+                var mgnr = await Context.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
+                var zwst = await Context.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(" ")[0], b => b);
+                var attr = await Context.WineAttributes.ToDictionaryAsync(a => a.Name.ToLower().Split(" ")[0], a => a);
 
                 for (int i = 0; i < filter.Count; i++) {
                     var e = filter[i];
-                    if (e.Length == 2 && var.Contains(e.ToUpper())) {
+                    if (e.Length == 2 && var.ContainsKey(e.ToUpper())) {
                         filterVar.Add(e.ToUpper());
                         filter.RemoveAt(i--);
-                    } else if (e.Length == 3 && qual.Contains(e.ToUpper())) {
+                        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.Length == 3 && qual.ContainsKey(e.ToUpper())) {
                         filterQual.Add(e.ToUpper());
                         filter.RemoveAt(i--);
-                    } else if (e.All(char.IsAsciiDigit) && mgnr.Contains(e)) {
+                        filterNames.Add(qual[e.ToUpper()].Name);
+                    } else if (e.All(char.IsAsciiDigit) && mgnr.ContainsKey(e)) {
                         filterMgNr.Add(int.Parse(e));
                         filter.RemoveAt(i--);
+                        filterNames.Add(mgnr[e].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 (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("<")) {
                         if (double.TryParse(e[1..], out var num)) {
                             switch ((e[0], num)) {
@@ -282,12 +367,6 @@ namespace Elwig.Windows {
                                 case ('<', _): filterOeLt = num; break;
                             }
                             filter.RemoveAt(i--);
-                        } else if (TimeOnly.TryParse(e[1..], out var time)) {
-                            switch ((e[0], time)) {
-                                case ('>', _): filterTimeGt = $"{time:HH:mm}"; break;
-                                case ('<', _): filterTimeLt = $"{time:HH:mm}"; break;
-                            }
-                            filter.RemoveAt(i--);
                         }
                         if (e.Length == 1) filter.RemoveAt(i--);
                     } else if (e.Length > 1 && Utils.FromToRegex.IsMatch(e)) {
@@ -295,14 +374,14 @@ namespace Elwig.Windows {
                         double? from = (parts[0].Length > 0) ? double.Parse(parts[0].Replace(".", ",")) : null;
                         double? to = (parts[1].Length > 0) ? double.Parse(parts[1].Replace(".", ",")) : null;
                         switch ((from, to)) {
-                            case (<= 30, <= 30):
-                            case (<= 30, null):
+                            case ( <= 30, <= 30):
+                            case ( <= 30, null):
                             case (null, <= 30):
                                 filterKmwGt = from ?? 0;
                                 filterKmwLt = to ?? 0;
                                 break;
-                            case (>= 1900, >= 1900):
-                            case (>= 1900, null):
+                            case ( >= 1900, >= 1900):
+                            case ( >= 1900, null):
                             case (null, >= 1900):
                                 filterYearGt = (int)(from ?? 0);
                                 filterYearLt = (int)(to ?? -1) + 1;
@@ -315,16 +394,58 @@ namespace Elwig.Windows {
                         filter.RemoveAt(i--);
                     } else if (e.Length > 1 && Utils.FromToTimeRegex.IsMatch(e)) {
                         var parts = e.Split("-");
-                        filterTimeGt = TimeOnly.TryParse(parts[0], out var from) ? $"{from:HH:mm}" : null;
-                        filterTimeLt = TimeOnly.TryParse(parts[1], out var to) ? $"{to:HH:mm}" : null;
+                        filterTime.Add((TimeOnly.TryParse(parts[0], out var from) ? $"{from:HH:mm}" : null, TimeOnly.TryParse(parts[1], out var to) ? $"{to:HH:mm}" : null));
                         filter.RemoveAt(i--);
+                        var t = filterTime.Last();
+                        if (t.Item1 != null && t.Item2 != null) {
+                            filterNames.Add($"{t.Item1}–{t.Item2}");
+                        } else if (t.Item1 != null) {
+                            filterNames.Add($"ab {t.Item1}");
+                        } else if (t.Item2 != null) {
+                            filterNames.Add($"bis {t.Item2}");
+                        }
                     } else if (DateOnly.TryParse(e, out var date)) {
-                        filterDate.Add($"{date:yyyy-MM-dd}");
-                        filter.RemoveAt(i--);
-                    } else if (Utils.PartialDateRegex.IsMatch(e)) {
-                        var parts = e.Split(".");
-                        filterPartDate.Add($"-{int.Parse(parts[1]):00}-{int.Parse(parts[0]):00}");
+                        var s = date.ToString("yyyy-MM-dd");
+                        filterDate.Add((s, s));
                         filter.RemoveAt(i--);
+                        if (filterNames.Contains(SeasonInput.Value.ToString()) && SeasonInput.Value == date.Year)
+                            filterNames.Remove(SeasonInput.Value.ToString());
+                        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(SeasonInput.Value.ToString());
+                                filterNames.Add(n + SeasonInput.Value.ToString());
+                            } else {
+                                if (SeasonInput.Value.ToString() == dParts[2])
+                                    filterNames.Remove(SeasonInput.Value.ToString());
+                                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) {
@@ -332,22 +453,67 @@ namespace Elwig.Windows {
                     }
                 }
 
-                if (filterMgNr.Count > 0) deliveryQuery = deliveryQuery.Where(d => filterMgNr.Contains(d.MgNr));
-                if (filterDate.Count > 0) deliveryQuery = deliveryQuery.Where(d => filterDate.Contains(d.DateString));
-                if (filterPartDate.Count > 0) deliveryQuery = deliveryQuery.Where(d => filterPartDate.Contains(d.DateString.Substring(4)));
-                if (filterYearGt > 0) deliveryQuery = deliveryQuery.Where(d => d.Year >= filterYearGt);
-                if (filterYearLt > 0) deliveryQuery = deliveryQuery.Where(d => d.Year < filterYearLt);
-                if (filterTimeGt != null) deliveryQuery = deliveryQuery.Where(d => filterTimeGt.CompareTo(d.TimeString) <= 0);
-                if (filterTimeLt != null) deliveryQuery = deliveryQuery.Where(d => filterTimeLt.CompareTo(d.TimeString) > 0);
-                if (filterVar.Count > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => filterVar.Contains(p.SortId)));
-                if (filterQual.Count > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => filterQual.Contains(p.QualId)));
-                if (filterKmwGt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw >= filterKmwGt));
-                if (filterKmwLt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw < filterKmwLt));
-                if (filterOeGt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt));
-                if (filterOeLt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw * (4.54 + 0.022 * p.Kmw) < filterOeLt));
+                if (filterYearGt > 0) dpq = dpq.Where(p => p.Year >= filterYearGt);
+                if (filterYearLt > 0) dpq = dpq.Where(p => p.Year < filterYearLt);
+                if (filterMgNr.Count > 0) dpq = dpq.Where(p => filterMgNr.Contains(p.Delivery.MgNr));
+                if (filterDate.Count > 0) {
+                    var pr = PredicateBuilder.New<DeliveryPart>(false);
+                    foreach (var (d1, d2) in filterDate)
+                        pr.Or(p => (d1 == null || d1.CompareTo(p.Delivery.DateString.Substring(10 - d1.Length)) <= 0) && (d2 == null || d2.CompareTo(p.Delivery.DateString.Substring(10 - d2.Length)) >= 0));
+                    dpq = dpq.Where(pr);
+                }
+                if (filterTime.Count > 0) {
+                    var pr = PredicateBuilder.New<DeliveryPart>(false);
+                    foreach (var (t1, t2) in filterTime)
+                        pr.Or(p => (t1 == null || t1.CompareTo(p.Delivery.TimeString) <= 0) && (t2 == null || t2.CompareTo(p.Delivery.TimeString) > 0));
+                    dpq = dpq.Where(p => p.Delivery.TimeString != null).Where(pr);
+                }
+                if (filterVar.Count > 0) dpq = dpq.Where(p => filterVar.Contains(p.SortId));
+                if (filterNotVar.Count > 0) dpq = dpq.Where(p => !filterNotVar.Contains(p.SortId));
+                if (filterQual.Count > 0) dpq = dpq.Where(p => filterQual.Contains(p.QualId));
+                if (filterZwst.Count > 0) dpq = dpq.Where(p => filterZwst.Contains(p.Delivery.ZwstId));
+                if (filterAttr.Count > 0)
+                    foreach (var a in filterAttr)
+                        dpq = dpq.Where(p => p.PartAttributes.Select(a => a.Attr.AttrId).Contains(a));
+                if (filterNotAttr.Count > 0)
+                    foreach (var a in filterNotAttr)
+                        dpq = dpq.Where(p => !p.PartAttributes.Select(a => a.Attr.AttrId).Contains(a));
+                if (filterKmwGt > 0) dpq = dpq.Where(p => p.Kmw >= filterKmwGt);
+                if (filterKmwLt > 0) dpq = dpq.Where(p => p.Kmw < filterKmwLt);
+                if (filterOeGt > 0) dpq = dpq.Where(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt);
+                if (filterOeLt > 0) dpq = dpq.Where(p => p.Kmw * (4.54 + 0.022 * p.Kmw) < filterOeLt);
+
+                if (filterYearGt > 0 && filterYearLt > 0) {
+                    filterNames.Insert(0, $"{filterYearGt}–{filterYearLt - 1}");
+                } else if (filterYearGt > 0) {
+                    filterNames.Insert(0, $"ab {filterYearGt}");
+                } else if (filterYearLt > 0) {
+                    filterNames.Insert(0, $"bis {filterYearLt - 1}");
+                }
+                if (filterKmwGt > 0 && filterKmwLt > 0) {
+                    filterNames.Add($"{filterKmwGt:N1}–{filterKmwLt:N1} °KMW");
+                } else if (filterKmwGt > 0) {
+                    filterNames.Add($"ab {filterKmwGt:N1} °KMW");
+                } else if (filterKmwLt > 0) {
+                    filterNames.Add($"unter {filterKmwLt:N1} °KMW");
+                }
+                if (filterOeGt > 0 && filterOeLt > 0) {
+                    filterNames.Add($"{filterOeGt:N1}–{filterOeLt:N1} °Oe");
+                } else if (filterOeGt > 0) {
+                    filterNames.Add($"ab {filterOeGt:N1} °Oe");
+                } else if (filterOeLt > 0) {
+                    filterNames.Add($"unter {filterOeLt:N1} °Oe");
+                }
             }
 
-            List<Delivery> deliveries = await deliveryQuery.OrderByDescending(d => d.DateString).ThenByDescending(d => d.TimeString).ToListAsync();
+            return (filterNames, dpq.Select(p => p.Delivery).Distinct().OrderBy(d => d.DateString).ThenBy(d => d.TimeString), dpq, filter);
+        }
+
+        private async Task RefreshDeliveryListQuery(bool updateSort = false) {
+            var (_, deliveryQuery, deliveryPartsQuery, filter) = await GetFilters();
+            var deliveries = await deliveryQuery.ToListAsync();
+            deliveries.Reverse();
+
             if (filter.Count > 0 && deliveries.Count > 0) {
                 var dict = deliveries.AsParallel()
                     .ToDictionary(d => d, d => d.SearchScore(TextFilter))
@@ -365,18 +531,11 @@ namespace Elwig.Windows {
 
             var members = deliveries.Select(d => d.Member).DistinctBy(m => m.MgNr).ToList();
             StatusMembers.Text = $"Mitglieder: {members.Count}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : "");
+            StatusMembers.ToolTip = StatusMembers.Text;
             StatusDeliveries.Text = $"Lieferungen: {deliveries.Count}";
 
             if (filter.Count == 0) {
-                var partsQuery = deliveryQuery.SelectMany(d => d.Parts);
-                if (filterVar.Count > 0) partsQuery = partsQuery.Where(p => filterVar.Contains(p.SortId));
-                if (filterQual.Count > 0) partsQuery = partsQuery.Where(p => filterQual.Contains(p.QualId));
-                if (filterKmwGt > 0) partsQuery = partsQuery.Where(p => p.Kmw >= filterKmwGt);
-                if (filterKmwLt > 0) partsQuery = partsQuery.Where(p => p.Kmw < filterKmwLt);
-                if (filterOeGt > 0) partsQuery = partsQuery.Where(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt);
-                if (filterOeLt > 0) partsQuery = partsQuery.Where(p => p.Kmw * (4.54 + 0.022 * p.Kmw) < filterOeLt);
-                var deliveryParts = partsQuery;
-
+                var deliveryParts = deliveryPartsQuery;
                 var n = await deliveryParts.CountAsync();
                 StatusDeliveries.Text = $"Lieferungen: {deliveries.Count} ({n})";
                 var varieties = await deliveryParts.Select(d => d.SortId).Distinct().ToListAsync();
@@ -394,9 +553,8 @@ namespace Elwig.Windows {
                     StatusGradation.Text = "Gradation: -";
                 }
 
-
                 if (n > 0 && (n <= 200 || TodayOnlyInput.IsChecked == true)) {
-                    var parts = (await deliveryParts.ToListAsync());
+                    var parts = await deliveryParts.ToListAsync();
                     var groups = parts
                         .GroupBy(p => string.Join("/", p.Attributes.Select(a => a.Name)))
                         .Select(g => (g.Key, g.Sum(p => p.Weight), g.Min(p => p.Kmw), Utils.AggregateDeliveryPartsKmw(g), g.Max(p => p.Kmw)))
@@ -406,8 +564,8 @@ namespace Elwig.Windows {
                     if (groups.Count == 1) {
                         var g = groups.First().Key;
                         if (g != "") {
-                            StatusWeight.Text += $" ({g})";
-                            StatusGradation.Text += $" ({g})";
+                            StatusWeight.Text += $" [{g}]";
+                            StatusGradation.Text += $" [{g}]";
                         }
 
                         var sortGroups = parts
@@ -417,12 +575,12 @@ namespace Elwig.Windows {
                             .ToList();
 
                         if (sortGroups.Count > 1 && sortGroups.Count <= 4) {
-                            StatusWeight.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item2:N0} kg" + (g.Key == "" ? "" : $" ({g.Key})")))}";
-                            StatusGradation.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" ({g.Key})")))}";
+                            StatusWeight.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item2:N0} kg ({(double)g.Item2 / weight:0%})" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
+                            StatusGradation.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
                         }
                     } else if (groups.Count <= 4) {
-                        StatusWeight.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item2:N0} kg" + (g.Key == "" ? "" : $" ({g.Key})")))}";
-                        StatusGradation.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" ({g.Key})")))}";
+                        StatusWeight.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item2:N0} kg ({(double)g.Item2 / weight:0%})" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
+                        StatusGradation.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
                     }
                 }
             } else {
@@ -430,6 +588,11 @@ namespace Elwig.Windows {
                 StatusWeight.Text = "Gewicht: -";
                 StatusGradation.Text = "Gradation: -";
             }
+
+            StatusVarieties.ToolTip = StatusVarieties.Text;
+            // TODO display Weight/Gradation with newlines in ToolTip and grouped by sortid AND attributes
+            StatusWeight.ToolTip = StatusWeight.Text;
+            StatusGradation.ToolTip = StatusGradation.Text;
         }
 
         protected override async Task OnRenewContext() {
@@ -459,7 +622,7 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(MemberInput, await Context.Members.Where(m => m.IsActive || !IsCreating).OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName).ToListAsync(), i => (i as Member)?.MgNr);
             ControlUtils.RenewItemsSource(BranchInput, await Context.Branches.OrderBy(b => b.Name).ToListAsync(), i => (i as Branch)?.ZwstId);
             ControlUtils.RenewItemsSource(WineVarietyInput, await Context.WineVarieties.OrderBy(v => v.Name).ToListAsync(), i => (i as WineVar)?.SortId);
-            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.Where(a => IsCreating || a.IsActive).OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
+            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.Where(a => !IsCreating || a.IsActive).OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
             ControlUtils.RenewItemsSource(WineQualityLevelInput, await Context.WineQualityLevels.ToListAsync(), i => (i as WineQualLevel)?.QualId);
             ControlUtils.RenewItemsSource(ModifiersInput, await Context.Modifiers.Where(m => m.Year == y).OrderBy(m => m.Ordering).ToListAsync(), i => (i as Modifier)?.ModId);
             ControlUtils.RenewItemsSource(WineOriginInput, (await Context.WineOrigins.ToListAsync()).OrderByDescending(o => o.SortKey).ThenBy(o => o.HkId), i => (i as WineOrigin)?.HkId);
@@ -548,6 +711,7 @@ namespace Elwig.Windows {
             AcidInput.Text = (p != null && p.Acid != null) ? $"{p.Acid:N1}" : "";
             LesewagenInput.IsChecked = p?.IsLesewagen ?? false;
             HandPickedInput.IsChecked = p?.IsHandPicked;
+            GebundenInput.IsChecked = p?.IsGebunden;
 
             ScaleId = p?.ScaleId;
             WeighingId = p?.WeighingId;
@@ -585,10 +749,10 @@ namespace Elwig.Windows {
             if (deliveryNew || InputHasChanged(DateInput)) {
                 d.LNr = await Context.NextLNr(d.Date);
             }
-            if (IsCreating) {
+            if (IsCreating && !InputIsNotDefault(TimeInput)) {
                 d.TimeString = DateTime.Now.ToString("HH:mm:ss");
-            } else if (InputHasChanged(TimeInput)) {
-                d.TimeString = TimeInput.Text + ":00";
+            } else if (IsCreating || InputHasChanged(TimeInput)) {
+                d.TimeString = (TimeInput.Text != "") ? TimeInput.Text + ":00" : null;
             }
             d.ZwstId = (BranchInput.SelectedItem as Branch)?.ZwstId;
             d.LsNr = LsNrInput.Text;
@@ -605,6 +769,7 @@ namespace Elwig.Windows {
             p.IsGerebelt = GerebeltGewogenInput.IsChecked ?? false;
             p.IsHandPicked = HandPickedInput.IsChecked;
             p.IsLesewagen = LesewagenInput.IsChecked;
+            p.IsGebunden = GebundenInput.IsChecked;
             p.Temperature = (TemperatureInput.Text == "") ? null : double.Parse(TemperatureInput.Text);
             p.Acid = (AcidInput.Text == "") ? null : double.Parse(AcidInput.Text);
             p.Comment = (PartCommentInput.Text == "") ? null : PartCommentInput.Text;
@@ -790,7 +955,7 @@ namespace Elwig.Windows {
             NewDeliveryPartButton.Cursor = Cursors.Wait;
             DeliveryPartList.IsEnabled = false;
             var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
-			EmptyScale();
+            EmptyScale();
             await RefreshDeliveryList();
             await RefreshDeliveryParts();
             NewDeliveryPartButton.Cursor = null;
@@ -806,11 +971,11 @@ namespace Elwig.Windows {
             FinishButton.Cursor = Cursors.Wait;
             DeliveryPartList.IsEnabled = false;
             var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
-			EmptyScale();
-			await RefreshDeliveryList();
+            EmptyScale();
+            await RefreshDeliveryList();
             await RefreshDeliveryParts();
             if (p?.Delivery != null) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 using var doc = new DeliveryNote(p.Delivery, Context);
                 await doc.Generate();
                 Mouse.OverrideCursor = null;
@@ -818,7 +983,6 @@ namespace Elwig.Windows {
                     doc.Show();
                 } else {
                     await doc.Print(2);
-                    Activate();
                 }
             }
             FinishButton.Cursor = null;
@@ -882,7 +1046,7 @@ namespace Elwig.Windows {
             try {
                 if (res == null || res <= 0)
                     return;
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 ClearOriginalValues();
                 if (res >= p.Weight) {
                     ControlUtils.SelectComboBoxItem(WineQualityLevelInput, q => (q as WineQualLevel)?.QualId, "WEI");
@@ -964,7 +1128,7 @@ namespace Elwig.Windows {
                 $"Soll die Lieferung {d.LsNr} ({d.Member.AdministrativeName}, MgNr. {d.Member.MgNr}) wirklich unwiderruflich gelöscht werden?",
                 "Lieferung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
             if (r == MessageBoxResult.Yes) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 Context.Remove(d);
                 await Context.SaveChangesAsync();
                 await RefreshDeliveryList();
@@ -1039,8 +1203,8 @@ namespace Elwig.Windows {
                 day = day.AddDays(-1);
             var lsnrs = await Context.Deliveries
                 .Where(d => d.ZwstId == delivery.ZwstId)
-                .Where(d => (d.DateString == day.ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") > 0) ||
-                            (d.DateString == day.AddDays(1).ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") <= 0))
+                .Where(d => (d.DateString == day.ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo("03:00:00") > 0)) ||
+                            (d.DateString == day.AddDays(1).ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo("03:00:00") <= 0)))
                 .Where(d => d.LsNr != delivery.LsNr)
                 .OrderBy(d => d.LsNr)
                 .Select(d => d.LsNr)
@@ -1051,7 +1215,7 @@ namespace Elwig.Windows {
             EntityEntry<Delivery>? entry = null;
             try {
                 Delivery? d = null;
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 if (res == "new") {
                     d = Context.CreateProxy<Delivery>();
                     d.Date = delivery.Date;
@@ -1102,7 +1266,7 @@ namespace Elwig.Windows {
                 $"Soll die Teillieferung Nr. {p.DPNr} wirklich unwiderruflich gelöscht werden?",
                 "Lieferung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
             if (r == MessageBoxResult.Yes) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 Context.Remove(p);
                 await Context.SaveChangesAsync();
                 await RefreshDeliveryParts();
@@ -1192,9 +1356,9 @@ namespace Elwig.Windows {
             AbgewertetInput.IsEnabled = false;
             ManualWeighingInput.IsEnabled = false;
             LsNrInput.IsReadOnly = true;
-            DateInput.IsReadOnly = true;
-            TimeInput.IsReadOnly = true;
-            BranchInput.IsEnabled = false;
+            DateInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked;
+            TimeInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked;
+            BranchInput.IsEnabled = Menu_Settings_EnableFreeEditing.IsChecked;
         }
 
         private void DisableWeighingButtons() {
@@ -1218,15 +1382,25 @@ namespace Elwig.Windows {
             if (DateInput.Text == "" || BranchInput.SelectedItem == null) {
                 LsNrInput.Text = "";
             } else {
-                var branch = (Branch)BranchInput.SelectedItem;
-                var date = DateOnly.ParseExact(DateInput.Text, "dd.MM.yyyy");
-                var lnr = await Context.NextLNr(date);
-                LsNrInput.Text = Utils.GenerateLsNr(date, branch.ZwstId, lnr);
+                try {
+                    var branch = (Branch)BranchInput.SelectedItem;
+                    var date = DateOnly.ParseExact(DateInput.Text, "dd.MM.yyyy");
+                    var lnr = await Context.NextLNr(date);
+                    LsNrInput.Text = Utils.GenerateLsNr(date, branch.ZwstId, lnr);
+                } catch {
+                    LsNrInput.Text = "";
+                }
             }
         }
 
         private void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            if (IsCreating) UpdateLsNr().GetAwaiter().GetResult();
+            base.DateInput_TextChanged(sender, evt);
+            if (IsEditing ||  IsCreating) UpdateLsNr().GetAwaiter().GetResult();
+        }
+
+        private void BranchInput_SelectionChanged(object sender, RoutedEventArgs evt) {
+            base.ComboBox_SelectionChanged(sender, evt);
+            if (IsEditing || IsCreating) UpdateLsNr().GetAwaiter().GetResult();
         }
 
         private void UpdateWineVariety(bool valid) {

Elwig/Windows/MainWindow.xaml

@@ -8,6 +8,8 @@
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Button">
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="HorizontalAlignment" Value="Left"/>
             <Setter Property="FontSize" Value="14"/>
             <Setter Property="Padding" Value="9,3"/>
             <Setter Property="Height" Value="32"/>
@@ -30,28 +32,32 @@
             </Grid.ColumnDefinitions>
             <Image Source="/elwig.png" RenderOptions.BitmapScalingMode="HighQuality" Grid.Column="0"
                    HorizontalAlignment="Left" Margin="5,5,5,5" VerticalAlignment="Top"/>
-            <Label Grid.Column="1" Content="Elwig" FontSize="32"
-                   HorizontalAlignment="Left" Margin="0,10,0,0" VerticalAlignment="Top"/>
-            <Label Grid.Column="1" Content="Elektonische Winzer-"
-                   HorizontalAlignment="Left" Margin="0,55,0,0" VerticalAlignment="Top"/>
-            <Label Grid.Column="1" Content="genossenschaftsverwaltung"
-                   HorizontalAlignment="Left" Margin="0,70,0,0" VerticalAlignment="Top"/>
+            <TextBlock Grid.Column="1" FontSize="32" HorizontalAlignment="Left" Margin="0,5,0,0" VerticalAlignment="Top">
+                Elwig
+            </TextBlock>
+            <TextBlock Grid.Column="1" HorizontalAlignment="Left" Margin="0,50,0,0" VerticalAlignment="Top" LineHeight="14" LineStackingStrategy="BlockLineHeight">
+                Elektonische Winzer-<LineBreak/>
+                genossenschaftsverwaltung
+            </TextBlock>
+            <TextBlock x:Name="VersionField" Grid.Column="1" FontSize="10" HorizontalAlignment="Left" Margin="0,80,0,0" VerticalAlignment="Top">
+                Version: ?
+            </TextBlock>
         </Grid>
 
         <Button x:Name="MemberAdminButton" Content="Mitglieder" Click="MemberAdminButton_Click"
-                Margin="50,160,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="50,160,0,0"/>
         <Button x:Name="ReceiptButton" Content="Übernahme" Click="ReceiptButton_Click"
-                Margin="50,200,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="50,200,0,0"/>
         <Button x:Name="DeliveryAdminButton" Content="Lieferungen" Click="DeliveryAdminButton_Click"
-                Margin="50,240,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-        <Button x:Name="PaymentWindowButton" Content="Auszahlung" Click="PaymentWindowButton_Click"
-                Margin="50,280,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="50,240,0,0"/>
+        <Button x:Name="SeasonFinishButton" Content="Leseabschluss" Click="SeasonFinishButton_Click"
+                Margin="50,280,0,0"/>
         <Button x:Name="BaseDataButton" Content="Stammdaten" Click="BaseDataButton_Click"
-                Margin="50,320,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="50,320,0,0"/>
 
         <Button x:Name="TestWindowButton" Content="Test Fenster" Click="TestWindowButton_Click"
-                Margin="260,280,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="260,280,0,0"/>
         <Button x:Name="QueryWindowButton" Content="Datenbankabfragen" Click="QueryWindowButton_Click"
-                Margin="260,320,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="260,320,0,0"/>
     </Grid>
 </Window>

Elwig/Windows/MainWindow.xaml.cs

@@ -1,3 +1,4 @@
+using System.Reflection;
 using System.Windows;
 
 namespace Elwig.Windows {
@@ -5,6 +6,8 @@ namespace Elwig.Windows {
 
         public MainWindow() {
             InitializeComponent();
+            var v = Assembly.GetExecutingAssembly().GetName().Version;
+            VersionField.Text = "Version: " + (v == null ? "?" : $"{v.Major}.{v.Minor}.{v.Build}");
             if (!App.Config.Debug) {
                 TestWindowButton.Visibility = Visibility.Hidden;
                 //QueryWindowButton.Visibility = Visibility.Hidden;
@@ -52,8 +55,8 @@ namespace Elwig.Windows {
             w.Show();
         }
 
-        private void PaymentWindowButton_Click(object sender, RoutedEventArgs e) {
-            var w = new ChartWindow();
+        private void SeasonFinishButton_Click(object sender, RoutedEventArgs e) {
+            var w = new SeasonFinishWindow();
             w.Show();
         }
     }

Elwig/Windows/MemberAdminWindow.xaml

@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
-        Title="Mitglieder - Elwig" Height="670" Width="1250" MinHeight="600" MinWidth="1000"
+        Title="Mitglieder - Elwig" Height="700" Width="1250" MinHeight="650" MinWidth="1150"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -36,16 +36,13 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="19"/>
-            <RowDefinition Height="0.8*"/>
-            <RowDefinition Height="0.8*"/>
-            <RowDefinition Height="0.2*"/>
-            <RowDefinition Height="1.3*"/>
-            <RowDefinition Height="0.8*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="24"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="370"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*" MinWidth="300"/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition Width="2.5*" MinWidth="800"/>
         </Grid.ColumnDefinitions>
 
         <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
@@ -54,8 +51,17 @@
                           Click="Menu_Member_SendEmail_Click"/>
             </MenuItem>
             <MenuItem Header="Drucken">
+                <MenuItem x:Name="Menu_Print_Letterhead" Header="Briefkopf drucken"
+                          Click="Menu_Print_Letterhead_Click"/>
                 <MenuItem Header="Stammdatenblatt drucken"/>
-                <MenuItem Header="Mitgliederliste drucken"/>
+                <MenuItem Header="Briefköpfe drucken">
+                    <MenuItem x:Name="Menu_Print_Letterheads_MgNr" Header="nach MgNr. sortiert" IsEnabled="False" Tag="Print"
+                              Click="Menu_Print_Letterheads_MgNr_Click"/>
+                    <MenuItem x:Name="Menu_Print_Letterheads_Name" Header="nach Name sortiert" IsEnabled="False" Tag="Print"
+                              Click="Menu_Print_Letterheads_Name_Click"/>
+                    <MenuItem x:Name="Menu_Print_Letterheads_Plz" Header="nach PLZ, Ort, Name sortiert" IsEnabled="False" Tag="Print"
+                              Click="Menu_Print_Letterheads_Plz_Click"/>
+                </MenuItem>
             </MenuItem>
             <MenuItem Header="Rundschreiben">
                 <MenuItem Header="Runschreiben ausschicken"/>
@@ -66,7 +72,7 @@
             </MenuItem>
         </Menu>
 
-        <Grid Grid.RowSpan="5" Grid.Row="1" Margin="5,0,5,0">
+        <Grid Grid.Row="1" Margin="5,0,0,0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="39"/>
                 <RowDefinition Height="*"/>
@@ -88,9 +94,23 @@
                       SelectionChanged="MemberList_SelectionChanged"
                       Margin="5,0,5,0" Grid.Row="1" FontSize="14" Grid.ColumnSpan="3">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="MgNr."    Binding="{Binding MgNr}"       Width="70"/>
-                    <DataGridTextColumn Header="Nachname" Binding="{Binding FamilyName}" Width="4*"/>
-                    <DataGridTextColumn Header="Vorname"  Binding="{Binding GivenName}"  Width="3*"/>
+                    <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="Nachname" Binding="{Binding FamilyName}" Width="140"/>
+                    <DataGridTextColumn Header="Vorname" Binding="{Binding GivenName}" Width="140"/>
+                    <DataGridTextColumn Header="GA" Binding="{Binding BusinessShares, StringFormat='{}{0} '}" Width="40">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Rechnungsadresse" Binding="{Binding BillingAddress.Name}" Width="200"/>
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -115,256 +135,307 @@
                     Click="CancelButton_Click"/>
         </Grid>
 
-        <GroupBox Header="Persönliche Daten" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80"/>
-                    <ColumnDefinition Width="3*"/>
-                    <ColumnDefinition Width="50"/>
-                    <ColumnDefinition Width="2*"/>
-                </Grid.ColumnDefinitions>
+        <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
 
-                <Label Content="MgNr.:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="MgNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus"/>
+        <Grid Grid.Column="2" Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="0.8*"/>
+                <RowDefinition Height="0.8*"/>
+                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="1.3*"/>
+                <RowDefinition Height="0.8*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
 
-                <Label Content="Vorg.:" Margin="10,10,0,0" Grid.Column="2"/>
-                <TextBox x:Name="PredecessorMgNrInput" Margin="0,10,10,0" Width="48" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="PredecessorMgNrInput_TextChanged" LostFocus="PredecessorMgNrInput_LostFocus"/>
+            <GroupBox Header="Persönliche Daten" Grid.Column="0" Grid.Row="0" Grid.RowSpan="2" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="3*"/>
+                        <ColumnDefinition Width="50"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="Präfix:" Margin="10,40,0,0" Grid.Column="2"/>
-                <TextBox x:Name="PrefixInput" Margin="0,40,10,0" Grid.Column="3"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="MgNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="MgNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
+                             TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus"/>
 
-                <Label Content="Vorname:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="GivenNameInput" Margin="0,40,0,0" Grid.Column="1"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="Vorg.:" Margin="10,10,0,0" Grid.Column="2"/>
+                    <TextBox x:Name="PredecessorMgNrInput" Margin="0,10,10,0" Width="48" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
+                             TextChanged="PredecessorMgNrInput_TextChanged" LostFocus="PredecessorMgNrInput_LostFocus"/>
 
-                <Label Content="Nachname:" Margin="10,70,0,0" Grid.Column="0"/>
-                <TextBox x:Name="FamilyNameInput" Margin="0,70,0,0" Grid.Column="1"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="Präfix:" Margin="10,40,0,0" Grid.Column="2"/>
+                    <TextBox x:Name="PrefixInput" Margin="0,40,10,0" Grid.Column="3"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Suffix:" Margin="10,70,0,0" Grid.Column="2"/>
-                <TextBox x:Name="SuffixInput" Margin="0,70,10,0" Grid.Column="3"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="Vorname:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="GivenNameInput" Margin="0,40,0,0" Grid.Column="1"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Geburtstag:" Margin="10,100,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BirthdayInput" Margin="0,100,0,0" Grid.Column="1" Width="78" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="PartialDateInput_TextChanged" LostFocus="PartialDateInput_LostFocus"/>
+                    <Label Content="Nachname:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="FamilyNameInput" Margin="0,70,0,0" Grid.Column="1"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Alter:" Margin="85,100,0,0" Grid.Column="1" Grid.ColumnSpan="3"/>
-                <TextBlock x:Name="Age" Text="-" Margin="119,104,0,0" Grid.Column="1" Grid.ColumnSpan="3" TextWrapping="NoWrap" VerticalAlignment="Top"/>
+                    <Label Content="Suffix:" Margin="10,70,0,0" Grid.Column="2"/>
+                    <TextBox x:Name="SuffixInput" Margin="0,70,10,0" Grid.Column="3"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <CheckBox x:Name="DeceasedInput" Content="Verstorben" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Grid.Column="3" HorizontalAlignment="Left" Margin="0,105,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                    <Label Content="Geburtstag:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="BirthdayInput" Margin="0,100,0,0" Grid.Column="1" Width="78" TextAlignment="Right" HorizontalAlignment="Left"
+                             TextChanged="PartialDateInput_TextChanged" LostFocus="PartialDateInput_LostFocus"/>
 
-                <Label Content="Adresse:" Margin="10,130,0,0"/>
-                <TextBox x:Name="AddressInput" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="Alter:" Margin="85,100,0,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+                    <TextBlock x:Name="Age" Text="-" Margin="119,104,0,0" Grid.Column="1" Grid.ColumnSpan="3" TextWrapping="NoWrap" VerticalAlignment="Top"/>
 
-                <Label Content="PLZ/Ort:" Margin="10,160,0,0" Grid.Column="0"/>
-                <TextBox x:Name="PlzInput" Margin="0,160,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
-                         TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
-                <ComboBox x:Name="OrtInput" ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
-                          Margin="47,160,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
-            </Grid>
-        </GroupBox>
-        <GroupBox Header="Kontaktdaten" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*" MinWidth="180"/>
-                    <ColumnDefinition Width="2*"/>
-                </Grid.ColumnDefinitions>
+                    <CheckBox x:Name="DeceasedInput" Content="Verstorben" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Grid.Column="3" HorizontalAlignment="Left" Margin="0,105,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
-                <Label Content="E-Mail-Adresse (1):" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="EmailAddress1Input" Margin="0,10,10,0" Grid.Column="1" Grid.ColumnSpan="2"
-                         TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+                    <Label Content="Adresse:" Margin="10,130,0,0"/>
+                    <TextBox x:Name="AddressInput" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="E-Mail-Adresse (2):" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="EmailAddress2Input" Margin="0,40,10,0" Grid.Column="1" Grid.ColumnSpan="2"
-                         TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+                    <Label Content="PLZ/Ort:" Margin="10,160,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="PlzInput" Margin="0,160,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
+                             TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
+                    <ComboBox x:Name="OrtInput" ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
+                              Margin="47,160,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+                </Grid>
+            </GroupBox>
+            <GroupBox Header="Kontaktdaten" Grid.Column="0" Grid.Row="2" Grid.RowSpan="2" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="135"/>
+                        <ColumnDefinition Width="*" MinWidth="180"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
 
-                <ComboBox x:Name="PhoneNr1TypeInput" DisplayMemberPath="Value" Margin="6,70,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr1Input" Margin="0,70,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr1CommentInput" Margin="0,70,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="E-Mail-Adresse (1):" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="EmailAddress1Input" Margin="0,10,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
 
-                <ComboBox x:Name="PhoneNr2TypeInput" DisplayMemberPath="Value" Margin="6,100,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr2Input" Margin="0,100,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr2CommentInput" Margin="0,100,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="E-Mail-Adresse (2):" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="EmailAddress2Input" Margin="0,40,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
 
-                <ComboBox x:Name="PhoneNr3TypeInput" DisplayMemberPath="Value" Margin="6,130,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr3Input" Margin="0,130,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr3CommentInput" Margin="0,130,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <ComboBox x:Name="PhoneNr1TypeInput" DisplayMemberPath="Value" Margin="6,70,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr1Input" Margin="0,70,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr1CommentInput" Margin="0,70,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr4TypeInput" DisplayMemberPath="Value" Margin="6,160,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr4Input" Margin="0,160,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr4CommentInput" Margin="0,160,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <ComboBox x:Name="PhoneNr2TypeInput" DisplayMemberPath="Value" Margin="6,100,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr2Input" Margin="0,100,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr2CommentInput" Margin="0,100,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr5TypeInput" DisplayMemberPath="Value" Margin="6,190,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr5Input" Margin="0,190,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr5CommentInput" Margin="0,190,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <ComboBox x:Name="PhoneNr3TypeInput" DisplayMemberPath="Value" Margin="6,130,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr3Input" Margin="0,130,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr3CommentInput" Margin="0,130,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr6TypeInput" DisplayMemberPath="Value" Margin="6,220,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr6Input" Margin="0,220,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr6CommentInput" Margin="0,220,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <ComboBox x:Name="PhoneNr4TypeInput" DisplayMemberPath="Value" Margin="6,160,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr4Input" Margin="0,160,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr4CommentInput" Margin="0,160,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr7TypeInput" DisplayMemberPath="Value" Margin="6,250,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr7Input" Margin="0,250,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr7CommentInput" Margin="0,250,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <ComboBox x:Name="PhoneNr5TypeInput" DisplayMemberPath="Value" Margin="6,190,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr5Input" Margin="0,190,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr5CommentInput" Margin="0,190,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr8TypeInput" DisplayMemberPath="Value" Margin="6,280,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr8Input" Margin="0,280,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr8CommentInput" Margin="0,280,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <ComboBox x:Name="PhoneNr6TypeInput" DisplayMemberPath="Value" Margin="6,220,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr6Input" Margin="0,220,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr6CommentInput" Margin="0,220,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr9TypeInput" DisplayMemberPath="Value" Margin="6,310,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr9Input" Margin="0,310,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr9CommentInput" Margin="0,280,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
-            </Grid>
-        </GroupBox>
-        <GroupBox Header="Bankverbindung" Grid.Column="1" Grid.Row="5" Margin="5,5,5,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="65"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+                    <ComboBox x:Name="PhoneNr7TypeInput" DisplayMemberPath="Value" Margin="6,250,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr7Input" Margin="0,250,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr7CommentInput" Margin="0,250,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="IBAN:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="IbanInput" Margin="0,10,10,0" Grid.Column="1"
-                         TextChanged="IbanInput_TextChanged" LostFocus="IbanInput_LostFocus"/>
+                    <ComboBox x:Name="PhoneNr8TypeInput" DisplayMemberPath="Value" Margin="6,280,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr8Input" Margin="0,280,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr8CommentInput" Margin="0,280,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="BIC:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BicInput" Margin="0,40,10,0" Grid.Column="1"
-                         TextChanged="BicInput_TextChanged" LostFocus="BicInput_LostFocus"/>
-            </Grid>
-        </GroupBox>
-        <GroupBox Header="Betrieb" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="90"/>
-                    <ColumnDefinition Width="150"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+                    <ComboBox x:Name="PhoneNr9TypeInput" DisplayMemberPath="Value" Margin="6,310,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr9Input" Margin="0,310,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr9CommentInput" Margin="0,280,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
+                </Grid>
+            </GroupBox>
+            <GroupBox Header="Bankverbindung" Grid.Column="0" Grid.Row="4" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="65"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="UstIdNrInput" Margin="0,10,10,0" Grid.Column="1" Width="96" HorizontalAlignment="Left"
-                         TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
+                    <Label Content="IBAN:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="IbanInput" Margin="0,10,10,0" Grid.Column="1"
+                             TextChanged="IbanInput_TextChanged" LostFocus="IbanInput_LostFocus"/>
 
-                <Label Content="Betriebs-Nr.:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="LfbisNrInput" Margin="0,40,10,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
+                    <Label Content="BIC:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="BicInput" Margin="0,40,10,0" Grid.Column="1"
+                             TextChanged="BicInput_TextChanged" LostFocus="BicInput_LostFocus"/>
+                </Grid>
+            </GroupBox>
+            <GroupBox Header="Betrieb" Grid.Column="1" Grid.Row="0" Grid.RowSpan="1" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="90"/>
+                        <ColumnDefinition Width="150"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
-            </Grid>
-        </GroupBox>
-        <GroupBox Header="Rechnungsadresse (optional)" Grid.Column="2" Grid.Row="2" Grid.RowSpan="2" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="65"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+                    <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="UstIdNrInput" Margin="0,10,10,0" Grid.Column="1" Width="96" HorizontalAlignment="Left"
+                             TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
 
-                <Label Content="Name:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BillingNameInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="Betriebs-Nr.:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="LfbisNrInput" Margin="0,40,10,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
 
-                <Label Content="Adresse:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BillingAddressInput" Margin="0,40,10,0" Grid.Column="1"
-                         TextChanged="TextBox_TextChanged"/>
+                    <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                </Grid>
+            </GroupBox>
+            <GroupBox Header="Rechnungsadresse (optional)" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="65"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="PLZ/Ort:" Margin="10,70,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BillingPlzInput" Margin="0,70,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
-                         TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
-                <ComboBox x:Name="BillingOrtInput" ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
-                          Margin="47,70,10,0" Grid.Column="1"/>
-            </Grid>
-        </GroupBox>
-        <GroupBox Header="Genossenschaft" Grid.Column="2" Grid.Row="4" Grid.RowSpan="2" Margin="5,5,5,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="120"/>
-                    <ColumnDefinition Width="120"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+                    <Label Content="Name:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="BillingNameInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Eintritt:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="EntryDateInput" Margin="0,10,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                    <Label Content="Adresse:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="BillingAddressInput" Margin="0,40,10,0" Grid.Column="1"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Austritt:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="ExitDateInput" Margin="0,40,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                    <Label Content="PLZ/Ort:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="BillingPlzInput" Margin="0,70,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
+                             TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
+                    <ComboBox x:Name="BillingOrtInput" ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
+                              Margin="47,70,10,0" Grid.Column="1"/>
+                </Grid>
+            </GroupBox>
+            <GroupBox Header="Genossenschaft" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="120"/>
+                        <ColumnDefinition Width="120"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="Geschäftsanteile:" Margin="10,70,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BusinessSharesInput" Margin="0,70,10,0" Width="48" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="IntegerInput_TextChanged"/>
+                    <Label Content="Eintritt:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="EntryDateInput" Margin="0,10,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
 
-                <Label Content="BH-Konto:" Margin="10,100,0,0" Grid.Column="0"/>
-                <TextBox x:Name="AccountingNrInput" Margin="0,100,10,0" Grid.Column="1"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="Austritt:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="ExitDateInput" Margin="0,40,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
 
-                <CheckBox x:Name="ActiveInput" Content="Aktiv" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                    <Label Content="Geschäftsanteile:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="BusinessSharesInput" Margin="0,70,10,0" Width="48" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="IntegerInput_TextChanged"/>
 
-                <CheckBox x:Name="VollLieferantInput" Content="Volllieferant" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                    <Label Content="BH-Konto:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="AccountingNrInput" Margin="0,100,10,0" Grid.Column="1"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <CheckBox x:Name="FunkionärInput" Content="Funktionär" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                    <CheckBox x:Name="ActiveInput" Content="Aktiv" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
-                <Label Content="Stamm-Zwst.:" Margin="10,130,0,0" Grid.Column="0"/>
-                <ComboBox x:Name="BranchInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                          Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
+                    <CheckBox x:Name="VollLieferantInput" Content="Volllieferant" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
-                <Label Content="Stammgemeinde:" Margin="10,160,0,0" Grid.Column="0"/>
-                <ComboBox x:Name="DefaultKgInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                          Margin="0,160,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
+                    <CheckBox x:Name="FunkionärInput" Content="Funktionär" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
-                <Label Content="Anmerkung:" Margin="10,190,0,0" Grid.Column="0"/>
-                <TextBox x:Name="CommentInput" Margin="0,190,10,0" Grid.Column="1" Grid.ColumnSpan="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="Stamm-Zwst.:" Margin="10,130,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="BranchInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
+                              Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
 
-                <Label Content="Kontaktart:" Margin="10,220,0,0" Grid.Column="0"/>
-                <CheckBox x:Name="ContactPostalInput" Content="Post" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          HorizontalAlignment="Left" Margin="0,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
-                <CheckBox x:Name="ContactEmailInput" Content="E-Mail" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          HorizontalAlignment="Left" Margin="60,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+                    <Label Content="Stammgemeinde:" Margin="10,160,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="DefaultKgInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
+                              Margin="0,160,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
 
-                <Label Content="Gebundene Fläche:" Margin="10,250,0,0" Grid.Column="0"/>
-                <TextBlock x:Name="AreaCommitment" Text="- m²"
-                           Grid.Column="1" HorizontalAlignment="Stretch" Margin="5,252,5,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" TextAlignment="Right"/>
+                    <Label Content="Anmerkung:" Margin="10,190,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="CommentInput" Margin="0,190,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Button x:Name="DeliveryButton" Content="Lieferungen" Click="DeliveryButton_Click" IsEnabled="False"
-                        HorizontalAlignment="Right" Margin="10,00,10,37" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
-                <Button x:Name="AreaCommitmentButton" Content="Flächenbindungen" Click="AreaCommitmentButton_Click" IsEnabled="False"
-                        HorizontalAlignment="Right" Margin="10,10,10,5" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
-            </Grid>
-        </GroupBox>
+                    <Label Content="Kontaktart:" Margin="10,220,0,0" Grid.Column="0"/>
+                    <CheckBox x:Name="ContactPostalInput" Content="Post" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              HorizontalAlignment="Left" Margin="0,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+                    <CheckBox x:Name="ContactEmailInput" Content="E-Mail" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              HorizontalAlignment="Left" Margin="60,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+
+                    <Button x:Name="DeliveryButton" Content="Lieferungen" Click="DeliveryButton_Click" IsEnabled="False"
+                            HorizontalAlignment="Right" Margin="10,00,10,37" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
+                    <Button x:Name="AreaCommitmentButton" Content="Flächenbindungen" Click="AreaCommitmentButton_Click" IsEnabled="False"
+                            HorizontalAlignment="Right" Margin="10,10,10,5" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
+                </Grid>
+            </GroupBox>
+        </Grid>
+
+        <StatusBar Grid.Row="5" 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="2*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="3*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="3*"/>
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+            <StatusBarItem>
+                <TextBlock Name="StatusMembers" Text="Mitglieder: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="1"/>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock Name="StatusBusinessShares" Text="Geschäftsanteile: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="3"/>
+            <StatusBarItem Grid.Column="4">
+                <TextBlock Name="StatusAreaCommitment" Text="Gebundene Fläche: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="5"/>
+            <StatusBarItem Grid.Column="6">
+                <TextBlock Name="StatusDeliveriesLastSeason" Text="Lieferungen (letzte Saison): -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="7"/>
+            <StatusBarItem Grid.Column="8">
+                <TextBlock Name="StatusDeliveriesThisSeason" Text="Lieferungen (aktuelle Saison): -"/>
+            </StatusBarItem>
+        </StatusBar>
     </Grid>
 </local:AdministrationWindow>

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -10,6 +10,7 @@ using Elwig.Models;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using System.Collections.ObjectModel;
+using Elwig.Documents;
 
 namespace Elwig.Windows {
     public partial class MemberAdminWindow : AdministrationWindow {
@@ -54,6 +55,9 @@ namespace Elwig.Windows {
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            Menu_Print_Letterheads_MgNr.IsEnabled = App.IsPrintingReady;
+            Menu_Print_Letterheads_Name.IsEnabled = App.IsPrintingReady;
+
             ActiveMemberInput.IsChecked = true;
             UpdatePhoneNrInputVisibility();
             LockInputs();
@@ -136,6 +140,8 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(BranchInput, await Context.Branches.OrderBy(b => b.Name).ToListAsync(), i => (i as Branch)?.ZwstId);
             ControlUtils.RenewItemsSource(DefaultKgInput, await Context.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync(), i => (i as AT_Kg)?.KgNr);
             await RefreshMemberList();
+            StatusMembers.Text = $"Mitglieder: {await Context.Members.CountAsync(m => m.IsActive):N0} ({await Context.Members.CountAsync():N0})";
+            StatusBusinessShares.Text = $"Geschäftsanteile: {await Context.Members.Where(m => m.IsActive).SumAsync(m => m.BusinessShares):N0} ({await Context.Members.SumAsync(m => m.BusinessShares):N0})";
         }
 
         private void SetPhoneNrInput(int nr, string? type, string? number, string? comment) {
@@ -266,7 +272,71 @@ namespace Elwig.Windows {
         }
 
         private void Menu_Member_SendEmail_Click(object sender, RoutedEventArgs evt) {
-            Utils.MailTo(((Member)MemberList.SelectedItem).EmailAddresses.First().Address);
+            if (MemberList.SelectedItem is not Member m)
+                return;
+            Utils.MailTo(m.EmailAddresses.Select(a => a.Address));
+        }
+
+        private async void Menu_Print_Letterhead_Click(object sender, RoutedEventArgs evt) {
+            if (MemberList.SelectedItem is not Member m)
+                return;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            using var doc = new Letterhead(m);
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            if (App.Config.Debug) {
+                doc.Show();
+            } else {
+                await doc.Print();
+            }
+        }
+
+        private async Task PrintLetterheads(int ordering) {
+            var n = await Context.Members.CountAsync(m => m.IsActive);
+            var res = MessageBox.Show(
+                $"Sollen wirklich {n} Seiten gedruckt werden?", "Ausdruck Bestätigen",
+                MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+            if (res != MessageBoxResult.Yes)
+                return;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            var members = Context.Members.Where(m => m.IsActive && m.ContactViaPost);
+            switch (ordering) {
+                case 0: members = members
+                        .OrderBy(m => m.MgNr);
+                    break;
+                case 1: members = members
+                        .OrderBy(m => m.FamilyName)
+                        .ThenBy(m => m.GivenName)
+                        .ThenBy(m => m.MgNr);
+                    break;
+                case 2: members = members
+                        .OrderBy(m => m.PostalDest.AtPlz.Plz)
+                        .ThenBy(m => m.PostalDest.AtPlz.Ort.Name)
+                        .ThenBy(m => m.FamilyName)
+                        .ThenBy(m => m.GivenName)
+                        .ThenBy(m => m.MgNr);
+                    break;
+            }
+            using var doc = await Document.Merge((await members.ToListAsync()).Select(m => new Letterhead(m)));
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            if (App.Config.Debug) {
+                doc.Show();
+            } else {
+                await doc.Print();
+            }
+        }
+
+        private async void Menu_Print_Letterheads_MgNr_Click(object sender, RoutedEventArgs evt) {
+            await PrintLetterheads(0);
+        }
+
+        private async void Menu_Print_Letterheads_Name_Click(object sender, RoutedEventArgs evt) {
+            await PrintLetterheads(1);
+        }
+
+        private async void Menu_Print_Letterheads_Plz_Click(object sender, RoutedEventArgs evt) {
+            await PrintLetterheads(2);
         }
 
         private void FocusSearchInput(object sender, RoutedEventArgs evt) {
@@ -545,16 +615,24 @@ namespace Elwig.Windows {
             ContactPostalInput.IsChecked = m.ContactViaPost;
             ContactEmailInput.IsChecked = m.ContactViaEmail;
 
-            AreaCommitment.Text = $"{m.ActiveAreaCommitments.Select(c => c.Area).Sum():N0} m²";
+            var d1 = Context.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason && d.MgNr == m.MgNr);
+            var d2 = Context.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason - 1 && d.MgNr == m.MgNr);
+            StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): {d2.Count():N0} ({d2.Sum(d => d.Parts.Count):N0}), {d2.SelectMany(d => d.Parts).Sum(p => p.Weight):N0} kg";
+            StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): {d1.Count():N0} ({d1.Sum(d => d.Parts.Count):N0}), {d1.SelectMany(d => d.Parts).Sum(p => p.Weight):N0} kg";
+            StatusAreaCommitment.Text = $"Gebundene Fläche: {m.ActiveAreaCommitments.Select(c => c.Area).Sum():N0} m²";
 
             Menu_Member_SendEmail.IsEnabled = m.EmailAddresses.Count > 0;
+            Menu_Print_Letterhead.IsEnabled = true;
 
             FinishInputFilling();
         }
 
         new protected void ClearInputs(bool validate = false) {
             Menu_Member_SendEmail.IsEnabled = false;
-            AreaCommitment.Text = "- m²";
+            Menu_Print_Letterhead.IsEnabled = false;
+            StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): -";
+            StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): -";
+            StatusAreaCommitment.Text = "Gebundene Fläche: -";
             Age.Text = "-";
             base.ClearInputs(validate);
         }

Elwig/Windows/SeasonFinishWindow.xaml

@@ -0,0 +1,50 @@
+<local:ContextWindow x:Class="Elwig.Windows.SeasonFinishWindow"
+        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:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        mc:Ignorable="d"
+        Loaded="Window_Loaded"
+        Title="Leseabschluss - Elwig" Height="450" Width="800">
+    <Window.Resources>
+        <Style TargetType="Button">
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="9,3"/>
+            <Setter Property="Height" Value="32"/>
+            <Setter Property="Width" Value="200"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Label Content="Saison:" Margin="50,40,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Padding="2,4,2,4" Height="25"/>
+        <xctk:IntegerUpDown Name="SeasonInput" Height="25" Width="56" FontSize="14" Minimum="1000" Maximum="9999"
+                            Margin="110,40,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"
+                            ValueChanged="SeasonInput_ValueChanged"/>
+
+        <Button x:Name="CalculateBinsButton" Content="Aufteilung Berechnen"
+                Click="CalculateBinsButton_Click"
+                Margin="50,80,0,0"/>
+        <CheckBox x:Name="AllowAttrIntoLowerBinsInput" Content="Erlauben Lieferungen auch auf (konfigurierte) &quot;schlechtere&quot; Flächenbindungen aufzuteilen" IsChecked="True"
+                  VerticalAlignment="Top" HorizontalAlignment="Left" Margin="255,68,0,0"/>
+        <CheckBox x:Name="AvoidUnderDeliveriesInput" Content="Unterlieferungen durch Abzug bei &quot;besseren&quot; Flächenbindungen vermeiden" IsChecked="True"
+                  VerticalAlignment="Top" HorizontalAlignment="Left" Margin="255,88,0,0"/>
+        <CheckBox x:Name="HonorGebundenInput" Margin="255,108,0,0" VerticalAlignment="Top">
+            <TextBlock>Bei Lieferungen das Feld <Italic>Gebunden</Italic> berücksichtigen</TextBlock>
+        </CheckBox>
+
+        <Button x:Name="DeliveryConfirmationButton" Content="Anlieferungsbestätigungen"
+                Click="DeliveryConfirmationButton_Click"
+                Margin="50,122,0,0"/>
+
+        <Button x:Name="OverUnderDeliveryButton" Content="Über-/Unterlieferungen"
+                Click="OverUnderDeliveryButton_Click"
+                Margin="50,164,0,0"/>
+
+        <Button x:Name="PaymentButton" Content="Auszahlung"
+                Click="PaymentButton_Click"
+                Margin="50,206,0,0"/>
+    </Grid>
+</local:ContextWindow>

Elwig/Windows/SeasonFinishWindow.xaml.cs

@@ -0,0 +1,155 @@
+using Elwig.Dialogs;
+using Elwig.Helpers;
+using Elwig.Helpers.Billing;
+using Microsoft.Win32;
+using System;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+
+namespace Elwig.Windows {
+    public partial class SeasonFinishWindow : ContextWindow {
+        public SeasonFinishWindow() {
+            InitializeComponent();
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            SeasonInput.Value = Utils.CurrentLastSeason;
+        }
+
+        protected override async Task OnRenewContext() {
+            SeasonInput_ValueChanged(null, null);
+        }
+
+        private async void SeasonInput_ValueChanged(object? sender, RoutedEventArgs? evt) {
+            var s0 = await Context.Seasons.FindAsync(SeasonInput.Value);
+            var s1 = await Context.Seasons.FindAsync(SeasonInput.Value + 1);
+            var valid = (s0 != null);
+            var last = (s1 == null);
+            CalculateBinsButton.IsEnabled = valid && last;
+            DeliveryConfirmationButton.IsEnabled = valid;
+            OverUnderDeliveryButton.IsEnabled = valid;
+        }
+
+        private async void CalculateBinsButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            CalculateBinsButton.IsEnabled = false;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            var b = new Billing(year);
+            await b.FinishSeason();
+            await b.CalculateBins(
+                AllowAttrIntoLowerBinsInput.IsChecked ?? false,
+                AvoidUnderDeliveriesInput.IsChecked ?? false,
+                HonorGebundenInput.IsChecked ?? false);
+            Mouse.OverrideCursor = null;
+            CalculateBinsButton.IsEnabled = true;
+        }
+
+        private void DeliveryConfirmationButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            var d = new DeliveryConfirmationsDialog(year);
+            d.Show();
+        }
+
+        private async void OverUnderDeliveryButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            var d = new SaveFileDialog() {
+                FileName = $"Über-Unterlieferungen-{year}.csv",
+                DefaultExt = "csv",
+                Filter = "CSV-Datei (*.csv)|*.csv",
+                Title = $"Über-/Unterlieferungen {year} speichern unter - Elwig"
+            };
+            if (d.ShowDialog() == false)
+                return;
+
+            Mouse.OverrideCursor = Cursors.AppStarting;
+
+            try {
+                using var file = new StreamWriter(d.FileName, false, Encoding.Latin1);
+                using var cnx = await AppDbContext.ConnectAsync();
+                await file.WriteLineAsync($"Auswertungen {year};;;;;;;;;;;");
+
+                await file.WriteLineAsync($";;;;;;;;;;;");
+                await file.WriteLineAsync($"Über-/Unterlieferungen lt. gez. GA;;;;;;;;;;;");
+                await file.WriteLineAsync($"MgNr;Name;Vorname;Adresse;PLZ;Ort;GA;Lieferpflicht;Lieferrecht;Geliefert;Über-/Unterliefert;Prozent");
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                    SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name, m.address, m.business_shares,
+                           m.business_shares * (SELECT value FROM client_parameter WHERE param = 'DELIVERY_OBLIGATION') AS min_kg,
+                           m.business_shares * (SELECT value FROM client_parameter WHERE param = 'DELIVERY_RIGHT') AS max_kg,
+                           COALESCE(SUM(d.weight), 0) AS sum
+                    FROM member m
+                        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_delivery d ON d.mgnr = m.mgnr AND d.year = {year}
+                    WHERE m.active = 1
+                    GROUP BY d.year, m.mgnr
+                    ORDER BY sum = 0 DESC, 100.0 * sum / max_kg, m.mgnr;
+                    """;
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        var mgnr = reader.GetInt32(0);
+                        var familyName = reader.GetString(1);
+                        var givenName = reader.GetString(2);
+                        var plz = reader.GetInt32(3);
+                        var ort = reader.GetString(4);
+                        var addr = reader.GetString(5);
+                        var ga = reader.GetInt32(6);
+                        var minKg = reader.GetInt32(7);
+                        var maxKg = reader.GetInt32(8);
+                        var sum = reader.GetInt32(9);
+                        var s1 = sum < minKg ? $"{sum - minKg}" : sum > maxKg ? $"{sum - maxKg}" : "";
+                        var s2 = sum < minKg ? $"{sum * 100.0 / minKg - 100.0:0.0}" : sum > maxKg ? $"{sum * 100.0 / maxKg - 100:0.0}" : "";
+                        await file.WriteLineAsync($"{mgnr};{familyName};{givenName};{addr};{plz};{ort};{ga};{minKg};{maxKg};{sum};{s1};{s2}");
+                    }
+                }
+
+                await file.WriteLineAsync($";;;;;;;;;;;");
+                await file.WriteLineAsync($"Unterlieferungen lt. Flächenbindungen;;;;;;;;;;;");
+                await file.WriteLineAsync($"MgNr;Name;Vorname;Adresse;PLZ;Ort;Vertrag;Lieferpflicht;Lieferrecht;Geliefert;Unterliefert;Prozent");
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                    SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name, m.address,
+                           c.bin, c.min_kg, c.max_kg, b.weight
+                    FROM member m
+                        LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
+                        LEFT JOIN AT_ort o ON o.okz = p.okz
+                        JOIN v_area_commitment_bin c ON c.mgnr = m.mgnr AND c.year = {year}
+                        LEFT JOIN v_payment_bin b ON (b.mgnr, b.bin) = (m.mgnr, c.bin) AND b.year = {year}
+                    WHERE m.active = 1 AND b.weight < c.min_kg
+                    ORDER BY m.mgnr, c.bin
+                    """;
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        var mgnr = reader.GetInt32(0);
+                        var familyName = reader.GetString(1);
+                        var givenName = reader.GetString(2);
+                        var plz = reader.GetInt32(3);
+                        var ort = reader.GetString(4);
+                        var addr = reader.GetString(5);
+                        var id = reader.GetString(6);
+                        var minKg = reader.GetInt32(7);
+                        var maxKg = reader.GetInt32(8);
+                        var sum = reader.GetInt32(9);
+                        await file.WriteLineAsync($"{mgnr};{familyName};{givenName};{addr};{plz};{ort};{id};{minKg};{maxKg};{sum};{sum - minKg};{sum * 100.0 / minKg - 100.0:0.0}");
+                    }
+                }
+
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+            Mouse.OverrideCursor = null;
+        }
+
+        private void PaymentButton_Click(object sender, RoutedEventArgs evt) {
+            var w = new ChartWindow();
+            w.Show();
+        }
+    }
+}

Elwig/Windows/TestWindow.xaml

@@ -19,9 +19,9 @@
         <Button x:Name="ChartButton" Content="Chart" Click="ChartButton_Click"
                 Margin="50,240,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 
-        <Button x:Name="PdfDeliveryButton" Content="Lieferschein Erzeugen" Click="PdfDeliveryButton_Click" Tag="Print"
+        <Button x:Name="PdfDeliveryButton" Content="Lieferschein Erzeugen" Click="PdfDeliveryButton_Click" Tag="Print" IsEnabled="False"
                 Margin="260,190,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-        <Button x:Name="PdfCreditButton" Content="Gutschrift Erzeugen" Click="PdfCreditButton_Click" Tag="Print"
+        <Button x:Name="PdfCreditButton" Content="Gutschrift Erzeugen" Click="PdfCreditButton_Click" Tag="Print" IsEnabled="False"
                 Margin="260,160,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
     </Grid>
 </Window>

Elwig/Windows/TestWindow.xaml.cs

@@ -1,5 +1,6 @@
 using Elwig.Documents;
 using Elwig.Helpers;
+using Elwig.Helpers.Billing;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Linq;
@@ -51,7 +52,7 @@ namespace Elwig.Windows {
         }
 
         private async void PdfDeliveryButton_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             using var ctx = new AppDbContext();
             using var doc = new DeliveryNote(await ctx.Deliveries.OrderBy(d => d.Parts.Count).ThenBy(d => d.Year).ThenBy(d => d.DId).LastAsync(), ctx);
             await doc.Generate();
@@ -60,7 +61,7 @@ namespace Elwig.Windows {
         }
 
         private async void PdfCreditButton_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             using var ctx = new AppDbContext();
             using var doc = new CreditNote(await ctx.Credits.FirstAsync(), ctx);
             await doc.Generate();