Billing: small fixes

Elwig/App.xaml.cs

@@ -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/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;
+                IAddress addr = (Member.BillingAddress != null && UseBillingAddress) ? Member.BillingAddress : Member;
-                if (b != null && UseBillingAddress) {
+                var plz = addr.PostalDest.AtPlz;
-                    var plz = b.PostalDest.AtPlz;
+                return (addr is BillingAddr ? $"{addr.Name}\n" : "") + $"{Member.AdministrativeName}\n{addr.Address}\n{plz?.Plz} {plz?.Ort.Name.Split(",")[0]}\n{addr.PostalDest.Country.Name}";
-                    return $"{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";
-                }
             }
         }
     }

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,21 @@
                 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" : "")">
+                <tr class="first @(binNum <= 1 ? "last" : "") @(last != null && last != part.SortId ? "new" : "")">
-                    <td rowspan="@bucketNum" class="lsnr">@part.Delivery.LsNr</td>
+                    <td rowspan="@binNum" class="lsnr">@part.Delivery.LsNr</td>
-                    <td rowspan="@bucketNum" class="dpnr">@part.DPNr</td>
+                    <td rowspan="@binNum" class="dpnr">@part.DPNr</td>
-                    <td rowspan="@bucketNum" class="variant">@part.Variant.Name</td>
+                    <td rowspan="@binNum" class="variant">@part.Variant.Name</td>
-                    <td rowspan="@bucketNum" class="attribute">@string.Join(" / ", part.PartAttributes.Select(a => a.AttrId))</td>
+                    <td rowspan="@binNum" class="attribute">@string.Join(" / ", part.PartAttributes.Select(a => a.AttrId))</td>
-                    <td rowspan="@bucketNum" class="oe">@($"{part.Oe:N0}")</td>
+                    <td rowspan="@binNum" class="oe">@($"{part.Oe:N0}")</td>
-                    <td rowspan="@bucketNum" class="kmw">@($"{part.Kmw:N1}")</td>
+                    <td rowspan="@binNum" class="kmw">@($"{part.Kmw:N1}")</td>
-                    <td rowspan="@bucketNum" class="abs">@abs</td>
+                    <td rowspan="@binNum" class="abs">@abs</td>
-                    <td rowspan="@bucketNum" class="rel">@rel</td>
+                    <td rowspan="@binNum" class="rel">@rel</td>
-                    @Raw(FormatRow(pmt?.Buckets?.ElementAtOrDefault(0), pmt?.Prices?.ElementAtOrDefault(0)))
+                    @Raw(FormatRow(pmt?.DeliveryPart.Bins?.ElementAtOrDefault(0), pmt?.Prices?.ElementAtOrDefault(0)))
-                    <td rowspan="@bucketNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
+                    <td rowspan="@binNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
                 </tr>
-                @for (int i = 1; i < bucketNum; i++) {
+                @for (int i = 1; i < binNum; i++) {
-                    <tr class="@(i == bucketNum - 1 ? "last" : "")">
+                    <tr class="@(i == binNum - 1 ? "last" : "")">
-                        @Raw(FormatRow(pmt?.Buckets?.ElementAtOrDefault(i), pmt?.Prices?.ElementAtOrDefault(i)))
+                        @Raw(FormatRow(pmt?.DeliveryPart.Bins?.ElementAtOrDefault(i), pmt?.Prices?.ElementAtOrDefault(i)))
                     </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 = c.Payment.Variant.Season.BinNames;
             Precision = c.Payment.Variant.Season.Precision;
             Parts = ctx.DeliveryParts.FromSql($"""
                 SELECT p.*

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)
+                .OrderBy(p => p.Delivery.DateString)
-                .ThenBy(p => p.DPNr)
+                .ThenBy(p => p.Delivery.TimeString)
-                .ToList()) { }
+                .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,9 +75,9 @@
 @if (Model.Delivery.Comment != null) {
     <p class="comment">Amerkung zur Lieferung: @Model.Delivery.Comment</p>
 }
-@if (displayStats) {
+@if (Model.DisplayStats > 0) {
     <div id="delivery-stats">
-        <table class="delivery-stats">
+        <table class="delivery-stats @(Model.DisplayStats > 2 ? "expanded" : "")">
             <colgroup>
                 <col style="width: 45mm;"/>
                 <col style="width: 20mm;"/>
@@ -147,18 +109,23 @@
                             $"<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());
+                    var bins = Model.MemberBins.GroupBy(b => b.Item1[..2]).ToDictionary(g => g.Key, g => g.Count());
                 }
                 <tr>
-                    <th>Gesamtlieferung</th>
+                    <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>
-                @foreach (var (id, name, right, obligation, sum) in Model.MemberBuckets.OrderBy(b => b.Item1)) {
+                @if (Model.DisplayStats > 1) {
-                    if (right > 0 || obligation > 0 || (sum > 0 && buckets[id[..2]] > 1 && !id.EndsWith('_'))) {
+                    <tr class="subheading">
-                        <tr class="@(sortids.Contains(id[..2]) ? "" : "optional")">
+                        <th>Flächenbindungen:</th>
-                            <th>@name</th>
+                    </tr>
-                            @Raw(FormatRow(obligation, right, sum))
+                    @foreach (var (id, name, right, obligation, sum) in Model.MemberBins.OrderBy(b => b.Item1)) {
-                        </tr>
+                        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>

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 IEnumerable<(string, string, 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.Member, d.Year).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?.Dispose();
-            PdfFile = null;
+            _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,17 @@ namespace Elwig.Documents {
                 name = "CreditNote";
             } else if (this is DeliveryJournal) {
                 name = "DeliveryJournal";
+            } else if (this is Letterhead) {
+                name = "Letterhead";
             } else {
                 throw new InvalidOperationException("Invalid document object");
             }
-            return Render(name);
+            return await Render(name);
         }
 
-        private Task<string> Render(string name) {
+        private async Task<string> Render(string name) {
-            return Html.CompileRenderAsync(name, this);
+            _renderedHtml = await Html.CompileRenderAsync(name, this);
+            return _renderedHtml;
         }
 
         public async Task Generate() {
@@ -71,22 +117,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");
+            if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            File.Copy(PdfFile.FilePath, pdfPath);
+            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");
+            if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            await Pdf.Print(PdfFile.FilePath, copies);
+            await Pdf.Print(_pdfFile.FilePath, copies);
         }
 
         public void Show() {
-            if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
+            if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            Pdf.Show(PdfFile.NewReference(), Title);
+            Pdf.Show(_pdfFile.NewReference(), Title);
+        }
+
+        private class InternalDocument : Document {
+            public InternalDocument(string title) : base(title) { }
         }
     }
 }

Elwig/Documents/Html.cs

@@ -20,6 +20,7 @@ namespace Elwig.Documents {
             await e.CompileTemplateAsync("DeliveryNote");
             await e.CompileTemplateAsync("CreditNote");
             await e.CompileTemplateAsync("DeliveryJournal");
+            await e.CompileTemplateAsync("Letterhead");
 
             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-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;
@@ -60,13 +58,8 @@ table.delivery-stats {
     break-after: avoid;
 }
 
-table.delivery-stats.expanded th,
+table.delivery-stats th,
-table.delivery-stats.expanded td {
+table.delivery-stats td {
-    padding: 0.25mm 0;
-}
-
-table.delivery-stats:not(.expanded) th,
-table.delivery-stats:not(.expanded) td {
     padding: 0.125mm 0;
 }
 
@@ -74,6 +67,15 @@ table.delivery-stats:not(.expanded) tr.optional {
     display: none;
 }
 
+table.delivery-stats tr.subheading th {
+    text-align: left;
+}
+
+table.delivery-stats.expanded tr.subheading:not(:has(~ tr)),
+table.delivery-stats tr.subheading:not(:has(~ tr:not(.optional))) {
+    display: none;
+}
+
 table.delivery-stats thead th {
     font-weight: normal;
     font-style: italic;
@@ -84,10 +86,6 @@ table.delivery-stats thead th:first-child {
     text-align: left;
 }
 
-table.delivery-stats.expanded tbody {
-    font-size: 10pt;
-}
-
 table.delivery-stats td {
     text-align: right;
 }

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.3.7</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

@@ -206,13 +206,13 @@ namespace Elwig.Helpers {
             }
         }
 
-        public async Task<IEnumerable<(string, string, int, int, int)>> GetMemberBuckets(Member m, int year) {
+        public async Task<IEnumerable<(string, string, int, int, int)>> GetMemberBins(Member m, int year) {
             using var cnx = await ConnectAsync();
-            var (rights, obligations) = await Billing.Billing.GetMemberRightsObligations(m.MgNr, year, cnx);
+            var (rights, obligations) = await Billing.Billing.GetMemberRightsObligations(cnx, year, m.MgNr);
-            var buckets = await Billing.Billing.GetMemberBucketWeights(m.MgNr, year, cnx);
+            var bins = await Billing.Billing.GetMemberBinWeights(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)) {
+            foreach (var id in rights.Keys.Union(obligations.Keys).Union(bins.Keys)) {
                 var s = await WineVarieties.FindAsync(id[..2]);
                 var attrIds = id[2..];
                 var a = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync();
@@ -221,7 +221,7 @@ namespace Elwig.Helpers {
                     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
+                    bins.TryGetValue(id, out var v3) ? v3 : 0
                 ));
             }
 

Elwig/Helpers/AppDbUpdater.cs

@@ -4,7 +4,7 @@ using System;
 namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
-        public static readonly int RequiredSchemaVersion = 2;
+        public static readonly int RequiredSchemaVersion = 3;
 
         private static int _versionOffset = 0;
         private static readonly Action<SqliteConnection>[] _updaters = new[] {
@@ -80,6 +80,112 @@ 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, "ALTER TABLE season ADD COLUMN bin_1_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_2_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_3_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_4_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_5_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_6_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_7_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_8_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_9_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, """
+                UPDATE season
+                SET bin_1_name = n.bucket_1_name,
+                    bin_2_name = n.bucket_2_name,
+                    bin_3_name = n.bucket_3_name,
+                    bin_4_name = n.bucket_4_name,
+                    bin_5_name = n.bucket_5_name,
+                    bin_6_name = n.bucket_6_name,
+                    bin_7_name = n.bucket_7_name,
+                    bin_8_name = n.bucket_8_name,
+                    bin_9_name = n.bucket_9_name
+                FROM (SELECT year, bucket_1_name, bucket_2_name, bucket_3_name, bucket_4_name, bucket_5_name, bucket_6_name, bucket_7_name, bucket_8_name, bucket_9_name
+                      FROM payment_variant GROUP BY year HAVING avnr = MAX(avnr)) AS n
+                WHERE season.year = n.year
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE TABLE delivery_part_bin (
+                    year     INTEGER NOT NULL,
+                    did      INTEGER NOT NULL,
+                    dpnr     INTEGER NOT NULL,
+
+                    bin_1 INTEGER DEFAULT NULL,
+                    bin_2 INTEGER DEFAULT NULL,
+                    bin_3 INTEGER DEFAULT NULL,
+                    bin_4 INTEGER DEFAULT NULL,
+                    bin_5 INTEGER DEFAULT NULL,
+                    bin_6 INTEGER DEFAULT NULL,
+                    bin_7 INTEGER DEFAULT NULL,
+                    bin_8 INTEGER DEFAULT NULL,
+                    bin_9 INTEGER DEFAULT NULL,
+
+                    CONSTRAINT pk_delivery_part_bin PRIMARY KEY (year, did, dpnr),
+                    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, bin_1, bin_2, bin_3, bin_4, bin_5, bin_6, bin_7, bin_8, bin_9)
+                SELECT year, did, dpnr, bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9
+                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, "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, "DROP VIEW v_delivery");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery AS
+                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.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(DISTINCT a.attrid) as attributes, GROUP_CONCAT(DISTINCT o.modid) as modifiers,
+                       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 a ON (a.year, a.did, a.dpnr) = (p.year, p.did, p.dpnr)
+                    LEFT JOIN delivery_part_modifier o ON (o.year, o.did, o.dpnr) = (p.year, p.did, p.dpnr)
+                GROUP BY p.year, p.did, p.dpnr
+                ORDER BY p.year, p.did, p.dpnr;
+                """);
+
+            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, "ALTER TABLE wine_attribute ADD COLUMN fill_lower_bins INTEGER NOT NULL CHECK (fill_lower_bins IN (TRUE, FALSE)) DEFAULT FALSE");
+        }
     }
 }

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,173 @@ using System.Threading.Tasks;
 namespace Elwig.Helpers.Billing {
     public class Billing {
 
-        private readonly int Year;
+        protected readonly int Year;
-        private readonly int AvNr;
+        protected readonly AppDbContext Context;
-        private readonly AppDbContext Context;
+        protected readonly Dictionary<string, string> Attributes;
-        private readonly Dictionary<string, string> Attributes;
+        protected readonly Dictionary<string, (decimal?, decimal?)> Modifiers;
-        private readonly Dictionary<string, (decimal?, decimal?)> Modifiers;
+        protected readonly Dictionary<string, (string, string?, string?, string?, int?, int?, decimal?)> AreaComTypes;
-        private 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})";
+                cmd.CommandText = $"""
+                    UPDATE season
+                    SET (start_date, end_date) = (SELECT MIN(date), MAX(date) FROM delivery WHERE year = {Year}),
+                        bin_1_name = 'gebunden mit zwei Attributen',
+                        bin_2_name = 'gebunden mit (erstem) Attribut',
+                        bin_3_name = 'gebunden mit zweitem Attribut',
+                        bin_4_name = 'gebunden ohne Attribut',
+                        bin_5_name = 'ungebunden',
+                        bin_6_name = NULL,
+                        bin_7_name = NULL,
+                        bin_8_name = NULL,
+                        bin_9_name = NULL
+                    WHERE year = {Year}
+                    """;
                 await cmd.ExecuteNonQueryAsync();
             }
+        }
+
+        public async Task CalculateBins() {
+            using var cnx = await AppDbContext.ConnectAsync();
+            var memberOblRig = await GetMemberRightsObligations(cnx, Year);
+            var inserts = new List<(int, int, int, int, int, int, int)>();
+
+            var deliveries = new List<(int, int, int, string, int, double, string, string[], string[])>();
             using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"DELETE FROM payment_member WHERE (year, avnr) = ({Year}, {AvNr})";
+                cmd.CommandText = $"""
+                    SELECT mgnr, did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers
+                    FROM v_delivery
+                    WHERE year = {Year}
+                    ORDER BY mgnr, sortid, abgewertet ASC, LENGTH(attributes) DESC, COALESCE(attributes, '~'), kmw DESC, lsnr, dpnr
+                    """;
+                var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    deliveries.Add((
+                        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()
+                    ));
+                }
+            }
+
+            int lastMgNr = 0;
+            Dictionary<string, int>? rights = null;
+            foreach (var (mgnr, did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers) in deliveries) {
+                if (lastMgNr != mgnr) {
+                    rights = memberOblRig.GetValueOrDefault(mgnr, (new(), new())).Item2;
+                }
+                if (rights == null || rights.Count == 0 || qualid == "WEI" || qualid == "RSW" || qualid == "LDW") {
+                    // Mitglied hat keine Flächenbindungen, oder
+                    // Nicht mindestens Qualitätswein (QUW) -> ungebunden
+                    inserts.Add((did, dpnr, 0, 0, 0, 0, weight));
+                    continue;
+                }
+
+                if (attributes.Length > 2)
+                    throw new NotSupportedException();
+
+                int w = weight;
+                int[] b = new int[4];
+                foreach (var p in Utils.Permutate(attributes)) {
+                    var c = p.Count();
+                    var key = sortid + string.Join("", p);
+                    if (rights.ContainsKey(key)) {
+                        int i = 0;
+                        if (c == 1) {
+                            i = (p.ElementAt(0) == attributes[0]) ? 1 : 2;
+                        } else if (c == 0) {
+                            i = b.Length - 1;
+                        }
+                        var v = Math.Max(0, Math.Min(rights[key], w));
+                        b[i] += v;
+                        rights[key] -= v;
+                        w -= v;
+                    }
+                }
+                inserts.Add((did, dpnr, b[0], b[1], b[2], b[3], weight - b[0] - b[1] - b[2] - b[3]));
+                lastMgNr = mgnr;
+            }
+
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    INSERT INTO delivery_part_bin (year, did, dpnr, bin_1, bin_2, bin_3, bin_4, bin_5)
+                    VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, {i.Item4}, {i.Item5}, {i.Item6}, {i.Item7})"))}
+                    ON CONFLICT DO UPDATE
+                    SET bin_1 = excluded.bin_1,
+                        bin_2 = excluded.bin_2,
+                        bin_3 = excluded.bin_3,
+                        bin_4 = excluded.bin_4,
+                        bin_5 = excluded.bin_5,
+                        bin_6 = NULL,
+                        bin_7 = NULL,
+                        bin_8 = NULL,
+                        bin_9 = NULL;
+                    """;
                 await cmd.ExecuteNonQueryAsync();
             }
         }
 
-        public async Task Calculate() {
+        public static async Task<Dictionary<int, (Dictionary<string, int>, Dictionary<string, int>)>> GetMemberRightsObligations(SqliteConnection cnx, int year, int? mgnr = null) {
-            await DeleteInDb();
+            var members = new Dictionary<int, (Dictionary<string, int>, Dictionary<string, int>)>();
-            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,
+                SELECT mgnr, 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})
+                WHERE ({(mgnr == null ? "NULL" : mgnr)} IS NULL OR mgnr = {(mgnr == null ? "NULL" : mgnr)}) AND
-                GROUP BY t.vtrgid
+                      (year_from IS NULL OR year_from <= {year}) AND
+                      (year_to IS NULL OR year_to >= {year})
+                GROUP BY mgnr, t.vtrgid
                 ORDER BY LENGTH(t.vtrgid) DESC, t.vtrgid
                 """;
 
             var reader = await cmd.ExecuteReaderAsync();
             while (await reader.ReadAsync()) {
-                var vtrgid = reader.GetString(0);
+                var m = reader.GetInt32(0);
-                obligations[vtrgid] = reader.GetInt32(1);
+                var vtrgid = reader.GetString(1);
-                rights[vtrgid] = reader.GetInt32(2);
+                if (!members.ContainsKey(m)) members[m] = (new(), new());
+                members[m].Item1[vtrgid] = reader.GetInt32(2);
+                members[m].Item2[vtrgid] = reader.GetInt32(3);
             }
 
-            return (rights, obligations);
+            return members;
         }
 
-        public static async Task<Dictionary<string, int>> GetMemberBucketWeights(int mgnr, int year, SqliteConnection cnx) {
+        public static async Task<(Dictionary<string, int>, Dictionary<string, int>)> GetMemberRightsObligations(SqliteConnection cnx, int year, int mgnr) {
-            var buckets = new Dictionary<string, int>();
+            var members = await GetMemberRightsObligations(cnx, year, (int?)mgnr);
+            return members.GetValueOrDefault(mgnr, (new(), new()));
+        }
+
+        public static async Task<Dictionary<string, int>> GetMemberBinWeights(int mgnr, int year, SqliteConnection cnx) {
+            var bins = new Dictionary<string, int>();
 
             using var cmd = cnx.CreateCommand();
             cmd.CommandText = $"""
-                SELECT bucket, weight
+                SELECT bin, weight
-                FROM v_bucket
+                FROM v_delivery_bin
                 WHERE (year, mgnr) = ({year}, {mgnr})
                 """;
 
             var reader = await cmd.ExecuteReaderAsync();
             while (await reader.ReadAsync()) {
-                var bucket = reader.GetString(0);
+                var bin = reader.GetString(0);
-                buckets[bucket] = reader.GetInt32(1);
+                bins[bin] = 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
-                    """;
-                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(",")
-                    ));
-                }
-            }
-
-            foreach (var (did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers) in deliveries) {
-                if (qualid == "WEI" || qualid == "RSW" || qualid == "LDW") {
-                    // 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();
-                    continue;
-                }
-
-                // TODO
             }
 
+            return bins;
         }
     }
 }

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,6 +55,8 @@ namespace Elwig.Helpers {
         public decimal VatReduced;
         public decimal VatFlatRate;
 
+        public int ModeDeliveryNoteStats;
+
         public string? TextDeliveryNote;
 
         public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
@@ -85,6 +91,13 @@ 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");
             } catch {
@@ -93,6 +106,13 @@ namespace Elwig.Helpers {
         }
 
         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,6 +135,7 @@ 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),
             };

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)]
+        [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 GeneratedPartialDateRegex();
+        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,19 @@ namespace Elwig.Helpers {
                 return (familyName, fullName.Replace(familyName, "").Replace("  ", " ").Trim());
             }
         }
+
+        public static IEnumerable<IEnumerable<T>> Permutate<T>(IEnumerable<T> input) {
+            List<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++) {
+                    if ((i & (1 << j)) != 0) {
+                        t.Add(input.ElementAt(j));
+                    }
+                }
+                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

@@ -99,6 +99,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 +113,12 @@ 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 DeliveryPartBin Bin { get; private set; }
+
+        [NotMapped]
+        public int[] Bins => (new int?[] { Bin.Bin1, Bin.Bin2, Bin.Bin3, Bin.Bin4, Bin.Bin5, Bin.Bin6, Bin.Bin7, Bin.Bin8, Bin.Bin9 })
+            .Where(b => b != null).Select(b => b.Value).ToArray();
     }
 }

Elwig/Models/DeliveryPartBin.cs

@@ -0,0 +1,46 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models {
+    [Table("delivery_part_bin"), PrimaryKey("Year", "DId", "DPNr")]
+    public class DeliveryPartBin {
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("did")]
+        public int DId { get; set; }
+
+        [Column("dpnr")]
+        public int DPNr { get; set; }
+
+        [ForeignKey("Year, DId, DPNr")]
+        public virtual DeliveryPart Part { get; private set; }
+
+        [Column("bin_1")]
+        public int? Bin1 { get; set; }
+
+        [Column("bin_2")]
+        public int? Bin2 { get; set; }
+
+        [Column("bin_3")]
+        public int? Bin3 { get; set; }
+
+        [Column("bin_4")]
+        public int? Bin4 { get; set; }
+
+        [Column("bin_5")]
+        public int? Bin5 { get; set; }
+
+        [Column("bin_6")]
+        public int? Bin6 { get; set; }
+
+        [Column("bin_7")]
+        public int? Bin7 { get; set; }
+
+        [Column("bin_8")]
+        public int? Bin8 { get; set; }
+
+        [Column("bin_9")]
+        public int? Bin9 { get; set; }
+    }
+}

Elwig/Models/PaymentDeliveryPart.cs

@@ -34,37 +34,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]

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/Season.cs

@@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
 
 namespace Elwig.Models {
     [Table("season"), PrimaryKey("Year")]
@@ -42,6 +43,37 @@ namespace Elwig.Models {
             }
         }
 
+        [Column("bin_1_name")]
+        public string? Bin1Name { get; set; }
+
+        [Column("bin_2_name")]
+        public string? Bin2Name { get; set; }
+
+        [Column("bin_3_name")]
+        public string? Bin3Name { get; set; }
+
+        [Column("bin_4_name")]
+        public string? Bin4Name { get; set; }
+
+        [Column("bin_5_name")]
+        public string? Bin5Name { get; set; }
+
+        [Column("bin_6_name")]
+        public string? Bin6Name { get; set; }
+
+        [Column("bin_7_name")]
+        public string? Bin7Name { get; set; }
+
+        [Column("bin_8_name")]
+        public string? Bin8Name { get; set; }
+
+        [Column("bin_9_name")]
+        public string? Bin9Name { get; set; }
+
+        [NotMapped]
+        public string[] BinNames => (new string?[] { Bin1Name, Bin2Name, Bin3Name, Bin4Name, Bin5Name, Bin6Name, Bin7Name, Bin8Name, Bin9Name })
+            .Where(n => n != null).Select(n => n ?? "").ToArray();
+
         [ForeignKey("CurrencyCode")]
         public virtual Currency Currency { get; private 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 bool 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/BaseDataWindow.xaml

@@ -215,7 +215,34 @@
 
             </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>
+                    </StackPanel>
+                </ScrollViewer>
             </TabItem>
         </TabControl>
 

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -201,6 +201,14 @@ 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;
+            }
+
             FinishInputFilling();
         }
 
@@ -222,6 +230,9 @@ 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;
+
             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="5"/>
-            <ColumnDefinition Width="1*"/>
+            <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)"
+                <MenuItem x:Name="Menu_Print_DeliveryJournal" Header="Lieferjournal">
-                          Click="Menu_Print_ShowDeliveryJournalToday_Click"/>
+                    <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowToday" Header="von heute anzeigen" IsEnabled="False" Tag="Print"
-                <MenuItem x:Name="Menu_Print_ShowDeliveryJournalYesterday" Header="Lieferjournal anzeigen (gestern)"
+                              Click="Menu_Print_DeliveryJournal_ShowToday_Click"/>
-                          Click="Menu_Print_ShowDeliveryJournalYesterday_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="Einstellungen">
-                <MenuItem Header="Alle Lieferscheine überprüfen"/>
+                <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="MgNr." Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="50">
-                    <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.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,256 @@
                     Click="CancelButton_Click"/>
         </Grid>
 
-        <GroupBox Header="Mitglied" Grid.Column="1" Grid.Row="1" Margin="5,5,5,5">
+        <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="70"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
 
-                <Label Content="Mitglied:" Margin="10,10,0,0" Grid.Column="0"/>
+        <Grid Grid.Row="1" Grid.Column="2">
-                <TextBox x:Name="MgNrInput" Width="48" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left" TextAlignment="Right"
+            <Grid.RowDefinitions>
-                         TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus" KeyUp="Input_KeyUp"/>
+                <RowDefinition Height="0.625*"/>
-                <ComboBox x:Name="MemberInput" Grid.Column="1" Margin="53,10,10,10" IsEditable="True"
+                <RowDefinition Height="*"/>
-                          ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
+                <RowDefinition Height="*"/>
-                          SelectionChanged="MemberInput_SelectionChanged" KeyUp="Input_KeyUp"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
 
-                <Label Content="Wohnort:" Margin="10,38,0,0" Grid.Column="0"/>
+            <GroupBox Header="Mitglied" Grid.Column="0" Grid.Row="0" Margin="5,5,5,5">
-                <TextBox x:Name="MemberAddressField" Grid.Column="1" Margin="0,40,10,10" FontSize="12" Height="22"
+                <Grid>
-                         IsReadOnly="True" IsTabStop="False"/>
+                    <Grid.ColumnDefinitions>
-            </Grid>
+                        <ColumnDefinition Width="70"/>
-        </GroupBox>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-        <GroupBox Header="Lieferung" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
+                    <Label Content="Mitglied:" Margin="10,10,0,0" Grid.Column="0"/>
-            <Grid>
+                    <TextBox x:Name="MgNrInput" Width="48" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left" TextAlignment="Right"
-                <Grid.ColumnDefinitions>
+                             TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus" KeyUp="Input_KeyUp"/>
-                    <ColumnDefinition Width="100"/>
+                    <ComboBox x:Name="MemberInput" Grid.Column="1" Margin="53,10,10,10" IsEditable="True"
-                    <ColumnDefinition/>
+                              ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
-                </Grid.ColumnDefinitions>
+                              SelectionChanged="MemberInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 
-                <Label Content="LieferscheinNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="Wohnort:" Margin="10,38,0,0" Grid.Column="0"/>
-                <TextBox x:Name="LsNrInput" Width="126" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
+                    <TextBox x:Name="MemberAddressField" Grid.Column="1" Margin="0,40,10,10" FontSize="12" Height="22"
-                         IsReadOnly="True" IsTabStop="False"/>
+                             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"/>
                 </Grid>
-                <Label Content="=" Margin="60,10,10,10" Grid.Column="1"/>
+            </GroupBox>
-                <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"
+            <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Margin="5,5,5,5">
-                             TextChanged="GradationKmwInput_TextChanged" LostFocus="GradationKmwInput_LostFocus" KeyUp="Input_KeyUp"/>
+                <Grid>
-                    <Label Content="°KMW" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
+                    <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"/>
+            <GroupBox Header="Sorte" Grid.Column="1" Grid.Row="0" Margin="5,5,5,5">
-                <ComboBox x:Name="WineQualityLevelInput" Width="146" Margin="0,40,10,10" Grid.Column="1" HorizontalAlignment="Left"
+                <Grid>
-                          ItemTemplate="{StaticResource WineQualityLevelTemplate}"
+                    <Grid.ColumnDefinitions>
-                          SelectionChanged="WineQualityLevelInput_SelectionChanged" KeyUp="Input_KeyUp"/>
+                        <ColumnDefinition Width="70"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <CheckBox x:Name="AbgewertetInput" Content="Abgewertet" IsEnabled="False"
+                    <Label Content="Sorte:" Margin="10,10,0,0" Grid.Column="0"/>
-                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"/>
+                    <TextBox x:Name="SortIdInput" Width="36" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left"
-            </Grid>
+                             TextChanged="SortIdInput_TextChanged" LostFocus="SortIdInput_LostFocus" KeyUp="Input_KeyUp"/>
-        </GroupBox>
+                    <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">
+                    <Label Content="Attribute:" Margin="10,40,0,0" Grid.Column="0"/>
-            <Grid>
+                    <xctk:CheckComboBox x:Name="AttributesInput" Grid.Row="1" Grid.Column="1" Margin="0,40,10,10"
-                <Grid.ColumnDefinitions>
+                                        DisplayMemberPath="Name" Delimiter=", " AllItemsSelectedContent="Alle"
-                    <ColumnDefinition Width="70"/>
+                                        ItemSelectionChanged="AttributesInput_SelectionChanged" KeyUp="Input_KeyUp"/>
-                    <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>
+            </GroupBox>
 
-                <CheckBox x:Name="ManualWeighingInput" Content="Handwiegung" IsEnabled="False"
+            <GroupBox Header="Gradation" Grid.Column="1" Grid.Row="1" Margin="5,5,5,5">
-                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,45,10,10" Grid.Column="0" Grid.ColumnSpan="2"
+                <Grid>
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+                    <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"
+                    <Label Content="Qualitätsstufe:" Margin="10,40,10,10"/>
-                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
+                    <ComboBox x:Name="WineQualityLevelInput" Width="146" Margin="0,40,10,10" Grid.Column="1" HorizontalAlignment="Left"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+                              ItemTemplate="{StaticResource WineQualityLevelTemplate}"
+                              SelectionChanged="WineQualityLevelInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 
-                <Button x:Name="WeighingAButton" Content="Wiegen A" Width="120"
+                    <CheckBox x:Name="AbgewertetInput" Content="Abgewertet" IsEnabled="False"
-                        Click="WeighingButton_Click"
+                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"/>
-                        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"/>
                 </Grid>
+            </GroupBox>
 
-                <Label Content="Säure:" Margin="10,100,0,10"/>
+            <GroupBox Header="Gewicht" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
-                <Grid Grid.Column="1" Height="25" Margin="0,100,10,10" VerticalAlignment="Top">
+                <Grid>
-                    <TextBox x:Name="AcidInput" TextAlignment="Right" Padding="2,2,19,2"
+                    <Grid.ColumnDefinitions>
-                             TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"/>
+                        <ColumnDefinition Width="70"/>
-                    <Label Content="g/l" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
+                        <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"
+            <GroupBox Header="Sonstiges" Grid.Column="1" Grid.Row="3" Margin="5,5,5,10">
-                          VerticalAlignment="Top" HorizontalAlignment="Left"
+                <Grid>
-                          Checked="LesewagenInput_Changed" Unchecked="LesewagenInput_Changed"/>
+                    <Grid.ColumnDefinitions>
-                <CheckBox x:Name="HandPickedInput" Content="Handlese" Margin="10,105,0,0" Grid.Column="2" IsThreeState="True"
+                        <ColumnDefinition Width="100"/>
-                          VerticalAlignment="Top" HorizontalAlignment="Left"
+                        <ColumnDefinition Width="65"/>
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+                        <ColumnDefinition/>
-            </Grid>
+                    </Grid.ColumnDefinitions>
-        </GroupBox>
 
-        <GroupBox Header="Teillieferungen" Grid.Column="1" Grid.Row="3" Margin="5,5,5,5">
+                    <Label Content="Zu-/Abschläge:" Margin="10,10,0,10"/>
-            <Grid>
+                    <xctk:CheckComboBox x:Name="ModifiersInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
-                <Grid.ColumnDefinitions>
+                                        ItemTemplate="{StaticResource ModifierTemplate}" Delimiter=", " AllItemsSelectedContent="Alle"
-                    <ColumnDefinition/>
+                                        ItemSelectionChanged="ModifiersInput_SelectionChanged"/>
-                    <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>
 
-                <Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
+                    <Label Content="Anmerkung:" Margin="10,40,0,10"/>
-                        ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
+                    <TextBox x:Name="PartCommentInput" Grid.Column="1" Margin="0,40,10,10" Grid.ColumnSpan="2"
-                        HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
+                             TextChanged="TextBox_TextChanged"/>
-                        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="1" Grid.Row="4" Margin="5,5,5,10">
+                    <Label Content="Temperatur:" Margin="10,70,0,10"/>
-            <Grid>
+                    <Grid Grid.Column="1" Height="25" Margin="0,70,10,10" VerticalAlignment="Top">
-                <Grid.ColumnDefinitions>
+                        <TextBox x:Name="TemperatureInput" TextAlignment="Right" Padding="2,2,16,2"
-                    <ColumnDefinition Width="100"/>
+                                 TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"/>
-                    <ColumnDefinition/>
+                        <Label Content="°C" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
-                </Grid.ColumnDefinitions>
+                    </Grid>
 
-                <Label Content="Weinbaugebiet:" Margin="10,10,0,10" Grid.Column="0"/>
+                    <Label Content="Säure:" Margin="10,100,0,10"/>
-                <ComboBox x:Name="WineOriginInput" Margin="0,10,10,10" Grid.Column="1"
+                    <Grid Grid.Column="1" Height="25" Margin="0,100,10,10" VerticalAlignment="Top">
-                          ItemTemplate="{StaticResource WineOriginTemplate}"/>
+                        <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"/>
+                    <CheckBox x:Name="LesewagenInput" Content="Lesewagen" Margin="10,75,0,0" Grid.Column="2"
-                <ComboBox x:Name="WineKgInput" Margin="0,40,10,10" Grid.Column="1"
+                              VerticalAlignment="Top" HorizontalAlignment="Left"
-                          DisplayMemberPath="Name"
+                              Checked="LesewagenInput_Changed" Unchecked="LesewagenInput_Changed"/>
-                          SelectionChanged="WineKgInput_SelectionChanged"/>
+                    <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"/>
+            <GroupBox Header="Teillieferungen" Grid.Column="0" Grid.Row="2" Margin="5,5,5,5">
-                <ComboBox x:Name="WineRdInput" Margin="0,70,10,10" Grid.Column="1"
+                <Grid>
-                          DisplayMemberPath="Name"/>
+                    <Grid.ColumnDefinitions>
-            </Grid>
+                        <ColumnDefinition/>
-        </GroupBox>
+                        <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"/>
+                </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) {
+        private async void Menu_Print_DeliveryJournal_ShowToday_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            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) {
+        private async void Menu_Print_DeliveryJournal_PrintToday_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
-            var doc = new DeliveryJournal(Context, DateOnly.FromDateTime(Utils.Today.AddDays(-1)));
+            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);
             }
         }
 
@@ -227,50 +270,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) || 
+                    .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.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 filterZwst = new List<string>();
-            var filterPartDate = new List<string>();
+            var filterAttr = new List<string>();
-            string? filterTimeGt = null;
+            var filterNotAttr = new List<string>();
-            string? filterTimeLt = null;
+            var filterDate = new List<(string?, string?)>();
-            int filterYearGt = 0;
+            var filterTime = new List<(string?, string?)>();
-            int filterYearLt = 0;
+            int filterYearGt = 0, filterYearLt = 0;
-            double filterKmwGt = 0;
+            double filterKmwGt = 0, filterKmwLt = 0;
-            double filterKmwLt = 0;
+            double filterOeGt = 0, filterOeLt = 0;
-            double filterOeGt = 0;
-            double filterOeLt = 0;
 
             var filter = TextFilter.ToList();
             if (filter.Count > 0) {
-                var var = await Context.WineVarieties.Select(v => v.SortId).ToListAsync();
+                var var = await Context.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
-                var qual = await Context.WineQualityLevels.Select(q => q.QualId).ToListAsync();
+                var qual = await Context.WineQualityLevels.ToDictionaryAsync(q => q.QualId, q => q);
-                var mgnr = await Context.Members.Select(m => m.MgNr.ToString()).ToListAsync();
+                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 +358,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 +365,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, <= 30):
-                            case (<= 30, null):
+                            case ( <= 30, null):
                             case (null, <= 30):
                                 filterKmwGt = from ?? 0;
                                 filterKmwLt = to ?? 0;
                                 break;
-                            case (>= 1900, >= 1900):
+                            case ( >= 1900, >= 1900):
-                            case (>= 1900, null):
+                            case ( >= 1900, null):
                             case (null, >= 1900):
                                 filterYearGt = (int)(from ?? 0);
                                 filterYearLt = (int)(to ?? -1) + 1;
@@ -315,16 +385,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;
+                        filterTime.Add((TimeOnly.TryParse(parts[0], out var from) ? $"{from:HH:mm}" : null, TimeOnly.TryParse(parts[1], out var to) ? $"{to:HH:mm}" : null));
-                        filterTimeLt = 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}");
+                        var s = date.ToString("yyyy-MM-dd");
-                        filter.RemoveAt(i--);
+                        filterDate.Add((s, s));
-                    } else if (Utils.PartialDateRegex.IsMatch(e)) {
-                        var parts = e.Split(".");
-                        filterPartDate.Add($"-{int.Parse(parts[1]):00}-{int.Parse(parts[0]):00}");
                         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 +444,67 @@ namespace Elwig.Windows {
                     }
                 }
 
-                if (filterMgNr.Count > 0) deliveryQuery = deliveryQuery.Where(d => filterMgNr.Contains(d.MgNr));
+                if (filterYearGt > 0) dpq = dpq.Where(p => p.Year >= filterYearGt);
-                if (filterDate.Count > 0) deliveryQuery = deliveryQuery.Where(d => filterDate.Contains(d.DateString));
+                if (filterYearLt > 0) dpq = dpq.Where(p => p.Year < filterYearLt);
-                if (filterPartDate.Count > 0) deliveryQuery = deliveryQuery.Where(d => filterPartDate.Contains(d.DateString.Substring(4)));
+                if (filterMgNr.Count > 0) dpq = dpq.Where(p => filterMgNr.Contains(p.Delivery.MgNr));
-                if (filterYearGt > 0) deliveryQuery = deliveryQuery.Where(d => d.Year >= filterYearGt);
+                if (filterDate.Count > 0) {
-                if (filterYearLt > 0) deliveryQuery = deliveryQuery.Where(d => d.Year < filterYearLt);
+                    var pr = PredicateBuilder.New<DeliveryPart>(false);
-                if (filterTimeGt != null) deliveryQuery = deliveryQuery.Where(d => filterTimeGt.CompareTo(d.TimeString) <= 0);
+                    foreach (var (d1, d2) in filterDate)
-                if (filterTimeLt != null) deliveryQuery = deliveryQuery.Where(d => filterTimeLt.CompareTo(d.TimeString) > 0);
+                        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));
-                if (filterVar.Count > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => filterVar.Contains(p.SortId)));
+                    dpq = dpq.Where(pr);
-                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 (filterTime.Count > 0) {
-                if (filterKmwLt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw < filterKmwLt));
+                    var pr = PredicateBuilder.New<DeliveryPart>(false);
-                if (filterOeGt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt));
+                    foreach (var (t1, t2) in filterTime)
-                if (filterOeLt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw * (4.54 + 0.022 * p.Kmw) < filterOeLt));
+                        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 +522,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);
+                var deliveryParts = deliveryPartsQuery;
-                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 n = await deliveryParts.CountAsync();
                 StatusDeliveries.Text = $"Lieferungen: {deliveries.Count} ({n})";
                 var varieties = await deliveryParts.Select(d => d.SortId).Distinct().ToListAsync();
@@ -394,9 +544,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 +555,8 @@ namespace Elwig.Windows {
                     if (groups.Count == 1) {
                         var g = groups.First().Key;
                         if (g != "") {
-                            StatusWeight.Text += $" ({g})";
+                            StatusWeight.Text += $" [{g}]";
-                            StatusGradation.Text += $" ({g})";
+                            StatusGradation.Text += $" [{g}]";
                         }
 
                         var sortGroups = parts
@@ -417,12 +566,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})")))}";
+                            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})")))}";
+                            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})")))}";
+                        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})")))}";
+                        StatusGradation.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
                     }
                 }
             } else {
@@ -430,6 +579,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 +613,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);
@@ -585,10 +739,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)) {
+            } else if (IsCreating || InputHasChanged(TimeInput)) {
-                d.TimeString = TimeInput.Text + ":00";
+                d.TimeString = (TimeInput.Text != "") ? TimeInput.Text + ":00" : null;
             }
             d.ZwstId = (BranchInput.SelectedItem as Branch)?.ZwstId;
             d.LsNr = LsNrInput.Text;
@@ -790,7 +944,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 +960,11 @@ namespace Elwig.Windows {
             FinishButton.Cursor = Cursors.Wait;
             DeliveryPartList.IsEnabled = false;
             var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
-			EmptyScale();
+            EmptyScale();
-			await RefreshDeliveryList();
+            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 +972,6 @@ namespace Elwig.Windows {
                     doc.Show();
                 } else {
                     await doc.Print(2);
-                    Activate();
                 }
             }
             FinishButton.Cursor = null;
@@ -882,7 +1035,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 +1117,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 +1192,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) ||
+                .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.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 +1204,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 +1255,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 +1345,9 @@ namespace Elwig.Windows {
             AbgewertetInput.IsEnabled = false;
             ManualWeighingInput.IsEnabled = false;
             LsNrInput.IsReadOnly = true;
-            DateInput.IsReadOnly = true;
+            DateInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked;
-            TimeInput.IsReadOnly = true;
+            TimeInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked;
-            BranchInput.IsEnabled = false;
+            BranchInput.IsEnabled = Menu_Settings_EnableFreeEditing.IsChecked;
         }
 
         private void DisableWeighingButtons() {
@@ -1218,15 +1371,25 @@ namespace Elwig.Windows {
             if (DateInput.Text == "" || BranchInput.SelectedItem == null) {
                 LsNrInput.Text = "";
             } else {
-                var branch = (Branch)BranchInput.SelectedItem;
+                try {
-                var date = DateOnly.ParseExact(DateInput.Text, "dd.MM.yyyy");
+                    var branch = (Branch)BranchInput.SelectedItem;
-                var lnr = await Context.NextLNr(date);
+                    var date = DateOnly.ParseExact(DateInput.Text, "dd.MM.yyyy");
-                LsNrInput.Text = Utils.GenerateLsNr(date, branch.ZwstId, lnr);
+                    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/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="1*"/>
-            <RowDefinition Height="0.8*"/>
+            <RowDefinition Height="24"/>
-            <RowDefinition Height="0.2*"/>
-            <RowDefinition Height="1.3*"/>
-            <RowDefinition Height="0.8*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="370"/>
+            <ColumnDefinition Width="1*" MinWidth="300"/>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="5"/>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2.5*" MinWidth="800"/>
         </Grid.ColumnDefinitions>
 
         <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
@@ -54,8 +51,15 @@
                           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>
             </MenuItem>
             <MenuItem Header="Rundschreiben">
                 <MenuItem Header="Runschreiben ausschicken"/>
@@ -66,7 +70,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 +92,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="MgNr." Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="50">
-                    <DataGridTextColumn Header="Nachname" Binding="{Binding FamilyName}" Width="4*"/>
+                        <DataGridTextColumn.CellStyle>
-                    <DataGridTextColumn Header="Vorname"  Binding="{Binding GivenName}"  Width="3*"/>
+                            <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 +133,307 @@
                     Click="CancelButton_Click"/>
         </Grid>
 
-        <GroupBox Header="Persönliche Daten" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
+        <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80"/>
-                    <ColumnDefinition Width="3*"/>
-                    <ColumnDefinition Width="50"/>
-                    <ColumnDefinition Width="2*"/>
-                </Grid.ColumnDefinitions>
 
-                <Label Content="MgNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+        <Grid Grid.Column="2" Grid.Row="1">
-                <TextBox x:Name="MgNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
+            <Grid.RowDefinitions>
-                         TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus"/>
+                <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"/>
+            <GroupBox Header="Persönliche Daten" Grid.Column="0" Grid.Row="0" Grid.RowSpan="2" Margin="5,5,5,5">
-                <TextBox x:Name="PredecessorMgNrInput" Margin="0,10,10,0" Width="48" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
+                <Grid>
-                         TextChanged="PredecessorMgNrInput_TextChanged" LostFocus="PredecessorMgNrInput_LostFocus"/>
+                    <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"/>
+                    <Label Content="MgNr.:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="PrefixInput" Margin="0,40,10,0" Grid.Column="3"
+                    <TextBox x:Name="MgNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus"/>
 
-                <Label Content="Vorname:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <Label Content="Vorg.:" Margin="10,10,0,0" Grid.Column="2"/>
-                <TextBox x:Name="GivenNameInput" Margin="0,40,0,0" Grid.Column="1"
+                    <TextBox x:Name="PredecessorMgNrInput" Margin="0,10,10,0" Width="48" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="PredecessorMgNrInput_TextChanged" LostFocus="PredecessorMgNrInput_LostFocus"/>
 
-                <Label Content="Nachname:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <Label Content="Präfix:" Margin="10,40,0,0" Grid.Column="2"/>
-                <TextBox x:Name="FamilyNameInput" Margin="0,70,0,0" Grid.Column="1"
+                    <TextBox x:Name="PrefixInput" Margin="0,40,10,0" Grid.Column="3"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Suffix:" Margin="10,70,0,0" Grid.Column="2"/>
+                    <Label Content="Vorname:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="SuffixInput" Margin="0,70,10,0" Grid.Column="3"
+                    <TextBox x:Name="GivenNameInput" Margin="0,40,0,0" Grid.Column="1"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Geburtstag:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <Label Content="Nachname:" Margin="10,70,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BirthdayInput" Margin="0,100,0,0" Grid.Column="1" Width="78" TextAlignment="Right" HorizontalAlignment="Left"
+                    <TextBox x:Name="FamilyNameInput" Margin="0,70,0,0" Grid.Column="1"
-                         TextChanged="PartialDateInput_TextChanged" LostFocus="PartialDateInput_LostFocus"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Alter:" Margin="85,100,0,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+                    <Label Content="Suffix:" Margin="10,70,0,0" Grid.Column="2"/>
-                <TextBlock x:Name="Age" Text="-" Margin="119,104,0,0" Grid.Column="1" Grid.ColumnSpan="3" TextWrapping="NoWrap" VerticalAlignment="Top"/>
+                    <TextBox x:Name="SuffixInput" Margin="0,70,10,0" Grid.Column="3"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <CheckBox x:Name="DeceasedInput" Content="Verstorben" IsEnabled="False"
+                    <Label Content="Geburtstag:" Margin="10,100,0,0" Grid.Column="0"/>
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                    <TextBox x:Name="BirthdayInput" Margin="0,100,0,0" Grid.Column="1" Width="78" TextAlignment="Right" HorizontalAlignment="Left"
-                          Grid.Column="3" HorizontalAlignment="Left" Margin="0,105,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                             TextChanged="PartialDateInput_TextChanged" LostFocus="PartialDateInput_LostFocus"/>
 
-                <Label Content="Adresse:" Margin="10,130,0,0"/>
+                    <Label Content="Alter:" Margin="85,100,0,0" Grid.Column="1" Grid.ColumnSpan="3"/>
-                <TextBox x:Name="AddressInput" Margin="0,130,10,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"/>
-                         TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="PLZ/Ort:" Margin="10,160,0,0" Grid.Column="0"/>
+                    <CheckBox x:Name="DeceasedInput" Content="Verstorben" IsEnabled="False"
-                <TextBox x:Name="PlzInput" Margin="0,160,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                         TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
+                              Grid.Column="3" HorizontalAlignment="Left" Margin="0,105,0,0" VerticalAlignment="Top" IsChecked="False"/>
-                <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>
 
-                <Label Content="E-Mail-Adresse (1):" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="Adresse:" Margin="10,130,0,0"/>
-                <TextBox x:Name="EmailAddress1Input" Margin="0,10,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                    <TextBox x:Name="AddressInput" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"
-                         TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="E-Mail-Adresse (2):" Margin="10,40,0,0" Grid.Column="0"/>
+                    <Label Content="PLZ/Ort:" Margin="10,160,0,0" Grid.Column="0"/>
-                <TextBox x:Name="EmailAddress2Input" Margin="0,40,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                    <TextBox x:Name="PlzInput" Margin="0,160,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
-                         TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+                             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"/>
+                    <Label Content="E-Mail-Adresse (1):" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="PhoneNr1Input" Margin="0,70,5,0" Grid.Column="1"
+                    <TextBox x:Name="EmailAddress1Input" Margin="0,10,10,0" Grid.Column="1" Grid.ColumnSpan="2"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr1CommentInput" Margin="0,70,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"/>
+                    <Label Content="E-Mail-Adresse (2):" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="PhoneNr2Input" Margin="0,100,5,0" Grid.Column="1"
+                    <TextBox x:Name="EmailAddress2Input" Margin="0,40,10,0" Grid.Column="1" Grid.ColumnSpan="2"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr2CommentInput" Margin="0,100,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"/>
+                    <ComboBox x:Name="PhoneNr1TypeInput" DisplayMemberPath="Value" Margin="6,70,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr3Input" Margin="0,130,5,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr1Input" Margin="0,70,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr3CommentInput" Margin="0,130,10,0" Grid.Column="2"
+                    <TextBox x:Name="PhoneNr1CommentInput" Margin="0,70,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr4TypeInput" DisplayMemberPath="Value" Margin="6,160,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <ComboBox x:Name="PhoneNr2TypeInput" DisplayMemberPath="Value" Margin="6,100,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr4Input" Margin="0,160,5,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr2Input" Margin="0,100,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr4CommentInput" Margin="0,160,10,0" Grid.Column="2"
+                    <TextBox x:Name="PhoneNr2CommentInput" Margin="0,100,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr5TypeInput" DisplayMemberPath="Value" Margin="6,190,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <ComboBox x:Name="PhoneNr3TypeInput" DisplayMemberPath="Value" Margin="6,130,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr5Input" Margin="0,190,5,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr3Input" Margin="0,130,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr5CommentInput" Margin="0,190,10,0" Grid.Column="2"
+                    <TextBox x:Name="PhoneNr3CommentInput" Margin="0,130,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr6TypeInput" DisplayMemberPath="Value" Margin="6,220,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <ComboBox x:Name="PhoneNr4TypeInput" DisplayMemberPath="Value" Margin="6,160,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr6Input" Margin="0,220,5,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr4Input" Margin="0,160,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr6CommentInput" Margin="0,220,10,0" Grid.Column="2"
+                    <TextBox x:Name="PhoneNr4CommentInput" Margin="0,160,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr7TypeInput" DisplayMemberPath="Value" Margin="6,250,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <ComboBox x:Name="PhoneNr5TypeInput" DisplayMemberPath="Value" Margin="6,190,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr7Input" Margin="0,250,5,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr5Input" Margin="0,190,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr7CommentInput" Margin="0,250,10,0" Grid.Column="2"
+                    <TextBox x:Name="PhoneNr5CommentInput" Margin="0,190,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr8TypeInput" DisplayMemberPath="Value" Margin="6,280,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <ComboBox x:Name="PhoneNr6TypeInput" DisplayMemberPath="Value" Margin="6,220,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr8Input" Margin="0,280,5,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr6Input" Margin="0,220,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr8CommentInput" Margin="0,280,10,0" Grid.Column="2"
+                    <TextBox x:Name="PhoneNr6CommentInput" Margin="0,220,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr9TypeInput" DisplayMemberPath="Value" Margin="6,310,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <ComboBox x:Name="PhoneNr7TypeInput" DisplayMemberPath="Value" Margin="6,250,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr9Input" Margin="0,310,5,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr7Input" Margin="0,250,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr9CommentInput" Margin="0,280,10,0" Grid.Column="2"
+                    <TextBox x:Name="PhoneNr7CommentInput" Margin="0,250,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                             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>
 
-                <Label Content="IBAN:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="PhoneNr8TypeInput" DisplayMemberPath="Value" Margin="6,280,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="IbanInput" Margin="0,10,10,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr8Input" Margin="0,280,5,0" Grid.Column="1"
-                         TextChanged="IbanInput_TextChanged" LostFocus="IbanInput_LostFocus"/>
+                             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"/>
+                    <ComboBox x:Name="PhoneNr9TypeInput" DisplayMemberPath="Value" Margin="6,310,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="BicInput" Margin="0,40,10,0" Grid.Column="1"
+                    <TextBox x:Name="PhoneNr9Input" Margin="0,310,5,0" Grid.Column="1"
-                         TextChanged="BicInput_TextChanged" LostFocus="BicInput_LostFocus"/>
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-            </Grid>
+                    <TextBox x:Name="PhoneNr9CommentInput" Margin="0,280,10,0" Grid.Column="2"
-        </GroupBox>
+                             TextChanged="TextBox_TextChanged"/>
-        <GroupBox Header="Betrieb" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,5">
+                </Grid>
-            <Grid>
+            </GroupBox>
-                <Grid.ColumnDefinitions>
+            <GroupBox Header="Bankverbindung" Grid.Column="0" Grid.Row="4" Margin="5,5,5,10">
-                    <ColumnDefinition Width="90"/>
+                <Grid>
-                    <ColumnDefinition Width="150"/>
+                    <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
+                        <ColumnDefinition Width="65"/>
-                </Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="IBAN:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="UstIdNrInput" Margin="0,10,10,0" Grid.Column="1" Width="96" HorizontalAlignment="Left"
+                    <TextBox x:Name="IbanInput" Margin="0,10,10,0" Grid.Column="1"
-                         TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
+                             TextChanged="IbanInput_TextChanged" LostFocus="IbanInput_LostFocus"/>
 
-                <Label Content="Betriebs-Nr.:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <Label Content="BIC:" 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"
+                    <TextBox x:Name="BicInput" Margin="0,40,10,0" Grid.Column="1"
-                         TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
+                             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"
+                    <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0"/>
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                    <TextBox x:Name="UstIdNrInput" Margin="0,10,10,0" Grid.Column="1" Width="96" HorizontalAlignment="Left"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                             TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
-            </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="Name:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="Betriebs-Nr.:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BillingNameInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
+                    <TextBox x:Name="LfbisNrInput" Margin="0,40,10,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
 
-                <Label Content="Adresse:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsEnabled="False"
-                <TextBox x:Name="BillingAddressInput" Margin="0,40,10,0" Grid.Column="1"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                         TextChanged="TextBox_TextChanged"/>
+                              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"/>
+                    <Label Content="Name:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BillingPlzInput" Margin="0,70,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
+                    <TextBox x:Name="BillingNameInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
-                         TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
+                             TextChanged="TextBox_TextChanged"/>
-                <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="Eintritt:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="Adresse:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="EntryDateInput" Margin="0,10,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                    <TextBox x:Name="BillingAddressInput" Margin="0,40,10,0" Grid.Column="1"
-                         TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Austritt:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <Label Content="PLZ/Ort:" Margin="10,70,0,0" Grid.Column="0"/>
-                <TextBox x:Name="ExitDateInput" Margin="0,40,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                    <TextBox x:Name="BillingPlzInput" Margin="0,70,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
-                         TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                             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"/>
+                    <Label Content="Eintritt:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BusinessSharesInput" Margin="0,70,10,0" Width="48" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                    <TextBox x:Name="EntryDateInput" Margin="0,10,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="IntegerInput_TextChanged"/>
+                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
 
-                <Label Content="BH-Konto:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <Label Content="Austritt:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="AccountingNrInput" Margin="0,100,10,0" Grid.Column="1"
+                    <TextBox x:Name="ExitDateInput" Margin="0,40,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="TextBox_TextChanged"/>
+                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
 
-                <CheckBox x:Name="ActiveInput" Content="Aktiv" IsEnabled="False"
+                    <Label Content="Geschäftsanteile:" Margin="10,70,0,0" Grid.Column="0"/>
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                    <TextBox x:Name="BusinessSharesInput" Margin="0,70,10,0" Width="48" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                             TextChanged="IntegerInput_TextChanged"/>
 
-                <CheckBox x:Name="VollLieferantInput" Content="Volllieferant" IsEnabled="False"
+                    <Label Content="BH-Konto:" Margin="10,100,0,0" Grid.Column="0"/>
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                    <TextBox x:Name="AccountingNrInput" Margin="0,100,10,0" Grid.Column="1"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <CheckBox x:Name="FunkionärInput" Content="Funktionär" IsEnabled="False"
+                    <CheckBox x:Name="ActiveInput" Content="Aktiv" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                              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"/>
+                    <CheckBox x:Name="VollLieferantInput" Content="Volllieferant" IsEnabled="False"
-                <ComboBox x:Name="BranchInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
+                              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"/>
+                    <CheckBox x:Name="FunkionärInput" Content="Funktionär" IsEnabled="False"
-                <ComboBox x:Name="DefaultKgInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Margin="0,160,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
+                              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"/>
+                    <Label Content="Stamm-Zwst.:" Margin="10,130,0,0" Grid.Column="0"/>
-                <TextBox x:Name="CommentInput" Margin="0,190,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                    <ComboBox x:Name="BranchInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                         TextChanged="TextBox_TextChanged"/>
+                              Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
 
-                <Label Content="Kontaktart:" Margin="10,220,0,0" Grid.Column="0"/>
+                    <Label Content="Stammgemeinde:" Margin="10,160,0,0" Grid.Column="0"/>
-                <CheckBox x:Name="ContactPostalInput" Content="Post" IsEnabled="False"
+                    <ComboBox x:Name="DefaultKgInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Margin="0,160,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
-                          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="Gebundene Fläche:" Margin="10,250,0,0" Grid.Column="0"/>
+                    <Label Content="Anmerkung:" Margin="10,190,0,0" Grid.Column="0"/>
-                <TextBlock x:Name="AreaCommitment" Text="- m²"
+                    <TextBox x:Name="CommentInput" Margin="0,190,10,0" Grid.Column="1" Grid.ColumnSpan="2"
-                           Grid.Column="1" HorizontalAlignment="Stretch" Margin="5,252,5,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" TextAlignment="Right"/>
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Button x:Name="DeliveryButton" Content="Lieferungen" Click="DeliveryButton_Click" IsEnabled="False"
+                    <Label Content="Kontaktart:" Margin="10,220,0,0" Grid.Column="0"/>
-                        HorizontalAlignment="Right" Margin="10,00,10,37" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
+                    <CheckBox x:Name="ContactPostalInput" Content="Post" IsEnabled="False"
-                <Button x:Name="AreaCommitmentButton" Content="Flächenbindungen" Click="AreaCommitmentButton_Click" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                        HorizontalAlignment="Right" Margin="10,10,10,5" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
+                              HorizontalAlignment="Left" Margin="0,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
-            </Grid>
+                    <CheckBox x:Name="ContactEmailInput" Content="E-Mail" IsEnabled="False"
-        </GroupBox>
+                              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,66 @@ 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 void Menu_Print_Letterheads_MgNr_Click(object sender, RoutedEventArgs evt) {
+            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;
+            using var doc = await Document.Merge(Context.Members
+                .Where(m => m.IsActive && m.ContactViaPost)
+                .OrderBy(m => m.MgNr)
+                .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_Name_Click(object sender, RoutedEventArgs evt) {
+            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;
+            using var doc = await Document.Merge(Context.Members
+                .Where(m => m.IsActive && m.ContactViaPost)
+                .OrderBy(m => m.FamilyName)
+                .ThenBy(m => m.GivenName)
+                .Select(m => new Letterhead(m)));
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            if (App.Config.Debug) {
+                doc.Show();
+            } else {
+                await doc.Print();
+            }
         }
 
         private void FocusSearchInput(object sender, RoutedEventArgs evt) {
@@ -545,16 +610,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/TestWindow.xaml

@@ -19,9 +19,12 @@
         <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"/>
+
+        <Button x:Name="CalcBinsButton" Content="Berechnen" Click="CalcBinsButton_Click"
+                Margin="20,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,12 +61,20 @@ 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();
             doc.Show();
             Mouse.OverrideCursor = null;
         }
+
+        private async void CalcBinsButton_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            var b = new Billing(2022);
+            await b.FinishSeason();
+            await b.CalculateBins();
+            Mouse.OverrideCursor = null;
+        }
     }
 }