Elwig: Bump version to 0.6.3

.gitignore

@@ -3,3 +3,4 @@ bin/
 *.user
 .vs
 .idea
+Tests/Resources/Create.sql

Elwig/App.xaml.cs

@@ -16,6 +16,8 @@ using Elwig.Helpers.Printing;
 using Elwig.Windows;
 using Elwig.Dialogs;
 using System.Threading.Tasks;
+using Elwig.Helpers.Billing;
+using Elwig.Models.Entities;
 
 namespace Elwig {
     public partial class App : Application {
@@ -63,26 +65,31 @@ namespace Elwig {
             MainDispatcher = Dispatcher;
             Scales = Array.Empty<IScale>();
             CurrentApp = this;
+            OverrideCulture();
         }
 
-        protected override void OnStartup(StartupEventArgs evt) {
-            var locale = new CultureInfo("de-AT");
-            locale.NumberFormat.CurrencyGroupSeparator = "\u202f";
-            locale.NumberFormat.NumberGroupSeparator = "\u202f";
-            locale.NumberFormat.PercentGroupSeparator = "\u202f";
+        private static void OverrideCulture() {
+            var locale = new CultureInfo("de-AT", false);
+            locale.NumberFormat.CurrencyGroupSeparator = Utils.GroupSeparator;
+            locale.NumberFormat.NumberGroupSeparator = Utils.GroupSeparator;
+            locale.NumberFormat.PercentGroupSeparator = Utils.GroupSeparator;
+            CultureInfo.CurrentCulture = locale;
+            CultureInfo.CurrentUICulture = locale;
             Thread.CurrentThread.CurrentCulture = locale;
             Thread.CurrentThread.CurrentUICulture = locale;
             CultureInfo.DefaultThreadCurrentCulture = locale;
             CultureInfo.DefaultThreadCurrentUICulture = locale;
             FrameworkElement.LanguageProperty.OverrideMetadata(
                 typeof(FrameworkElement),
-                new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag))
+                new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.Name))
             );
+        }
 
+        protected override async void OnStartup(StartupEventArgs evt) {
             Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split("+")[0] ?? "0.0.0";
 
             try {
-                AppDbUpdater.CheckDb();
+                await AppDbUpdater.CheckDb();
             } catch (Exception e) {
                 MessageBox.Show($"Invalid Database:\n\n{e.Message}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
                 Shutdown();
@@ -104,6 +111,7 @@ namespace Elwig {
 
             Utils.RunBackground("HTML Initialization", () => Html.Init(PrintingReadyChanged));
             Utils.RunBackground("PDF Initialization", () => Pdf.Init(PrintingReadyChanged));
+            Utils.RunBackground("JSON Schema Initialization", BillingData.Init);
 
             var list = new List<IScale>();
             foreach (var s in Config.Scales) {
@@ -219,6 +227,13 @@ namespace Elwig {
             return w;
         }
 
+        public static BaseDataWindow FocusBaseDataSeason(int year) {
+            var w = FocusBaseData();
+            w.Seasons.Focus();
+            ControlUtils.SelectListBoxItem(w.SeasonList, s => (s as Season)?.Year, year);
+            return w;
+        }
+
         public static SeasonFinishWindow FocusSeasonFinish() {
             return FocusWindow<SeasonFinishWindow>(() => new());
         }

Elwig/Dialogs/AbwertenDialog.xaml.cs

@@ -12,7 +12,7 @@ namespace Elwig.Dialogs {
             InitializeComponent();
             TextLsNr.Text = lsnr;
             TextMember.Text = name;
-            TextWeight.Text = $"{weight:N0}\u202fkg";
+            TextWeight.Text = $"{weight:N0}{Utils.UnitSeparator}kg";
         }
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {

Elwig/Dialogs/LinearPriceIncreaseDialog.xaml.cs

@@ -1,5 +1,4 @@
 using Elwig.Helpers;
-using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -14,7 +13,7 @@ namespace Elwig.Dialogs {
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
             DialogResult = true;
-            Price = double.Parse(PriceInput.Text.Replace("\u202f", ""));
+            Price = double.Parse(PriceInput.Text.Replace(Utils.GroupSeparator, ""));
             Close();
         }
 

Elwig/Documents/BusinessDocument.cs

@@ -1,5 +1,8 @@
 using Elwig.Helpers;
 using Elwig.Models.Entities;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 
 namespace Elwig.Documents {
     public abstract class BusinessDocument : Document {
@@ -32,5 +35,149 @@ namespace Elwig.Documents {
                 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}";
             }
         }
+
+        private static string GetColGroup(IEnumerable<double> cols) {
+            return "<colgroup>\n" + string.Join("\n", cols.Select(g => $"<col style=\"width: {g.ToString(CultureInfo.InvariantCulture)}mm;\"/>")) + "\n</colgroup>\n";
+        }
+
+        public static string PrintSortenaufteilung(Dictionary<string, MemberBucket> buckets) {
+            List<string> attributes = ["_", ""];
+            List<string> names = ["kein Qual.Wein", "ohne Attribut"];
+            List<(string, string)> bucketAttrs = [
+                .. buckets
+                .Where(b => b.Key.Length > 2 && b.Key[2] != '_' && b.Value.DeliveryStrict > 0)
+                .Select(b => (b.Key[2..], b.Value.Name.Split("(")[1][..^1]))
+                .Distinct()
+                .OrderBy(v => v.Item1)
+            ];
+            names.AddRange(bucketAttrs.Select(b => b.Item2));
+            names.Add("Gesamt");
+            attributes.AddRange(bucketAttrs.Select(b => b.Item1));
+
+            List<double> cols = [40];
+            cols.AddRange(names.Select(_ => 125.0 / names.Count));
+            string tbl = GetColGroup(cols);
+            tbl += "<thead><tr>" +
+                $"<th><b>Sortenaufteilung</b> [kg]</th>" +
+                string.Join("", names.Select(c => $"<th>{c}</th>")) +
+                "</tr></thead>";
+
+            tbl += string.Join("\n", buckets
+                .GroupBy(b => (b.Key[..2], b.Value.Name.Split("(")[0].Trim()))
+                .Where(g => g.Sum(a => a.Value.DeliveryStrict) > 0)
+                .OrderBy(g => g.Key.Item1)
+                .Select(g => {
+                    var dict = g.ToDictionary(a => a.Key[2..], a => a.Value);
+                    var vals = attributes.Select(a => dict.TryGetValue(a, out MemberBucket value) ? value.DeliveryStrict : 0).ToList();
+                    return $"<tr><th>{g.Key.Item2}</th>" + string.Join("", vals.Select(v => "<td class=\"number\">" + (v == 0 ? "-" : $"{v:N0}") + "</td>")) +
+                        $"<td class=\"number\">{dict.Values.Select(v => v.DeliveryStrict).Sum():N0}</td></tr>";
+                })
+            );
+            var totalDict = buckets.GroupBy(b => b.Key[2..]).ToDictionary(g => g.Key, g => g.Sum(a => a.Value.DeliveryStrict));
+            var totals = attributes.Select(a => totalDict.TryGetValue(a, out int value) ? value : 0);
+            tbl += "<tr class=\"sum bold\"><td></td>" + string.Join("", totals.Select(v => $"<td class=\"number\">{v:N0}</td>")) +
+                $"<td class=\"number\">{totalDict.Values.Sum():N0}</td></tr>";
+
+            return "<table class=\"sortenaufteilung small number cohere\">" + tbl + "</table>";
+        }
+
+        private static string FormatRow(
+            int obligation, int right, int delivery, int? payment = null, int? area = null,
+            bool isGa = false, bool showPayment = false, bool showArea = false
+        ) {
+            payment ??= delivery;
+            var baseline = showPayment ? payment : delivery;
+
+            if (showArea) {
+                return $"<td>{(area == null ? "" : $"{area:N0}")}</td>" +
+                    $"<td>{obligation:N0}</td>" +
+                    $"<td>{right:N0}</td>";
+            }
+
+            return $"<td>{(obligation == 0 ? "-" : $"{obligation:N0}")}</td>" +
+                $"<td>{(right == 0 ? "-" : $"{right:N0}")}</td>" +
+                $"<td>{(baseline < obligation ? $"<b>{obligation - baseline:N0}</b>" : "-")}</td>" +
+                $"<td>{(baseline >= obligation && delivery <= right ? $"{right - delivery:N0}" : "-")}</td>" +
+                $"<td>{(obligation == 0 && right == 0 ? "-" : (delivery > right ? ((isGa ? "<b>" : "") + $"{delivery - right:N0}" + (isGa ? "</b>" : "")) : "-"))}</td>" +
+                (showPayment ? $"<td>{(isGa ? "" : obligation == 0 && right == 0 ? "-" : $"{payment:N0}")}</td>" : "") +
+                $"<td>{delivery:N0}</td>";
+        }
+
+        private static string FormatRow(MemberBucket bucket, bool isGa = false, bool showPayment = false, bool showArea = false) {
+            return FormatRow(bucket.Obligation, bucket.Right, bucket.Delivery, bucket.Payment, bucket.Area, isGa, showPayment, showArea);
+        }
+
+        public string PrintBucketTable(
+            Season season, Dictionary<string, MemberBucket> buckets,
+            bool includeDelivery = true, bool includePayment = false,
+            bool isTiny = false, IEnumerable<string>? filter = null
+        ) {
+            includePayment = includePayment && includeDelivery;
+            string tbl = GetColGroup(!includeDelivery ? [105, 20, 20, 20] : includePayment ? [45, 17, 17, 17, 19, 16, 17, 17] : [45, 20, 20, 20, 20, 20, 20]);
+            tbl += $"""
+                <thead>
+                    <tr>
+                        <th{(!includeDelivery ? " rowspan=\"2\"" : "")}>
+                            <b>{(includeDelivery ? "Lese " + season.Year : "Zusammengefasste Flächenbindungen")}</b>
+                            per {Date:dd.MM.yyyy} {(includeDelivery ? "[kg]" : "")}
+                        </th>
+                        {(!includeDelivery ? "<th>Fläche</th>" : "")}
+                        <th>Lieferpflicht</th>
+                        <th>Lieferrecht</th>
+                        {(includeDelivery ? "<th>Unterliefert</th>" : "")}
+                        {(includeDelivery ? "<th>Noch lieferbar</th>" : "")}
+                        {(includeDelivery ? "<th>Überliefert</th>" : "")}
+                        {(includePayment ? "<th>Zugeteilt</th>" : "")}
+                        {(includeDelivery ? "<th>Geliefert</th>" : "")}
+                    </tr>
+                    {(!includeDelivery ? "<tr><th class=\"unit\">[m²]</th><th class=\"unit\">[kg]</th><th class=\"unit\">[kg]</th></tr>" : "")}
+                </thead>
+                """;
+
+            var mBuckets = buckets
+                .Where(b => ((!includeDelivery && b.Value.Area > 0) ||
+                             (includeDelivery && (b.Value.Right > 0 || b.Value.Obligation > 0 || b.Value.Delivery > 0))) &&
+                            (filter == null || filter.Contains(b.Key[..2])))
+                .ToList();
+            var fbVars = mBuckets
+                .Where(b => b.Value.Right > 0 || b.Value.Obligation > 0)
+                .Select(b => b.Key.Replace("_", ""))
+                .Order()
+                .ToArray();
+            var fbs = mBuckets
+                .Where(b => fbVars.Contains(b.Key) && b.Key.Length == 2)
+                .OrderBy(b => b.Value.Name);
+            var vtr = mBuckets
+                .Where(b => fbVars.Contains(b.Key) && b.Key.Length > 2)
+                .OrderBy(b => b.Value.Name);
+            var rem = mBuckets
+                .Where(b => !fbVars.Contains(b.Key))
+                .OrderBy(b => b.Value.Name);
+
+            tbl += "\n<tbody>\n";
+            tbl += $"<tr><th>Gesamtlieferung lt. gez. GA</th>{FormatRow(
+                    Member.BusinessShares * season.MinKgPerBusinessShare,
+                    Member.BusinessShares * season.MaxKgPerBusinessShare,
+                    Member.Deliveries.Where(d => d.Year == season.Year).Sum(d => d.Weight),
+                    isGa: true, showPayment: includePayment, showArea: !includeDelivery
+                )}</tr>";
+            if (fbs.Any()) {
+                tbl += $"<tr class=\"subheading{(filter == null ? " border" : "")}\"><th colspan=\"{(includePayment ? 8 : 7)}\">" +
+                    $"Flächenbindungen{(vtr.Any() ? " (inkl. Verträge)" : "")}:</th></tr>";
+                foreach (var (id, b) in fbs) {
+                    tbl += $"<tr><th>{b.Name}</th>{FormatRow(b, showPayment: includePayment, showArea: !includeDelivery)}</tr>";
+                }
+            }
+            if (vtr.Any()) {
+                tbl += $"<tr class=\"subheading{(filter == null ? " border" : "")}\"><th colspan=\"{(includePayment ? 8 : 7)}\">" +
+                    "Verträge:</th></tr>";
+                foreach (var (id, b) in vtr) {
+                    tbl += $"<tr><th>{b.Name}</th>{FormatRow(b, showPayment: includePayment, showArea: !includeDelivery)}</tr>";
+                }
+            }
+            tbl += "\n</tbody>\n";
+
+            return $"<table class=\"buckets {(isTiny ? "tiny" : "small")} number cohere\">\n" + tbl + "\n</table>";
+        }
     }
 }

Elwig/Documents/BusinessDocument.css

@@ -1,5 +1,5 @@
 
-.address-wrapper, aside, main {
+.address-wrapper, aside {
     overflow: hidden;
 }
 
@@ -64,7 +64,7 @@ aside table thead:not(:first-child) tr {
     border-top: 0.5pt solid #808080;
 }
 
-aside table thead th {
+aside table thead tr {
     background-color: #E0E0E0;
     font-size: 10pt;
 }
@@ -95,7 +95,10 @@ main > *:first-child {
     margin-top: 0;
 }
 
-main h1, .main-wrapper p {
+main h1,
+main h2,
+main h3,
+.main-wrapper p {
     font-size: 12pt;
     margin: 1em 0;
     text-align: justify;
@@ -116,6 +119,11 @@ main h1 {
     font-size: 10pt;
 }
 
+.main-wrapper p.custom {
+    white-space: pre-wrap;
+    break-inside: avoid;
+}
+
 .main-wrapper .hidden {
     break-before: avoid;
 }

Elwig/Documents/CreditNote.cs

@@ -1,31 +1,72 @@
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Elwig.Documents {
     public class CreditNote : BusinessDocument {
 
+        public new static string Name => "Traubengutschrift";
+
+        public PaymentMember? Payment;
         public Credit? Credit;
-        public CreditNoteData Data;
+        public CreditNoteDeliveryData Data;
         public string? Text;
         public string CurrencySymbol;
         public int Precision;
+        public string MemberModifier;
+        public IEnumerable<(string Name, int Kg, decimal Amount)>? MemberUnderDeliveries;
+        public decimal MemberTotalUnderDelivery;
+        public decimal MemberAutoBusinessShares;
 
-        public CreditNote(AppDbContext ctx, PaymentMember p, CreditNoteData data) :
-            base($"Traubengutschrift {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr}" : p.Member.Name)} – {p.Variant.Name}", p.Member) {
+        public CreditNote(AppDbContext ctx, PaymentMember p, CreditNoteDeliveryData data, Dictionary<string, UnderDelivery>? underDeliveries = null) :
+            base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.Name)} – {p.Variant.Name}", p.Member) {
             UseBillingAddress = true;
             ShowDateAndLocation = true;
             Data = data;
+            Payment = p;
             Credit = p.Credit;
+            var season = p.Variant.Season;
+            var mod = App.Client.IsMatzen ? ctx.Modifiers.Where(m => m.Year == season.Year && m.Name.StartsWith("Treue")).FirstOrDefault() : null;
+            if (mod != null) {
+                MemberModifier = $"{mod.Name} ({mod.ValueStr})";
+            } else {
+                MemberModifier = "Sonstige Zu-/Abschläge";
+            }
+            var total = data.Rows.SelectMany(r => r.Buckets).Sum(b => b.Value);
+            var totalUnderDelivery = total - p.Member.BusinessShares * season.MinKgPerBusinessShare;
+            MemberTotalUnderDelivery = totalUnderDelivery < 0 ? totalUnderDelivery * (season.PenaltyPerKg ?? 0) - (season.PenaltyAmount ?? 0) : 0;
+            var fromDate = $"{season.Year}-06-01";
+            var toDate = $"{season.Year + 1}-06-01";
+            MemberAutoBusinessShares = ctx.MemberHistory
+                .Where(h => h.MgNr == p.Member.MgNr && h.Type == "auto")
+                .Where(h => h.DateString.CompareTo(fromDate) >= 0 && h.DateString.CompareTo(toDate) < 0)
+                .Sum(h => h.BusinessShares) * (-season.BusinessShareValue ?? 0);
+            if (total == 0) MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0);
             Aside = Aside.Replace("</table>", "") +
                 $"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
-                $"<tr><th>TG-Nr.</th><td>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr}" : "-")}</td></tr>" +
+                $"<tr><th>TG-Nr.</th><td>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : "-")}</td></tr>" +
                 $"<tr><th>Überw. am</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
                 $"<tr><th>Datum/Zeit</th><td>{p.Credit?.ModifiedTimestamp:dd.MM.yyyy} / {p.Credit?.ModifiedTimestamp:HH:mm}</td></tr>" +
                 $"</tbody></table>";
-            Text = App.Client.TextDeliveryNote;
-            DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr}" : p.MgNr);
-            CurrencySymbol = p.Variant.Season.Currency.Symbol ?? p.Variant.Season.Currency.Code;
-            Precision = p.Variant.Season.Precision;
+            Text = App.Client.TextCreditNote;
+            DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : p.MgNr);
+            CurrencySymbol = season.Currency.Symbol ?? season.Currency.Code;
+            Precision = season.Precision;
+
+            var varieties = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);
+            var attributes = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a);
+            var comTypes = ctx.AreaCommitmentTypes.ToDictionary(t => t.VtrgId, t => t);
+            MemberUnderDeliveries = underDeliveries?
+                .OrderBy(u => u.Key)
+                .Select(u => (
+                    varieties[u.Key[..2]].Name + (u.Key.Length > 2 ? " " + attributes[u.Key[2..]].Name : ""),
+                    u.Value.Diff,
+                    u.Value.Diff * (comTypes[u.Key].PenaltyPerKg ?? 0)
+                      - (comTypes[u.Key].PenaltyAmount ?? 0)
+                      - ((u.Value.Weight == 0 ? comTypes[u.Key].PenaltyNone : null) ?? 0)))
+                .Where(u => u.Item3 != 0)
+                .ToList();
         }
     }}

Elwig/Documents/CreditNote.cshtml

@@ -1,3 +1,4 @@
+@using Elwig.Helpers
 @using RazorLight
 @inherits TemplatePage<Elwig.Documents.CreditNote>
 @model Elwig.Documents.CreditNote
@@ -8,84 +9,159 @@
     <table class="credit">
         <colgroup>
             <col style="width: 25mm;"/>
-            <col style="width: 5mm;"/>
+            <col style="width:  5mm;"/>
+            <col style="width: 20mm;"/>
             <col style="width: 20mm;"/>
-            <col style="width: 18mm;"/>
             <col style="width: 10mm;"/>
             <col style="width: 10mm;"/>
             <col style="width: 15mm;"/>
             <col style="width: 12mm;"/>
             <col style="width: 15mm;"/>
-            <col style="width: 10mm;"/>
-            <col style="width: 10mm;"/>
-            <col style="width: 15mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 16mm;"/>
         </colgroup>
         <thead>
             <tr>
-                <th rowspan="3" style="text-align: left;">Lieferschein-Nr.</th>
-                <th rowspan="3">Pos.</th>
-                <th rowspan="3" style="text-align: left;">Sorte</th>
-                <th rowspan="3" style="text-align: left;">Attribut</th>
-                <th rowspan="2" colspan="2">Gradation</th>
-                <th rowspan="2" colspan="2">Flächenbindung</th>
-                <th rowspan="2">Preis</th>
-                <th colspan="2">Zu-/Abschläge</th>
-                <th rowspan="2">Betrag</th>
+                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
+                <th rowspan="2" class="narrow">Pos.</th>
+                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th rowspan="2" style="text-align: left;">Attribut</th>
+                <th colspan="2">Gradation</th>
+                <th colspan="2">Flächenbindung</th>
+                <th>Preis</th>
+                <th class="narrow">Zu-/Abschläge</th>
+                <th>Betrag</th>
             </tr>
             <tr>
-                <th>Rel.</th>
-                <th>Abs.</th>
-            </tr>
-            <tr>
-                <th>[°Oe]</th>
-                <th>[°KMW]</th>
-                <th colspan="2">[kg]</th>
-                <th>[@Model.CurrencySymbol/kg]</th>
-                <th>[%]</th>
-                <th>[@Model.CurrencySymbol/kg]</th>
-                <th>[@Model.CurrencySymbol]</th>
+                <th class="unit">[°Oe]</th>
+                <th class="unit narrow">[°KMW]</th>
+                <th class="unit" colspan="2">[kg]</th>
+                <th class="unit">[@Model.CurrencySymbol/kg]</th>
+                <th class="unit">[@Model.CurrencySymbol]</th>
+                <th class="unit">[@Model.CurrencySymbol]</th>
             </tr>
         </thead>
-        <tbody>
+        <tbody class="sum">
             @foreach (var p in Model.Data.Rows) {
                 var rows = Math.Max(p.Buckets.Length, p.Modifiers.Length + 1);
-                var first = true;
-                //var pmt = p.Payment;
-                var abs = 0; // pmt?.ModAbs == null || pmt?.ModAbs == 0 ? "-" : pmt?.ModAbs.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)));
-                var rel = 0; // pmt?.ModRel == null || pmt?.ModRel == 0 ? "-" : $"{pmt?.ModRel * 100:0.00##}";
                 @for (int i = 0; i < rows; i++) {
-                    <tr class="@(first ? "first" : "") @(rows > i + 1 ? "trailing" : "")">
-                        @if (first) {
-                            <td rowspan="@rows" class="lsnr">@p.LsNr</td>
-                            <td rowspan="@rows" class="dpnr">@p.DPNr</td>
-                            <td class="variant small">@p.Variant</td>
-                            <td class="attribute small">@p.Attribute</td>
-                            <td rowspan="@rows" class="oe">@($"{p.Gradation.Oe:N0}")</td>
-                            <td rowspan="@rows" class="kmw">@($"{p.Gradation.Kmw:N1}")</td>
+                    <tr class="@(i == 0 ? "first" : "") @(rows == i + 1 ? "last" : "")">
+                        @if (i == 0) {
+                            <td rowspan="@rows">@p.LsNr</td>
+                            <td rowspan="@rows">@p.DPNr</td>
+                            <td class="small">@p.Variety</td>
+                            <td class="small">@p.Attribute</td>
+                            <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td>
+                            <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td>
                         }
                         @if (i > 0 && i <= p.Modifiers.Length) {
-                            <td colspan="2" class="mod">@(p.Modifiers[i - 1])</td>
+                            <td colspan="2" class="small mod">@p.Modifiers[i - 1]</td>
                         } else if (i > 0) {
                             <td colspan="2"></td>
                         }
                         @if (i < p.Buckets.Length) {
                             var bucket = p.Buckets[i];
-                            <td class="geb small">@bucket.Name:</td>
-                            <td class="weight">@($"{bucket.Value:N0}")</td>
-                            <td class="price">@($"{bucket.Price:N4}")</td>
+                            <td class="small">@bucket.Name:</td>
+                            <td class="number">@($"{bucket.Value:N0}")</td>
+                            <td class="number">@($"{bucket.Price:N4}")</td>
                         } else {
                             <td colspan="3"></td>
                         }
-                        @if (first) {
-                            <td rowspan="@rows" class="rel">@rel</td>
-                            <td rowspan="@rows" class="abs">@abs</td>
-                            <!-- FIXME rel/abs mods -->
-                            <td rowspan="@rows" class="amount">@($"{p.Buckets.Sum(b => b.Amount):N2}")</td>
-                            first = false;
+                        @if (i == p.Buckets.Length - 1) {
+                            var totalMod = p.TotalModifiers ?? 0;
+                            <td class="number@(totalMod == 0 ? " center" : "")">@(totalMod == 0 ? "-" : Utils.GetSign(totalMod) + $"{Math.Abs(totalMod):N2}")</td>
+                            <td class="number">@($"{p.Amount:N2}")</td>
+                        } else {
+                            <td colspan="2"></td>
                         }
                     </tr>
                 }
             }
         </tbody>
     </table>
+    <div class="hint">
+        Hinweis:<br/>
+        Die Summe der Lieferungen und die Summe der anfallenden Pönalen werden mit
+        @Model.Payment?.Variant.Season.Precision Nachkommastellen berechnent,
+        erst das Ergebnis wird kaufmännisch auf 2 Nachkommastellen gerundet.
+    </div>
+    <table class="credit-sum">
+        @{
+            string FormatRow(string name, decimal? value, bool add = false, bool bold = false, bool subCat = false, bool noTopBorder = false) {
+                return $"<tr class=\"{(!add && !noTopBorder ? "sum" : !add ? "large" : "")} {(bold ? "large bold" : "")}\">"
+                     + $"<td class=\"{(subCat ? "small" : "")}\" style=\"overflow: visible;\">{name}:</td>"
+                     + $"<td class=\"number {(subCat ? "small" : "large")}\">{(value < 0 ? "–" : (add ? "+" : ""))}</td>"
+                     + $"<td class=\"number {(subCat ? "small" : "large")}\">"
+                     +   $"<span class=\"fleft\">{Model.CurrencySymbol}</span>{Math.Abs(value ?? 0):N2}</td>"
+                     + $"</tr>\n";
+            }
+        }
+        <tbody style="break-inside: avoid;">
+            @{ var sum = Model.Data.Rows.Sum(p => p.Amount); }
+            @if (Model.Payment == null) {
+                @Raw(FormatRow("Gesamt", sum, bold: true, noTopBorder: true))
+            } else {
+                var noBorder = true;
+                if (Model.Payment.NetAmount != Model.Payment.Amount) {
+                    @Raw(FormatRow("Zwischensumme", Model.Payment.NetAmount, noTopBorder: noBorder))
+                    noBorder = false;
+                    @Raw(FormatRow(Model.MemberModifier, Model.Payment.Amount - Model.Payment.NetAmount, add: true))
+                }
+                if (Model.Credit == null) {
+                    @Raw(FormatRow("Gesamtbetrag", Model.Payment.Amount, bold: true, noTopBorder: noBorder))
+                    // TODO Mock VAT
+                } else {
+                    var hasPrev = Model.Credit.PrevNetAmount != null;
+                    @Raw(FormatRow(hasPrev ? "Gesamtbetrag" : "Nettobetrag", Model.Credit.NetAmount, bold: true, noTopBorder: noBorder))
+                    if (hasPrev) {
+                        @Raw(FormatRow("Bisher berücksichtigt", -Model.Credit.PrevNetAmount, add: true))
+                        @Raw(FormatRow("Nettobetrag", Model.Credit.NetAmount - (Model.Credit.PrevNetAmount ?? 0)))
+                    }
+                    @Raw(FormatRow($"Mehrwertsteuer ({Model.Credit.Vat * 100} %)", Model.Credit.VatAmount, add: true))
+                    @Raw(FormatRow("Bruttobetrag", Model.Credit.GrossAmount, bold: true))
+                }
+            }
+        </tbody>
+        <tbody style="break-inside: avoid;">
+            @{ decimal penalty = 0; }
+
+            @if (Model.MemberUnderDeliveries != null && Model.MemberUnderDeliveries.Count() > 0) {
+                <tr class="small">
+                    <td colspan="2" style="padding-top: 5mm;">Anfallende Pönalen durch Unterlieferungen:</td>
+                    <td></td>
+                </tr>
+                foreach (var u in Model.MemberUnderDeliveries) {
+                    @Raw(FormatRow($"{u.Name} ({u.Kg:N0} kg)", u.Amount, add: true, subCat: true))
+                    penalty += u.Amount;
+                }
+                penalty = Math.Round(penalty, 2, MidpointRounding.AwayFromZero);
+            }
+            @if (Model.MemberTotalUnderDelivery != 0) {
+                @Raw(FormatRow("Unterlieferung (GA)", Model.MemberTotalUnderDelivery, add: true));
+                penalty += Model.MemberTotalUnderDelivery;
+            }
+            @if (Model.MemberAutoBusinessShares != 0) {
+                @Raw(FormatRow("Autom. Nachz. von GA", Model.MemberAutoBusinessShares, add: true));
+                penalty += Model.MemberAutoBusinessShares;
+            }
+
+            @if (Model.Credit == null) {
+                @Raw(FormatRow("Auszahlungsbetrag", (Model.Payment?.Amount + penalty) ?? (sum + penalty), bold: true))
+            } else {
+                if (Model.Credit.Modifiers - penalty != 0) {
+                    @Raw(FormatRow("Weitere Abzüge", Model.Credit.Modifiers - penalty, add: true))
+                }
+                if (Model.Credit.PrevModifiers != null && Model.Credit.PrevModifiers != 0) {
+                    @Raw(FormatRow("Bereits berücksichtigte Abzüge", -Model.Credit.PrevModifiers, add: true))
+                }
+                @Raw(FormatRow("Auszahlungsbetrag", Model.Credit.Amount, bold: true))
+            }
+        </tbody>
+    </table>
+    <p>Überweisung erfolgt auf Konto @(Elwig.Helpers.Utils.FormatIban(Model.Member.Iban ?? "-")).</p>
+    <div style="margin-top: 1em;">
+        @if (Model.Text != null) {
+            <p class="custom">@Model.Text</p>
+        }
+    </div>
 </main>

Elwig/Documents/CreditNote.css

@@ -1,69 +1,48 @@
 
 table.credit {
-    font-size: 10pt;
+    margin-bottom: 0;
 }
 
-table.credit th,
-table.credit td {
-    padding: 0 0.25mm;
+table.credit .mod {
+    padding-left: 5mm;
 }
 
-table.credit thead {
-    font-size: 8pt
-}
-
-table.credit thead th {
-    font-weight: normal;
-    font-style: italic;
-    vertical-align: bottom;
-}
-
-table.credit td {
-    vertical-align: top;
-}
-
-table.credit .oe,
-table.credit .kmw {
-    text-align: center;
-}
-
-table.credit .dpnr {
-    text-align: center;
-}
-
-table.credit .amount,
-table.credit .weight,
-table.credit .price {
-    text-align: right;
-}
-
-table.credit .rel,
-table.credit .abs {
-    text-align: center;
-}
-
-table.credit .amount.sum {
-    vertical-align: bottom;
-    padding-bottom: 1mm;
-}
-
-table.credit tbody tr:not(.first):not(.last) {
+table.credit tbody tr:not(.first) {
     break-before: avoid;
+}
+
+table.credit tbody tr:not(.last) {
     break-after: avoid;
 }
 
-table.credit tbody tr.first td {
-    padding-top: 1mm;
+table.credit tr:not(.first) td {
+    padding-top: 0;
 }
 
-table.credit tbody tr.last td {
-    padding-bottom: 1mm;
+table.credit tr.last td {
+    padding-bottom: 0;
 }
 
-table.credit tbody tr.new {
-    border-top: 0.5pt solid black;
+table.credit-sum {
+    width: 50%;
+    margin-left: 50%;
 }
 
-table.credit .small {
+table.credit-sum tr.sum,
+table.credit-sum tr .sum {
+    font-size: 12pt;
+}
+
+table.credit-sum tr.sum td,
+table.credit-sum td.sum {
+    padding-top: 1mm !important;
+}
+
+.hint {
+    font-style: italic;
     font-size: 8pt;
+    width: 74mm;
+    position: absolute;
+    left: 0;
+    margin: 2mm 4mm;
 }

Elwig/Documents/DeliveryConfirmation.cs

@@ -7,13 +7,15 @@ using System.Collections.Generic;
 namespace Elwig.Documents {
     public class DeliveryConfirmation : BusinessDocument {
 
-        public Season Season;
-        public DeliveryConfirmationData Data;
-        public string? Text = App.Client.TextDeliveryConfirmation;
-        public Dictionary<string, (string, int, int, int, int)> MemberBuckets;
+        public new static string Name => "Anlieferungsbestätigung";
 
-        public DeliveryConfirmation(AppDbContext ctx, int year, Member m, DeliveryConfirmationData data) :
-            base($"Anlieferungsbestätigung {year}", m) {
+        public Season Season;
+        public DeliveryConfirmationDeliveryData Data;
+        public string? Text = App.Client.TextDeliveryConfirmation;
+        public Dictionary<string, MemberBucket> MemberBuckets;
+
+        public DeliveryConfirmation(AppDbContext ctx, int year, Member m, DeliveryConfirmationDeliveryData data) :
+            base($"{Name} {year}", m) {
             Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("invalid season");
             ShowDateAndLocation = true;
             UseBillingAddress = true;

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -1,3 +1,4 @@
+@using Elwig.Documents
 @using RazorLight
 @inherits TemplatePage<Elwig.Documents.DeliveryConfirmation>
 @model Elwig.Documents.DeliveryConfirmation
@@ -8,7 +9,7 @@
     <table class="delivery-confirmation">
         <colgroup>
             <col style="width: 25mm;"/>
-            <col style="width: 5mm;"/>
+            <col style="width:  5mm;"/>
             <col style="width: 20mm;"/>
             <col style="width: 21mm;"/>
             <col style="width: 19mm;"/>
@@ -22,7 +23,7 @@
         <thead>
             <tr>
                 <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
-                <th rowspan="2">Pos.</th>
+                <th rowspan="2" class="narrow">Pos.</th>
                 <th rowspan="2" style="text-align: left;">Sorte</th>
                 <th rowspan="2" style="text-align: left;">Attribut</th>
                 <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
@@ -32,146 +33,68 @@
                 <th>Davon<br/>abzuwerten</th>
             </tr>
             <tr>
-                <th>[°Oe]</th>
-                <th>[°KMW]</th>
-                <th colspan="2">[kg]</th>
-                <th>[kg]</th>
-                <th>[kg]</th>
+                <th class="unit">[°Oe]</th>
+                <th class="unit narrow">[°KMW]</th>
+                <th class="unit" colspan="2">[kg]</th>
+                <th class="unit">[kg]</th>
+                <th class="unit">[kg]</th>
             </tr>
         </thead>
         <tbody>
             @{
-                var lastVariant = "";
+                var lastVariety = "";
             }
             @foreach (var p in Model.Data.Rows) {
                 var rows = Math.Max(p.Buckets.Length, p.Modifiers.Length + 1);
                 var first = true;
                 @for (int i = 0; i < rows; i++) {
-                    <tr class="@(first ? "first" : "") @(p.Variant != lastVariant && lastVariant != "" ? "new": "") @(rows > i + 1 ? "trailing" : "")">
+                    <tr class="@(first ? "first" : "") @(p.Variety != lastVariety && lastVariety != "" ? "new": "") @(rows > i + 1 ? "last" : "")">
                         @if (first) {
                             <td rowspan="@rows">@p.LsNr</td>
                             <td rowspan="@rows">@p.DPNr</td>
-                            <td class="small">@p.Variant</td>
+                            <td class="small">@p.Variety</td>
                             <td class="small">@p.Attribute</td>
                             <td class="small">@p.QualityLevel</td>
-                            <td rowspan="@rows" class="grad">@($"{p.Gradation.Oe:N0}")</td>
-                            <td rowspan="@rows" class="grad">@($"{p.Gradation.Kmw:N1}")</td>
+                            <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td>
+                            <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td>
                         }
                         @if (i > 0 && i <= p.Modifiers.Length) {
-                            <td colspan="3" class="mod">@(p.Modifiers[i - 1])</td>
+                            <td colspan="3" class="small mod">@(p.Modifiers[i - 1])</td>
                         } else if (i > 0) {
                             <td colspan="3"></td>
                         }
                         @if (i < p.Buckets.Length) {
                             var bucket = p.Buckets[i];
-                            <td class="geb">@bucket.Name:</td>
-                            <td class="weight">@($"{bucket.Value:N0}")</td>
+                            <td class="small">@bucket.Name:</td>
+                            <td class="number">@($"{bucket.Value:N0}")</td>
                         } else {
                             <td colspan="2"></td>
                         }
                         @if (i == p.Buckets.Length - 1) {
-                            <td class="weight">@($"{p.Weight:N0}")</td>
+                            <td class="number">@($"{p.Weight:N0}")</td>
                         } else {
                             <td></td>
                         }
                         @if (first) {
-                            <td rowspan="@rows" class="weight"></td>
+                            <td rowspan="@rows" class="number"></td>
                             first = false;
                         }
                     </tr>
+                    lastVariety = p.Variety;
                 }
-                lastVariant = p.Variant;
             }
-            <tr class="sum">
+            <tr class="sum bold">
                 <td colspan="8">Gesamt:</td>
-                <td colspan="2" class="weight">@($"{Model.Data.Rows.Sum(p => p.Weight):N0}")</td>
+                <td colspan="2" class="number">@($"{Model.Data.Rows.Sum(p => p.Weight):N0}")</td>
                 <td></td>
             </tr>
         </tbody>
     </table>
-    <table class="delivery-confirmation-stats">
-        <colgroup>
-            <col style="width: 45mm;"/>
-            <col style="width: 17mm;"/>
-            <col style="width: 17mm;"/>
-            <col style="width: 17mm;"/>
-            <col style="width: 19mm;"/>
-            <col style="width: 16mm;"/>
-            <col style="width: 17mm;"/>
-            <col style="width: 17mm;"/>
-        </colgroup>
-        <thead>
-            <tr>
-                <th><b>Lese @Model.Season.Year</b> per @($"{Model.Date:dd.MM.yyyy}") [kg]</th>
-                <th>Lieferpflicht</th>
-                <th>Lieferrecht</th>
-                <th>Unterliefert</th>
-                <th>Noch lieferbar</th>
-                <th>Überliefert</th>
-                <th>Zugeteilt</th>
-                <th>Geliefert</th>
-            </tr>
-        </thead>
-        <tbody>
-            @{
-                string FormatRow(int mode, int obligation, int right, int sum, int? payment = null) {
-                    var isGa = mode == 0;
-                    payment ??= sum;
-                    return $"<td>{(mode == 1 ? "" : obligation == 0 ? "-" : $"{obligation:N0}")}</td>" +
-                        $"<td>{(mode == 1 ? "" : right == 0 ? "-" : $"{right:N0}")}</td>" +
-                        $"<td>{(mode == 1 ? "" : payment < obligation ? $"<b>{obligation - payment:N0}\x3c/b>" : "-")}</td>" +
-                        $"<td>{(mode == 1 ? "" : payment >= obligation && sum <= right ? $"{right - sum:N0}" : "-")}</td>" +
-                        $"<td>{(mode == 1 ? "" : obligation == 0 && right == 0 ? "-" : (sum > right ? ((isGa ? "<b>" : "") + $"{sum - right:N0}" + (isGa ? "</b>" : "")) : "-"))}</td>" +
-                        $"<td>{(mode != 2 ? "" : obligation == 0 && right == 0 ? "-" : $"{payment:N0}")}</td>" +
-                        $"<td>{sum:N0}</td>";
-                }
-                var mBuckets = Model.MemberBuckets.Where(b => b.Value.Item2 > 0 || b.Value.Item3 > 0 || b.Value.Item4 > 0).ToList();
-                var fbVars = mBuckets.Where(b => b.Value.Item2 > 0 || b.Value.Item3 > 0).Select(b => b.Key.Replace("_", "")).Order().ToArray();
-                var fbs = mBuckets.Where(b => fbVars.Contains(b.Key) && b.Key.Length == 2).OrderBy(b => b.Value.Item1);
-                var vtr = mBuckets.Where(b => fbVars.Contains(b.Key) && b.Key.Length > 2).OrderBy(b => b.Value.Item1);
-                var rem = mBuckets.Where(b => !fbVars.Contains(b.Key)).OrderBy(b => b.Value.Item1);
-            }
-            <tr>
-                <th>Gesamtlieferung lt. gez. GA</th>
-                @Raw(FormatRow(
-                    0,
-                    Model.Member.BusinessShares * Model.Season.MinKgPerBusinessShare,
-                    Model.Member.BusinessShares * Model.Season.MaxKgPerBusinessShare,
-                    Model.Member.Deliveries.Where(d => d.Year == Model.Season.Year).Sum(d => d.Weight)
-                ))
-            </tr>
-            @if (rem.Any()) {
-                <tr class="subheading"><th colspan="8">Sortenaufteilung:</th></tr>
-            }
-            @foreach (var (id, (name, right, obligation, sum, payment)) in rem) {
-                <tr>
-                    <th>@name</th>
-                    @Raw(FormatRow(1, obligation, right, sum, payment))
-                </tr>
-            }
-            @if (fbs.Any()){
-                <tr class="subheading"><th colspan="8">Flächenbindungen:</th></tr>
-            }
-            @foreach (var (id, (name, right, obligation, sum, payment)) in fbs) {
-                <tr>
-                    <th>@name</th>
-                    @Raw(FormatRow(2, obligation, right, sum, payment))
-                </tr>
-            }
-            @if (vtr.Any()) {
-                <tr class="subheading"><th colspan="8">Verträge:</th></tr>
-            }
-            @foreach (var (id, (name, right, obligation, sum, payment)) in vtr) {
-                <tr>
-                    <th>@name</th>
-                    @Raw(FormatRow(2, obligation, right, sum, payment))
-                </tr>
-            }
-        </tbody>
-    </table>
-    <div class="text" style="margin-top: 2em;">
+    @Raw(BusinessDocument.PrintSortenaufteilung(Model.MemberBuckets))
+    @Raw(Model.PrintBucketTable(Model.Season, Model.MemberBuckets, includePayment: true))
+    <div style="margin-top: 2em;">
         @if (Model.Text != null) {
-            <p class="comment" style="white-space: pre-wrap; break-inside: avoid;">@Model.Text</p>
+            <p class="custom comment">@Model.Text</p>
         }
     </div>
 </main>

Elwig/Documents/DeliveryConfirmation.css

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

Elwig/Documents/DeliveryJournal.cs

@@ -19,7 +19,7 @@ namespace Elwig.Documents {
         public DeliveryJournal(string filter, IQueryable<DeliveryPart> deliveries) :
             this(filter, deliveries
                 .Include(p => p.Delivery).ThenInclude(d => d.Member)
-                .Include(p => p.Variant)
+                .Include(p => p.Variety)
                 .ToList()) { }
 
         public DeliveryJournal(AppDbContext ctx, DateOnly date) :

Elwig/Documents/DeliveryJournal.cshtml

@@ -10,9 +10,9 @@
         <colgroup>
             <col style="width: 25mm;"/>
             <col style="width: 5mm;"/>
-            <col style="width: 17mm;"/>
-            <col style="width: 10mm;"/>
+            <col style="width: 15mm;"/>
             <col style="width: 8mm;"/>
+            <col style="width: 12mm;"/>
             <col style="width: 38mm;"/>
             <col style="width: 28mm;"/>
             <col style="width: 10mm;"/>
@@ -22,7 +22,7 @@
         <thead>
             <tr>
                 <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
-                <th rowspan="2">Pos.</th>
+                <th rowspan="2" class="narrow">Pos.</th>
                 <th rowspan="2">Datum</th>
                 <th rowspan="2">Zeit</th>
                 <th colspan="2" rowspan="2" style="text-align: left;">Mitglied</th>
@@ -31,9 +31,9 @@
                 <th>Gewicht</th>
             </tr>
             <tr>
-                <th>[°Oe]</th>
-                <th>[°KMW]</th>
-                <th>[kg]</th>
+                <th class="unit">[°Oe]</th>
+                <th class="unit narrow">[°KMW]</th>
+                <th class="unit">[kg]</th>
             </tr>
         </thead>
         <tbody>
@@ -41,26 +41,26 @@
                 <tr>
                     <td>@p.Delivery.LsNr</td>
                     <td>@p.DPNr</td>
-                    <td>@($"{p.Delivery.Date:dd.MM.yyyy}")</td>
-                    <td>@($"{p.Delivery.Time:HH:mm}")</td>
-                    <td class="mgnr">@p.Delivery.Member.MgNr</td>
-                    <td>@p.Delivery.Member.AdministrativeName</td>
-                    <td>@p.Variant.Name</td>
-                    <td class="grad">@($"{p.Oe:N0}")</td>
-                    <td class="grad">@($"{p.Kmw:N1}")</td>
-                    <td class="weight">@($"{p.Weight:N0}")</td>
+                    <td class="small">@($"{p.Delivery.Date:dd.MM.yyyy}")</td>
+                    <td class="small">@($"{p.Delivery.Time:HH:mm}")</td>
+                    <td class="number">@p.Delivery.Member.MgNr</td>
+                    <td class="small">@p.Delivery.Member.AdministrativeName</td>
+                    <td class="small">@p.Variety.Name</td>
+                    <td class="center">@($"{p.Oe:N0}")</td>
+                    <td class="center">@($"{p.Kmw:N1}")</td>
+                    <td class="number">@($"{p.Weight:N0}")</td>
                 </tr>
             }
-            <tr class="sum">
+            <tr class="sum bold">
                 @{
                     var kmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(Model.Deliveries);
                     var oe = Elwig.Helpers.Utils.KmwToOe(kmw);
                 }
                 <td colspan="2">Gesamt:</td>
                 <td colspan="5">(Teil-)Lieferungen: @($"{Model.Deliveries.DistinctBy(p => p.Delivery).Count():N0}") (@($"{Model.Deliveries.Count():N0}"))</td>
-                <td class="grad">@($"{oe:N0}")</td>
-                <td class="grad">@($"{kmw:N1}")</td>
-                <td class="weight">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>
+                <td class="center">@($"{oe:N0}")</td>
+                <td class="center">@($"{kmw:N1}")</td>
+                <td class="number">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>
             </tr>
         </tbody>
     </table>

Elwig/Documents/DeliveryJournal.css

@@ -10,38 +10,3 @@ h2 {
     font-size: 14pt;
     margin-top: 2mm;
 }
-
-table.journal {
-    font-size: 10pt;
-}
-
-table.journal thead {
-    font-size: 8pt;
-}
-
-table.journal th {
-    font-weight: normal;
-    font-style: italic;
-}
-
-table.journal td {
-    overflow: hidden;
-    white-space: nowrap;
-}
-
-table.journal .mgnr,
-table.journal .weight {
-    text-align: right;
-}
-
-table.journal .grad {
-    text-align: center;
-}
-
-table.journal tr.sum {
-    font-weight: bold;
-}
-
-table.journal tr.sum td {
-    border-top: 0.5pt solid black;
-}

Elwig/Documents/DeliveryNote.cs

@@ -7,7 +7,7 @@ namespace Elwig.Documents {
 
         public Delivery Delivery;
         public string? Text;
-        public Dictionary<string, (string, int, int, int, int)> MemberBuckets;
+        public Dictionary<string, MemberBucket> MemberBuckets;
 
         // 0 - none
         // 1 - GA only

Elwig/Documents/DeliveryNote.cshtml

@@ -5,7 +5,7 @@
 <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryNote.css" />
 <main>
 <h1>@Model.Title</h1>
-<table class="delivery">
+<table class="delivery large">
     <colgroup>
         <col style="width: 10.00mm;"/>
         <col style="width: 21.25mm;"/>
@@ -19,7 +19,7 @@
     </colgroup>
     <thead>
         <tr>
-            <th class="main" rowspan="2" style="text-align: center;">Pos.</th>
+            <th class="main center narrow" rowspan="2">Pos.</th>
             <th class="main" rowspan="2" colspan="2">Sorte</th>
             <th class="main" rowspan="2" colspan="2">Attribut</th>
             <th class="main" rowspan="2">Qualitätsstufe</th>
@@ -27,21 +27,21 @@
             <th>Gewicht</th>
         </tr>
         <tr>
-            <th style="font-size: 8pt;">[°Oe]</th>
-            <th style="font-size: 8pt;">[°KMW]</th>
-            <th style="font-size: 8pt;">[kg]</th>
+            <th class="unit">[°Oe]</th>
+            <th class="unit narrow">[°KMW]</th>
+            <th class="unit">[kg]</th>
         </tr>
     </thead>
     <tbody>
         @foreach (var part in Model.Delivery.Parts.OrderBy(p => p.DPNr)) {
             <tr class="main">
-                <td style="text-align: center;">@part.DPNr</td>
-                <td colspan="2">@part.Variant.Name</td>
+                <td class="center">@part.DPNr</td>
+                <td colspan="2">@part.Variety.Name</td>
                 <td colspan="2">@part.Attribute?.Name</td>
                 <td>@part.Quality.Name</td>
-                <td class="narrow" style="text-align: center;">@($"{part.Oe:N0}")</td>
-                <td class="narrow" style="text-align: center;">@($"{part.Kmw:N1}")</td>
-                <td class="narrow" style="text-align: right;">@($"{part.Weight:N0}")</td>
+                <td class="center">@($"{part.Oe:N0}")</td>
+                <td class="center">@($"{part.Kmw:N1}")</td>
+                <td class="number">@($"{part.Weight:N0}")</td>
             </tr>
             <tr><td></td><td colspan="5" style="white-space: pre;"><i>Herkunft:</i> @part.OriginString</td></tr>
             @if (part.Modifiers.Count() > 0) {
@@ -63,11 +63,11 @@
             }
         }
         @if (Model.Delivery.Parts.Count() > 1) {
-            <tr class="main sum">
+            <tr class="main sum bold">
                 <td colspan="6">Gesamt:</td>
-                <td style="text-align: center;">@($"{Model.Delivery.Oe:N0}")</td>
-                <td style="text-align: center;">@($"{Model.Delivery.Kmw:N1}")</td>
-                <td style="text-align: right;">@($"{Model.Delivery.Weight:N0}")</td>
+                <td class="center">@($"{Model.Delivery.Oe:N0}")</td>
+                <td class="center">@($"{Model.Delivery.Kmw:N1}")</td>
+                <td class="number">@($"{Model.Delivery.Weight:N0}")</td>
             </tr>
         }
     </tbody>
@@ -76,63 +76,12 @@
     <p class="comment">Amerkung zur Lieferung: @Model.Delivery.Comment</p>
 }
 @if (Model.DisplayStats > 0) {
-    <table class="delivery-note-stats @(Model.DisplayStats > 2 ? "expanded" : "")">
-        <colgroup>
-            <col style="width: 45mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 20mm;"/>
-        </colgroup>
-        <thead>
-            <tr>
-                <th><b>Lese @Model.Delivery.Year</b> per @($"{Model.Date:dd.MM.yyyy}") [kg]</th>
-                <th>Lieferpflicht</th>
-                <th>Lieferrecht</th>
-                <th>Unterliefert</th>
-                <th>Noch lieferbar</th>
-                <th>Überliefert</th>
-                <th>Geliefert</th>
-            </tr>
-        </thead>
-        <tbody>
-            @{
-                string FormatRow(int obligation, int right, int sum) {
-                    return $"<td>{obligation:N0}</td>" +
-                        $"<td>{right:N0}</td>" +
-                        $"<td>{(sum < obligation ? $"{obligation - sum:N0}" : "-")}</td>" +
-                        $"<td>{(sum >= obligation && sum <= right ? $"{right - sum:N0}" : "-")}</td>" +
-                        $"<td>{(sum > right ? $"{sum - right:N0}" : "-")}</td>" +
-                        $"<td>{sum:N0}</td>";
-                }
-                var sortids = Model.Delivery.Parts.Select(p => p.SortId).ToList();
-                var buckets = Model.MemberBuckets.GroupBy(b => b.Key[..2]).ToDictionary(g => g.Key, g => g.Count());
-            }
-            <tr>
-                <th>Gesamtlieferung lt. gez. GA</th>
-                @Raw(FormatRow(
-                    Model.Member.BusinessShares * Model.Delivery.Season.MinKgPerBusinessShare,
-                    Model.Member.BusinessShares * Model.Delivery.Season.MaxKgPerBusinessShare,
-                    Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)
-                ))
-            </tr>
-            @if (Model.DisplayStats > 1) {
-                <tr class="subheading">
-                    <th>Flächenbindungen:</th>
-                </tr>
-                    @foreach (var (id, (name, right, obligation, sum, _)) in Model.MemberBuckets.OrderBy(b => b.Key)) {
-                    if (right > 0 || obligation > 0 || (sum > 0 && buckets[id[..2]] > 1 && !id.EndsWith('_'))) {
-                        <tr class="@(sortids.Contains(id[..2]) ? "" : "optional")">
-                            <th>@name</th>
-                            @Raw(FormatRow(obligation, right, sum))
-                        </tr>
-                    }
-                }
-            }
-        </tbody>
-    </table>
+    @Raw(Model.PrintBucketTable(
+        Model.Delivery.Season, Model.MemberBuckets, isTiny: true,
+        filter: Model.DisplayStats > 2 ? null :
+                Model.DisplayStats == 1 ? new List<string>() :
+                Model.Delivery.Parts.Select(p => p.SortId).Distinct().ToList()
+    ))
 }
 </main>
 @for (int i = 0; i < 2; i++) {

Elwig/Documents/DeliveryNote.css

@@ -11,12 +11,6 @@ table.delivery tr:not(.main) {
     break-before: avoid;
 }
 
-table.delivery th {
-    font-weight: normal;
-    font-style: italic;
-    font-size: 10pt;
-}
-
 table.delivery th.main {
     text-align: left;
 }
@@ -43,55 +37,10 @@ table.delivery tr.tight:has(+ tr:not(.tight)) td {
     padding-bottom: 0.5mm !important;
 }
 
-table.delivery tr.sum {
-    border-top: 0.5pt solid black;
-    break-before: avoid;
-}
-
 table.delivery tr.sum td {
     padding-top: 1mm;
 }
 
 table.delivery-note-stats {
-    font-size: 8pt;
-    break-inside: avoid;
     break-after: avoid;
 }
-
-table.delivery-note-stats th,
-table.delivery-note-stats td {
-    padding: 0.125mm 0;
-}
-
-table.delivery-note-stats:not(.expanded) tr.optional {
-    display: none;
-}
-
-table.delivery-note-stats tr.subheading th {
-    text-align: left;
-}
-
-table.delivery-note-stats.expanded tr.subheading:not(:has(~ tr)),
-table.delivery-note-stats tr.subheading:not(:has(~ tr:not(.optional))) {
-    display: none;
-}
-
-table.delivery-note-stats thead th {
-    font-weight: normal;
-    font-style: italic;
-    text-align: right;
-}
-
-table.delivery-note-stats thead th:first-child {
-    text-align: left;
-}
-
-table.delivery-note-stats td {
-    text-align: right;
-}
-
-table.delivery-note-stats tbody th {
-    font-weight: normal;
-    font-style: italic;
-    text-align: left;
-}

Elwig/Documents/Document.Page.css

@@ -68,4 +68,9 @@ hr.page-break {
     .page::after {
         content: "Seite " counter(page) " von " counter(pages) !important;
     }
+
+    a {
+        text-decoration: inherit;
+        color: inherit;
+    }
 }

Elwig/Documents/Document.Table.css

@@ -0,0 +1,153 @@
+
+main table {
+    border-collapse: collapse;
+    margin-bottom: 10mm;
+    font-size: 10pt;
+}
+main table.large {font-size: 12pt;}
+main table.tiny {
+    font-size: 8pt;
+    margin-bottom: 5mm;
+}
+
+main table.border {
+    border: 0.5pt solid black;
+}
+
+main table tr {
+    break-inside: avoid;
+}
+
+main table th,
+main table td {
+    overflow: hidden;
+    white-space: nowrap;
+    vertical-align: middle;
+    padding: 0.5mm 1mm;
+    font-weight: normal;
+}
+main table.small th,
+main table.small td,
+main table.tiny th,
+main table.tiny td {
+    padding: 0.125mm 0.125mm;
+}
+
+main table td[rowspan] {
+    vertical-align: top;
+}
+
+main table thead {
+    font-size: 8pt;
+}
+main table.large thead {
+    font-size: 10pt;
+}
+
+main table th {
+    font-style: italic;
+}
+
+main table tbody {
+}
+
+main table .small {
+    font-size: 8pt;
+}
+main table .large {
+    font-size: 12pt;
+}
+
+main table.number td,
+main table.number th {
+    padding-left: 0;
+    padding-right: 0;
+}
+
+main table.number thead th,
+main table.number td,
+main table tbody td.number {
+    text-align: right;
+}
+
+main table.center tbody td,
+main table tbody td.center {
+    text-align: center;
+}
+
+main table tbody th {
+    text-align: left;
+}
+
+main table.cohere {
+    break-inside: avoid;
+}
+
+main table tr.subheading th,
+main table tr.subheading td {
+    font-weight: bold;
+}
+
+main table tr.subheading th {
+    text-align: left;
+    font-size: 10pt;
+}
+
+main table.small tr.subheading th,
+main table.small tr.subheading td,
+main table.tiny tr.subheading th,
+main table.tiny tr.subheading td {
+    font-size: 8pt;
+}
+
+main table tr.sectionheading {
+    background-color: #E0E0E0;
+}
+
+main table tr.sectionheading th {
+    padding-top: 0.5mm;
+    padding-bottom: 0.5mm;
+    font-weight: bold;
+    text-align: center;
+    font-size: 10pt;
+    border-top: 0.5pt solid black;
+}
+
+main table.number thead tr:first-child th:first-child {
+    text-align: left;
+}
+
+main table tr.bold td {
+    font-weight: bold;
+}
+
+main table tr.sum,
+main table td.sum,
+main table tr.new,
+main table tr.border {
+    border-top: 0.5pt solid black;
+}
+
+main table th.unit {
+    font-size: 8pt;
+}
+
+main table.number th.unit {
+    padding-right: 2mm;
+}
+
+main table th.narrow {
+    padding-left: 0;
+    padding-right: 0;
+}
+
+main table .lborder {border-left: 0.5pt solid black;}
+main table .rborder {border-right: 0.5pt solid black;}
+
+main table .fleft {
+    float: left;
+}
+
+main tbody.sum tr:last-child {
+    border-bottom: 0.5pt solid black;
+}

Elwig/Documents/Document.cs

@@ -9,6 +9,10 @@ using Elwig.Helpers.Printing;
 namespace Elwig.Documents {
     public abstract partial class Document : IDisposable {
 
+        public static string Name => "Dokument";
+
+        private static readonly double GenerationProportion = 0.125;
+
         private TempFile? _pdfFile = null;
 
         public bool ShowFoldMarks = App.Config.Debug;
@@ -33,7 +37,9 @@ namespace Elwig.Documents {
             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()
-                .Item(c.EmailAddress).Item(c.Website).Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine()
+                .Item(c.EmailAddress != null ? $"<a href=\"mailto:{c.Name} {c.NameSuffix} <{c.EmailAddress}>\">{c.EmailAddress}</a>" : null)
+                    .Item(c.Website != null ? $"<a href=\"http://{c.Website}/\">{c.Website}</a>" : null)
+                    .Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine()
                 .Item("BIC", c.Bic).Item("IBAN", c.Iban)
                 .ToString();
             Date = DateTime.Today;
@@ -91,10 +97,10 @@ namespace Elwig.Documents {
                     await File.WriteAllTextAsync(tmpHtml.FilePath, await doc.Render(), Utils.UTF8);
                     tmpHtmls.Add(tmpHtml);
                     i++;
-                    progress?.Report(25.0 * i / n);
+                    progress?.Report(GenerationProportion * 100 * i / n);
                 }
-                progress?.Report(25.0);
-                await Pdf.Convert(tmpHtmls.Select(f => f.FileName), pdf.FileName, DoubleSided, new Progress<double>(v => progress?.Report(25.0 + v * 0.75)));
+                progress?.Report(GenerationProportion * 100);
+                await Pdf.Convert(tmpHtmls.Select(f => f.FileName), pdf.FileName, DoubleSided, new Progress<double>(v => progress?.Report(GenerationProportion * 100 + v * (1 - GenerationProportion))));
                 foreach (var tmp in tmpHtmls) {
                     tmp.Dispose();
                 }

Elwig/Documents/Document.cshtml

@@ -9,6 +9,7 @@
     <meta charset="UTF-8"/>
     <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.css"/>
     <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Page.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Table.css"/>
     @if (Model.DoubleSided) {
         <style>
             @@page :left {

Elwig/Documents/MemberDataSheet.cs

@@ -2,20 +2,20 @@
 using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Elwig.Documents {
     public class MemberDataSheet : BusinessDocument {
 
-        public Season Season;
-        public int Year = Utils.CurrentYear;
-        public Dictionary<string, (string, int, int, int, int)> MemberBuckets;
-        public Dictionary<string, int> BucketAreas;
+        public new static string Name => "Stammdatenblatt";
 
-        public MemberDataSheet(Member m, AppDbContext ctx) : base($"Stammdatenblatt {m.AdministrativeName}", m) {
-            DocumentId = $"Stammdatenblatt {m.MgNr}";
-            Season = ctx.Seasons.Find(Year) ?? throw new ArgumentException("invalid season");
-            MemberBuckets = ctx.GetMemberBuckets(Year, m.MgNr).GetAwaiter().GetResult();
-            BucketAreas = ctx.GetMemberBucketAreas(Year, m.MgNr).GetAwaiter().GetResult();
+        public Season Season;
+        public Dictionary<string, MemberBucket> MemberBuckets;
+
+        public MemberDataSheet(Member m, AppDbContext ctx) : base($"{Name} {m.AdministrativeName}", m) {
+            DocumentId = $"{Name} {m.MgNr}";
+            Season = ctx.Seasons.ToList().MaxBy(s => s.Year) ?? throw new ArgumentException("invalid season");
+            MemberBuckets = ctx.GetMemberBuckets(Season.Year, m.MgNr).GetAwaiter().GetResult();
         }
     }
-}
+}

Elwig/Documents/MemberDataSheet.cshtml

@@ -1,4 +1,5 @@
 @using RazorLight
+@using Elwig.Helpers
 @inherits TemplatePage<Elwig.Documents.MemberDataSheet>
 @model Elwig.Documents.MemberDataSheet
 @{
@@ -7,166 +8,146 @@
 <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberDataSheet.css" />
 <main>
     <h1>@Model.Title</h1>
-    <table class="member">
-        <thead>
-            <tr><th colspan="4">Persönliche Daten</th></tr>
-        </thead>
+    <table class="member border">
+        <colgroup>
+            <col style="width: 30.0mm;"/>
+            <col style="width: 51.5mm;"/>
+            <col style="width: 20.0mm;"/>
+            <col style="width: 12.0mm;"/>
+            <col style="width: 18.0mm;"/>
+            <col style="width: 31.5mm;"/>
+        </colgroup>
         <tbody>
+            <tr class="sectionheading"><th colspan="6">Persönliche Daten</th></tr>
             <tr>
-                <th>Mitglieds-Nr.</th>
+                <th class="small">Titel (vorangestellt)</th>
+                <th class="small">Vorname</th>
+                <th colspan="3" class="small">Nachname</th>
+                <th class="small">Titel (nachgestellt)</th>
+            </tr>
+            <tr>
+                <td class="large">@Model.Member.Prefix</td>
+                <td class="large">@Model.Member.GivenName @Model.Member.MiddleName</td>
+                <td class="large" colspan="3">@Model.Member.FamilyName</td>
+                <td class="large">@Model.Member.Suffix</td>
+            </tr>
+            <tr>
+                <th>Mitglieds-Nr.:</th>
                 <td>@Model.Member.MgNr</td>
-                <th>Vorgänger MgNr.</th>
-                <td>@Model.Member.PredecessorMgNr</td>
+                <th colspan="2">Geburtsjahr/-tag:</th>
+                <td colspan="2">@(string.Join('.', Model.Member.Birthday?.Split('-')?.Reverse() ?? Array.Empty<string>()))</td>
             </tr>
             <tr>
-                <th>Titel (vorangestellt)</th>
-                <td>@Model.Member.Prefix</td>
-                <th>Titel (nachgestellt)</th>
-                <td>@Model.Member.Suffix</td>
+                <th>Adresse:</th>
+                <td colspan="5">@Model.Member.Address</td>
             </tr>
             <tr>
-                <th>Vorname</th>
-                <td>@Model.Member.GivenName</td>
-                <th>Nachname</th>
-                <td>@Model.Member.FamilyName</td>
+                <th>PLZ/Ort:</th>
+                <td colspan="5">
+                    @Model.Member.PostalDest.AtPlz?.Plz
+                    @Model.Member.PostalDest.AtPlz?.Dest
+                    (@Model.Member.PostalDest.AtPlz?.Ort.Name)
+                </td>
+            </tr>
+            <tr class="sectionheading"><th colspan="6">Rechnungsadresse (optional)</th></tr>
+            <tr>
+                <th>Name:</th>
+                <td colspan="5">@Model.Member.BillingAddress?.Name</td>
             </tr>
             <tr>
-                <th>Weitere Vornamen</th>
-                <td colspan="3">@Model.Member.MiddleName</td>
+                <th>Adresse:</th>
+                <td colspan="5">@Model.Member.BillingAddress?.Address</td>
             </tr>
             <tr>
-                <th>Geburtsjahr/-tag</th>
-                <td colspan="3">@(string.Join('.', Model.Member.Birthday?.Split('-')?.Reverse()??Array.Empty<string>()))</td>
-            </tr>
-        </tbody>
-
-        <thead>
-            <tr><th colspan="4">Anschrift</th></tr>
-        </thead>
-        <tbody>
-            <tr>
-                <th>Adresse</th>
-                <td colspan="3">@Model.Member.Address</td>
-            </tr>
-            <tr>
-                <th>PLZ/Ort</th>
-                <td colspan="3">@Model.Member.PostalDest.AtPlz?.Plz @Model.Member.PostalDest.AtPlz?.Dest (@Model.Member.PostalDest.AtPlz?.Ort.Name)</td>
-            </tr>
-        </tbody>
-
-        <thead>
-            <tr><th colspan="4">Rechnungsadresse</th></tr>
-        </thead>
-        <tbody>
-            <tr>
-                <th>Name</th>
-                <td colspan="3">@Model.Member.BillingAddress?.Name</td>
-            </tr>
-            <tr>
-                <th>Adresse</th>
-                <td colspan="3">@Model.Member.BillingAddress?.Address</td>
-            </tr>
-            <tr>
-                <th>PLZ/Ort</th>
-                <td colspan="3">@Model.Member.BillingAddress?.PostalDest.AtPlz?.Plz @Model.Member.BillingAddress?.PostalDest.AtPlz?.Dest @((Model.Member.BillingAddress != null && Model.Member.BillingAddress.PostalDest.AtPlz != null) ? "(" + Model.Member.BillingAddress?.PostalDest.AtPlz?.Ort.Name + ")" : "")</td>
-            </tr>
-        </tbody>
-        
-        <thead>
-            <tr><th colspan="4">Kontaktdaten</th></tr>
-        </thead>
-        <tbody>
-            @foreach (var e in Model.Member.EmailAddresses) {
-                var emailNumber = Model.Member.EmailAddresses.Count > 1 ? 1 : 0;
-                <tr>
-                    <th>E-Mail-Adresse @(emailNumber != 0 ? $"({emailNumber})" : "")</th>
-                    <td colspan="3">@e.Address</td>
-                </tr>
-                emailNumber++;
-            }
-            @foreach (var k in Model.Member.TelephoneNumbers) {
-                <tr>
-                    @if (k.Type.Equals("landline")) {
-                        <th>Tel.-Nr. (Festnetz)</th>
-                    } else if (k.Type.Equals("mobile")) {
-                        <th>Tel.-Nr. (mobil)</th>
-                    } else if (k.Type.Equals("fax")) {
-                        <th>Fax-Nr.</th>
+                <th>PLZ/Ort:</th>
+                <td colspan="5">
+                    @if (Model.Member.BillingAddress != null) {
+                        @Model.Member.BillingAddress.PostalDest.AtPlz?.Plz
+                        @Model.Member.BillingAddress.PostalDest.AtPlz?.Dest
+                        @("(")@Model.Member.BillingAddress.PostalDest.AtPlz?.Ort.Name@(")")
                     }
-                    <td colspan="3">@k.Number</td>
+                </td>
+            </tr>
+            <tr class="sectionheading">
+                <th colspan="3">Kontaktdaten</th>
+                <th colspan="3" class="lborder">Bankverbindung</th>
+            </tr>
+            @{
+                List<string?[]> subTbl1 = new();
+                subTbl1.AddRange(Model.Member.EmailAddresses.Select(a => new[] { "E-Mail-Adresse", a.Address }));
+                subTbl1.AddRange(Model.Member.TelephoneNumbers.Select(n => new[] { Utils.PhoneNrTypeToString(n.Type), n.Number, n.Comment }));
+                subTbl1.Add(new[] { "Tel.-Nr./E-Mail-Adr.", null });
+
+                List<string?[]> subTbl2 = new();
+                subTbl2.Add(new[] { "IBAN", Model.Member.Iban != null ? Elwig.Helpers.Utils.FormatIban(Model.Member.Iban) : null });
+                subTbl2.Add(new[] { "BIC", Model.Member.Bic });
+            }
+            @for (int i = 0; i < Math.Max(subTbl1.Count, subTbl2.Count); i++) {
+                <tr>
+                    <th>@(i < subTbl1.Count ? subTbl1[i][0] + ":" : "")</th>
+                    @if (i < subTbl1.Count && subTbl1[i].Length >= 3 && subTbl1[i][2] != null) {
+                        <td>@subTbl1[i][1]</td>
+                        <td>(@subTbl1[i][2])</td>
+                    } else {
+                        <td colspan="2">@(i < subTbl1.Count ? subTbl1[i][1] : "")</td>
+                    }
+
+                    <th class="lborder">@(i < subTbl2.Count ? subTbl2[i][0] + ":" : "")</th>
+                    <td colspan="2">@(i < subTbl2.Count ? subTbl2[i][1] : "")</td>
                 </tr>
             }
-        </tbody>
-
-        <thead>
-            <tr><th colspan="4">Bankverbindung</th></tr>
-        </thead>
-        <tbody>
+            <tr class="sectionheading"><th colspan="6">Betrieb</th></tr>
             <tr>
-                <th>IBAN</th>
-                <td colspan="3">@(Model.Member.Iban != null ? Elwig.Helpers.Utils.FormatIban(Model.Member.Iban) : "")</td>
-            </tr>
-            <tr>
-                <th>BIC</th>
-                <td colspan="3">@Model.Member.Bic</td>
-            </tr>
-        </tbody>
-
-        <thead>
-            <tr><th colspan="4">Betrieb</th></tr>
-        </thead>
-        <tbody>
-            <tr>
-                <th>UID</th>
-                <td>@Model.Member.UstIdNr</td>
-                <th>Betriebs-Nr.</th>
+                <th>Betriebs-Nr.:</th>
                 <td>@Model.Member.LfbisNr</td>
+                <th colspan="2">UID:</th>
+                <td colspan="2">@Model.Member.UstIdNr</td>
             </tr>
             <tr>
-                <th>Buchführend</th>
-                <td>@(Model.Member.IsBuchführend ? "Ja" : "Nein")</td>
-                <th>Bio</th>
-                <td>@(Model.Member.IsOrganic ? "Ja" : "Nein")</td>
-            </tr>
-        </tbody>
-
-        <thead>
-            <tr><th colspan="4">Genossenschaft</th></tr>
-        </thead>
-        <tbody>
-            <tr>
-                <th>Eintritt</th>
-                <td>@Model.Member.EntryDate</td>
-                <th>Austritt</th>
-                <td>@Model.Member.ExitDate</td>
-            </tr>
-            <tr>
-                <th>Aktiv</th>
-                <td>@(Model.Member.IsActive ? "Ja" : "Nein")</td>
-                <th>Geschäftsanteile</th>
-                <td>@Model.Member.BusinessShares</td>
-            </tr>
-            <tr>
-                <th>Volllierferant</th>
-                <td>@(Model.Member.IsVollLieferant ? "Ja" : "Nein")</td>
-                <th>Funktionär</th>
-                <td>@(Model.Member.IsFunktionär ? "Ja" : "Nein")</td>
-            </tr>
-            <tr>
-                <th>Stamm-Zweigstelle</th>
-                <td>@Model.Member.Branch?.Name</td>
-                <th>Stammgemeinde</th>
+                <th>Stammgemeinde:</th>
                 <td>@Model.Member.DefaultKg?.Name</td>
+                <th colspan="2">Buchführend:</th>
+                <td colspan="2">@(Model.Member.IsBuchführend ? "Ja" : "Nein")</td>
             </tr>
             <tr>
-                <th>Kontakt via Post</th>
-                <td>@(Model.Member.ContactViaPost ? "Ja" : "Nein")</td>
-                <th>Kontakt via E-Mail</th>
-                <td>@(Model.Member.ContactViaEmail ? "Ja" : "Nein")</td>
+                <th colspan="2" class="small">(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)</th>
+                <th colspan="2">Bio:</th>
+                <td colspan="2">@(Model.Member.IsOrganic ? "Ja" : "Nein")</td>
+            </tr>
+            <tr class="sectionheading"><th colspan="6">Genossenschaft</th></tr>
+            <tr>
+                <th>Status:</th>
+                <td>
+                    @(Model.Member.IsActive ? "Aktiv" : "Nicht aktiv")
+                    <span class="small">
+                        (@(Model.Member.ExitDate != null ?
+                        $"{Model.Member.EntryDate:dd.MM.yyyy}–{Model.Member.ExitDate:dd.MM.yyyy}" :
+                        $"seit {Model.Member.EntryDate:dd.MM.yyyy}"))
+                    </span>
+                </td>
+                <th colspan="2">Geschäftsanteile:</th>
+                <td colspan="2">@Model.Member.BusinessShares</td>
+            </tr>
+            <tr>
+                <th>Stamm-Zweigstelle:</th>
+                <td>@Model.Member.Branch?.Name</td>
+                <th colspan="2">Volllierferant:</th>
+                <td colspan="2">@(Model.Member.IsVollLieferant ? "Ja" : "Nein")</td>
+            </tr>
+            <tr>
+                <th>Zusendungen via...</th>
+                <td>
+                    <i>Post:</i> @(Model.Member.ContactViaPost ? "Ja" : "Nein") –
+                    <i>E-Mail:</i> @(Model.Member.ContactViaEmail ? "Ja" : "Nein")
+                </td>
+                <th colspan="2">Funktionär:</th>
+                <td colspan="2">@(Model.Member.IsFunktionär ? "Ja" : "Nein")</td>
             </tr>
         </tbody>
     </table>
 
+    @Raw(Model.PrintBucketTable(Model.Season, Model.MemberBuckets, includeDelivery: false))
+
     @{
         var areaComs = Model.Member.ActiveAreaCommitments.GroupBy(a => a.AreaComType).Select(group => new {
             AreaComType = group.Key,
@@ -177,15 +158,15 @@
     }
 
     @if (areaComs.Count != 0) {
-        <h1>Flächenbindungen</h1>
+        <h2>Flächenbindungen per @($"{Model.Date:dd.MM.yyyy}")</h2>
         <table class="area-commitements">
             <colgroup>
-                <col style="width: 40mm;" />
-                <col style="width: 30mm;" />
-                <col style="width: 35mm;" />
-                <col style="width: 15mm;" />
-                <col style="width: 25mm;" />
-                <col style="width: 20mm;" />
+                <col style="width: 40mm;"/>
+                <col style="width: 30mm;"/>
+                <col style="width: 35mm;"/>
+                <col style="width: 15mm;"/>
+                <col style="width: 25mm;"/>
+                <col style="width: 20mm;"/>
             </colgroup>
             <thead>
                 <tr>
@@ -201,124 +182,32 @@
                 </tr>
             </thead>
             <tbody>
-
                 @foreach (var contractType in areaComs) {
-                    <tr class="contract-type @(contractType.AreaComType.DisplayName != lastContract && lastContract != "" ? "new" : "")">
-                        <th colspan="3" style="text-align: left">
+                    <tr class="subheading @(contractType.AreaComType.DisplayName != lastContract && lastContract != "" ? "new" : "")">
+                        <th colspan="3">
                             @($"{contractType.AreaComType.WineVar.Name} {(contractType.AreaComType.WineAttr != null ? "(" + contractType.AreaComType.WineAttr + ")" : "")}")
                         </th>
-                        <th style="text-align: right">@($"{contractType.Size:N0}")</th>
-                        <th colspan="2"></th>
+                        <td class="number">@($"{contractType.Size:N0}")</td>
+                        <td colspan="2"></td>
                     </tr>
                     @foreach (var areaCom in contractType.AreaComs) {
                         <tr class="area-commitment">
-                            <td>@areaCom.Kg.AtKg.Name <span style="font-size: 8pt;">(@areaCom.Kg.AtKg.KgNr)</span></td>
+                            <td>@areaCom.Kg.AtKg.Name <span style="font-size: 8pt;">(@($"{areaCom.Kg.AtKg.KgNr:00000}"))</span></td>
                             <td>@areaCom.Rd?.Name</td>
-                            <td>@areaCom.GstNr.Replace(",", ", ")</td>
-                            <td style="text-align: right;">@($"{areaCom.Area:N0}")</td>
-                            <td style="text-align: center;">@areaCom.WineCult.Name</td>
-                            <td style="text-align: center;">Ab @areaCom.YearFrom</td>
+                            <td class="text">@areaCom.GstNr.Replace(",", ", ").Replace("-", "–")</td>
+                            <td class="number">@($"{areaCom.Area:N0}")</td>
+                            <td class="center">@areaCom.WineCult.Name</td>
+                            <td class="center">@(areaCom.YearTo == null ? $"ab {areaCom.YearFrom}" : $"{areaCom.YearFrom}–{areaCom.YearTo}")</td>
                         </tr>
                         lastContract = contractType.AreaComType.DisplayName;
                     }
                 }
-
-                <tr class="new">
-                    <th colspan="3" style="text-align: left">Gesamt</th>
-                    <th style="text-align: right">@($"{Model.Member.ActiveAreaCommitments.Select(a => a.Area).Sum():N0}")</th>
-                    <th colspan="2"></th>
-                </tr>
-
-            </tbody>
-        </table>
-
-        <table class="delivery-confirmation-stats">
-            <colgroup>
-                <col style="width: 102mm;" />
-                <col style="width: 21mm;" />
-                <col style="width: 21mm;" />
-                <col style="width: 21mm;" />
-            </colgroup>
-            <thead>
-                <tr>
-                    <th rowspan="2"></th>
-                    <th style="text-align: center;">Fläche</th>
-                    <th style="text-align: center;">Lieferpflicht</th>
-                    <th style="text-align: center;">Lieferrecht</th>
-                </tr>
-                <tr>
-                    <th style="text-align: center;">[m²]</th>
-                    <th style="text-align: center;">[kg]</th>
-                    <th style="text-align: center;">[kg]</th>
-                </tr>
-            </thead>
-            <tbody>
-                @{
-                    string FormatRow(int mode, int area, int obligation, int right) {
-                        return $"<td>{(mode == 0 || mode == 1 ? "" : area == 0 ? "-" : $"{area:N0}")}</td>" +
-                        $"<td>{(mode == 1 ? "" : obligation == 0 ? "-" : $"{obligation:N0}")}</td>" +
-                        $"<td>{(mode == 1 ? "" : right == 0 ? "-" : $"{right:N0}")}</td>";
-                    }
-                    var mBuckets = Model.MemberBuckets.Where(b => b.Value.Item2 > 0 || b.Value.Item3 > 0 || b.Value.Item4 > 0).ToList();
-                    var fbVars = mBuckets.Where(b => b.Value.Item2 > 0 || b.Value.Item3 > 0).Select(b => b.Key.Replace("_", "")).Order().ToArray();
-                    var fbs = mBuckets.Where(b => fbVars.Contains(b.Key) && b.Key.Length == 2).OrderBy(b => b.Value.Item1);
-                    var vtr = mBuckets.Where(b => fbVars.Contains(b.Key) && b.Key.Length > 2).OrderBy(b => b.Value.Item1);
-                }
-                <tr>
-                    <th>Laut gezeichneten GA</th>
-                    @Raw(FormatRow(
-                        0,
-                        0,
-                        Model.Member.BusinessShares * Model.Season.MinKgPerBusinessShare,
-                        Model.Member.BusinessShares * Model.Season.MaxKgPerBusinessShare
-                        ))
-                </tr>
-                @if (fbs.Any()) {
-                    <tr class="subheading"><th colspan="8">Flächenbindungen:</th></tr>
-                }
-                @foreach (var (id, (name, right, obligation, _, _)) in fbs) {
-                    <tr>
-                        <th>@name</th>
-                        @Raw(FormatRow(2, Model.BucketAreas[id], obligation, right))
-                    </tr>
-                }
-                @if (vtr.Any()) {
-                    <tr class="subheading"><th colspan="8">Verträge:</th></tr>
-                }
-                @foreach (var (id, (name, right, obligation, _, _)) in vtr) {
-                    <tr>
-                        <th>@name</th>
-                        @Raw(FormatRow(2, Model.BucketAreas[id], obligation, right))
-                    </tr>
-                }
-            </tbody>
-        </table>
-    } else {
-        <table class="delivery-confirmation-stats" style="margin-top: 5mm;">
-            <colgroup>
-                <col style="width: 123mm;" />
-                <col style="width: 21mm;" />
-                <col style="width: 21mm;" />
-            </colgroup>
-            <thead>
-                <tr>
-                    <th rowspan="2"></th>
-                    <th style="text-align: center;">Lieferpflicht</th>
-                    <th style="text-align: center;">Lieferrecht</th>
-                </tr>
-                <tr>
-                    <th style="text-align: center;">[kg]</th>
-                    <th style="text-align: center;">[kg]</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    <th>Laut gezeichneten GA</th>
-                    <td>@($"{Model.Member.BusinessShares * Model.Season.MinKgPerBusinessShare:N0}")</td>
-                    <td>@($"{Model.Member.BusinessShares * Model.Season.MaxKgPerBusinessShare:N0}")</td>
+                <tr class="sum bold">
+                    <td colspan="3">Gesamt:</td>
+                    <td class="number">@($"{Model.Member.ActiveAreaCommitments.Select(a => a.Area).Sum():N0}")</td>
+                    <td colspan="2"></td>
                 </tr>
             </tbody>
         </table>
     }
-
 </main>

Elwig/Documents/MemberDataSheet.css

@@ -1,82 +1,24 @@
-table.member {
-    border: 0.5pt solid black;
+
+h2 {
+    margin-bottom: 0.5em !important;
 }
 
-table.member, table.area-commitements {
-    font-size: 10pt;
+table.member {
+    margin-bottom: 5mm;
 }
 
-table.member tbody th {
-    font-weight: normal;
-    font-style: italic;
-    text-align: left;
-}
-
-
-table.member thead,
-table.member tbody {
-    border: 0.5pt solid black;
+table.area-commitements {
+    margin-top: 0;
 }
 
 table.area-commitements td {
-    overflow: hidden;
-}
-
-table.area-commitements thead tr th {
-    font-weight: normal;
-    font-style: italic; 
-}
-
-table.area-commitements tbody tr.contract-type {
-    margin-bottom: 10px;
-}
-
-table.area-commitements tbody td {
     vertical-align: top;
 }
 
-table.area-commitements tr.new th {
-    border-top: 0.5pt solid black;
+table.area-commitements td.text {
+    white-space: normal;
 }
 
-table.delivery-confirmation-stats {
-    font-size: 10pt;
-    break-inside: avoid;
+table.area-commitements tr.sum {
+    font-size: 12pt;
 }
-
-table.delivery-confirmation-stats th,
-table.delivery-confirmation-stats td {
-    padding: 0.125mm 0;
-    overflow: hidden;
-    white-space: nowrap;
-}
-
-table.delivery-confirmation-stats tr.subheading th {
-    text-align: left;
-}
-
-table.delivery-confirmation-stats thead th {
-    font-weight: normal;
-    font-style: italic;
-    text-align: right;
-    font-size: 10pt;
-}
-
-table.delivery-confirmation-stats thead th:first-child {
-    text-align: left;
-}
-
-table.delivery-confirmation-stats td {
-    text-align: right;
-}
-
-table.delivery-confirmation-stats tbody th {
-    font-weight: normal;
-    font-style: italic;
-    text-align: left;
-}
-
-table.delivery-confirmation-stats tr.subheading th {
-    font-weight: bold;
-    border-top: 0.5pt solid black;
-}

Elwig/Elwig.csproj

@@ -2,18 +2,20 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.5.1</Version>
+    <Version>0.6.3</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 
   <ItemGroup>
     <Resource Include="Resources\Images\Elwig.png" />
     <Content Include="Resources\Images\Elwig.ico" />
+    <EmbeddedResource Include="Resources\Schemas\PaymentVariantData.json" />
+    <EmbeddedResource Include="Resources\Sql\*" />
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
@@ -22,16 +24,17 @@
 
   <ItemGroup>
     <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.24" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.13" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.13" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2088.41" />
+    <PackageReference Include="LinqKit" Version="1.2.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.26" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2210.55" />
+    <PackageReference Include="NJsonSchema" Version="11.0.0" />
     <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="4.1.68" />
-    <PackageReference Include="System.IO.Ports" Version="7.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.19" />
+    <PackageReference Include="System.IO.Ports" Version="8.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
   </ItemGroup>
 
 </Project>

Elwig/Helpers/AppDbContext.cs

@@ -10,8 +10,14 @@ using Microsoft.Data.Sqlite;
 using System.Text.RegularExpressions;
 using System.Collections.Generic;
 using Elwig.Models.Dtos;
+using System.Reflection;
 
 namespace Elwig.Helpers {
+
+    public record struct AreaComBucket(int Area, int Obligation, int Right);
+    public record struct UnderDelivery(int Weight, int Diff);
+    public record struct MemberBucket(string Name, int Area, int Obligation, int Right, int Delivery, int DeliveryStrict, int Payment);
+
     public class AppDbContext : DbContext {
 
         public DbSet<Country> Countries { get; private set; }
@@ -38,6 +44,7 @@ namespace Elwig.Helpers {
         public DbSet<Member> Members { get; private set; }
         public DbSet<BillingAddr> BillingAddresses { get; private set; }
         public DbSet<MemberTelNr> MemberTelephoneNrs { get; private set; }
+        public DbSet<MemberHistory> MemberHistory { get; private set; }
         public DbSet<AreaCom> AreaCommitments { get; private set; }
         public DbSet<Season> Seasons { get; private set; }
         public DbSet<Modifier> Modifiers { get; private set; }
@@ -51,6 +58,7 @@ namespace Elwig.Helpers {
         public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; }
         public DbSet<AreaComUnderDeliveryRowSingle> AreaComUnderDeliveryRows { get; private set; }
         public DbSet<MemberDeliveryPerVariantRowSingle> MemberDeliveryPerVariantRows { get; private set; }
+        public DbSet<CreditNoteDeliveryRowSingle> CreditNoteDeliveryRows { get; private set; }
         public DbSet<CreditNoteRowSingle> CreditNoteRows { get; private set; }
 
         private readonly StreamWriter? LogFile = null;
@@ -58,12 +66,14 @@ namespace Elwig.Helpers {
         public DateTime SavedLastWriteTime { get; private set; }
         public bool HasBackendChanged => SavedLastWriteTime != LastWriteTime;
 
-        public static string ConnectionString => $"Data Source=\"{App.Config.DatabaseFile}\"; Foreign Keys=True; Mode=ReadWrite; Cache=Default";
+        public static string? ConnectionStringOverride { get; set; } = null;
+        public static string ConnectionString => ConnectionStringOverride ?? $"Data Source=\"{App.Config.DatabaseFile}\"; Mode=ReadWrite; Foreign Keys=True; Cache=Default";
 
-        private readonly Dictionary<int, Dictionary<int, Dictionary<string, (int, int)>>> _memberRightsAndObligations = new();
-        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBuckets = new();
-        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberPaymentBuckets = new();
-        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberBucketAreas = new();
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, AreaComBucket>>> _memberAreaCommitmentBuckets = [];
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBuckets = [];
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBucketsStrict = [];
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberPaymentBuckets = [];
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, UnderDelivery>>> _memberUnderDelivery = [];
 
         public AppDbContext() {
             if (App.Config.DatabaseLog != null) {
@@ -94,6 +104,24 @@ namespace Elwig.Helpers {
             return cnx;
         }
 
+        public static async Task ExecuteBatch(SqliteConnection cnx, string sql) {
+            using var cmd = cnx.CreateCommand();
+            cmd.CommandText = sql;
+            await (await cmd.ExecuteReaderAsync()).CloseAsync();
+        }
+
+        public static async Task ExecuteEmbeddedScript(SqliteConnection cnx, Assembly asm, string name) {
+            using var stream = asm.GetManifestResourceStream(name) ?? throw new FileNotFoundException("Unable to load embedded resource");
+            using var reader = new StreamReader(stream);
+            await ExecuteBatch(cnx, await reader.ReadToEndAsync());
+        }
+
+        public static async Task<object?> ExecuteScalar(SqliteConnection cnx, string sql) {
+            using var cmd = cnx.CreateCommand();
+            cmd.CommandText = sql;
+            return await cmd.ExecuteScalarAsync();
+        }
+
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) {
             optionsBuilder.UseSqlite(ConnectionString);
             optionsBuilder.UseLazyLoadingProxies();
@@ -174,6 +202,13 @@ namespace Elwig.Helpers {
             return c + 1;
         }
 
+        public async Task<int> NextAvNr(int year) {
+            int c = 0;
+            (await PaymentVariants.Where(v => v.Year == year).Select(v => v.AvNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
+        }
+
         public async Task<WineQualLevel> GetWineQualityLevel(double kmw) {
             return await WineQualityLevels
                 .Where(q => !q.IsPredicate && (q.MinKmw == null || q.MinKmw <= kmw))
@@ -203,22 +238,22 @@ namespace Elwig.Helpers {
             }
         }
 
-        private async Task FetchMemberRightsAndObligations(int year, SqliteConnection? cnx = null) {
+        private async Task FetchMemberAreaCommitmentBuckets(int year, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();
-            var buckets = new Dictionary<int, Dictionary<string, (int, int)>>();
+            var buckets = new Dictionary<int, Dictionary<string, AreaComBucket>>();
             using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"SELECT mgnr, bucket, min_kg, max_kg FROM v_area_commitment_bucket WHERE year = {year}";
+                cmd.CommandText = $"SELECT mgnr, bucket, area, min_kg, max_kg FROM v_area_commitment_bucket WHERE year = {year}";
                 using var reader = await cmd.ExecuteReaderAsync();
                 while (await reader.ReadAsync()) {
                     var mgnr = reader.GetInt32(0);
                     var vtrgid = reader.GetString(1);
-                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
-                    buckets[mgnr][vtrgid] = (reader.GetInt32(3), reader.GetInt32(2));
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = [];
+                    buckets[mgnr][vtrgid] = new(reader.GetInt32(2), reader.GetInt32(3), reader.GetInt32(4));
                 }
             }
             if (ownCnx) await cnx.DisposeAsync();
-            _memberRightsAndObligations[year] = buckets;
+            _memberAreaCommitmentBuckets[year] = buckets;
         }
 
         private async Task FetchMemberDeliveryBuckets(int year, SqliteConnection? cnx = null) {
@@ -231,7 +266,7 @@ namespace Elwig.Helpers {
                 while (await reader.ReadAsync()) {
                     var mgnr = reader.GetInt32(0);
                     var bucket = reader.GetString(1);
-                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = [];
                     buckets[mgnr][bucket] = reader.GetInt32(2);
                 }
             }
@@ -239,6 +274,24 @@ namespace Elwig.Helpers {
             _memberDeliveryBuckets[year] = buckets;
         }
 
+        private async Task FetchMemberDeliveryBucketsStrict(int year, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var buckets = new Dictionary<int, Dictionary<string, int>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bucket, weight FROM v_delivery_bucket_strict WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var bucket = reader.GetString(1);
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = [];
+                    buckets[mgnr][bucket] = reader.GetInt32(2);
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberDeliveryBucketsStrict[year] = buckets;
+        }
+
         private async Task FetchMemberPaymentBuckets(int year, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();
@@ -249,7 +302,7 @@ namespace Elwig.Helpers {
                 while (await reader.ReadAsync()) {
                     var mgnr = reader.GetInt32(0);
                     var bucket = reader.GetString(1);
-                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = [];
                     buckets[mgnr][bucket] = reader.GetInt32(2);
                 }
             }
@@ -257,71 +310,75 @@ namespace Elwig.Helpers {
             _memberPaymentBuckets[year] = buckets;
         }
 
-        private async Task FetchMemberBucketAreas(int year, SqliteConnection? cnx = null) {
+        private async Task FetchMemberUnderDelivery(int year, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();
-            var buckets = new Dictionary<int, Dictionary<string, int>>();
+            var buckets = new Dictionary<int, Dictionary<string, UnderDelivery>>();
             using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"SELECT mgnr, bucket, area FROM v_area_commitment_bucket_strict WHERE year = {year}";
+                cmd.CommandText = $"SELECT mgnr, bucket, weight, diff FROM v_under_delivery WHERE year = {year}";
                 using var reader = await cmd.ExecuteReaderAsync();
                 while (await reader.ReadAsync()) {
                     var mgnr = reader.GetInt32(0);
                     var bucket = reader.GetString(1);
-                    var v = reader.GetInt32(2);
-                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
-                    buckets[mgnr][bucket] = v;
-                    if (bucket.Length > 2) {
-                        buckets[mgnr][bucket[..2]] = buckets[mgnr].GetValueOrDefault(bucket[..2], 0) + v;
-                    }
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = [];
+                    buckets[mgnr][bucket] = new(reader.GetInt32(2), reader.GetInt32(3));
                 }
             }
             if (ownCnx) await cnx.DisposeAsync();
-            _memberBucketAreas[year] = buckets;
+            _memberUnderDelivery[year] = buckets;
         }
 
-        public async Task<Dictionary<string, (int, int)>> GetMemberRightsAndObligations(int year, int mgnr, SqliteConnection? cnx = null) {
-            if (!_memberRightsAndObligations.ContainsKey(year))
-                await FetchMemberRightsAndObligations(year, cnx);
-            return _memberRightsAndObligations[year].GetValueOrDefault(mgnr, new());
+        public async Task<Dictionary<string, AreaComBucket>> GetMemberAreaCommitmentBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberAreaCommitmentBuckets.ContainsKey(year))
+                await FetchMemberAreaCommitmentBuckets(year, cnx);
+            return _memberAreaCommitmentBuckets[year].GetValueOrDefault(mgnr, []);
         }
 
         public async Task<Dictionary<string, int>> GetMemberDeliveryBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
             if (!_memberDeliveryBuckets.ContainsKey(year))
                 await FetchMemberDeliveryBuckets(year, cnx);
-            return _memberDeliveryBuckets[year].GetValueOrDefault(mgnr, new());
+            return _memberDeliveryBuckets[year].GetValueOrDefault(mgnr, []);
+        }
+
+        public async Task<Dictionary<string, int>> GetMemberDeliveryBucketsStrict(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberDeliveryBucketsStrict.ContainsKey(year))
+                await FetchMemberDeliveryBucketsStrict(year, cnx);
+            return _memberDeliveryBucketsStrict[year].GetValueOrDefault(mgnr, []);
         }
 
         public async Task<Dictionary<string, int>> GetMemberPaymentBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
             if (!_memberPaymentBuckets.ContainsKey(year))
                 await FetchMemberPaymentBuckets(year, cnx);
-            return _memberPaymentBuckets[year].GetValueOrDefault(mgnr, new());
+            return _memberPaymentBuckets[year].GetValueOrDefault(mgnr, []);
         }
 
-        public async Task<Dictionary<string, int>> GetMemberBucketAreas(int year, int mgnr, SqliteConnection? cnx = null) {
-            if (!_memberBucketAreas.ContainsKey(year))
-                await FetchMemberBucketAreas(year, cnx);
-            return _memberBucketAreas[year].GetValueOrDefault(mgnr, new());
+        public async Task<Dictionary<string, UnderDelivery>> GetMemberUnderDelivery(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberUnderDelivery.ContainsKey(year))
+                await FetchMemberUnderDelivery(year, cnx);
+            return _memberUnderDelivery[year].GetValueOrDefault(mgnr, []);
         }
 
-        public async Task<Dictionary<string, (string, int, int, int, int)>> GetMemberBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
+        public async Task<Dictionary<string, MemberBucket>> GetMemberBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();
-            var rightsAndObligations = await GetMemberRightsAndObligations(year, mgnr, cnx);
+            var rightsAndObligations = await GetMemberAreaCommitmentBuckets(year, mgnr, cnx);
             var deliveryBuckets = await GetMemberDeliveryBuckets(year, mgnr, cnx);
+            var deliveryBucketsStrict = await GetMemberDeliveryBucketsStrict(year, mgnr, cnx);
             var paymentBuckets = await GetMemberPaymentBuckets(year, mgnr, cnx);
             if (ownCnx) await cnx.DisposeAsync();
 
-            var buckets = new Dictionary<string, (string, int, int, int, int)>();
+            var buckets = new Dictionary<string, MemberBucket>();
             foreach (var id in rightsAndObligations.Keys.Union(deliveryBuckets.Keys).Union(paymentBuckets.Keys)) {
                 var variety = await WineVarieties.FindAsync(id[..2]);
-                var attrIds = id[2..];
-                var attrs = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync();
-                var name = (variety?.Name ?? "") + (attrIds == "_" ? " (kein Qual.Wein)" : attrs.Count > 0 ? $" ({string.Join(" / ", attrs.Select(a => a.Name))})" : "");
-                buckets[id] = (
+                var attribute = await WineAttributes.FindAsync(id[2..]);
+                var name = (variety?.Name ?? "") + (id[2..] == "_" ? " (kein Qual.Wein)" : attribute != null ? $" ({attribute})" : "");
+                buckets[id] = new(
                     name,
-                    rightsAndObligations.GetValueOrDefault(id).Item1,
-                    rightsAndObligations.GetValueOrDefault(id).Item2,
+                    rightsAndObligations.GetValueOrDefault(id).Area,
+                    rightsAndObligations.GetValueOrDefault(id).Obligation,
+                    rightsAndObligations.GetValueOrDefault(id).Right,
                     deliveryBuckets.GetValueOrDefault(id),
+                    deliveryBucketsStrict.GetValueOrDefault(id),
                     paymentBuckets.GetValueOrDefault(id)
                 );
             }

Elwig/Helpers/AppDbUpdater.cs

@@ -1,717 +1,90 @@
 using Microsoft.Data.Sqlite;
 using System;
-using System.Windows;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
 
 namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
-        public static readonly int RequiredSchemaVersion = 9;
+        // Don't forget to update value in Tests/fetch-resources.bat!
+        public static readonly int RequiredSchemaVersion = 14;
 
-        private static int _versionOffset = 0;
-        private static readonly Action<SqliteConnection>[] _updaters = new[] {
-            UpdateDbSchema_1_To_2, UpdateDbSchema_2_To_3, UpdateDbSchema_3_To_4, UpdateDbSchema_4_To_5,
-            UpdateDbSchema_5_To_6, UpdateDBSchema_6_To_7, UpdateDbSchema_7_To_8, UpdateDbSchema_8_To_9,
-        };
+        private static int VersionOffset = 0;
 
-        private static void ExecuteNonQuery(SqliteConnection cnx, string sql) {
-            using var cmd = cnx.CreateCommand();
-            cmd.CommandText = sql;
-            cmd.ExecuteNonQuery();
-        }
-
-        private static object? ExecuteScalar(SqliteConnection cnx, string sql) {
-            using var cmd = cnx.CreateCommand();
-            cmd.CommandText = sql;
-            return cmd.ExecuteScalar();
-        }
-
-        public static string CheckDb() {
+        public static async Task<string> CheckDb() {
             using var cnx = AppDbContext.Connect();
 
-            var applId = (long?)ExecuteScalar(cnx, "PRAGMA application_id") ?? 0;
+            var applId = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA application_id") ?? 0;
             if (applId != 0x454C5747) throw new Exception("Invalid application_id of database");
 
-            var schemaVers = (long?)ExecuteScalar(cnx, "PRAGMA schema_version") ?? 0;
-            _versionOffset = (int)(schemaVers % 100);
-            if (_versionOffset != 0) {
+            var schemaVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA schema_version") ?? 0;
+            VersionOffset = (int)(schemaVers % 100);
+            if (VersionOffset != 0) {
                 // schema was modified manually/externally
                 // TODO issue warning
             }
-            UpdateDbSchema(cnx, (int)(schemaVers / 100), RequiredSchemaVersion);
+            await UpdateDbSchema(cnx, (int)(schemaVers / 100), RequiredSchemaVersion);
 
-            var userVers = (long?)ExecuteScalar(cnx, "PRAGMA user_version") ?? 0;
+            var userVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA user_version") ?? 0;
             var major = userVers >> 24;
             var minor = (userVers >> 16) & 0xFF;
             var patch = userVers & 0xFFFF;
 
             if (App.VersionMajor > major ||
                 (App.VersionMajor == major && App.VersionMinor > minor) ||
-                (App.VersionMajor == major && App.VersionMinor == minor && App.VersionPatch > patch))
-            {
+                (App.VersionMajor == major && App.VersionMinor == minor && App.VersionPatch > patch)) {
                 long vers = (App.VersionMajor << 24) | (App.VersionMinor << 16) | App.VersionPatch;
-                ExecuteNonQuery(cnx, $"PRAGMA user_version = {vers}");
+                await AppDbContext.ExecuteBatch(cnx, $"PRAGMA user_version = {vers}");
             }
 
             return $"{major}.{minor}.{patch}";
         }
 
-        private static void UpdateDbSchema(SqliteConnection cnx, int fromVersion, int toVersion) {
+        private static async Task UpdateDbSchema(SqliteConnection cnx, int fromVersion, int toVersion) {
             if (fromVersion == toVersion) {
                 return;
             } else if (fromVersion > toVersion) {
                 throw new Exception("schema_version of database is too new");
-            } else if (toVersion - 1 > _updaters.Length) {
-                throw new Exception("Unable to update database schema: Updater not implemented");
             } else if (fromVersion <= 0) {
                 throw new Exception("schema_version of database is invalid");
             }
 
-            ExecuteNonQuery(cnx, "PRAGMA locking_mode = EXCLUSIVE");
-            ExecuteNonQuery(cnx, "PRAGMA foreign_keys = OFF");
-            ExecuteNonQuery(cnx, "BEGIN EXCLUSIVE");
-            for (int i = fromVersion; i < toVersion; i++) {
-                _updaters[i - 1](cnx);
+            var asm = Assembly.GetExecutingAssembly();
+            (int From, int To, string Name)[] scripts = asm.GetManifestResourceNames()
+                .Where(n => n.StartsWith("Elwig.Resources.Sql."))
+                .Select(n => {
+                    var p = n.Split(".")[^2].Split("-");
+                    return (int.Parse(p[0]), int.Parse(p[1]), n);
+                })
+                .OrderBy(s => s.Item1).ThenBy(s => s.Item2)
+                .ToArray();
+
+            List<string> toExecute = [];
+            var vers = fromVersion;
+            while (vers < toVersion) {
+                var (_, to, name) = scripts.Where(s => s.From == vers).Last();
+                toExecute.Add(name);
+                vers = to;
             }
-            ExecuteNonQuery(cnx, "PRAGMA foreign_key_check");
-            ExecuteNonQuery(cnx, "COMMIT");
-            ExecuteNonQuery(cnx, "PRAGMA foreign_keys = ON");
-            ExecuteNonQuery(cnx, "VACUUM");
-            ExecuteNonQuery(cnx, $"PRAGMA schema_version = {toVersion * 100 + _versionOffset}");
-        }
+            if (toExecute.Count == 0)
+                return;
 
-        private static void UpdateDbSchema_1_To_2(SqliteConnection cnx) {
-            ExecuteNonQuery(cnx, "DROP VIEW v_area_commitment");
-            ExecuteNonQuery(cnx, "ALTER TABLE delivery_part DROP COLUMN weighing_reason");
-            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) {
-            ExecuteNonQuery(cnx, """
-                CREATE TABLE delivery_part_bin (
-                    year     INTEGER NOT NULL,
-                    did      INTEGER NOT NULL,
-                    dpnr     INTEGER NOT NULL,
-                    binnr    INTEGER NOT NULL,
-
-                    discr    TEXT    NOT NULL,
-                    value    INTEGER NOT NULL,
-
-                    CONSTRAINT pk_delivery_part_bin PRIMARY KEY (year, did, dpnr, binnr),
-                    CONSTRAINT fk_delivery_part_bin_delivery_part FOREIGN KEY (year, did, dpnr) REFERENCES delivery_part (year, did, dpnr)
-                        ON UPDATE CASCADE
-                        ON DELETE CASCADE
-                ) STRICT;
+            await AppDbContext.ExecuteBatch(cnx, """
+                PRAGMA locking_mode = EXCLUSIVE;
+                PRAGMA foreign_keys = OFF;
+                BEGIN EXCLUSIVE;
                 """);
-            ExecuteNonQuery(cnx, """
-                INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
-                SELECT year, did, dpnr, 0, '_', bucket_2 + bucket_3
-                FROM payment_delivery_part
-                WHERE COALESCE(bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9) IS NOT NULL
-                ON CONFLICT DO NOTHING;
-                """);
-            ExecuteNonQuery(cnx, """
-                INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
-                SELECT d.year, d.did, d.dpnr, 1, COALESCE(attributes, ''), bucket_1
-                FROM payment_delivery_part p
-                    JOIN v_delivery d ON (d.year, d.did, d.dpnr) = (p.year, p.did, p.dpnr)
-                WHERE COALESCE(bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9) IS NOT NULL
-                ON CONFLICT DO NOTHING;
-                """);
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_1");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_2");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_3");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_4");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_5");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_6");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_7");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_8");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_9");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_1_name");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_2_name");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_3_name");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_4_name");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_5_name");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_6_name");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_7_name");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_8_name");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_9_name");
-
-            ExecuteNonQuery(cnx, "ALTER TABLE delivery_part ADD COLUMN gebunden INTEGER CHECK (gebunden IN (TRUE, FALSE)) DEFAULT NULL");
-
-            ExecuteNonQuery(cnx, "DROP VIEW v_delivery");
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_delivery AS
-                SELECT s.*, GROUP_CONCAT(o.modid) AS modifiers
-                FROM (SELECT p.year, p.did, p.dpnr,
-                             d.date, d.time, d.zwstid, d.lnr, d.lsnr,
-                             m.mgnr, m.family_name, m.given_name,
-                             p.sortid, p.weight, p.kmw, ROUND(p.kmw * (4.54 + 0.022 * p.kmw), 0) AS oe, p.qualid, p.hkid, p.kgnr, p.rdnr,
-                             p.gerebelt, p.gebunden,
-                             p.qualid IN (SELECT l.qualid FROM wine_quality_level l WHERE NOT l.predicate AND (p.kmw >= l.min_kmw OR l.min_kmw IS NULL) ORDER BY l.min_kmw DESC LIMIT 1,100) AS abgewertet,
-                             p.qualid NOT IN ('WEI', 'RSW', 'LDW') AS min_quw,
-                             GROUP_CONCAT(a.attrid) AS attributes,
-                             COALESCE(SUM(a.fill_lower_bins), 0) AS attribute_prio,
-                             d.comment, p.comment AS part_comment
-                    FROM delivery_part p
-                        JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
-                        JOIN member m ON m.mgnr = d.mgnr
-                        LEFT JOIN delivery_part_attribute pa ON (pa.year, pa.did, pa.dpnr) = (p.year, p.did, p.dpnr)
-                        LEFT JOIN wine_attribute a ON a.attrid = pa.attrid
-                    GROUP BY p.year, p.did, p.dpnr
-                    ORDER BY p.year, p.did, p.dpnr, a.attrid) s
-                LEFT JOIN delivery_part_modifier o ON (o.year, o.did, o.dpnr) = (s.year, s.did, s.dpnr)
-                GROUP BY s.year, s.lsnr, s.dpnr
-                ORDER BY s.year, s.lsnr, s.dpnr, o.modid;
-                """);
-
-            ExecuteNonQuery(cnx, "DROP VIEW v_bucket");
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_delivery_bin AS
-                SELECT year, mgnr,
-                       sortid || IIF(min_quw, REPLACE(COALESCE(attributes, ''), ',', ''), '_') AS bin,
-                       SUM(weight) AS weight
-                FROM v_delivery
-                GROUP BY year, mgnr, bin
-                ORDER BY year, mgnr, LENGTH(bin) DESC, bin;
-                """);
-
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_payment_bin AS
-                SELECT d.year, d.mgnr,
-                       sortid || discr AS bin,
-                       SUM(value) AS weight
-                FROM v_delivery d
-                    JOIN delivery_part_bin b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
-                GROUP BY d.year, d.mgnr, bin
-                HAVING SUM(value) > 0
-                ORDER BY d.year, d.mgnr, bin;
-                """);
-
-            ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute ADD COLUMN fill_lower_bins INTEGER NOT NULL CHECK (fill_lower_bins IN (0, 1, 2)) DEFAULT 0");
-        }
-
-        private static void UpdateDbSchema_3_To_4(SqliteConnection cnx) {
-            ExecuteNonQuery(cnx, "DROP VIEW v_payment_bin");
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_payment_bin AS
-                SELECT d.year, d.mgnr,
-                       sortid || discr AS bin,
-                       SUM(value) AS weight
-                FROM v_delivery d
-                    JOIN delivery_part_bin b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
-                GROUP BY d.year, d.mgnr, bin
-                HAVING SUM(value) > 0
-                ORDER BY d.year, d.mgnr, LENGTH(bin) DESC, bin;
-                """);
-
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_area_commitment_bin AS
-                SELECT s.year, c.mgnr,
-                       c.vtrgid AS bin,
-                       CAST(ROUND(SUM(COALESCE(area * min_kg_per_ha, 0)) / 10000.0, 0) AS INTEGER) AS min_kg,
-                       CAST(ROUND(SUM(COALESCE(area * max_kg_per_ha, 0)) / 10000.0, 0) AS INTEGER) AS max_kg
-                FROM area_commitment c, season s
-                    JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
-                WHERE (year_from IS NULL OR year_from <= s.year) AND
-                      (year_to IS NULL OR year_to >= s.year)
-                GROUP BY s.year, c.mgnr, c.vtrgid
-                ORDER BY s.year, c.mgnr, LENGTH(c.vtrgid) DESC, c.vtrgid;
-                """);
-        }
-
-        private static void UpdateDbSchema_4_To_5(SqliteConnection cnx) {
-            ExecuteNonQuery(cnx, """
-                CREATE TABLE _area_commitment_type (
-                    vtrgid         TEXT NOT NULL CHECK (vtrgid = sortid || COALESCE(attrid, '') || disc),
-                    sortid         TEXT NOT NULL,
-                    attrid         TEXT,
-                    disc           TEXT DEFAULT NULL CHECK (disc REGEXP '^[A-Z0-9]+$'),
-
-                    min_kg_per_ha  INTEGER,
-                    max_kg_per_ha  INTEGER,
-                    penalty_amount INTEGER,
-
-                    CONSTRAINT pk_area_commitment_type PRIMARY KEY (vtrgid),
-                    CONSTRAINT sk_area_commitment_type_sort_attr UNIQUE (sortid, attrid, disc),
-                    CONSTRAINT fk_area_commitment_type_wine_variety FOREIGN KEY (sortid) REFERENCES wine_variety (sortid)
-                        ON UPDATE CASCADE
-                        ON DELETE RESTRICT,
-                    CONSTRAINT fk_area_commitment_type_wine_attribute FOREIGN KEY (attrid) REFERENCES wine_attribute (attrid)
-                        ON UPDATE CASCADE
-                        ON DELETE RESTRICT
-                ) STRICT;
-                """);
-            ExecuteNonQuery(cnx, """
-                INSERT INTO _area_commitment_type (vtrgid, sortid, attrid, disc, min_kg_per_ha, max_kg_per_ha, penalty_amount)
-                SELECT vtrgid, sortid, attrid_1, disc, min_kg_per_ha, max_kg_per_ha, penalty_amount FROM area_commitment_type
-                """);
-            ExecuteNonQuery(cnx, "PRAGMA writable_schema = ON");
-            ExecuteNonQuery(cnx, "DROP TABLE area_commitment_type");
-            ExecuteNonQuery(cnx, "ALTER TABLE _area_commitment_type RENAME TO area_commitment_type");
-            ExecuteNonQuery(cnx, "PRAGMA writable_schema = OFF");
-
-            ExecuteNonQuery(cnx, """
-            ALTER TABLE delivery_part ADD COLUMN attrid TEXT DEFAULT NULL
-                REFERENCES wine_attribute (attrid)
-                    ON UPDATE CASCADE
-                    ON DELETE RESTRICT
-            """);
-            ExecuteNonQuery(cnx, """
-                UPDATE delivery_part
-                SET attrid = (SELECT attrid
-                              FROM delivery_part_attribute a
-                              WHERE (delivery_part.year, delivery_part.did, delivery_part.dpnr) = (a.year, a.did, a.dpnr)
-                              ORDER BY attrid DESC
-                              LIMIT 1)
-                """);
-            ExecuteNonQuery(cnx, "DROP TRIGGER t_delivery_part_attribute_i_mtime_delivery_part");
-            ExecuteNonQuery(cnx, "DROP TRIGGER t_delivery_part_attribute_u_mtime_delivery_part");
-            ExecuteNonQuery(cnx, "DROP TRIGGER t_delivery_part_attribute_d_mtime_delivery_part");
-            ExecuteNonQuery(cnx, "DROP TABLE delivery_part_attribute");
-
-            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, a.attrid,
-                       p.weight, p.kmw, ROUND(p.kmw * (4.54 + 0.022 * p.kmw), 0) AS oe, p.qualid,
-                       p.hkid, p.kgnr, p.rdnr,
-                       p.gerebelt, p.gebunden,
-                       p.qualid IN (SELECT l.qualid FROM wine_quality_level l WHERE NOT l.predicate AND (p.kmw >= l.min_kmw OR l.min_kmw IS NULL) ORDER BY l.min_kmw DESC LIMIT 1,100) AS abgewertet,
-                       p.qualid NOT IN ('WEI', 'RSW', 'LDW') AS min_quw,
-                       COALESCE(a.fill_lower_bins, 0) AS attribute_prio,
-                       GROUP_CONCAT(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 wine_attribute a ON a.attrid = p.attrid
-                    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, o.modid;
-                """);
-
-            ExecuteNonQuery(cnx, "DROP VIEW v_delivery_bin");
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_delivery_bin AS
-                SELECT year, mgnr,
-                       sortid || IIF(min_quw, COALESCE(attrid, ''), '_') AS bin,
-                       SUM(weight) AS weight
-                FROM v_delivery
-                GROUP BY year, mgnr, bin
-                ORDER BY year, mgnr, LENGTH(bin) DESC, bin;
-                """);
-
-            ExecuteNonQuery(cnx, "DROP VIEW v_stat_attr");
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_stat_attr AS
-                SELECT year, attrid,
-                       SUM(weight) as sum,
-                       ROUND(SUM(kmw * weight) / SUM(weight), 2) AS kmw,
-                       ROUND(SUM(oe * weight) / SUM(weight), 1) AS oe,
-                       COUNT(DISTINCT did) AS lieferungen,
-                       COUNT(DISTINCT mgnr) AS mitglieder
-                FROM v_delivery
-                GROUP BY year, attrid
-                ORDER BY year, attrid;
-                """);
-
-            ExecuteNonQuery(cnx, "DROP VIEW v_stat_sort_attr");
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_stat_sort_attr AS
-                SELECT year, sortid, attrid,
-                       SUM(weight) as sum,
-                       ROUND(SUM(kmw * weight) / SUM(weight), 2) AS kmw,
-                       ROUND(SUM(oe * weight) / SUM(weight), 1) AS oe,
-                       COUNT(DISTINCT did) AS lieferungen,
-                       COUNT(DISTINCT mgnr) AS mitglieder
-                FROM v_delivery
-                GROUP BY year, sortid, attrid
-                ORDER BY year, sortid, attrid;
-                """);
-        }
-
-        private static void UpdateDbSchema_5_To_6(SqliteConnection cnx) {
-            ExecuteNonQuery(cnx, "DROP VIEW IF EXISTS v_area_commitment");
-
-            ExecuteNonQuery(cnx, "PRAGMA writable_schema = ON");
-            ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute DROP COLUMN fill_lower_bins");
-            ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute ADD COLUMN strict INTEGER NOT NULL CHECK (strict IN (TRUE, FALSE)) DEFAULT FALSE");
-            ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute ADD COLUMN fill_lower INTEGER NOT NULL CHECK (fill_lower IN (0, 1, 2)) DEFAULT 0");
-            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, a.attrid,
-                       p.weight, p.kmw, ROUND(p.kmw * (4.54 + 0.022 * p.kmw), 0) AS oe, p.qualid,
-                       p.hkid, p.kgnr, p.rdnr,
-                       p.gerebelt, p.gebunden,
-                       p.qualid IN (SELECT l.qualid FROM wine_quality_level l WHERE NOT l.predicate AND (p.kmw >= l.min_kmw OR l.min_kmw IS NULL) ORDER BY l.min_kmw DESC LIMIT 1,100) AS abgewertet,
-                       p.qualid NOT IN ('WEI', 'RSW', 'LDW') AS min_quw,
-                       IIF(a.strict, COALESCE(a.fill_lower, 0), 0) AS attribute_prio,
-                       GROUP_CONCAT(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 wine_attribute a ON a.attrid = p.attrid
-                    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, o.modid;
-                """);
-            ExecuteNonQuery(cnx, "PRAGMA writable_schema = OFF");
-
-            ExecuteNonQuery(cnx, "DROP VIEW v_area_commitment_bin");
-            ExecuteNonQuery(cnx, "DROP VIEW v_delivery_bin");
-            ExecuteNonQuery(cnx, "DROP VIEW v_payment_bin");
-
-            ExecuteNonQuery(cnx, "ALTER TABLE area_commitment_type DROP COLUMN max_kg_per_ha");
-            ExecuteNonQuery(cnx, "ALTER TABLE area_commitment_type ADD COLUMN penalty_per_kg INTEGER DEFAULT NULL");
-            ExecuteNonQuery(cnx, "ALTER TABLE area_commitment_type ADD COLUMN penalty_none INTEGER DEFAULT NULL");
-
-            ExecuteNonQuery(cnx, "ALTER TABLE wine_cultivation ADD COLUMN description TEXT DEFAULT NULL");
-            ExecuteNonQuery(cnx, "ALTER TABLE member ADD COLUMN organic INTEGER NOT NULL CHECK (organic IN (TRUE, FALSE)) DEFAULT FALSE");
-
-            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN max_kg_per_ha INTEGER NOT NULL DEFAULT 10000");
-            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN vat_normal REAL NOT NULL DEFAULT 0.10");
-            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN vat_flatrate REAL NOT NULL DEFAULT 0.13");
-            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN min_kg_per_bs INTEGER NOT NULL DEFAULT 750");
-            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN max_kg_per_bs INTEGER NOT NULL DEFAULT 3000");
-            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN penalty_per_kg INTEGER DEFAULT NULL");
-            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN penalty_amount INTEGER DEFAULT NULL");
-            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN penalty_none INTEGER DEFAULT NULL");
-
-            ExecuteNonQuery(cnx, "DELETE FROM client_parameter WHERE param IN ('DELIVERY_RIGHT', 'DELIVERY_OBLIGATION', 'VAT_NORMAL', 'VAT_REDUCED', 'VAT_FLATRATE')");
-
-            ExecuteNonQuery(cnx, """
-                CREATE TABLE delivery_part_bucket (
-                    year     INTEGER NOT NULL,
-                    did      INTEGER NOT NULL,
-                    dpnr     INTEGER NOT NULL,
-                    bktnr    INTEGER NOT NULL,
-
-                    discr    TEXT    NOT NULL,
-                    value    INTEGER NOT NULL,
-
-                    CONSTRAINT pk_delivery_part_bucket PRIMARY KEY (year, did, dpnr, bktnr),
-                    CONSTRAINT fk_delivery_part_bucket_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_bucket (year, did, dpnr, bktnr, discr, value)
-                SELECT year, did, dpnr, binnr, discr, value
-                FROM delivery_part_bin
-                """);
-            ExecuteNonQuery(cnx, "DROP TABLE delivery_part_bin");
-
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_area_commitment_bucket_strict AS
-                SELECT s.year, c.mgnr,
-                       t.sortid || COALESCE(a.attrid, '') AS bucket,
-                       t.sortid, a.attrid,
-                       CAST(ROUND(SUM(area) * COALESCE(t.min_kg_per_ha, 0) / 10000.0, 0) AS INTEGER) AS min_kg,
-                       CAST(ROUND(SUM(area) * MIN(COALESCE(a.max_kg_per_ha, s.max_kg_per_ha), s.max_kg_per_ha) / 10000.0, 0) AS INTEGER) AS max_kg,
-                       CAST(ROUND(SUM(area) * s.max_kg_per_ha / 10000.0, 0) AS INTEGER) AS upper_max_kg
-                FROM season s, area_commitment c
-                    JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
-                    LEFT JOIN wine_attribute a ON a.attrid = t.attrid
-                WHERE (year_from IS NULL OR year_from <= s.year) AND
-                      (year_to IS NULL OR year_to >= s.year)
-                GROUP BY s.year, c.mgnr, bucket
-                ORDER BY s.year, c.mgnr, bucket;
-                """);
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_area_commitment_bucket AS
-                SELECT year, mgnr, bucket, min_kg, max_kg
-                FROM v_area_commitment_bucket_strict
-                WHERE attrid IS NOT NULL
-                UNION ALL
-                SELECT b.year, b.mgnr, b.sortid,
-                       SUM(b.min_kg) AS min_kg,
-                       SUM(b.upper_max_kg) AS max_kg
-                FROM v_area_commitment_bucket_strict b
-                    LEFT JOIN wine_attribute a ON a.attrid = b.attrid
-                WHERE a.strict IS NULL OR a.strict = FALSE
-                GROUP BY b.year, b.mgnr, b.sortid
-                ORDER BY year, mgnr, bucket;
-                """);
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_delivery_bucket_strict AS
-                SELECT year, mgnr,
-                       sortid || IIF(min_quw, COALESCE(attrid, ''), '_') AS bucket,
-                       sortid, IIF(min_quw, attrid, NULL) AS attrid,
-                       SUM(weight) AS weight,
-                       min_quw
-                FROM v_delivery
-                GROUP BY year, mgnr, bucket
-                ORDER BY year, mgnr, bucket;
-                """);
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_delivery_bucket AS
-                SELECT year, mgnr, bucket, weight
-                FROM v_delivery_bucket_strict
-                WHERE attrid IS NOT NULL OR NOT min_quw
-                UNION ALL
-                SELECT b.year, b.mgnr, b.sortid,
-                       SUM(b.weight) AS weight
-                FROM v_delivery_bucket_strict b
-                    LEFT JOIN wine_attribute a ON a.attrid = b.attrid
-                WHERE min_quw AND (a.strict IS NULL OR a.strict = FALSE)
-                GROUP BY b.year, b.mgnr, b.sortid
-                ORDER BY year, mgnr, bucket;
-                """);
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_payment_bucket_strict AS
-                SELECT d.year, d.mgnr,
-                       d.sortid || b.discr AS bucket,
-                       d.sortid, IIF(b.discr IN ('', '_'), NULL, b.discr) AS attrid,
-                       SUM(b.value) AS weight,
-                       b.discr != '_' AS gebunden
-                FROM v_delivery d
-                    LEFT JOIN delivery_part_bucket b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
-                GROUP BY d.year, d.mgnr, bucket
-                HAVING SUM(b.value) > 0
-                ORDER BY d.year, d.mgnr, bucket;
-                """);
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_payment_bucket AS
-                SELECT year, mgnr, bucket, weight
-                FROM v_payment_bucket_strict
-                WHERE attrid IS NOT NULL OR NOT gebunden
-                UNION ALL
-                SELECT b.year, b.mgnr, b.sortid,
-                       SUM(b.weight) AS weight
-                FROM v_payment_bucket_strict b
-                    LEFT JOIN wine_attribute a ON a.attrid = b.attrid
-                WHERE gebunden AND (a.strict IS NULL OR a.strict = FALSE)
-                GROUP BY b.year, b.mgnr, b.sortid
-                ORDER BY year, mgnr, bucket;
-                """);
-        }
-
-        private static void UpdateDBSchema_6_To_7(SqliteConnection cnx) {
-            ExecuteNonQuery(cnx, "DROP VIEW v_area_commitment_bucket_strict");
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_area_commitment_bucket_strict AS
-                SELECT s.year, c.mgnr,
-                       t.sortid || COALESCE(a.attrid, '') AS bucket,
-                       t.sortid, a.attrid,
-                       SUM(area) AS area,
-                       CAST(ROUND(SUM(area) * COALESCE(t.min_kg_per_ha, 0) / 10000.0, 0) AS INTEGER) AS min_kg,
-                       CAST(ROUND(SUM(area) * MIN(COALESCE(a.max_kg_per_ha, s.max_kg_per_ha), s.max_kg_per_ha) / 10000.0, 0) AS INTEGER) AS max_kg,
-                       CAST(ROUND(SUM(area) * s.max_kg_per_ha / 10000.0, 0) AS INTEGER) AS upper_max_kg
-                FROM season s, area_commitment c
-                    JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
-                    LEFT JOIN wine_attribute a ON a.attrid = t.attrid
-                WHERE (year_from IS NULL OR year_from <= s.year) AND
-                      (year_to IS NULL OR year_to >= s.year)
-                GROUP BY s.year, c.mgnr, bucket
-                ORDER BY s.year, c.mgnr, bucket;
-                """);
-
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_under_delivery_bucket_strict AS
-                SELECT c.year, c.mgnr, c.bucket, c.min_kg, COALESCE(p.weight, 0) AS weight
-                FROM v_area_commitment_bucket_strict c
-                    LEFT JOIN v_payment_bucket_strict p ON (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket)
-                ORDER BY c.year, c.mgnr, c.bucket;
-                """);
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_under_delivery_bucket AS
-                SELECT u.year, u.mgnr, u.bucket, u.min_kg,
-                       u.weight + SUM(MAX(COALESCE(p.weight - s.min_kg, 0), 0)) AS weight
-                FROM v_under_delivery_bucket_strict u
-                    LEFT JOIN v_payment_bucket_strict p ON (p.year, p.mgnr, p.sortid) = (u.year, u.mgnr, u.bucket) AND p.attrid IS NOT NULL
-                    LEFT JOIN wine_attribute a ON a.attrid = p.attrid
-                    LEFT JOIN v_area_commitment_bucket_strict s ON (s.year, s.mgnr, s.bucket) = (p.year, p.mgnr, p.bucket)
-                WHERE (p.gebunden IS NULL OR p.gebunden) AND (a.strict IS NULL OR a.strict = FALSE)
-                GROUP BY u.year, u.mgnr, u.bucket
-                ORDER BY u.year, u.mgnr, u.bucket;
-                """);
-            ExecuteNonQuery(cnx, """
-                CREATE VIEW v_under_delivery AS
-                SELECT year, mgnr, bucket, min_kg, weight, weight - min_kg AS diff
-                FROM v_under_delivery_bucket
-                WHERE diff < 0;
-                """);
-        }
-
-        private static void UpdateDbSchema_7_To_8(SqliteConnection cnx) {
-            ExecuteNonQuery(cnx, """
-                INSERT INTO wb_gem
-                SELECT a.gkz, 'WLNO'
-                FROM AT_gem a
-                    LEFT JOIN wb_gem w ON w.gkz = a.gkz
-                WHERE a.gkz / 10000 = 3 AND w.hkid IS NULL;
-                """);
-            ExecuteNonQuery(cnx, """
-                INSERT INTO wb_gem
-                SELECT gkz, 'SLVL'
-                FROM AT_gem
-                WHERE gkz / 100 IN (617, 622, 623);
-                """);
-            ExecuteNonQuery(cnx, """
-                INSERT INTO wb_gem
-                SELECT gkz, 'SLSS'
-                FROM AT_gem
-                WHERE gkz / 100 = 610;
-                """);
-            ExecuteNonQuery(cnx, """
-                UPDATE wb_gem
-                SET hkid = 'SLVL'
-                WHERE gkz IN (61007, 61052, 61001, 61055, 61027, 61057, 61008, 61057);
-                """);
-            ExecuteNonQuery(cnx, """
-                INSERT INTO wb_gem
-                SELECT gkz, 'SLWS'
-                FROM AT_gem
-                WHERE gkz / 100 IN (603, 616) OR gkz IN (60101, 60663, 60651, 60659, 60664, 60647, 60641, 60639, 60665, 60669, 60618, 60629, 60608, 60670, 60624, 60660, 60656, 60655);
-                """);
-            ExecuteNonQuery(cnx, """
-                INSERT INTO wb_gem
-                SELECT g.gkz, 'SLVL'
-                FROM AT_gem g
-                    LEFT JOIN wb_gem w ON w.gkz = g.gkz
-                WHERE g.gkz / 100 = 606 AND w.hkid IS NULL;
-                """);
-            ExecuteNonQuery(cnx, """
-                INSERT INTO wb_gem
-                SELECT g.gkz, 'SLST'
-                FROM AT_gem g
-                    LEFT JOIN wb_gem w ON w.gkz = g.gkz
-                WHERE g.gkz / 10000 = 6 AND w.hkid IS NULL;
-                """);
-            ExecuteNonQuery(cnx, """
-                INSERT INTO wb_gem
-                SELECT gkz, 'BLOO'
-                FROM AT_gem
-                WHERE gkz / 10000 = 4;
-                """);
-            ExecuteNonQuery(cnx, """
-                INSERT INTO wb_gem
-                SELECT gkz, 'BLKA'
-                FROM AT_gem
-                WHERE gkz / 10000 = 2;
-                """);
-            ExecuteNonQuery(cnx, """
-                INSERT INTO wb_gem
-                SELECT gkz, 'BLSB'
-                FROM AT_gem
-                WHERE gkz / 10000 = 5;
-                """);
-            ExecuteNonQuery(cnx, """
-                INSERT INTO wb_gem
-                SELECT gkz, 'BLTI'
-                FROM AT_gem
-                WHERE gkz / 10000 = 7;
-                """);
-            ExecuteNonQuery(cnx, """
-                INSERT INTO wb_gem
-                SELECT gkz, 'BLVO'
-                FROM AT_gem
-                WHERE gkz / 10000 = 8;
-                """);
-        }
-
-        private static void UpdateDbSchema_8_To_9(SqliteConnection cnx) {
-            ExecuteNonQuery(cnx, """
-                CREATE TABLE payment_delivery_part_bucket (
-                    year   INTEGER NOT NULL,
-                    did    INTEGER NOT NULL,
-                    dpnr   INTEGER NOT NULL,
-                    bktnr  INTEGER NOT NULL,
-                    avnr   INTEGER NOT NULL,
-
-                    price  INTEGER NOT NULL,
-                    amount INTEGER NOT NULL,
-
-                    CONSTRAINT pk_payment_delivery_part_bucket PRIMARY KEY (year, did, dpnr, bktnr, avnr),
-                    CONSTRAINT fk_payment_delivery_part_bucket_delivery_part_bucket FOREIGN KEY (year, did, dpnr, bktnr) REFERENCES delivery_part_bucket (year, did, dpnr, bktnr)
-                        ON UPDATE CASCADE
-                        ON DELETE CASCADE,
-                    CONSTRAINT fk_payment_delivery_part_bucket_payment_variant FOREIGN KEY (year, avnr) REFERENCES payment_variant (year, avnr)
-                        ON UPDATE CASCADE
-                        ON DELETE CASCADE
-                ) STRICT;
-                """);
-
-            ExecuteNonQuery(cnx, "DROP TRIGGER IF EXISTS t_payment_delivery_part_i");
-            ExecuteNonQuery(cnx, "DROP TRIGGER IF EXISTS t_payment_delivery_part_u");
-            ExecuteNonQuery(cnx, "DROP TRIGGER IF EXISTS t_payment_delivery_part_d");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part RENAME COLUMN amount TO net_amount");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part ADD COLUMN amount INTEGER NOT NULL GENERATED ALWAYS AS (ROUND(net_amount * (1 + mod_rel) + mod_abs)) VIRTUAL");
-
-            ExecuteNonQuery(cnx, """
-                CREATE TRIGGER t_payment_delivery_part_bucket_i
-                    AFTER INSERT ON payment_delivery_part_bucket FOR EACH ROW
-                BEGIN
-                    INSERT INTO payment_delivery_part (year, did, dpnr, avnr, net_amount)
-                    VALUES (NEW.year, NEW.did, NEW.dpnr, NEW.avnr, NEW.amount)
-                    ON CONFLICT DO UPDATE SET net_amount = net_amount + NEW.amount;
-                END;
-                """);
-            ExecuteNonQuery(cnx, """
-                CREATE TRIGGER t_payment_delivery_part_bucket_u
-                    AFTER UPDATE OF amount ON payment_delivery_part_bucket FOR EACH ROW
-                BEGIN
-                    UPDATE payment_delivery_part
-                    SET net_amount = net_amount - OLD.amount
-                    WHERE (year, did, dpnr, avnr) = (NEW.year, NEW.did, NEW.dpnr, NEW.avnr);
-                    UPDATE payment_delivery_part
-                    SET net_amount = net_amount + NEW.amount
-                    WHERE (year, did, dpnr, avnr) = (NEW.year, NEW.did, NEW.dpnr, NEW.avnr);
-                END;
-                """);
-            ExecuteNonQuery(cnx, """
-                CREATE TRIGGER t_payment_delivery_part_bucket_d
-                    AFTER DELETE ON payment_delivery_part_bucket FOR EACH ROW
-                BEGIN
-                    UPDATE payment_delivery_part
-                    SET net_amount = net_amount - OLD.amount
-                    WHERE (year, did, dpnr, avnr) = (OLD.year, OLD.did, OLD.dpnr, OLD.avnr);
-                END;
-                """);
-
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_member RENAME COLUMN amount TO net_amount");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_member ADD COLUMN mod_abs INTEGER NOT NULL DEFAULT 0");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_member ADD COLUMN mod_rel REAL NOT NULL DEFAULT 0");
-            ExecuteNonQuery(cnx, "ALTER TABLE payment_member ADD COLUMN amount INTEGER NOT NULL GENERATED ALWAYS AS (ROUND(net_amount * (1 + mod_rel) + mod_rel)) VIRTUAL");
-
-            ExecuteNonQuery(cnx, """
-                CREATE TRIGGER t_payment_delivery_part_i
-                    AFTER INSERT ON payment_delivery_part FOR EACH ROW
-                BEGIN
-                    INSERT INTO payment_member (year, avnr, mgnr, net_amount)
-                    VALUES (NEW.year, NEW.avnr, (SELECT mgnr FROM delivery WHERE (year, did) = (NEW.year, NEW.did)), NEW.amount)
-                    ON CONFLICT DO UPDATE SET net_amount = net_amount + excluded.net_amount;
-                END;
-                """);
-            ExecuteNonQuery(cnx, """
-                CREATE TRIGGER t_payment_delivery_part_u
-                    AFTER UPDATE OF amount ON payment_delivery_part FOR EACH ROW
-                BEGIN
-                    UPDATE payment_member
-                    SET net_amount = net_amount - OLD.amount
-                    WHERE (year, avnr, mgnr) = (NEW.year, NEW.avnr, (SELECT mgnr FROM delivery WHERE (year, did) = (NEW.year, NEW.did)));
-                    UPDATE payment_member
-                    SET net_amount = net_amount + NEW.amount
-                    WHERE (year, avnr, mgnr) = (NEW.year, NEW.avnr, (SELECT mgnr FROM delivery WHERE (year, did) = (NEW.year, NEW.did)));
-                END;
-                """);
-            ExecuteNonQuery(cnx, """
-                CREATE TRIGGER t_payment_delivery_part_d
-                    AFTER DELETE ON payment_delivery_part FOR EACH ROW
-                BEGIN
-                    UPDATE payment_member
-                    SET net_amount = net_amount - OLD.amount
-                    WHERE (year, avnr, mgnr) = (OLD.year, OLD.avnr, (SELECT mgnr FROM delivery WHERE (year, did) = (OLD.year, OLD.did)));
-                END;
+            foreach (var script in toExecute) {
+                await AppDbContext.ExecuteEmbeddedScript(cnx, asm, script);
+            }
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                PRAGMA foreign_key_check;
+                COMMIT;
+                PRAGMA foreign_keys = ON;
+                VACUUM;
+                PRAGMA schema_version = {toVersion * 100 + VersionOffset};
                 """);
         }
     }

Elwig/Helpers/Billing/Billing.cs

@@ -22,26 +22,32 @@ namespace Elwig.Helpers.Billing {
 
         public async Task FinishSeason() {
             using var cnx = await AppDbContext.ConnectAsync();
-            using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"""
-                    UPDATE season
-                    SET (start_date, end_date) = (SELECT MIN(date), MAX(date) FROM delivery WHERE year = {Year})
-                    WHERE year = {Year}
-                    """;
-                await cmd.ExecuteNonQueryAsync();
-            }
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                UPDATE season
+                SET (start_date, end_date) = (SELECT MIN(date), MAX(date) FROM delivery WHERE year = {Year})
+                WHERE year = {Year};
 
-            using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"DELETE FROM delivery_part_bucket WHERE year = {Year}";
-                await cmd.ExecuteNonQueryAsync();
-            }
+                DELETE FROM delivery_part_bucket WHERE year = {Year};
+                """);
+        }
+
+        public async Task AutoAdjustBusinessShare() {
+            using var cnx = await AppDbContext.ConnectAsync();
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                INSERT INTO member_history (mgnr, date, business_shares, type)
+                SELECT u.mgnr, '{Utils.Today:yyyy-MM-dd}', u.diff / s.max_kg_per_bs AS bs, 'auto'
+                FROM v_total_under_delivery u
+                    JOIN season s ON s.year = u.year
+                WHERE s.year = {Year} AND bs > 0
+                ON CONFLICT DO NOTHING
+                """);
         }
 
         public async Task CalculateBuckets(bool allowAttrsIntoLower, bool avoidUnderDeliveries, bool honorGebunden) {
             var attrVals = Context.WineAttributes.ToDictionary(a => a.AttrId, a => (a.IsStrict, a.FillLower));
             var attrForced = attrVals.Where(a => a.Value.IsStrict && a.Value.FillLower == 0).Select(a => a.Key).ToArray();
             using var cnx = await AppDbContext.ConnectAsync();
-            await Context.GetMemberRightsAndObligations(Year, 0, cnx);
+            await Context.GetMemberAreaCommitmentBuckets(Year, 0, cnx);
             var inserts = new List<(int, int, int, string, int)>();
 
             var deliveries = new List<(int, int, int, string, int, double, string, string?, string[], bool?)>();
@@ -66,11 +72,11 @@ namespace Elwig.Helpers.Billing {
             }
 
             int lastMgNr = 0;
-            Dictionary<string, (int, int)>? rightsAndObligations = null;
+            Dictionary<string, AreaComBucket>? rightsAndObligations = null;
             Dictionary<string, int> used = new();
             foreach (var (mgnr, did, dpnr, sortid, weight, kmw, qualid, attrid, modifiers, gebunden) in deliveries) {
                 if (lastMgNr != mgnr) {
-                    rightsAndObligations = await Context.GetMemberRightsAndObligations(Year, mgnr);
+                    rightsAndObligations = await Context.GetMemberAreaCommitmentBuckets(Year, mgnr);
                     used = new();
                 }
                 if ((honorGebunden && gebunden == false) ||
@@ -94,8 +100,8 @@ namespace Elwig.Helpers.Billing {
                     if (rightsAndObligations.ContainsKey(key)) {
                         int i = (c == 0) ? 1 : 2;
                         var u = used.GetValueOrDefault(key, 0);
-                        var vr = Math.Max(0, Math.Min(rightsAndObligations[key].Item1 - u, w));
-                        var vo = Math.Max(0, Math.Min(rightsAndObligations[key].Item2 - u, w));
+                        var vr = Math.Max(0, Math.Min(rightsAndObligations[key].Right - u, w));
+                        var vo = Math.Max(0, Math.Min(rightsAndObligations[key].Obligation - u, w));
                         var v = (attributes.Length == c || attributes.Select(a => !attrVals[a].IsStrict ? 2 : attrVals[a].FillLower).Min() == 2) ? vr : vo;
                         used[key] = u + v;
                         if (key.Length > 2 && !isStrict) used[key[..2]] = used.GetValueOrDefault(key[..2], 0) + v;
@@ -108,15 +114,12 @@ namespace Elwig.Helpers.Billing {
                 lastMgNr = mgnr;
             }
 
-            using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"""
-                    INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
-                    VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '{i.Item4}', {i.Item5})"))}
-                    ON CONFLICT DO UPDATE
-                    SET discr = excluded.discr, value = value + excluded.value
-                    """;
-                await cmd.ExecuteNonQueryAsync();
-            }
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+                VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '{i.Item4}', {i.Item5})"))}
+                ON CONFLICT DO UPDATE
+                SET discr = excluded.discr, value = value + excluded.value;
+                """);
 
             if (!avoidUnderDeliveries)
                 return;
@@ -186,25 +189,17 @@ namespace Elwig.Helpers.Billing {
                     if (needed == 0) break;
                 }
 
-                using (var cmd = cnx.CreateCommand()) {
-                    cmd.CommandText = $"""
-                        INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
-                        VALUES {string.Join(",\n       ", posChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
-                        ON CONFLICT DO UPDATE
-                        SET value = value + excluded.value
-                        """;
-                    await cmd.ExecuteNonQueryAsync();
-                }
+                await AppDbContext.ExecuteBatch(cnx, $"""
+                    INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+                    VALUES {string.Join(",\n       ", posChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
+                    ON CONFLICT DO UPDATE
+                    SET value = value + excluded.value;
 
-                using (var cmd = cnx.CreateCommand()) {
-                    cmd.CommandText = $"""
-                        INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
-                        VALUES {string.Join(",\n       ", negChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
-                        ON CONFLICT DO UPDATE
-                        SET value = excluded.value
-                        """;
-                    await cmd.ExecuteNonQueryAsync();
-                }
+                    INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+                    VALUES {string.Join(",\n       ", negChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
+                    ON CONFLICT DO UPDATE
+                    SET value = excluded.value;
+                    """);
             }
         }
     }

Elwig/Helpers/Billing/BillingData.cs

@@ -0,0 +1,387 @@
+using Newtonsoft.Json;
+using NJsonSchema;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Billing {
+    public class BillingData {
+
+        public enum CalculationMode { Elwig, WgMaster }
+        public enum CurveMode { Oe, Kmw }
+        public record struct Curve(CurveMode Mode, Dictionary<double, decimal> Normal, Dictionary<double, decimal>? Gebunden);
+
+        public static JsonSchema? Schema { get; private set; }
+
+        public static async Task Init() {
+            var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("Elwig.Resources.Schemas.PaymentVariantData.json");
+            Schema = await JsonSchema.FromJsonAsync(stream ?? throw new ArgumentException("JSON schema not found"));
+        }
+
+        public readonly JsonObject Data;
+        public readonly CalculationMode Mode;
+
+        public bool ConsiderDelieryModifiers {
+            get => GetConsider("consider_delivery_modifiers");
+            set => SetConsider(value, "consider_delivery_modifiers");
+        }
+        public bool ConsiderContractPenalties {
+            get => GetConsider("consider_contract_penalties");
+            set => SetConsider(value, "consider_contract_penalties");
+        }
+        public bool ConsiderTotalPenalty {
+            get => GetConsider("consider_total_penalty");
+            set => SetConsider(value, "consider_total_penalty");
+        }
+        public bool ConsiderAutoBusinessShares {
+            get => GetConsider("consider_auto_business_shares");
+            set => SetConsider(value, "consider_auto_business_shares");
+        }
+
+        private bool GetConsider(string name, string? wgMasterName = null) {
+            return ((Mode == CalculationMode.Elwig) ? Data[name] : Data[wgMasterName ?? ""])?.AsValue().GetValue<bool>() ?? false;
+        }
+
+        private void SetConsider(bool value, string name, string? wgMasterName = null) {
+            if (Mode == CalculationMode.WgMaster && wgMasterName == null) {
+                return;
+            } else if (value) {
+                Data[(Mode == CalculationMode.Elwig) ? name : wgMasterName ?? ""] = value;
+            } else {
+                Data.Remove((Mode == CalculationMode.Elwig) ? name : wgMasterName ?? "");
+            }
+        }
+
+        public BillingData(JsonObject data) {
+            Data = data;
+            var mode = Data["mode"]?.GetValue<string>();
+            Mode = (mode == "elwig") ? CalculationMode.Elwig : CalculationMode.WgMaster;
+        }
+
+        protected static JsonObject ParseJson(string json) {
+            if (Schema == null) throw new InvalidOperationException("Schema has to be initialized first");
+            try {
+                var errors = Schema.Validate(json);
+                if (errors.Count != 0) throw new ArgumentException("Invalid JSON data");
+                return JsonNode.Parse(json)?.AsObject() ?? throw new ArgumentException("Invalid JSON data");
+            } catch (JsonReaderException) {
+                throw new ArgumentException("Invalid JSON data");
+            }
+        }
+
+        public static BillingData FromJson(string json) {
+            return new(ParseJson(json));
+        }
+
+        protected JsonArray GetCurvesEntry() {
+            return Data[Mode == CalculationMode.Elwig ? "curves" : "Kurven"]?.AsArray() ?? throw new InvalidOperationException();
+        }
+
+        protected JsonNode GetPaymentEntry() {
+            return Data[Mode == CalculationMode.Elwig ? "payment" : "AuszahlungSorten"] ?? throw new InvalidOperationException();
+        }
+
+        protected JsonObject? GetQualityEntry() {
+            return Data[Mode == CalculationMode.Elwig ? "quality" : "AuszahlungSortenQualitätsstufe"]?.AsObject();
+        }
+
+        private static Dictionary<double, decimal> GetCurveData(JsonObject data, CurveMode mode) {
+            var dict = new Dictionary<double, decimal>();
+            foreach (var (index, price) in data) {
+                double idx;
+                bool? gtlt = index.StartsWith('>') ? true : index.StartsWith('<') ? false : null;
+                if (index.EndsWith("kmw")) {
+                    idx = double.Parse(index[(gtlt != null ? 1 : 0)..^3], CultureInfo.InvariantCulture);
+                    if (mode == CurveMode.Oe) {
+                        idx = Utils.KmwToOe(idx);
+                    }
+                } else if (index.EndsWith("oe")) {
+                    idx = double.Parse(index[(gtlt != null ? 1 : 0)..^2], CultureInfo.InvariantCulture);
+                    if (mode == CurveMode.Kmw) {
+                        idx = Utils.OeToKmw(idx);
+                    }
+                } else {
+                    throw new InvalidOperationException();
+                }
+                if (gtlt == true) {
+                    idx = Math.BitIncrement(idx);
+                } else if (gtlt == false) {
+                    idx = Math.BitDecrement(idx);
+                }
+                dict[idx] = price?.AsValue().GetValue<decimal>() ?? throw new InvalidOperationException();
+            }
+            return dict;
+        }
+
+        protected Dictionary<int, Curve> GetCurves() {
+            var dict = new Dictionary<int, Curve>();
+            var curves = GetCurvesEntry();
+            foreach (var c in curves) {
+                var obj = c?.AsObject() ?? throw new InvalidOperationException();
+                var id = obj["id"]?.GetValue<int>() ?? throw new InvalidOperationException();
+                var cMode = (obj["mode"]?.GetValue<string>() == "kmw") ? CurveMode.Kmw : CurveMode.Oe;
+                double quw = cMode == CurveMode.Oe ? 73 : 15;
+
+                Dictionary<double, decimal> c1;
+                Dictionary<double, decimal>? c2 = null;
+                var norm = obj["data"];
+                if (norm is JsonObject) {
+                    c1 = GetCurveData(norm.AsObject(), cMode);
+                } else if (norm?.AsValue().TryGetValue(out decimal v) == true) {
+                    c1 = new() { { quw, v } };
+                } else {
+                    throw new InvalidOperationException();
+                }
+                var geb = obj["geb"];
+                if (geb is JsonObject) {
+                    c2 = GetCurveData(geb.AsObject(), cMode);
+                } else if (geb?.AsValue().TryGetValue(out decimal v) == true) {
+                    var splitVal = GetCurveValueAt(c1, quw);
+                    c2 = c1.ToDictionary(e => e.Key, e => e.Value + (e.Key >= quw ? v : 0));
+                    c2[quw] = splitVal + v;
+                    c2[Math.BitDecrement(quw)] = splitVal;
+                }
+                dict.Add(id, new(cMode, c1, c2));
+            }
+            return dict;
+        }
+
+        protected static Dictionary<string, JsonValue> GetSelection(JsonNode value, IEnumerable<string> vaributes) {
+            if (value is JsonValue flatRate) {
+                return vaributes.ToDictionary(e => e, _ => flatRate);
+            } if (value is not JsonObject data) {
+                throw new InvalidOperationException();
+            }
+            Dictionary<string, JsonValue> dict;
+            if (data["default"] is JsonValue def) {
+                dict = vaributes.ToDictionary(e => e, _ => def);
+            } else {
+                dict = [];
+            }
+
+            var varieties = data.Where(p => !p.Key.StartsWith('/') && p.Key.Length == 2);
+            var attributes = data.Where(p => p.Key.StartsWith('/'));
+            var others = data.Where(p => !p.Key.StartsWith('/') && p.Key.Length > 2 && p.Key != "default");
+            foreach (var (idx, v) in varieties) {
+                var curve = v?.AsValue() ?? throw new InvalidOperationException();
+                foreach (var i in vaributes.Where(e => e.StartsWith(idx[..^1]))) {
+                    dict[i] = curve;
+                }
+            }
+            foreach (var (idx, v) in attributes) {
+                var curve = v?.AsValue() ?? throw new InvalidOperationException();
+                foreach (var i in vaributes.Where(e => e[2..] == idx[1..])) {
+                    dict[i] = curve;
+                }
+            }
+            foreach (var (idx, v) in others) {
+                var curve = v?.AsValue() ?? throw new InvalidOperationException();
+                dict[idx.Replace("/", "")] = curve;
+            }
+
+            return dict;
+        }
+
+        public static decimal GetCurveValueAt(Dictionary<double, decimal> curve, double key) {
+            if (curve.Count == 1) return curve.First().Value;
+
+            var lt = curve.Keys.Where(v => v <= key);
+            var gt = curve.Keys.Where(v => v >= key);
+            if (!lt.Any()) {
+                return curve[gt.Min()];
+            } else if (!gt.Any()) {
+                return curve[lt.Max()];
+            }
+
+            var max = lt.Max();
+            var min = gt.Min();
+            if (max == min) return curve[key];
+
+            var p1 = ((decimal)key - (decimal)min) / ((decimal)max - (decimal)min);
+            var p2 = 1 - p1;
+            return curve[min] * p2 + curve[max] * p1;
+        }
+
+        protected static JsonObject GraphToJson(Graph graph, string mode) {
+            var x = graph.DataX;
+            var y = graph.DataY;
+            var prec = graph.Precision;
+
+            try {
+                return new JsonObject() {
+                    ["15kmw"] = Math.Round(y.Distinct().Single(), prec)
+                };
+            } catch { }
+
+            var data = new JsonObject();
+            if (y[0] != y[1]) {
+                data[$"{x[0]}{mode}"] = Math.Round(y[0], prec);
+            }
+            for (int i = 1; i < x.Length - 1; i++) {
+                var d1 = Math.Round(y[i] - y[i - 1], prec);
+                var d2 = Math.Round(y[i + 1] - y[i], prec);
+                if (d1 != d2) {
+                    data[$"{x[i]}{mode}"] = Math.Round(y[i], prec);
+                }
+            }
+            if (y[^1] != y[^2]) {
+                data[$"{x[^1]}{mode}"] = Math.Round(y[^1], prec);
+            }
+            return data;
+        }
+
+        protected static JsonNode GraphEntryToJson(GraphEntry entry) {
+            try {
+                if (entry.GebundenFlatBonus == null) {
+                    return JsonValue.Create((decimal)entry.DataGraph.DataY.Distinct().Single());
+                }
+            } catch { }
+
+            var curve = new JsonObject {
+                ["id"] = entry.Id,
+                ["mode"] = entry.Mode.ToString().ToLower(),
+            };
+
+            curve["data"] = GraphToJson(entry.DataGraph, entry.Mode.ToString().ToLower());
+
+            if (entry.GebundenFlatBonus != null) {
+                curve["geb"] = (decimal)entry.GebundenFlatBonus;
+            } else if (entry.GebundenGraph != null) {
+                curve["geb"] = GraphToJson(entry.GebundenGraph, entry.Mode.ToString().ToLower());
+            }
+
+            return curve;
+        }
+
+        protected static void CollapsePaymentData(JsonObject data, IEnumerable<string> vaributes, bool useDefault = true) {
+            Dictionary<string, List<string>> rev1 = [];
+            Dictionary<decimal, List<string>> rev2 = [];
+            foreach (var (k, v) in data) {
+                if (k == "default" || k.StartsWith('/') || !k.Contains('/') || v is not JsonValue val) {
+                    continue;
+                } else if (val.TryGetValue<decimal>(out var dec)) {
+                    rev2[dec] = rev2.GetValueOrDefault(dec) ?? [];
+                    rev2[dec].Add(k);
+                } else if (val.TryGetValue<string>(out var cur)) {
+                    rev1[cur] = rev1.GetValueOrDefault(cur) ?? [];
+                    rev1[cur].Add(k);
+                }
+            }
+            if (!data.ContainsKey("default")) {
+                foreach (var (v, ks) in rev1) {
+                    if ((ks.Count >= vaributes.Count() * 0.5 && useDefault) || ks.Count == vaributes.Count()) {
+                        foreach (var k in ks) data.Remove(k);
+                        data["default"] = v;
+                        CollapsePaymentData(data, vaributes, useDefault);
+                        return;
+                    }
+                }
+                foreach (var (v, ks) in rev2) {
+                    if ((ks.Count >= vaributes.Count() * 0.5 && useDefault) || ks.Count == vaributes.Count()) {
+                        foreach (var k in ks) data.Remove(k);
+                        data["default"] = v;
+                        CollapsePaymentData(data, vaributes, useDefault);
+                        return;
+                    }
+                }
+            }
+            var attributes = data
+                .Select(e => e.Key)
+                .Where(k => k.Length > 3 && k.Contains('/'))
+                .Select(k => "/" + k.Split('/')[1])
+                .Distinct()
+                .ToList();
+            foreach (var idx in attributes) {
+                var len = vaributes.Count(e => e.EndsWith(idx));
+                foreach (var (v, ks) in rev1) {
+                    var myKs = ks.Where(k => k.EndsWith(idx)).ToList();
+                    if (myKs.Count > 1 && ((myKs.Count >= len * 0.5 && useDefault) || myKs.Count == len)) {
+                        foreach (var k in myKs) data.Remove(k);
+                        data[idx] = v;
+                    }
+                }
+                foreach (var (v, ks) in rev2) {
+                    var myKs = ks.Where(k => k.EndsWith(idx)).ToList();
+                    if (myKs.Count > 1 && ((myKs.Count >= len * 0.5 && useDefault) || myKs.Count == len)) {
+                        foreach (var k in myKs) data.Remove(k);
+                        data[idx] = v;
+                    }
+                }
+            }
+        }
+
+        public static JsonObject FromGraphEntries(
+            IEnumerable<GraphEntry> graphEntries,
+            BillingData? origData = null,
+            IEnumerable<string>? vaributes = null,
+            bool useDefaultPayment = true,
+            bool useDefaultQuality = true
+        ) {
+            var payment = new JsonObject();
+            var qualityWei = new JsonObject();
+            var curves = new JsonArray();
+            int curveId = 0;
+            foreach (var entry in graphEntries) {
+                var curve = GraphEntryToJson(entry);
+                JsonValue node;
+                if (curve is JsonObject obj) {
+                    obj["id"] = ++curveId;
+                    node = JsonValue.Create($"curve:{curveId}");
+                    curves.Add(obj);
+                } else if (curve is JsonValue val && val.TryGetValue<decimal>(out var flat)) {
+                    node = JsonValue.Create(flat);
+                } else {
+                    continue;
+                }
+                foreach (var c in entry.Vaributes) {
+                    if (entry.Abgewertet) {
+                        qualityWei[$"{c.Variety?.SortId}/{c.Attribute?.AttrId}"] = node.DeepClone();
+                    } else {
+                        payment[$"{c.Variety?.SortId}/{c.Attribute?.AttrId}"] = node.DeepClone();
+                    }
+                }
+            }
+
+            CollapsePaymentData(payment, vaributes ?? payment.Select(e => e.Key).ToList(), useDefaultPayment);
+            CollapsePaymentData(qualityWei, vaributes ?? qualityWei.Select(e => e.Key).ToList(), useDefaultQuality);
+
+            var data = new JsonObject {
+                ["mode"] = "elwig",
+                ["version"] = 1,
+            };
+
+            if (origData?.ConsiderDelieryModifiers == true)
+                data["consider_delivery_modifiers"] = true;
+            if (origData?.ConsiderContractPenalties == true)
+                data["consider_contract_penalties"] = true;
+            if (origData?.ConsiderTotalPenalty == true)
+                data["consider_total_penalty"] = true;
+            if (origData?.ConsiderAutoBusinessShares == true)
+                data["consider_auto_business_shares"] = true;
+
+            if (payment.Count == 0) {
+                data["payment"] = 0;
+            } else if (payment.Count == 1 && payment.First().Key == "default") {
+                data["payment"] = payment.Single().Value?.DeepClone();
+            } else {
+                data["payment"] = payment;
+            }
+            if (qualityWei.Count == 1 && qualityWei.First().Key == "default") {
+                data["quality"] = new JsonObject() {
+                    ["WEI"] = qualityWei.Single().Value?.DeepClone()
+                };
+            } else if (qualityWei.Count >= 1) {
+                data["quality"] = new JsonObject() {
+                    ["WEI"] = qualityWei
+                };
+            }
+            data["curves"] = curves;
+
+            return data;
+        }
+    }
+}

Elwig/Helpers/Billing/BillingVariant.cs

@@ -1,3 +1,6 @@
+using Elwig.Models.Entities;
+using Microsoft.Data.Sqlite;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -5,36 +8,124 @@ using System.Threading.Tasks;
 namespace Elwig.Helpers.Billing {
     public class BillingVariant : Billing {
 
-        private readonly int AvNr;
+        protected readonly int AvNr;
+        protected readonly PaymentVar PaymentVariant;
+        protected readonly PaymentBillingData Data;
 
         public BillingVariant(int year, int avnr) : base(year) {
             AvNr = avnr;
+            PaymentVariant = Context.PaymentVariants.Find(Year, AvNr) ?? throw new ArgumentException("PaymentVar not found");
+            Data = PaymentBillingData.FromJson(PaymentVariant.Data, Utils.GetVaributes(Context, Year, onlyDelivered: false));
         }
 
-        protected async Task DeleteInDb() {
+        public async Task Calculate() {
             using var cnx = await AppDbContext.ConnectAsync();
-            using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"DELETE FROM payment_delivery_part_bucket WHERE (year, avnr) = ({Year}, {AvNr})";
-                await cmd.ExecuteNonQueryAsync();
+            using var tx = await cnx.BeginTransactionAsync();
+            await DeleteInDb(cnx);
+            await SetCalcTime(cnx);
+            await CalculatePrices(cnx);
+            if (Data.ConsiderDelieryModifiers) {
+                await CalculateDeliveryModifiers(cnx);
+                await CalculateMemberModifiers(cnx);
             }
-            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();
+            await tx.CommitAsync();
+        }
+
+        public async Task Commit() {
+            await Revert();
+            using var cnx = await AppDbContext.ConnectAsync();
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                    INSERT INTO credit (year, tgnr, mgnr, avnr, net_amount, prev_net_amount, vat, modifiers, prev_modifiers)
+                    SELECT s.year,
+                           COALESCE(t.tgnr, 0) + ROW_NUMBER() OVER(ORDER BY m.mgnr) AS tgnr,
+                           m.mgnr,
+                           v.avnr,
+                           ROUND(p.amount / POW(10, s.precision - 2)) AS net_amount,
+                           ROUND(lp.amount / POW(10, s.precision - 2)) AS prev_amount,
+                           IIF(m.buchführend, s.vat_normal, s.vat_flatrate) AS vat,
+                           ROUND(IIF({Data.ConsiderContractPenalties}, COALESCE(u.total_penalty, 0), 0) / POW(10, 4 - 2)) +
+                           ROUND(IIF({Data.ConsiderTotalPenalty}, COALESCE(b.total_penalty, 0), 0) / POW(10, s.precision - 2)) +
+                           ROUND(IIF({Data.ConsiderAutoBusinessShares}, -COALESCE(a.total_amount, 0), 0) / POW(10, s.precision - 2))
+                           AS modifiers,
+                           lc.modifiers AS prev_modifiers
+                    FROM season s
+                        JOIN payment_variant v ON v.year = s.year
+                        LEFT JOIN payment_variant l ON l.year = s.year
+                            AND l.avnr = (SELECT avnr
+                                          FROM payment_variant
+                                          WHERE year = s.year AND NOT test_variant
+                                          ORDER BY COALESCE(transfer_date, date) DESC, avnr DESC
+                                          LIMIT 1)
+                        LEFT JOIN (SELECT year, MAX(tgnr) AS tgnr FROM credit GROUP BY year) t ON t.year = s.year
+                        JOIN (SELECT DISTINCT year, mgnr FROM delivery) d ON d.year = s.year
+                        JOIN member m ON m.mgnr = d.mgnr
+                        LEFT JOIN payment_member lp ON (lp.year, lp.avnr, lp.mgnr) = (l.year, l.avnr, m.mgnr)
+                        LEFT JOIN payment_member p ON (p.year, p.avnr, p.mgnr) = (v.year, v.avnr, m.mgnr)
+                        LEFT JOIN credit lc ON (lc.year, lc.avnr, lc.mgnr) = (l.year, l.avnr, m.mgnr)
+                        LEFT JOIN v_penalty_area_commitments u ON (u.year, u.mgnr) = (s.year, m.mgnr)
+                        LEFT JOIN v_penalty_business_shares b ON (b.year, b.mgnr) = (s.year, m.mgnr)
+                        LEFT JOIN v_auto_business_shares a ON (a.year, a.mgnr) = (s.year, m.mgnr)
+                    WHERE s.year = {Year} AND v.avnr = {AvNr};
+
+                    UPDATE payment_variant SET test_variant = FALSE WHERE (year, avnr) = ({Year}, {AvNr});
+                    """);
+        }
+
+        public async Task Revert() {
+            using var cnx = await AppDbContext.ConnectAsync();
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                DELETE FROM credit WHERE (year, avnr) = ({Year}, {AvNr});
+                UPDATE payment_variant SET test_variant = TRUE WHERE (year, avnr) = ({Year}, {AvNr});
+                """);
+        }
+
+        protected async Task SetCalcTime(SqliteConnection cnx) {
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                UPDATE payment_variant SET calc_time = UNIXEPOCH() WHERE (year, avnr) = ({Year}, {AvNr})
+                """);
+        }
+
+        protected async Task DeleteInDb(SqliteConnection cnx) {
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                DELETE FROM payment_delivery_part_bucket WHERE (year, avnr) = ({Year}, {AvNr});
+                DELETE FROM payment_delivery_part WHERE (year, avnr) = ({Year}, {AvNr});
+                DELETE FROM payment_member WHERE (year, avnr) = ({Year}, {AvNr});
+                UPDATE payment_variant SET calc_time = NULL WHERE (year, avnr) = ({Year}, {AvNr});
+                """);
+        }
+
+        protected async Task CalculateMemberModifiers(SqliteConnection cnx) {
+            if (App.Client.IsMatzen) {
+                var lastYears = 3;
+                var multiplier = 0.50;
+                var modName = "Treue%";
+                await AppDbContext.ExecuteBatch(cnx, $"""
+                    INSERT INTO payment_member (year, avnr, mgnr, net_amount, mod_abs, mod_rel)
+                    SELECT c.year, {AvNr}, s.mgnr, 0,
+                           ROUND(s.sum * COALESCE(m.abs, 0)),
+                           COALESCE(m.rel, 0)
+                    FROM (SELECT {Year} AS year, mgnr,
+                                 ROUND(AVG(sum) * {multiplier}) AS baseline,
+                                 COUNT(*) = {lastYears} AND MIN(sum) > 0 AS allowed
+                          FROM v_stat_member
+                          WHERE year > {Year} - {lastYears}
+                          GROUP BY mgnr
+                          HAVING allowed) c
+                        JOIN v_stat_member s ON (s.year, s.mgnr) = (c.year, c.mgnr)
+                        LEFT JOIN modifier m ON m.year = c.year AND m.name LIKE '{modName}'
+                    WHERE sum >= baseline
+                    ON CONFLICT DO UPDATE
+                    SET mod_abs = mod_abs + excluded.mod_abs,
+                        mod_rel = mod_rel + excluded.mod_rel
+                    """);
             }
         }
 
-        public async Task CalculatePrices() {
-            await DeleteInDb();
-            using var cnx = await AppDbContext.ConnectAsync();
-
-            var parts = new List<(int Year, int DId, int DPNr, int BktNr, string SortId, string Discr, int Value, bool MinQuw, double Oe, double Kmw)>();
+        protected async Task CalculatePrices(SqliteConnection cnx) {
+            var parts = new List<(int Year, int DId, int DPNr, int BktNr, string SortId, string? AttrId, string Discr, int Value, double Oe, double Kmw, string QualId)>();
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"""
-                    SELECT d.year, d.did, d.dpnr, b.bktnr, d.sortid, b.discr, b.value, d.min_quw, d.oe, d.kmw
+                    SELECT d.year, d.did, d.dpnr, b.bktnr, d.sortid, d.attrid, b.discr, b.value, d.oe, d.kmw, d.qualid
                     FROM delivery_part_bucket b
                         JOIN v_delivery d ON (d.year, d.did, d.dpnr) = (b.year, b.did, b.dpnr)
                     WHERE b.year = {Year}
@@ -43,27 +134,40 @@ namespace Elwig.Helpers.Billing {
                 while (await reader.ReadAsync()) {
                     parts.Add((
                         reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetInt32(3),
-                        reader.GetString(4), reader.GetString(5), reader.GetInt32(6),
-                        reader.GetBoolean(7), reader.GetDouble(8), reader.GetDouble(9)
+                        reader.GetString(4), reader.IsDBNull(5) ? null : reader.GetString(5), reader.GetString(6),
+                        reader.GetInt32(7), reader.GetDouble(8), reader.GetDouble(9), reader.GetString(10)
                     ));
                 }
             }
 
             var inserts = new List<(int Year, int DId, int DPNr, int BktNr, long Price, long Amount)>();
             foreach (var part in parts) {
-                var price = !part.MinQuw ? 0.5m : ((part.BktNr == 2 ? 0.8m : (part.BktNr == 1 ? 0.7m : 0.6m)) + ((decimal)(part.Oe - 73) * 0.005m));  // TODO
-                var priceL = Utils.DecToDb(price, 4);
-                var amount = Utils.DecToDb(price * part.Value, 4);
-                inserts.Add((part.Year, part.DId, part.DPNr, part.BktNr, priceL, amount));
+                var ungeb = part.Discr == "_";
+                var payAttrId = (part.Discr is "" or "_") ? null : part.Discr;
+                var geb = !ungeb && payAttrId == part.AttrId;
+                var price = Data.CalculatePrice(part.SortId, part.AttrId, part.QualId, geb, part.Oe, part.Kmw);
+                var priceL = PaymentVariant.Season.DecToDb(price);
+                inserts.Add((part.Year, part.DId, part.DPNr, part.BktNr, priceL, priceL * part.Value));
             }
 
-            using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"""
-                    INSERT INTO payment_delivery_part_bucket (year, did, dpnr, bktnr, avnr, price, amount)
-                    VALUES {string.Join(",\n       ", inserts.Select(i => $"({i.Year}, {i.DId}, {i.DPNr}, {i.BktNr}, {AvNr}, {i.Price}, {i.Amount})"))}
-                    """;
-                await cmd.ExecuteNonQueryAsync();
-            }
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                INSERT INTO payment_delivery_part_bucket (year, did, dpnr, bktnr, avnr, price, amount)
+                VALUES {string.Join(",\n       ", inserts.Select(i => $"({i.Year}, {i.DId}, {i.DPNr}, {i.BktNr}, {AvNr}, {i.Price}, {i.Amount})"))};
+                """);
+        }
+
+        protected async Task CalculateDeliveryModifiers(SqliteConnection cnx) {
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                INSERT INTO payment_delivery_part (year, did, dpnr, avnr, net_amount, mod_abs, mod_rel)
+                SELECT d.year, d.did, d.dpnr, {AvNr}, 0, COALESCE(m.abs, 0), COALESCE(m.rel, 0)
+                FROM delivery_part d
+                    LEFT JOIN delivery_part_modifier p ON (p.year, p.did, p.dpnr) = (d.year, d.did, d.dpnr)
+                    LEFT JOIN modifier m ON (m.year, m.modid) = (d.year, p.modid)
+                WHERE d.year = {Year}
+                ON CONFLICT DO UPDATE
+                SET mod_abs = mod_abs + excluded.mod_abs,
+                    mod_rel = mod_rel + excluded.mod_rel
+                """);
         }
     }
 }

Elwig/Helpers/Billing/EditBillingData.cs

@@ -0,0 +1,106 @@
+using Elwig.Models.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Elwig.Helpers.Billing {
+    public class EditBillingData : BillingData {
+
+        protected readonly IEnumerable<string> Vaributes;
+
+        public EditBillingData(JsonObject data, IEnumerable<string> vaributes) :
+            base(data) {
+            Vaributes = vaributes;
+        }
+
+        public static EditBillingData FromJson(string json, IEnumerable<string> vaributes) {
+            return new(ParseJson(json), vaributes);
+        }
+
+        private (Dictionary<int, Curve>, Dictionary<int, List<string>>) GetGraphEntries(JsonNode root) {
+            Dictionary<int, List<string>> dict1 = [];
+            Dictionary<decimal, List<string>> dict2 = [];
+            if (root is JsonObject paymentObj) {
+                foreach (var (selector, node) in paymentObj) {
+                    var val = node?.AsValue();
+                    if (val == null) {
+                        continue;
+                    } else if (val.TryGetValue<decimal>(out var price)) {
+                        if (!dict2.ContainsKey(price)) dict2[price] = [];
+                        dict2[price].Add(selector);
+                    } else if (val.TryGetValue<string>(out var curve)) {
+                        var idx = int.Parse(curve.Split(":")[1] ?? "0");
+                        if (!dict1.ContainsKey(idx)) dict1[idx] = [];
+                        dict1[idx].Add(selector);
+                    }
+                }
+            } else if (root is JsonValue paymentVal) {
+                if (paymentVal.TryGetValue<decimal>(out var price)) {
+                    if (!dict2.ContainsKey(price)) dict2[price] = [];
+                    dict2[price].Add("default");
+                } else if (paymentVal.TryGetValue<string>(out var curve)) {
+                    var idx = int.Parse(curve.Split(":")[1] ?? "0");
+                    if (!dict1.ContainsKey(idx)) dict1[idx] = [];
+                    dict1[idx].Add("default");
+                }
+            }
+
+            var virtOffset = dict1.Count > 0 ? dict1.Max(e => e.Key) + 1 : 1;
+            Dictionary<int, Curve> curves = GetCurves();
+            decimal[] virtCurves = [.. dict2.Keys.Order()];
+            for (int i = 0; i < virtCurves.Length; i++) {
+                var idx = virtCurves[i];
+                dict1[i + virtOffset] = dict2[idx];
+                curves[i + virtOffset] = new Curve(CurveMode.Oe, new() { { 73, idx } }, null);
+            }
+
+            Dictionary<int, List<string>> dict3 = curves.ToDictionary(c => c.Key, _ => new List<string>());
+            foreach (var (selector, value) in GetSelection(root, Vaributes)) {
+                int? idx = null;
+                if (value.TryGetValue<decimal>(out var val)) {
+                    idx = Array.IndexOf(virtCurves, val) + virtOffset;
+                } else if (value.TryGetValue<string>(out var str)) {
+                    idx = int.Parse(str.Split(":")[1]);
+                }
+                if (idx != null)
+                    dict3[(int)idx].Add(selector);
+            }
+
+            return (curves, dict3);
+        }
+
+        private static List<GraphEntry> CreateGraphEntries(
+            AppDbContext ctx, int precision,
+            Dictionary<int, Curve> curves,
+            Dictionary<int, List<string>> entries
+        ) {
+            var vars = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);
+            var attrs = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a);
+            return entries
+                .Select(e => new GraphEntry(e.Key, precision, curves[e.Key], e.Value
+                    .Select(s => new Varibute(vars[s[..2]], s.Length > 2 ? attrs[s[2..]] : null))
+                    .ToList()))
+                .ToList();
+        }
+
+        public IEnumerable<GraphEntry> GetPaymentGraphEntries(AppDbContext ctx, Season season) {
+            var root = GetPaymentEntry();
+            var (curves, entries) = GetGraphEntries(root);
+            return CreateGraphEntries(ctx, season.Precision, curves, entries).Where(e => e.Vaributes.Count > 0);
+        }
+
+        public IEnumerable<GraphEntry> GetQualityGraphEntries(AppDbContext ctx, Season season, int idOffset = 0) {
+            var root = GetQualityEntry();
+            if (root == null || root["WEI"] is not JsonNode qualityWei)
+                return [];
+            var (curves, entries) = GetGraphEntries(qualityWei);
+            var list = CreateGraphEntries(ctx, season.Precision, curves, entries).Where(e => e.Vaributes.Count > 0);
+            foreach (var e in list) {
+                e.Id += idOffset;
+                e.Abgewertet = true;
+            }
+            return list;
+        }
+    }
+}

Elwig/Helpers/Billing/Graph.cs

@@ -1,119 +1,107 @@
-using ScottPlot;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.Json.Nodes;
 
 namespace Elwig.Helpers.Billing {
     public class Graph : ICloneable {
 
-        public string Type { get; set; }
-        public int Num { get; set; }
-        private int MinX { get; set; }
-        private int MaxX { get; set; }
-        public string Contracts { get; set; }
+        public readonly int Precision;
         public double[] DataX { get; set; }
         public double[] DataY { get; set; }
+        public int MinX { get; set; }
+        public int MaxX { get; set; }
 
-        public Graph(int num, int minX, int maxX) {
-            Type = "oe";
-            Num = num;
-            Contracts = "";
+        public Graph(int precision, int minX, int maxX) {
+            Precision = precision;
             MinX = minX;
             MaxX = maxX;
-
-            DataX = DataGen.Range(MinX, MaxX + 1);
-            DataY = DataGen.Zeros(MaxX - MinX + 1);
+            DataX = Enumerable.Range(minX, maxX - minX + 1).Select(n => (double)n).ToArray();
+            DataY = new double[DataX.Length];
         }
 
-        public Graph(string type, int num, JsonObject graphData, string contracts, int minX, int maxX) {
-            Type = type;
-            Num = num;
-            Contracts =  contracts;
+        public Graph(Dictionary<double, decimal> data, int precision, int minX, int maxX) {
+            Precision = precision;
             MinX = minX;
             MaxX = maxX;
-
-            DataX = DataGen.Range(MinX, MaxX + 1);
-            DataY = DataGen.Zeros(MaxX - MinX + 1);
-            ParseGraphData(graphData);
+            DataX = Enumerable.Range(minX, maxX - minX + 1).Select(n => (double)n).ToArray();
+            DataY = DataX.Select(i => (double)BillingData.GetCurveValueAt(data, i)).ToArray();
         }
 
-        public Graph(string type, int num, int minX, int maxX, string contracts, double[] dataX, double[] dataY) {
-            Type = type;
-            Num = num;
+        public Graph(double[] values, int precision, int minX, int maxX) {
+            Precision = precision;
+            MinX = minX;
+            MaxX = maxX;
+            DataX = Enumerable.Range(MinX, MaxX - MinX + 1).Select(i => (double)i).ToArray();
+            DataY = values;
+        }
+
+        private Graph(double[] dataX, double[] dataY, int precision, int minX, int maxX) {
+            Precision = precision;
             MinX = minX;
             MaxX = maxX;
-            Contracts = contracts;
             DataX = dataX;
             DataY = dataY;
         }
 
-        private void ParseGraphData(JsonObject graphData) {
-            var GraphPoints = graphData.ToDictionary(p => int.Parse(p.Key[..^2]), p => (double)p.Value?.AsValue());
+        public double GetOechsleAt(int index) {
+            return DataX[index];
+        }
 
-            if (GraphPoints.Keys.Count < 1) {
-                return;
-            }
+        public void SetOechsleAt(int index, double oechsle) {
+            DataX[index] = oechsle;
+        }
 
-            var minKey = GraphPoints.Keys.Order().First();
-            var maxKey = GraphPoints.Keys.OrderDescending().First();
+        public void SetPriceAt(int index, double price) {
+            DataY[index] = price;
+        }
 
-            if (!GraphPoints.ContainsKey(MinX)) {
-                GraphPoints.Add(MinX, GraphPoints.GetValueOrDefault(minKey));
-            }
-            if (!GraphPoints.ContainsKey(MaxX)) {
-                GraphPoints.Add(MaxX, GraphPoints.GetValueOrDefault(maxKey));
-            }
+        public double GetPriceAt(int index) {
+            return DataY[index];
+        }
 
-            var keys = GraphPoints.Keys.Order().ToArray();
+        public double GetPriceAtOe(double oe) {
+            return DataY[Array.IndexOf(DataX, oe)];
+        }
 
-            for (int i = 0; i < keys.Length; i++) {
-                double point1Value = GraphPoints[keys[i]];
-                if (i + 1 < keys.Length) {
-                    double point2Value = GraphPoints[keys[i + 1]];
-                    if (point1Value == point2Value) {
-                        for (int j = keys[i] - MinX; j < keys[i + 1] - MinX; j++) {
-                            DataY[j] = point1Value;
-                        }
-                    } else {
-                        int steps = Math.Abs(keys[i + 1] - keys[i]);
-                        double step = (point2Value - point1Value) / steps;
-
-                        DataY[keys[i] - MinX] = point1Value;
-                        DataY[keys[i + 1] - MinX] = point2Value;
-
-                        for (int j = keys[i] - MinX; j < keys[i + 1] - MinX - 1; j++) {
-                            DataY[j + 1] = Math.Round(DataY[j] + step, 4); // TODO richtig runden
-                        }
-                    }
-                }
-                else {
-                    for (int j = keys[i] - MinX; j < DataX.Length; j++) {
-                        DataY[j] = point1Value;
-                    }
-                }
+        private void FlattenGraph(int begin, int end, double value) {
+            for (int i = begin; i <= end; i++) {
+                DataY[i] = value;
             }
         }
 
-        public JsonObject ToJson() {
-            JsonObject graph = new();
+        public void FlattenGraphLeft(int pointIndex) {
+            FlattenGraph(0, pointIndex, DataY[pointIndex]);
+        }
 
-            if (DataY[0] != DataY[1]) {
-                graph.Add(new KeyValuePair<string, JsonNode?>(DataX[0] + Type.ToLower(), Math.Round(DataY[0], 4)));
+        public void FlattenGraphRight(int pointIndex) {
+            FlattenGraph(pointIndex, DataY.Length - 1, DataY[pointIndex]);
+        }
+
+        private void LinearIncreaseGraph(int begin, int end, double inc) {
+            for (int i = begin; i < end; i++) {
+                DataY[i + 1] = Math.Round(DataY[i] + inc, Precision);
             }
-            for (int i = 1; i < DataX.Length - 1; i++) {
-                if (Math.Round(DataY[i] - DataY[i - 1], 4) != Math.Round(DataY[i + 1] - DataY[i], 4)) {
-                    graph.Add(new KeyValuePair<string, JsonNode?>(DataX[i] + Type.ToLower(), Math.Round(DataY[i], 4)));
-                }
+        }
+
+        public void LinearIncreaseGraphToEnd(int begin, double inc) {
+            LinearIncreaseGraph(begin, DataY.Length - 1, inc);
+        }
+
+        public void InterpolateGraph(int firstPoint, int secondPoint) {
+            int steps = Math.Abs(firstPoint - secondPoint);
+            if (firstPoint == -1 || secondPoint == -1 || steps < 2) {
+                return;
             }
-            if (DataY[^1] != DataY[^2]) {
-                graph.Add(new KeyValuePair<string, JsonNode?>(DataX[^1] + Type.ToLower(), Math.Round(DataY[^1], 4)));
+            var (lowIndex, highIndex) = firstPoint < secondPoint ? (firstPoint, secondPoint) : (secondPoint, firstPoint);
+            double step = (DataY[highIndex] - DataY[lowIndex]) / steps;
+
+            for (int i = lowIndex; i < highIndex - 1; i++) {
+                DataY[i + 1] = Math.Round(DataY[i] + step, Precision);
             }
-            return graph;
         }
 
         public object Clone() {
-            return new Graph(Type, Num, MinX, MaxX, Contracts, (double[])DataX.Clone(), (double[])DataY.Clone());
+            return new Graph((double[])DataX.Clone(), (double[])DataY.Clone(), Precision, MinX, MaxX);
         }
     }
 }

Elwig/Helpers/Billing/GraphEntry.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Elwig.Helpers.Billing {
+    public class GraphEntry {
+
+        public const int MinX = 50;
+        public const int MinXGeb = 73;
+        public const int MaxX = 120;
+
+        public int Id { get; set; }
+        public BillingData.CurveMode Mode { get; set; }
+        public bool Abgewertet { get; set; }
+
+        public Graph DataGraph { get; set; }
+        public Graph? GebundenGraph { get; set; }
+        public double? GebundenFlatBonus {
+            get {
+                try {
+                    var val = GebundenGraph?.DataX.Zip(GebundenGraph.DataY)
+                        .Select(e => Math.Round(e.Second - DataGraph.GetPriceAtOe(e.First), Precision))
+                        .Distinct()
+                        .Single();
+                    return (val == 0) ? null : val;
+                } catch {
+                    return null;
+                }
+            }
+            set {
+                if (value is not double v) return;
+                var values = Enumerable.Range(MinXGeb, MaxX - MinXGeb + 1)
+                    .Select(i => Math.Round(DataGraph.GetPriceAtOe(i) + v, Precision))
+                    .ToArray();
+                GebundenGraph = new Graph(values, Precision, MinXGeb, MaxX);
+            }
+        }
+
+        public List<Varibute> Vaributes { get; set; }
+        public string VaributeStringSimple => (Abgewertet ? "Abgew.: " : "") + (Vaributes.Count != 0 ? (Vaributes.Count >= 25 ? "Restliche Sorten" : string.Join(", ", Vaributes.Select(c => c.Listing))) : "-");
+        public string VaributeString => Vaributes.Count != 0 ? string.Join("\n", Vaributes.Select(c => c.FullName)) : "-";
+        public string VaributeStringChange => (Abgewertet ? "A." : "") + string.Join(",", Vaributes.Select(c => c.Listing));
+        private readonly int Precision;
+
+        public GraphEntry(int id, int precision, BillingData.CurveMode mode) {
+            Id = id;
+            Precision = precision;
+            Mode = mode;
+            DataGraph = new Graph(precision, MinX, MaxX); ;
+            Vaributes = [];
+        }
+
+        public GraphEntry(int id, int precision, BillingData.CurveMode mode, Dictionary<double, decimal> data, Dictionary<double, decimal>? gebunden) :
+            this(id, precision, mode) {
+            DataGraph = new Graph(data, precision, MinX, MaxX);
+            if (gebunden != null) GebundenGraph = new Graph(gebunden, precision, MinXGeb, MaxX);
+        }
+
+        public GraphEntry(int id, int precision, BillingData.Curve curve, List<Varibute> vaributes) :
+            this(id, precision, curve.Mode) {
+            DataGraph = new Graph(curve.Normal, precision, MinX, MaxX);
+            if (curve.Gebunden != null)
+                GebundenGraph = new Graph(curve.Gebunden, precision, MinXGeb, MaxX);
+            Vaributes = vaributes;
+        }
+
+        private GraphEntry(int id, int precision, BillingData.CurveMode mode, Graph dataGraph, Graph? gebundenGraph, List<Varibute> vaributes) {
+            Id = id;
+            Precision = precision;
+            Mode = mode;
+            DataGraph = dataGraph;
+            GebundenGraph = gebundenGraph;
+            Vaributes = vaributes;
+        }
+
+        public void AddGebundenGraph() {
+            GebundenGraph ??= new Graph(Precision, MinXGeb, MaxX);
+        }
+
+        public void RemoveGebundenGraph() {
+            GebundenGraph = null;
+        }
+
+        public GraphEntry Copy(int id) {
+            return new GraphEntry(id, Precision, Mode, (Graph)DataGraph.Clone(), (Graph?)GebundenGraph?.Clone(), []);
+        }
+    }
+}

Elwig/Helpers/Billing/PaymentBillingData.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Elwig.Helpers.Billing {
+    public class PaymentBillingData : BillingData {
+
+        protected readonly Dictionary<int, Curve> Curves;
+        protected readonly Dictionary<string, Curve> PaymentData;
+        protected readonly Dictionary<string, Curve> QualityData;
+        protected readonly IEnumerable<string> Vaributes;
+
+        public PaymentBillingData(JsonObject data, IEnumerable<string> vaributes) :
+            base(data) {
+            if (vaributes.Any(e => e.Any(c => c < 'A' || c > 'Z')))
+                throw new ArgumentException("Invalid vaributes");
+            Vaributes = vaributes;
+            Curves = GetCurves();
+            PaymentData = GetPaymentData();
+            QualityData = GetQualityData();
+        }
+
+        public static PaymentBillingData FromJson(string json, IEnumerable<string> vaributes) {
+            return new(ParseJson(json), vaributes);
+        }
+
+        private Dictionary<string, Curve> GetData(JsonNode data) {
+            return GetSelection(data, Vaributes).ToDictionary(e => e.Key, e => LookupCurve(e.Value));
+        }
+
+        protected Dictionary<string, Curve> GetPaymentData() {
+            return GetData(GetPaymentEntry());
+        }
+
+        protected Dictionary<string, Curve> GetQualityData() {
+            Dictionary<string, Curve> dict = [];
+            var q = GetQualityEntry();
+            if (q == null) return dict;
+
+            foreach (var (qualid, data) in q) {
+                foreach (var (idx, d) in GetData(data ?? throw new InvalidOperationException())) {
+                    dict[$"{qualid}/{idx}"] = d;
+                }
+            }
+
+            return dict;
+        }
+
+        public decimal CalculatePrice(string sortid, string? attrid, string qualid, bool gebunden, double oe, double kmw) {
+            var curve = GetQualityCurve(qualid, sortid, attrid) ?? GetCurve(sortid, attrid);
+            return GetCurveValueAt((gebunden ? curve.Gebunden : null) ?? curve.Normal, curve.Mode == CurveMode.Oe ? oe : kmw);
+        }
+
+        private Curve LookupCurve(JsonValue val) {
+            if (val.TryGetValue(out string? curve)) {
+                var curveId = int.Parse(curve.Split(":")[1]);
+                return Curves[curveId];
+            } else if (val.TryGetValue(out decimal value)) {
+                return new(CurveMode.Oe, new() { { 73, value } }, null);
+            }
+            throw new InvalidOperationException();
+        }
+
+        protected Curve GetCurve(string sortid, string? attrid) {
+            return PaymentData[$"{sortid}{attrid}"];
+        }
+
+        protected Curve? GetQualityCurve(string qualid, string sortid, string? attrid) {
+            return QualityData.TryGetValue($"{qualid}/{sortid}{attrid}", out var curve) ? curve : null;
+        }
+    }
+}

Elwig/Helpers/Billing/Transaction.cs

@@ -1,32 +0,0 @@
-using Elwig.Models.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Elwig.Helpers.Billing {
-    public class Transaction {
-
-        public readonly Member Member;
-        public readonly long AmountCent;
-        public readonly string Currency;
-        public readonly int Nr;
-
-        public Transaction(Member m, decimal amount, string currency, int nr) {
-            Member = m;
-            AmountCent = (long)Math.Round(amount * 100);
-            Currency = currency;
-            Nr = nr;
-        }
-
-        public static IEnumerable<Transaction> FromPaymentVariant(PaymentVar variant) {
-            var last = variant.Season.PaymentVariants.Where(v => v.TransferDate != null).OrderBy(v => v.TransferDate).LastOrDefault();
-            var dict = last?.MemberPayments.ToDictionary(m => m.MgNr, m => m.Amount) ?? new();
-            return variant.Credits
-                .OrderBy(c => c.MgNr)
-                .Select(c => new Transaction(c.Member, c.Amount, variant.Season.CurrencyCode, c.TgNr))
-                .ToList();
-        }
-
-        public static string FormatAmountCent(long cents) => $"{cents / 100}.{cents % 100:00}";
-    }
-}

Elwig/Helpers/Billing/Varibute.cs

@@ -0,0 +1,28 @@
+using Elwig.Models.Entities;
+using System;
+
+namespace Elwig.Helpers.Billing {
+    public class Varibute : IComparable<Varibute> {
+
+        public WineVar? Variety { get; }
+        public WineAttr? Attribute { get; }
+        public int? AssignedGraphId { get; set; }
+        public int? AssignedAbgewGraphId { get; set; }
+
+        public string Listing => $"{Variety?.SortId}{Attribute?.AttrId}";
+        public string FullName => $"{Variety?.Name}" + (Variety != null && Attribute != null ? " " : "") + $"{Attribute?.Name}";
+
+        public Varibute(WineVar? var, WineAttr? attr) {
+            Variety = var;
+            Attribute = attr;
+        }
+
+        public override string ToString() {
+            return Listing;
+        }
+
+        public int CompareTo(Varibute? other) {
+            return Listing.CompareTo(other?.Listing);
+        } 
+    }
+}

Elwig/Helpers/ClientParameters.cs

@@ -60,6 +60,7 @@ namespace Elwig.Helpers {
 
         public string? TextDeliveryNote;
         public string? TextDeliveryConfirmation;
+        public string? TextCreditNote;
 
         public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
 
@@ -99,6 +100,8 @@ namespace Elwig.Helpers {
                 if (TextDeliveryNote == "") TextDeliveryNote = null;
                 TextDeliveryConfirmation = parameters.GetValueOrDefault("TEXT_DELIVERYCONFIRMATION");
                 if (TextDeliveryConfirmation == "") TextDeliveryConfirmation = null;
+                TextCreditNote = parameters.GetValueOrDefault("TEXT_CREDITNOTE");
+                if (TextCreditNote == "") TextCreditNote = null;
             } catch {
                 throw new KeyNotFoundException();
             }
@@ -133,6 +136,7 @@ namespace Elwig.Helpers {
                 ("DOCUMENT_SENDER", Sender2),
                 ("TEXT_DELIVERYNOTE", TextDeliveryNote),
                 ("TEXT_DELIVERYCONFIRMATION", TextDeliveryConfirmation),
+                ("TEXT_CREDITNOTE", TextCreditNote),
             };
         }
 

Elwig/Helpers/Config.cs

@@ -1,8 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using IniParser;
-using IniParser.Model;
+using Microsoft.Extensions.Configuration;
 
 namespace Elwig.Helpers {
     public class Config {
@@ -13,7 +12,8 @@ namespace Elwig.Helpers {
         public string? DatabaseLog = null;
         public string? Branch = null;
         public IList<string?[]> Scales;
-        private readonly List<string?[]> ScaleList = new();
+        private readonly List<string?[]> ScaleList = [];
+        private static readonly string[] trueValues = ["1", "true", "yes", "on"];
 
         public Config(string filename) {
             FileName = filename;
@@ -22,57 +22,24 @@ namespace Elwig.Helpers {
         }
 
         public void Read() {
-            var parser = new FileIniDataParser();
-            IniData? ini = null;
-            try {
-                ini = parser.ReadFile(FileName, Utils.UTF8);
-            } catch {}
+            var config = new ConfigurationBuilder().AddIniFile(FileName).Build();
 
-            if (ini == null || !ini.TryGetKey("database.file", out string db)) {
-                DatabaseFile = App.DataPath + "database.sqlite3";
-            } else if (db.Length > 1 && (db[1] == ':' || db[0] == '/' || db[0] == '\\')) {
-                DatabaseFile = db;
-            } else {
-                DatabaseFile = App.DataPath + db;
-            }
-
-            if (ini == null || !ini.TryGetKey("database.log", out string log)) {
-                DatabaseLog = null;
-            } else if (log.Length > 1 && (log[1] == ':' || log[0] == '/' || log[0] == '\\')) {
-                DatabaseLog = log;
-            } else {
-                DatabaseLog = App.DataPath + log;
-            }
-
-            if (ini == null || !ini.TryGetKey("general.branch", out string branch)) {
-                Branch = null;
-            } else {
-                Branch = branch;
-            }
-
-            if (ini == null || !ini.TryGetKey("general.debug", out string debug)) {
-                Debug = false;
-            } else {
-                debug = debug.ToLower();
-                Debug = debug == "1" || debug == "true" || debug == "yes" || debug == "on";
-            }
+            DatabaseFile = Path.Combine(App.DataPath, config["database:file"] ?? "database.sqlite3");
+            var log = config["database:log"];
+            DatabaseLog = log != null ? Path.Combine(App.DataPath, log) : null;
+            Branch = config["general:branch"];
+            Debug = trueValues.Contains(config["general:debug"]?.ToLower());
 
+            var scales = config.AsEnumerable().Where(i => i.Key.StartsWith("scale.")).GroupBy(i => i.Key.Split(':')[0][6..]).Select(i => i.Key);
             ScaleList.Clear();
             Scales = ScaleList;
-            if (ini != null) {
-                foreach (var s in ini.Sections.Where(s => s.SectionName.StartsWith("scale."))) {
-                    string? scaleLog = null;
-                    if (s.Keys["log"] != null) {
-                        scaleLog = s.Keys["log"];
-                        if (scaleLog.Length <= 1 || (scaleLog[1] != ':' && scaleLog[0] != '/' && scaleLog[0] != '\\')) {
-                            scaleLog = App.DataPath + scaleLog;
-                        }
-                    }
-                    ScaleList.Add(new string?[] {
-                        s.SectionName[6..], s.Keys["type"], s.Keys["model"], s.Keys["connection"],
-                        s.Keys["empty"], s.Keys["filling"], s.Keys["limit"], scaleLog
-                    });
-                }
+            foreach (var s in scales) {
+                string? scaleLog = config[$"scale.{s}:log"];
+                if (scaleLog != null) scaleLog = Path.Combine(App.DataPath, scaleLog);
+                ScaleList.Add([
+                    s, config[$"scale.{s}:type"], config[$"scale.{s}:model"], config[$"scale.{s}:connection"],
+                    config[$"scale.{s}:empty"], config[$"scale.{s}:filling"], config[$"scale.{s}:limit"], scaleLog
+                ]);
             }
         }
 

Elwig/Helpers/Export/Ebics.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers.Billing;
+using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
@@ -7,32 +7,24 @@ using System.Linq;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Export {
-    public class Ebics : IBankingExporter {
+    public class Ebics(PaymentVar variant, string filename) : IBankingExporter {
 
         public static string FileExtension => "xml";
 
-        private readonly StreamWriter _writer;
-        private readonly DateOnly _date;
-        private readonly int _year;
-        private readonly string _name;
-        private readonly int _nr;
-
-        public Ebics(PaymentVar variant, string filename) {
-            _writer = new(filename, false, Utils.UTF8);
-            _date = variant.TransferDate ?? DateOnly.Parse("2021-01-10"); //throw new ArgumentException("TransferDate has to be set in PaymentVar");
-            _year = variant.Year;
-            _name = variant.Name;
-            _nr = variant.AvNr;
-        }
+        private readonly StreamWriter Writer = new(filename, false, Utils.UTF8);
+        private readonly DateOnly Date = variant.TransferDate ?? throw new ArgumentException("TransferDate has to be set in PaymentVar");
+        private readonly int Year = variant.Year;
+        private readonly string Name = variant.Name;
+        private readonly int AvNr = variant.AvNr;
 
         public void Dispose() {
             GC.SuppressFinalize(this);
-            _writer.Dispose();
+            Writer.Dispose();
         }
 
         public ValueTask DisposeAsync() {
             GC.SuppressFinalize(this);
-            return _writer.DisposeAsync();
+            return Writer.DisposeAsync();
         }
 
         public void Export(IEnumerable<Transaction> transactions, IProgress<double>? progress = null) {
@@ -43,66 +35,66 @@ namespace Elwig.Helpers.Export {
             progress?.Report(0.0);
             var nbOfTxs = transactions.Count();
             int count = nbOfTxs + 2, i = 0;
-            var ctrlSum = Transaction.FormatAmountCent(transactions.Sum(tx => tx.AmountCent));
-            var msgId = $"ELWIG-{App.Client.NameToken}-{_year}-AV{_nr:00}";
+            var ctrlSum = transactions.Sum(tx => tx.Amount);
+            var msgId = $"ELWIG-{App.Client.NameToken}-{Year}-AV{AvNr:00}";
             var pmtInfId = $"{msgId}-1";
 
-            await _writer.WriteLineAsync($"""
+            await Writer.WriteLineAsync($"""
                 <?xml version="1.0" encoding="UTF-8"?>
                 <Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.09"
                           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                           xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.001.001.09 pain.001.001.09.xsd">
-                  <CstmrCdtTrfInitn>
-                    <GrpHdr>
-                      <MsgId>{msgId}</MsgId>
-                      <CreDtTm>{DateTime.UtcNow:o}</CreDtTm>
-                      <NbOfTxs>{nbOfTxs}</NbOfTxs>
-                      <CtrlSum>{ctrlSum}</CtrlSum>
-                      <InitgPty><Nm>{App.Client.NameFull}</Nm></InitgPty>
-                    </GrpHdr>
-                    <PmtInf>
-                      <PmtInfId>{pmtInfId}</PmtInfId>
-                      <PmtMtd>TRF</PmtMtd>
-                      <NbOfTxs>{nbOfTxs}</NbOfTxs>
-                      <CtrlSum>{ctrlSum}</CtrlSum>
-                      <ReqdExctnDt><Dt>{_date:yyyy-MM-dd}</Dt></ReqdExctnDt>
-                      <Dbtr><Nm>{App.Client.NameFull}</Nm></Dbtr>
-                      <DbtrAcct><Id><IBAN>{App.Client.Iban?.Replace(" ", "")}</IBAN></Id></DbtrAcct>
-                      <DbtrAgt><FinInstnId><BICFI>{App.Client.Bic ?? "NOTPROVIDED"}</BICFI></FinInstnId></DbtrAgt>
+                 <CstmrCdtTrfInitn>
+                  <GrpHdr>
+                   <MsgId>{msgId}</MsgId>
+                   <CreDtTm>{DateTime.UtcNow:o}</CreDtTm>
+                   <NbOfTxs>{nbOfTxs}</NbOfTxs>
+                   <CtrlSum>{Transaction.FormatAmount(ctrlSum)}</CtrlSum>
+                   <InitgPty><Nm>{App.Client.NameFull}</Nm></InitgPty>
+                  </GrpHdr>
+                  <PmtInf>
+                   <PmtInfId>{pmtInfId}</PmtInfId>
+                   <PmtMtd>TRF</PmtMtd>
+                   <NbOfTxs>{nbOfTxs}</NbOfTxs>
+                   <CtrlSum>{Transaction.FormatAmount(ctrlSum)}</CtrlSum>
+                   <ReqdExctnDt><Dt>{Date:yyyy-MM-dd}</Dt></ReqdExctnDt>
+                   <Dbtr><Nm>{App.Client.NameFull}</Nm></Dbtr>
+                   <DbtrAcct><Id><IBAN>{App.Client.Iban?.Replace(" ", "")}</IBAN></Id></DbtrAcct>
+                   <DbtrAgt><FinInstnId><BICFI>{App.Client.Bic ?? "NOTPROVIDED"}</BICFI></FinInstnId></DbtrAgt>
                 """);
             progress?.Report(100.0 * ++i / count);
 
             foreach (var tx in transactions) {
                 var a = (IAddress?)tx.Member.BillingAddress ?? tx.Member;
                 var (a1, a2) = Utils.SplitAddress(a.Address);
-                var id = $"ELWIG-{App.Client.NameToken}-{_year}-TG{tx.Nr:0000}";
-                var info = $"{_name} - Traubengutschrift {_year}/{tx.Nr:000}";
-                await _writer.WriteLineAsync($"""
-                          <CdtTrfTxInf>
-                            <PmtId><EndToEndId>{id}</EndToEndId></PmtId>
-                            <Amt><InstdAmt Ccy="{tx.Currency}">{Transaction.FormatAmountCent(tx.AmountCent)}</InstdAmt></Amt>
-                            <Cdtr>
-                              <Nm>{a.Name}</Nm>
-                              <PstlAdr>
-                                <StrtNm>{a1}</StrtNm><BldgNb>{a2}</BldgNb>
-                                <PstCd>{a.PostalDest.AtPlz?.Plz}</PstCd><TwnNm>{a.PostalDest.AtPlz?.Ort.Name}</TwnNm>
-                                <Ctry>{a.PostalDest.Country.Alpha2}</Ctry>
-                              </PstlAdr>
-                            </Cdtr>
-                            <CdtrAcct><Id><IBAN>{tx.Member.Iban}</IBAN></Id><CdtrAcct>
-                            <CdtrAgt><FinInstnId><BICFI>{tx.Member.Bic ?? "NOTPROVIDED"}</BICFI></FinInstnId></CdtrAgt>
-                            <RmtInf><Ustrd>{info}</Ustrd></RmtInf>
-                          </CdtTrfTxInf>
+                var id = $"ELWIG-{App.Client.NameToken}-{Year}-TG{tx.Nr:0000}";
+                var info = $"{Name} - Traubengutschrift Nr. {Year}/{tx.Nr:000}";
+                await Writer.WriteLineAsync($"""
+                       <CdtTrfTxInf>
+                        <PmtId><EndToEndId>{id}</EndToEndId></PmtId>
+                        <Amt><InstdAmt Ccy="{tx.Currency}">{Transaction.FormatAmount(tx.Amount)}</InstdAmt></Amt>
+                        <Cdtr>
+                         <Nm>{a.Name}</Nm>
+                         <PstlAdr>
+                          <StrtNm>{a1}</StrtNm><BldgNb>{a2}</BldgNb>
+                          <PstCd>{a.PostalDest.AtPlz?.Plz}</PstCd><TwnNm>{a.PostalDest.AtPlz?.Ort.Name}</TwnNm>
+                          <Ctry>{a.PostalDest.Country.Alpha2}</Ctry>
+                         </PstlAdr>
+                        </Cdtr>
+                        <CdtrAcct><Id><IBAN>{tx.Member.Iban}</IBAN></Id></CdtrAcct>
+                        <CdtrAgt><FinInstnId><BICFI>{tx.Member.Bic ?? "NOTPROVIDED"}</BICFI></FinInstnId></CdtrAgt>
+                        <RmtInf><Ustrd>{info}</Ustrd></RmtInf>
+                       </CdtTrfTxInf>
                     """);
                 progress?.Report(100.0 * ++i / count);
             }
 
-            await _writer.WriteLineAsync("""
-                    </PmtInf>
-                  </CstmrCdtTrfInitn>
+            await Writer.WriteLineAsync("""
+                  </PmtInf>
+                 </CstmrCdtTrfInitn>
                 </Document>
                 """);
-            await _writer.FlushAsync();
+            await Writer.FlushAsync();
             progress?.Report(100.0);
         }
     }

Elwig/Helpers/Export/Elba.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers.Billing;
+using Elwig.Models.Dtos;
 using System;
 
 namespace Elwig.Helpers.Export {

Elwig/Helpers/Export/IBankingExporter.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers.Billing;
+using Elwig.Models.Dtos;
 
 namespace Elwig.Helpers.Export {
     /// <summary>

Elwig/Helpers/Export/Ods.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
+using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
@@ -107,19 +108,19 @@ namespace Elwig.Helpers.Export {
                    <style:paragraph-properties fo:text-align="center"/>
                    <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
                   </style:style>
-                  <number:number-style style:name="NN0"><number:number number:decimal-places="0" number:min-decimal-places="0" number:min-integer-digits="1"/></number:number-style>
+                  <number:number-style style:name="NN0"><number:number number:decimal-places="0" number:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
                   <style:style style:name="N0" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN0"/>
-                  <number:number-style style:name="NN1"><number:number number:decimal-places="1" number:min-decimal-places="1" number:min-integer-digits="1"/></number:number-style>
+                  <number:number-style style:name="NN1"><number:number number:decimal-places="1" number:min-decimal-places="1" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
                   <style:style style:name="N1" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN1"/>
-                  <number:number-style style:name="NN2"><number:number number:decimal-places="2" number:min-decimal-places="2" number:min-integer-digits="1"/></number:number-style>
+                  <number:number-style style:name="NN2"><number:number number:decimal-places="2" number:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
                   <style:style style:name="N2" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN2"/>
-                  <number:number-style style:name="NN3"><number:number number:decimal-places="3" number:min-decimal-places="3" number:min-integer-digits="1"/></number:number-style>
+                  <number:number-style style:name="NN3"><number:number number:decimal-places="3" number:min-decimal-places="3" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
                   <style:style style:name="N3" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN3"/>
-                  <number:number-style style:name="NN4"><number:number number:decimal-places="4" number:min-decimal-places="4" number:min-integer-digits="1"/></number:number-style>
+                  <number:number-style style:name="NN4"><number:number number:decimal-places="4" number:min-decimal-places="4" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
                   <style:style style:name="N4" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN4"/>
-                  <number:number-style style:name="NN5"><number:number number:decimal-places="5" number:min-decimal-places="5" number:min-integer-digits="1"/></number:number-style>
+                  <number:number-style style:name="NN5"><number:number number:decimal-places="5" number:min-decimal-places="5" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
                   <style:style style:name="N5" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN5"/>
-                  <number:number-style style:name="NN6"><number:number number:decimal-places="6" number:min-decimal-places="6" number:min-integer-digits="1"/></number:number-style>
+                  <number:number-style style:name="NN6"><number:number number:decimal-places="6" number:min-decimal-places="6" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
                   <style:style style:name="N6" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN6"/>
                  </office:automatic-styles>
                  <office:body>
@@ -261,20 +262,20 @@ namespace Elwig.Helpers.Export {
             string c;
             if (data == null) {
                 c = $"<{ct}{add}/>";
-            } else if (data is float || data is double || data is byte || data is char ||
+            } else if (data is decimal || data is float || data is double || data is byte || data is char ||
                        data is short || data is ushort || data is int || data is uint || data is long || data is ulong) {
-
-                double v = double.Parse(data?.ToString() ?? "0");
+                double v = double.Parse(data?.ToString() ?? "0");  // use default culture for ToString and Parse()!
                 if (units != null && units.Length > 0) {
                     int n = -1;
                     switch (units[0]) {
                         case "%": n = 1; data = $"{v:N1}"; break;
+                        case "€": n = 2; data = $"{v:N2}"; break;
                         case "°KMW": n = 1; data = $"{v:N1}"; break;
                         case "°Oe": n = 0; data = $"{v:N0}"; break;
                     }
                     if (n >= 0) add = string.Join(" ", add.Split(" ").Select(p => p.StartsWith("table:style-name=") ? $"table:style-name=\"N{n}\"" : p));
                 }
-                c = $"<{ct} office:value-type=\"float\" calcext:value-type=\"float\" office:value=\"{v.ToString()?.Replace(",", ".")}\"{add}><text:p>{data}</text:p></{ct}>";
+                c = $"<{ct} office:value-type=\"float\" calcext:value-type=\"float\" office:value=\"{v.ToString(CultureInfo.InvariantCulture)}\"{add}><text:p>{data}</text:p></{ct}>";
             } else {
                 c = $"<{ct} office:value-type=\"string\" calcext:value-type=\"string\"{add}><text:p>{data}</text:p></{ct}>";
             }

Elwig/Helpers/Printing/Pdf.cs

@@ -74,12 +74,16 @@ namespace Elwig.Helpers.Printing {
         }
 
         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();
+            try {
+                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();
+            } catch (Exception e) {
+                MessageBox.Show("Beim Drucken ist ein Fehler aufgetreten:\n\n" + e.Message, "Fehler beim Drucken");
+            }
         }
     }
 }

Elwig/Helpers/Utils.cs

@@ -11,6 +11,9 @@ using Elwig.Dialogs;
 using System.Text;
 using System.Numerics;
 using Elwig.Models.Entities;
+using System.IO;
+using ScottPlot.TickGenerators.TimeUnits;
+using Elwig.Helpers.Billing;
 
 namespace Elwig.Helpers {
     public static partial class Utils {
@@ -47,6 +50,19 @@ namespace Elwig.Helpers {
         [GeneratedRegex(@"^(.*?) +([0-9].*)$", RegexOptions.Compiled)]
         private static partial Regex GeneratedAddressRegex();
 
+        public static readonly string GroupSeparator = "\u202F";
+        public static readonly string UnitSeparator = "\u00A0";
+
+        public static readonly KeyValuePair<string, string>[] PhoneNrTypes = [
+            new("landline", "Tel.-Nr. (Festnetz)"),
+            new("mobile", "Tel.-Nr. (mobil)"),
+            new("fax", "Fax-Nr."),
+        ];
+
+        public static string PhoneNrTypeToString(string type) {
+            return PhoneNrTypes.Where(t => t.Key == type).Select(t => t.Value).FirstOrDefault(type);
+        }
+
         private static readonly ushort[] Crc16ModbusTable = {
             0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
             0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
@@ -147,7 +163,7 @@ namespace Elwig.Helpers {
         }
 
         public static string FormatIban(string iban) {
-            return Regex.Replace(iban, ".{4}", "$0 ");
+            return Regex.Replace(iban.Trim(), ".{4}", "$0 ").Trim();
         }
 
         public static void RunBackground(string title, Func<Task> a) {
@@ -345,5 +361,23 @@ namespace Elwig.Helpers {
             }
             return output.OrderByDescending(l => l.Count());
         }
+
+        public static List<string> GetVaributes(AppDbContext ctx, int year, bool withSlash = false, bool onlyDelivered = true) {
+            var varieties = ctx.WineVarieties.Select(v => v.SortId).ToList();
+            var delivered = ctx.DeliveryParts
+               .Where(d => d.Year == year)
+               .Select(d => $"{d.SortId}{(withSlash ? "/" : "")}{d.AttrId}")
+               .Distinct()
+               .ToList();
+            return [.. (onlyDelivered ? delivered : delivered.Union(varieties)).Order()];
+        }
+
+        public static List<Varibute> GetVaributeList(AppDbContext ctx, int year, bool onlyDelivered = true) {
+            var varieties = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);
+            var attributes = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a);
+            return GetVaributes(ctx, year, false, onlyDelivered)
+                .Select(s => new Varibute(varieties[s[..2]], s.Length > 2 ? attributes[s[2..]] : null))
+                .ToList();
+        }
     }
 }

Elwig/Helpers/Validator.cs

@@ -9,14 +9,14 @@ namespace Elwig.Helpers {
 
         private static readonly Dictionary<string, string[][]> PHONE_NRS = new() {
             { "43", new string[][] {
-                Array.Empty<string>(),
-                new string[] { "57", "59" },
-                new string[] {
+                [],
+                ["57", "59"],
+                [
                     "50", "517", "718", "804", "720", "780", "800", "802", "810",
                     "820", "821", "828", "900", "901", "930", "931", "939",
                     "650", "651", "652", "653", "655", "657", "659", "660", "661",
                     "663", "664", "665", "666", "667", "668", "669", "67", "68", "69"
-                }
+                ]
             } },
             { "49", Array.Empty<string[]>() },
             { "48", Array.Empty<string[]>() },
@@ -162,7 +162,7 @@ namespace Elwig.Helpers {
                     if (text.StartsWith("+43 ")) {
                         var nr = text[4..];
                         var vws = PHONE_NRS["43"];
-                        if (!text.EndsWith(" ") && v >= 4 && v - 4 < vws.Length && vws[v - 4].Any(vw => nr.StartsWith(vw))) {
+                        if (!text.EndsWith(' ') && v >= 4 && v - 4 < vws.Length && vws[v - 4].Any(vw => nr.StartsWith(vw))) {
                             text += ' ';
                         } else if (nr == "1") {
                             text += ' ';
@@ -320,18 +320,24 @@ namespace Elwig.Helpers {
                 return new(true, null);
             } else if (input.Text.Length != 7) {
                 return new(false, "Betriebsnummer zu kurz");
+            } else if (!CheckLfbisNr(input.Text)) {
+                return new(false, "Prüfsumme der Betriebsnummer ist falsch");
+            } else {
+                return new(true, null);
             }
+        }
+
+        public static bool CheckLfbisNr(string nr) {
+            if (nr.Length != 7 || !nr.All(char.IsAsciiDigit))
+                return false;
 
             // https://statistik.at/fileadmin/shared/QM/Standarddokumentationen/RW/std_r_land-forstw_register.pdf#page=41
             int s = 0, v;
             for (int i = 0; i < 6; i++)
-                s += (input.Text[i] - '0') * (7 - i);
+                s += (nr[i] - '0') * (7 - i);
             v = (11 - (s % 11)) % 10;
 
-            if (v != (input.Text[6] - '0'))
-                return new(false, "Prüfsumme der Betriebsnummer ist falsch");
-
-            return new(true, null);
+            return v == (nr[6] - '0');
         }
 
         public static ValidationResult CheckUstIdNr(TextBox input, bool required) {
@@ -373,17 +379,11 @@ namespace Elwig.Helpers {
                 return required ? new(false, "UID ist nicht optional") : new(true, null);
 
             if (text.StartsWith("AT")) {
-                if (text.Length != 11 || text[2] != 'U')
+                if (text.Length != 11 || text[2] != 'U') {
                     return new(false, "UID ist ungültig");
-
-                // http://www.pruefziffernberechnung.de/U/USt-IdNr.shtml
-                int s = 0, v = 0;
-                for (int i = 0; i < 7; i++)
-                    s += ((text[i + 3] - '0') * (i % 2 + 1)).ToString().Select(ch => ch - '0').Sum();
-                v = (96 - s) % 10;
-
-                if (v != (text[10] - '0'))
+                } else if (!CheckUstIdNr(text)) {
                     return new(false, "Prüfsumme der UID ist falsch");
+                }
             } else {
                 return new(false, "Not implemented yet");
             }
@@ -391,6 +391,26 @@ namespace Elwig.Helpers {
             return new(true, null);
         }
 
+        public static bool CheckUstIdNr(string nr) {
+            if (nr.Length < 4 || nr.Length > 14 || !nr.All(char.IsAsciiLetterOrDigit))
+                return false;
+
+            if (nr.StartsWith("AT")) {
+                if (nr.Length != 11 || nr[2] != 'U')
+                    return false;
+
+                // http://www.pruefziffernberechnung.de/U/USt-IdNr.shtml
+                int s = 0, v = 0;
+                for (int i = 0; i < 7; i++)
+                    s += ((nr[i + 3] - '0') * (i % 2 + 1)).ToString().Select(ch => ch - '0').Sum();
+                v = (96 - s) % 10;
+
+                return v == (nr[10] - '0');
+            } else {
+                return false;
+            }
+        }
+
         public static ValidationResult CheckMgNr(TextBox input, bool required, AppDbContext ctx) {
             var res = CheckInteger(input, required);
             if (!res.IsValid) {

Elwig/Models/Dtos/AreaComUnderDeliveyData.cs

@@ -1,5 +1,4 @@
 using Microsoft.EntityFrameworkCore;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
@@ -8,7 +7,7 @@ using System.Threading.Tasks;
 namespace Elwig.Models.Dtos {
     public class AreaComUnderDeliveryData : DataTable<AreaComUnderDeliveryRow> {
 
-        private static readonly (string, string, string?, int)[] FieldNames = new[] {
+        private static readonly (string, string, string?, int)[] FieldNames = [
             ("MgNr", "MgNr.", null, 12),
             ("Name", "Name", null, 40),
             ("GivenName", "Vorname", null, 40),
@@ -20,7 +19,7 @@ namespace Elwig.Models.Dtos {
             ("DeliveryObligations", "Lieferpflicht", "kg", 22),
             ("Weights", "Geliefert", "kg", 22),
             ("UnderDeliveries", "Unterliefert", "kg|%", 34),
-        };
+        ];
 
         public AreaComUnderDeliveryData(IEnumerable<AreaComUnderDeliveryRow> rows, int year) :
             base($"Unterlieferungen FB", $"Unterlieferungen laut Flächenbindungen {year}", rows, FieldNames) {
@@ -37,7 +36,7 @@ namespace Elwig.Models.Dtos {
         private static async Task<IEnumerable<AreaComUnderDeliveryRowSingle>> FromDbSet(DbSet<AreaComUnderDeliveryRowSingle> table, int year) {
             return await table.FromSqlRaw($"""
                     SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name AS ort, m.address,
-                            c.bucket, c.area, u.min_kg, u.weight
+                           c.bucket, c.area, u.min_kg, u.weight
                     FROM member m
                         LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
                         LEFT JOIN AT_ort o ON o.okz = p.okz

Elwig/Models/Dtos/CreditNoteData.cs

@@ -1,140 +1,180 @@
 using Elwig.Helpers;
-using Elwig.Models.Entities;
+using Elwig.Helpers.Billing;
 using Microsoft.EntityFrameworkCore;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace Elwig.Models.Dtos {
     public class CreditNoteData : DataTable<CreditNoteRow> {
 
-        private static readonly (string, string, string?)[] FieldNames = new[] {
-            ("", "", (string?)null), // TODO
-        };
+        private static readonly (string, string, string?, int)[] FieldNames = [
+            ("MgNr", "MgNr.", null, 12),
+            ("Name", "Name", null, 40),
+            ("GivenName", "Vorname", null, 40),
+            ("Address", "Adresse", null, 60),
+            ("Plz", "PLZ", null, 10),
+            ("Locality", "Ort", null, 60),
+            ("Iban", "IBAN", null, 45),
+            ("TgNr", "TG-Nr.", null, 20),
+            ("Sum", "Zwischens.", "€", 20),
+            ("Surcharge", "Zuschlag", "€", 20),
+            ("Total", "Gesamt", "€", 20),
+            ("ConsideredSum", "Berückstgt.", "€", 20),
+            ("Net", "Netto", "€", 20),
+            ("Vat1", "10% MwSt.", "€", 20),
+            ("Vat2", "13% MwSt.", "€", 20),
+            ("Gross", "Brutto", "€", 20),
+            ("Penalties", "Pönalen FB", "€", 20),
+            ("Penalty", "Unterl. GA", "€", 20),
+            ("AutoBs", "GA Nachz.", "€", 20),
+            ("Others", "Sonstige", "€", 20),
+            ("Considered", "Berückstgt.", "€", 20),
+            ("Amount", "Betrag", "€", 20),
+        ];
 
-        private readonly int Year;
-        private readonly int? TgNr;
-        private readonly int? AvNr;
-        private readonly int? MgNr;
-
-        private CreditNoteData(IEnumerable<CreditNoteRow> rows, int year, int? tgnr, int? avnr = null, int? mgnr = null) :
-            base($"Traubengutschrift {year}/{tgnr}", rows, FieldNames) {
-            Year = year;
-            TgNr = tgnr;
-            AvNr = avnr;
-            MgNr = mgnr;
+        public CreditNoteData(IEnumerable<CreditNoteRow> rows, int year, string name) :
+            base($"Buchungsliste", $"Buchungsliste {name} {year}", rows, FieldNames) {
         }
 
-        public static async Task<IDictionary<int, CreditNoteData>> ForPaymentVariant(DbSet<CreditNoteRowSingle> table, int year, int avnr) {
-            return (await FromDbSet(table, year, avnr))
-                .GroupBy(
-                    r => new { r.Year, r.AvNr, r.MgNr, r.TgNr, r.DId, r.DPNr },
-                    (k, g) => new CreditNoteRow(g))
-                .GroupBy(
-                    r => new { r.Year, r.AvNr, r.MgNr, r.TgNr },
-                    (k, g) => new CreditNoteData(g, k.Year, k.TgNr, mgnr: k.MgNr))
-                .ToDictionary(d => d.MgNr ?? 0);
+        public static async Task<CreditNoteData> ForPaymentVariant(AppDbContext ctx, int year, int avnr) {
+            var variant = await ctx.PaymentVariants.FindAsync(year, avnr);
+            var name = variant!.Name;
+            var data = BillingData.FromJson(variant!.Data);
+            var rows = (await FromDbSet(ctx.CreditNoteRows, year, avnr)).Select(r => new CreditNoteRow(r, data)).ToList();
+            return new CreditNoteData(rows, year, name);
         }
 
-        private static async Task<IEnumerable<CreditNoteRowSingle>> FromDbSet(DbSet<CreditNoteRowSingle> table, int? year = null, int? avnr = null, int? mgnr = null) {
-            var y = year?.ToString() ?? "NULL";
-            var v = avnr?.ToString() ?? "NULL";
-            var m = mgnr?.ToString() ?? "NULL";
-            return await table.FromSqlRaw($"""
-                SELECT d.year, c.tgnr, p.avnr, d.mgnr, d.did, d.lsnr, d.dpnr, b.bktnr, d.sortid, b.discr, b.value, p.price, p.amount,
-                       v.name AS variant, a.name AS attribute, q.name AS quality_level, d.oe, d.kmw
-                FROM v_delivery d
-                    JOIN wine_variety v ON d.sortid = v.sortid
-                    LEFT JOIN wine_attribute a ON a.attrid = d.attrid
-                    JOIN wine_quality_level q ON q.qualid = d.qualid
-                    LEFT JOIN delivery_part_bucket b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
-                    LEFT JOIN payment_delivery_part_bucket p ON (p.year, p.did, p.dpnr, p.bktnr) = (b.year, b.did, b.dpnr, b.bktnr)
-                    LEFT JOIN credit c ON (c.year, c.avnr, c.mgnr) = (d.year, p.avnr, d.mgnr)
-                WHERE b.value > 0 AND (d.year = {y} OR {y} IS NULL) AND (p.avnr = {v} OR {v} IS NULL OR p.avnr IS NULL) AND (d.mgnr = {m} OR {m} IS NULL)
-                ORDER BY d.year, p.avnr, d.mgnr, d.lsnr, d.dpnr
+        private static async Task<IEnumerable<CreditNoteRowSingle>> FromDbSet(DbSet<CreditNoteRowSingle> table, int year, int avnr) {
+            return await table.FromSql($"""
+                SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name AS ort, m.address, m.iban, c.tgnr, s.year, s.precision,
+                       p.amount - p.net_amount AS surcharge,
+                       c.net_amount, c.prev_net_amount, c.vat, c.vat_amount, c.gross_amount, c.modifiers, c.prev_modifiers, c.amount,
+                       ROUND(COALESCE(u.total_penalty, 0) / POW(10, 4 - 2)) AS fb_penalty,
+                       ROUND(COALESCE(b.total_penalty, 0) / POW(10, s.precision - 2)) AS bs_penalty,
+                       ROUND(COALESCE(a.total_amount, 0) / POW(10, s.precision - 2)) AS auto_bs
+                FROM credit c
+                    LEFT JOIN member m ON m.mgnr = c.mgnr
+                    LEFT JOIN payment_member p ON (p.year, p.avnr, p.mgnr) = (c.year, c.avnr, c.mgnr) 
+                    LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
+                    LEFT JOIN AT_ort o ON o.okz = p.okz
+                    LEFT JOIN season s ON s.year = c.year
+                    LEFT JOIN v_penalty_area_commitments u ON (u.year, u.mgnr) = (s.year, m.mgnr)
+                    LEFT JOIN v_penalty_business_shares b ON (b.year, b.mgnr) = (s.year, m.mgnr)
+                    LEFT JOIN v_auto_business_shares a ON (a.year, a.mgnr) = (s.year, m.mgnr)
+                WHERE c.year = {year} AND c.avnr = {avnr}
+                ORDER BY m.mgnr
                 """).ToListAsync();
         }
     }
 
     public class CreditNoteRow {
-
-        public int Year;
-        public int? TgNr;
-        public int AvNr;
         public int MgNr;
+        public string Name;
+        public string GivenName;
+        public string Address;
+        public int Plz;
+        public string Locality;
+        public string Iban;
+        public string TgNr;
+        public decimal Sum;
+        public decimal? Surcharge;
+        public decimal Total;
+        public decimal? ConsideredSum;
+        public decimal Net;
+        public decimal? Vat1, Vat2;
+        public decimal Gross;
+        public decimal? Penalties;
+        public decimal? Penalty;
+        public decimal? AutoBs;
+        public decimal? Others;
+        public decimal? Considered;
+        public decimal Amount;
 
-        public string LsNr;
-        public int DPNr;
-        public string Variant;
-        public string? Attribute;
-        public string[] Modifiers;
-        public string QualityLevel;
-        public (double Oe, double Kmw) Gradation;
-        public (string Name, int Value, decimal? Price, decimal? Amount)[] Buckets;
-
-        public CreditNoteRow(IEnumerable<CreditNoteRowSingle> rows) {
-            var f = rows.First();
-            Year = f.Year;
-            TgNr = f.TgNr;
-            MgNr = f.MgNr;
-
-            LsNr = f.LsNr;
-            DPNr = f.DPNr;
-            Variant = f.Variant;
-            Attribute = f.Attribute;
-            Modifiers = Array.Empty<string>();  // TODO
-            QualityLevel = f.QualityLevel;
-            Gradation = (f.Oe, f.Kmw);
-            Buckets = rows
-                .Where(b => b.Value > 0)
-                .OrderByDescending(b => b.BktNr)
-                // FIXME precision
-                .Select(b => (b.Discr == "_" ? "ungeb." : $"geb. {f.SortId}{b.Discr}", b.Value,
-                              b.Price != null ? (decimal?)Utils.DecFromDb((long)b.Price, 4) : null,
-                              b.Amount != null ? (decimal?)Utils.DecFromDb((long)b.Amount, 4) : null))
-                .ToArray();
+        public CreditNoteRow(CreditNoteRowSingle row, BillingData data) {
+            byte prec1 = 2, prec2 = row.Precision;
+            MgNr = row.MgNr;
+            Name = row.Name;
+            GivenName = row.GivenName;
+            Address = row.Address;
+            Plz = row.Plz;
+            Locality = row.Locality;
+            Iban = Utils.FormatIban(row.Iban);
+            TgNr = $"{row.Year}/{row.TgNr}";
+            Total = Utils.DecFromDb(row.NetAmount, prec1);
+            Surcharge = (row.Surcharge == null || row.Surcharge == 0) ? null : Utils.DecFromDb((long)row.Surcharge, prec2);
+            Sum = Total - (Surcharge ?? 0);
+            ConsideredSum = (row.PrevNetAmount == null ||row.PrevNetAmount == 0) ? null : -Utils.DecFromDb((long)row.PrevNetAmount, prec1);
+            Net = Total + (ConsideredSum ?? 0);
+            if (row.Vat == 0.10) {
+                Vat1 = Utils.DecFromDb(row.VatAmount, prec1);
+            } else if (row.Vat == 0.13) {
+                Vat2 = Utils.DecFromDb(row.VatAmount, prec1);
+            }
+            decimal mod = (row.Modifiers == null) ? 0 : Utils.DecFromDb((long)row.Modifiers, prec1);
+            if (data.ConsiderContractPenalties)
+                Penalties = (row.FbPenalty == null || row.FbPenalty == 0) ? null : Utils.DecFromDb((long)row.FbPenalty, prec1);
+            if (data.ConsiderTotalPenalty)
+                Penalty = (row.BsPealty == null || row.BsPealty == 0) ? null : Utils.DecFromDb((long)row.BsPealty, prec1);
+            if (data.ConsiderAutoBusinessShares)
+                AutoBs = (row.AutoBs == null || row.AutoBs == 0) ? null : -Utils.DecFromDb((long)row.AutoBs, prec1);
+            mod -= (Penalties ?? 0) + (Penalty ?? 0) + (AutoBs ?? 0);
+            Others = (mod == 0) ? null : mod;
+            Gross = Utils.DecFromDb(row.GrossAmount, prec1);
+            Considered = (row.PrevModifiers == null || row.PrevModifiers == 0) ? null : -Utils.DecFromDb((long)row.PrevModifiers, prec1);
+            Amount = Utils.DecFromDb(row.Amount, prec1);
         }
     }
 
     [Keyless]
     public class CreditNoteRowSingle {
-        [Column("year")]
-        public int Year { get; set; }
-        [Column("tgnr")]
-        public int? TgNr { get; set; }
-        [Column("avnr")]
-        public int? AvNr { get; set; }
         [Column("mgnr")]
         public int MgNr { get; set; }
-        [Column("did")]
-        public int DId { get; set; }
-        [Column("lsnr")]
-        public string LsNr { get; set; }
-        [Column("dpnr")]
-        public int DPNr { get; set; }
-        [Column("bktnr")]
-        public int BktNr { get; set; }
-        [Column("sortid")]
-        public string SortId { get; set; }
-        [Column("discr")]
-        public string Discr { get; set; }
-        [Column("value")]
-        public int Value { get; set; }
-        [Column("price")]
-        public long? Price { get; set; }
+        [Column("family_name")]
+        public string Name { get; set; }
+        [Column("given_name")]
+        public string GivenName { get; set; }
+        [Column("address")]
+        public string Address { get; set; }
+        [Column("plz")]
+        public int Plz { get; set; }
+        [Column("ort")]
+        public string LocalityFull { get; set; }
+        [NotMapped]
+        public string Locality => LocalityFull.Split(",")[0];
+        [Column("iban")]
+        public string Iban { get; set; }
+        [Column("year")]
+        public int Year { get; set; }
+        [Column("precision")]
+        public byte Precision { get; set; }
+        [Column("tgnr")]
+        public string TgNr { get; set; }
+        [Column("surcharge")]
+        public long? Surcharge { get; set; }
+        [Column("net_amount")]
+        public long NetAmount { get; set; }
+        [Column("prev_net_amount")]
+        public long? PrevNetAmount { get; set; }
+        [Column("vat")]
+        public double Vat { get; set; }
+        [Column("vat_amount")]
+        public long VatAmount { get; set; }
+        [Column("gross_amount")]
+        public long GrossAmount { get; set; }
+        [Column("modifiers")]
+        public long? Modifiers { get; set; }
+        [Column("prev_modifiers")]
+        public long? PrevModifiers { get; set; }
         [Column("amount")]
-        public long? Amount { get; set; }
-        [Column("variant")]
-        public string Variant { get; set; }
-        [Column("attribute")]
-        public string? Attribute { get; set; }
-        [Column("quality_level")]
-        public string QualityLevel { get; set; }
-        [Column("oe")]
-        public double Oe { get; set; }
-        [Column("kmw")]
-        public double Kmw { get; set; }
+        public long Amount { get; set; }
+        [Column("fb_penalty")]
+        public long? FbPenalty { get; set; }
+        [Column("bs_penalty")]
+        public long? BsPealty { get; set; }
+        [Column("auto_bs")]
+        public long? AutoBs { get; set; }
     }
 }

Elwig/Models/Dtos/CreditNoteDeliveryData.cs

@@ -0,0 +1,159 @@
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class CreditNoteDeliveryData : DataTable<CreditNoteDeliveryRow> {
+
+        private static readonly (string, string, string?)[] FieldNames = [
+            ("", "", null), // TODO
+        ];
+
+        private readonly int Year;
+        private readonly int? TgNr;
+        private readonly int? AvNr;
+        private readonly int? MgNr;
+
+        private CreditNoteDeliveryData(IEnumerable<CreditNoteDeliveryRow> rows, int year, int? tgnr, int? avnr = null, int? mgnr = null) :
+            base($"Traubengutschrift {year}/{tgnr}", rows, FieldNames) {
+            Year = year;
+            TgNr = tgnr;
+            AvNr = avnr;
+            MgNr = mgnr;
+        }
+
+        public static async Task<IDictionary<int, CreditNoteDeliveryData>> ForPaymentVariant(DbSet<CreditNoteDeliveryRowSingle> table, DbSet<Season> seasons, int year, int avnr) {
+            return (await FromDbSet(table, year, avnr))
+                .GroupBy(
+                    r => new { r.Year, r.AvNr, r.MgNr, r.TgNr, r.DId, r.DPNr },
+                    (k, g) => new CreditNoteDeliveryRow(g, seasons))
+                .GroupBy(
+                    r => new { r.Year, r.AvNr, r.MgNr, r.TgNr },
+                    (k, g) => new CreditNoteDeliveryData(g, k.Year, k.TgNr, mgnr: k.MgNr))
+                .ToDictionary(d => d.MgNr ?? 0);
+        }
+
+        private static async Task<IEnumerable<CreditNoteDeliveryRowSingle>> FromDbSet(DbSet<CreditNoteDeliveryRowSingle> table, int? year = null, int? avnr = null, int? mgnr = null) {
+            var y = year?.ToString() ?? "NULL";
+            var v = avnr?.ToString() ?? "NULL";
+            var m = mgnr?.ToString() ?? "NULL";
+            return await table.FromSqlRaw($"""
+                SELECT d.year, c.tgnr, v.avnr, d.mgnr, d.did, d.lsnr, d.dpnr, d.weight, d.modifiers,
+                       b.bktnr, d.sortid, b.discr, b.value, pb.price, pb.amount, p.net_amount, p.amount AS total_amount,
+                       s.name AS variety, a.name AS attribute, q.name AS quality_level, d.oe, d.kmw
+                FROM v_delivery d
+                    JOIN wine_variety s ON s.sortid = d.sortid
+                    LEFT JOIN wine_attribute a ON a.attrid = d.attrid
+                    JOIN wine_quality_level q ON q.qualid = d.qualid
+                    LEFT JOIN delivery_part_bucket b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
+                    LEFT JOIN payment_variant v ON v.year = d.year
+                    LEFT JOIN payment_delivery_part p ON (p.year, p.did, p.dpnr, p.avnr) = (d.year, d.did, d.dpnr, v.avnr)
+                    LEFT JOIN payment_delivery_part_bucket pb ON (pb.year, pb.did, pb.dpnr, pb.bktnr, pb.avnr) = (b.year, b.did, b.dpnr, b.bktnr, v.avnr)
+                    LEFT JOIN credit c ON (c.year, c.avnr, c.mgnr) = (d.year, v.avnr, d.mgnr)
+                WHERE b.value > 0 AND (d.year = {y} OR {y} IS NULL) AND (v.avnr = {v} OR {v} IS NULL) AND (d.mgnr = {m} OR {m} IS NULL)
+                ORDER BY d.year, v.avnr, d.mgnr, d.lsnr, d.dpnr
+                """).ToListAsync();
+        }
+    }
+
+    public class CreditNoteDeliveryRow {
+
+        public int Year;
+        public int? TgNr;
+        public int AvNr;
+        public int MgNr;
+
+        public string LsNr;
+        public int DPNr;
+        public string Variety;
+        public string? Attribute;
+        public string[] Modifiers;
+        public string QualityLevel;
+        public (double Oe, double Kmw) Gradation;
+        public (string Name, int Value, decimal? Price, decimal? Amount)[] Buckets;
+        public decimal? TotalModifiers;
+        public decimal? Amount;
+
+        public CreditNoteDeliveryRow(IEnumerable<CreditNoteDeliveryRowSingle> rows, DbSet<Season> seasons) {
+            var f = rows.First();
+            Year = f.Year;
+            TgNr = f.TgNr;
+            MgNr = f.MgNr;
+            var season = seasons.Find(Year);
+
+            LsNr = f.LsNr;
+            DPNr = f.DPNr;
+            Variety = f.Variety;
+            Attribute = f.Attribute;
+            var modifiers = (IEnumerable<Modifier>)(f.Modifiers ?? "").Split(',')
+                .Select(m => season?.Modifiers.FirstOrDefault(s => s.ModId == m))
+                .Where(m => m != null)
+                .OrderBy(m => m.Ordering)
+                .ToList();
+            Modifiers = modifiers.Select(m => m.Name).ToArray();
+            QualityLevel = f.QualityLevel;
+            Gradation = (f.Oe, f.Kmw);
+            Buckets = rows
+                .Where(b => b.Value > 0)
+                .OrderByDescending(b => b.BktNr)
+                .Select(b => (b.Discr == "_" ? "ungeb." : $"geb. {f.SortId}{b.Discr}", b.Value,
+                              b.Price != null ? season?.DecFromDb((long)b.Price) : null,
+                              b.Amount != null ? season?.DecFromDb((long)b.Amount) : null))
+                .ToArray();
+            Amount = f.TotalAmount != null ? season?.DecFromDb((long)f.TotalAmount) : null;
+            var netAmount = f.NetAmount != null ? season?.DecFromDb((long)f.NetAmount) : null;
+            TotalModifiers = Amount - netAmount;
+        }
+    }
+
+    [Keyless]
+    public class CreditNoteDeliveryRowSingle {
+        [Column("year")]
+        public int Year { get; set; }
+        [Column("tgnr")]
+        public int? TgNr { get; set; }
+        [Column("avnr")]
+        public int? AvNr { get; set; }
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+        [Column("did")]
+        public int DId { get; set; }
+        [Column("lsnr")]
+        public string LsNr { get; set; }
+        [Column("dpnr")]
+        public int DPNr { get; set; }
+        [Column("weight")]
+        public int Weight { get; set; }
+        [Column("modifiers")]
+        public string? Modifiers { get; set; }
+        [Column("bktnr")]
+        public int BktNr { get; set; }
+        [Column("sortid")]
+        public string SortId { get; set; }
+        [Column("discr")]
+        public string Discr { get; set; }
+        [Column("value")]
+        public int Value { get; set; }
+        [Column("price")]
+        public long? Price { get; set; }
+        [Column("amount")]
+        public long? Amount { get; set; }
+        [Column("net_amount")]
+        public long? NetAmount { get; set; }
+        [Column("total_amount")]
+        public long? TotalAmount { get; set; }
+        [Column("variety")]
+        public string Variety { get; set; }
+        [Column("attribute")]
+        public string? Attribute { get; set; }
+        [Column("quality_level")]
+        public string QualityLevel { get; set; }
+        [Column("oe")]
+        public double Oe { get; set; }
+        [Column("kmw")]
+        public double Kmw { get; set; }
+    }
+}

Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs

@@ -5,38 +5,42 @@ using System.Linq;
 using System.Threading.Tasks;
 
 namespace Elwig.Models.Dtos {
-    public class DeliveryConfirmationData : DataTable<DeliveryConfirmationRow> {
+    public class DeliveryConfirmationDeliveryData : DataTable<DeliveryConfirmationDeliveryRow> {
 
-        private static readonly (string, string, string?, int)[] FieldNames = new[] {
+        private static readonly (string, string, string?, int)[] FieldNames = [
             ("LsNr", "LsNr.", null, 26),
             ("DPNr", "Pos.", null, 8),
-            ("Variant", "Sorte", null, 40),
+            ("Variety", "Sorte", null, 40),
             ("Attribute", "Attribut", null, 20),
             ("Modifiers", "Zu-/Abschläge", null, 30),
             ("QualityLevel", "Qualitätsstufe", null, 25),
             ("Gradation", "Gradation", "°Oe|°KMW", 32),
             ("Buckets", "Flächenbindung", "|kg", 36),
             ("Weight", "Gewicht", "kg", 16),
-        };
+        ];
 
         private readonly int MgNr;
 
-        private DeliveryConfirmationData(IEnumerable<DeliveryConfirmationRow> rows, int year, Member m) :
+        private DeliveryConfirmationDeliveryData(IEnumerable<DeliveryConfirmationDeliveryRow> rows, int year, Member m) :
             base($"Anlieferungsbestätigung", $"Anlieferungsbestätigung {year} – {m.AdministrativeName}", rows, FieldNames) {
             MgNr = m.MgNr;
         }
 
-        public static async Task<IDictionary<int, DeliveryConfirmationData>> ForSeason(DbSet<DeliveryPart> table, int year) {
+        public static DeliveryConfirmationDeliveryData CreateEmpty(int year, Member m) {
+            return new([], year, m);
+        }
+
+        public static async Task<IDictionary<int, DeliveryConfirmationDeliveryData>> ForSeason(DbSet<DeliveryPart> table, int year) {
             return (await FromDbSet(table, year))
                 .GroupBy(
                     p => p.Delivery.Member,
-                    p => new DeliveryConfirmationRow(p),
-                    (k, g) => new DeliveryConfirmationData(g, year, k)
+                    p => new DeliveryConfirmationDeliveryRow(p),
+                    (k, g) => new DeliveryConfirmationDeliveryData(g, year, k)
                 ).ToDictionary(d => d.MgNr, d => d);
         }
 
-        public static async Task<DeliveryConfirmationData> ForMember(DbSet<DeliveryPart> table, int year, Member m) {
-            return new DeliveryConfirmationData((await FromDbSet(table, year, m.MgNr)).Select(p => new DeliveryConfirmationRow(p)), year, m);
+        public static async Task<DeliveryConfirmationDeliveryData> ForMember(DbSet<DeliveryPart> table, int year, Member m) {
+            return new DeliveryConfirmationDeliveryData((await FromDbSet(table, year, m.MgNr)).Select(p => new DeliveryConfirmationDeliveryRow(p)), year, m);
         }
 
         private static async Task<IEnumerable<DeliveryPart>> FromDbSet(DbSet<DeliveryPart> table, int? year = null, int? mgnr = null) {
@@ -47,7 +51,7 @@ namespace Elwig.Models.Dtos {
             if (mgnr != null) q = q.Where(p => p.Delivery.MgNr == mgnr);
             await q
                  .Include(p => p.Delivery)
-                 .Include(p => p.Variant)
+                 .Include(p => p.Variety)
                  .Include(p => p.Attribute)
                  .Include(p => p.Quality)
                  .Include(p => p.Buckets)
@@ -64,10 +68,10 @@ namespace Elwig.Models.Dtos {
         }
     }
 
-    public class DeliveryConfirmationRow {
+    public class DeliveryConfirmationDeliveryRow {
         public string LsNr;
         public int DPNr;
-        public string Variant;
+        public string Variety;
         public string? Attribute;
         public string QualityLevel;
         public (double Oe, double Kmw) Gradation;
@@ -75,11 +79,11 @@ namespace Elwig.Models.Dtos {
         public int Weight;
         public (string Name, int Value)[] Buckets;
 
-        public DeliveryConfirmationRow(DeliveryPart p) {
+        public DeliveryConfirmationDeliveryRow(DeliveryPart p) {
             var d = p.Delivery;
             LsNr = d.LsNr;
             DPNr = p.DPNr;
-            Variant = p.Variant.Name;
+            Variety = p.Variety.Name;
             Attribute = p.Attribute?.Name;
             QualityLevel = p.Quality.Name;
             Gradation = (p.Oe, p.Kmw);

Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 namespace Elwig.Models.Dtos {
     public class MemberDeliveryPerVariantData : DataTable<MemberDeliveryPerVariantRow> {
 
-        private static readonly (string, string, string?, int)[] FieldNames = new[] {
+        private static readonly (string, string, string?, int)[] FieldNames = [
             ("MgNr", "MgNr.", null, 12),
             ("Name", "Name", null, 40),
             ("GivenName", "Vorname", null, 40),
@@ -20,7 +20,7 @@ namespace Elwig.Models.Dtos {
             ("Weights", "Geliefert", "kg", 22),
             ("Areas", "Fläche", "m²", 22),
             ("Yields", "Ertrag", "kg/ha", 22),
-        };
+        ];
 
 
         public MemberDeliveryPerVariantData(IEnumerable<MemberDeliveryPerVariantRow> rows, int year) :

Elwig/Models/Dtos/OverUnderDeliveryData.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 namespace Elwig.Models.Dtos {
     public class OverUnderDeliveryData : DataTable<OverUnderDeliveryRow> {
 
-        private static readonly (string, string, string?, int)[] FieldNames = new[] {
+        private static readonly (string, string, string?, int)[] FieldNames = [
             ("MgNr", "MgNr.", null, 12),
             ("Name", "Name", null, 40),
             ("GivenName", "Vorname", null, 40),
@@ -19,7 +19,7 @@ namespace Elwig.Models.Dtos {
             ("DeliveryRight", "Lieferrecht", "kg", 22),
             ("Weight", "Geliefert", "kg", 22),
             ("OverUnderDelivery", "Über-/Unterliefert", "kg|%", 34),
-        };
+        ];
 
         public OverUnderDeliveryData(IEnumerable<OverUnderDeliveryRow> rows, int year) :
             base($"Über-Unterlieferungen", $"Über- und Unterlieferungen laut gezeichneten Geschäftsanteilen {year}", rows, FieldNames) {
@@ -71,6 +71,6 @@ namespace Elwig.Models.Dtos {
         [NotMapped]
         public (int? Kg, double? Percent) OverUnderDelivery =>
             Weight < DeliveryObligation ? (Weight - DeliveryObligation, Weight * 100.0 / DeliveryObligation - 100.0) :
-            Weight > DeliveryRight ? (Weight - DeliveryRight, Weight * 100.0 / DeliveryRight - 100) : (null, null);
+            Weight > DeliveryRight ? (Weight - DeliveryRight, Weight * 100.0 / DeliveryRight - 100.0) : (null, null);
     }
 }

Elwig/Models/Dtos/Transaction.cs

@@ -0,0 +1,26 @@
+using Elwig.Models.Entities;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Elwig.Models.Dtos {
+    public class Transaction(Member member, decimal amount, string currency, int nr) {
+
+        public readonly Member Member = member;
+        public readonly decimal Amount = amount;
+        public readonly string Currency = currency;
+        public readonly int Nr = nr;
+
+        public Transaction(Credit c) : this(c.Member, c.Amount, c.Variant.Season.CurrencyCode, c.TgNr) { }
+
+        public static IEnumerable<Transaction> FromPaymentVariant(PaymentVar variant) {
+            return variant.Credits
+                .OrderBy(c => c.TgNr)
+                .Select(c => new Transaction(c))
+                .ToList();
+        }
+
+        public static string FormatAmountCent(long cents) => $"{cents / 100}.{cents % 100:00}";
+
+        public static string FormatAmount(decimal amount) => FormatAmountCent((int)(amount * 100));
+    }
+}

Elwig/Models/Entities/Delivery.cs

@@ -68,19 +68,32 @@ namespace Elwig.Models.Entities {
 
         [InverseProperty("Delivery")]
         public virtual ISet<DeliveryPart> Parts { get; private set; }
+        [NotMapped]
+        public IEnumerable<DeliveryPart> FilteredParts => PartFilter == null ? Parts : Parts.Where(p => PartFilter(p));
+
+        [NotMapped]
+        public Predicate<DeliveryPart>? PartFilter { get; set; }
 
         public int Weight => Parts.Select(p => p.Weight).Sum();
+        public int FilteredWeight => FilteredParts.Select(p => p.Weight).Sum();
 
         public IEnumerable<string> SortIds => Parts
             .GroupBy(p => p.SortId)
             .OrderByDescending(g => g.Select(p => p.Weight).Sum())
-            .Select(g => g.Select(p => p.SortId).First());
+            .Select(g => g.Key);
+        public IEnumerable<string> FilteredSortIds => FilteredParts
+            .GroupBy(p => p.SortId)
+            .OrderByDescending(g => g.Select(p => p.Weight).Sum())
+            .Select(g => g.Key);
 
         public string SortIdString => string.Join(", ", SortIds);
+        public string FilteredSortIdString => string.Join(", ", FilteredSortIds);
 
         public double Kmw => Utils.AggregateDeliveryPartsKmw(Parts);
+        public double FilteredKmw => Utils.AggregateDeliveryPartsKmw(FilteredParts);
 
         public double Oe => Utils.KmwToOe(Kmw);
+        public double FilteredOe => Utils.KmwToOe(FilteredKmw);
 
         public int SearchScore(IEnumerable<string> keywords) {
             var list = new string?[] {

Elwig/Models/Entities/DeliveryPart.cs

@@ -23,7 +23,7 @@ namespace Elwig.Models.Entities {
         public string SortId { get; set; }
 
         [ForeignKey("SortId")]
-        public virtual WineVar Variant { get; private set; }
+        public virtual WineVar Variety { get; private set; }
 
         [Column("attrid")]
         public string? AttrId { get; set; }

Elwig/Models/Entities/Member.cs

@@ -62,12 +62,8 @@ namespace Elwig.Models.Entities {
 
         [NotMapped]
         public DateOnly? EntryDate {
-            get {
-                return EntryDateString != null ? DateOnly.ParseExact(EntryDateString, "yyyy-MM-dd") : null;
-            }
-            set {
-                EntryDateString = value?.ToString("yyyy-MM-dd");
-            }
+            get => EntryDateString != null ? DateOnly.ParseExact(EntryDateString, "yyyy-MM-dd") : null;
+            set => EntryDateString = value?.ToString("yyyy-MM-dd");
         }
 
         [Column("exit_date")]
@@ -75,12 +71,8 @@ namespace Elwig.Models.Entities {
 
         [NotMapped]
         public DateOnly? ExitDate {
-            get {
-                return ExitDateString != null ? DateOnly.ParseExact(ExitDateString, "yyyy-MM-dd") : null;
-            }
-            set {
-                ExitDateString = value?.ToString("yyyy-MM-dd");
-            }
+            get => ExitDateString != null ? DateOnly.ParseExact(ExitDateString, "yyyy-MM-dd") : null;
+            set => ExitDateString = value?.ToString("yyyy-MM-dd");
         }
 
         [Column("business_shares")]
@@ -163,7 +155,7 @@ namespace Elwig.Models.Entities {
 
         [NotMapped]
         public IEnumerable<AreaCom> ActiveAreaCommitments => AreaCommitments
-            .Where(c => c.YearFrom <= Utils.CurrentNextSeason && (c.YearTo ?? int.MaxValue) >= Utils.CurrentNextSeason);
+            .Where(c => c.YearFrom <= Utils.CurrentYear && (c.YearTo ?? int.MaxValue) >= Utils.CurrentYear);
 
         [InverseProperty("Member")]
         public virtual BillingAddr? BillingAddress { get; private set; }
@@ -181,7 +173,6 @@ namespace Elwig.Models.Entities {
 
         public int SearchScore(IEnumerable<string> keywords) {
             return Utils.GetSearchScore(new string?[] {
-                MgNr.ToString(),
                 FamilyName, MiddleName, GivenName,
                 BillingAddress?.Name,
                 Comment,

Elwig/Models/Entities/MemberHistory.cs

@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models.Entities {
+    [Table("member_history"), PrimaryKey("MgNr", "DateString")]
+    public class MemberHistory {
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+
+        [Column("date")]
+        public string DateString { get; set; }
+        [NotMapped]
+        public DateOnly Date {
+            get => DateOnly.ParseExact(DateString, "yyyy-MM-dd");
+            set => value.ToString("yyyy-MM-dd");
+        }
+
+        [Column("business_shares")]
+        public int BusinessShares { get; set; }
+
+        [Column("type")]
+        public string Type { get; set; }
+
+        [Column("comment")]
+        public string? Comment { get; set; }
+
+        [ForeignKey("MgNr")]
+        public virtual Member Member { get; private set; }
+    }
+}

Elwig/Models/Entities/PaymentDeliveryPart.cs

@@ -16,6 +16,14 @@ namespace Elwig.Models.Entities {
         [Column("avnr")]
         public int AvNr { get; set; }
 
+        [Column("net_amount")]
+        public long NetAmountValue { get; set; }
+        [NotMapped]
+        public decimal NetAmount {
+            get => Variant.Season.DecFromDb(NetAmountValue);
+            set => NetAmountValue = Variant.Season.DecToDb(value);
+        }
+
         [Column("mod_abs")]
         public long ModAbsValue { get; set; }
         [NotMapped]
@@ -33,12 +41,9 @@ namespace Elwig.Models.Entities {
         }
 
         [Column("amount")]
-        public long? AmountValue { get; set; }
+        public long AmountValue { get; private set; }
         [NotMapped]
-        public decimal? Amount {
-            get => AmountValue != null ? Variant.Season.DecFromDb(AmountValue.Value) : null;
-            set => AmountValue = value != null ? Variant.Season.DecToDb(value.Value) : null;
-        }
+        public decimal Amount => Variant.Season.DecFromDb(AmountValue);
 
         [ForeignKey("Year, AvNr")]
         public virtual PaymentVar Variant { get; private set; }

Elwig/Models/Entities/PaymentMember.cs

@@ -13,15 +13,36 @@ namespace Elwig.Models.Entities {
         [Column("mgnr")]
         public int MgNr { get; set; }
 
-        [Column("amount")]
-        public long AmountValue { get; set; }
 
+        [Column("net_amount")]
+        public long NetAmountValue { get; set; }
         [NotMapped]
-        public decimal Amount {
-            get => Variant.Season.DecFromDb(AmountValue);
-            set => AmountValue = Variant.Season.DecToDb(value);
+        public decimal NetAmount {
+            get => Variant.Season.DecFromDb(NetAmountValue);
+            set => NetAmountValue = Variant.Season.DecToDb(value);
         }
 
+        [Column("mod_abs")]
+        public long ModAbsValue { get; set; }
+        [NotMapped]
+        public decimal ModAbs {
+            get => Variant.Season.DecFromDb(ModAbsValue);
+            set => ModAbsValue = Variant.Season.DecToDb(value);
+        }
+
+        [Column("mod_rel")]
+        public double ModRelValue { get; set; }
+        [NotMapped]
+        public decimal ModRel {
+            get => (decimal)ModRelValue;
+            set => ModRelValue = (double)value;
+        }
+
+        [Column("amount")]
+        public long AmountValue { get; private set; }
+        [NotMapped]
+        public decimal Amount => Variant.Season.DecFromDb(AmountValue);
+
         [ForeignKey("Year, AvNr")]
         public virtual PaymentVar Variant { get; private set; }
 

Elwig/Models/Entities/PaymentVar.cs

@@ -51,6 +51,9 @@ namespace Elwig.Models.Entities {
         [InverseProperty("Variant")]
         public virtual ISet<PaymentMember> MemberPayments { get; private set; }
 
+        [InverseProperty("Variant")]
+        public virtual ISet<PaymentDeliveryPart> DeliveryPartPayments { get; private set; }
+
         [InverseProperty("Variant")]
         public virtual ISet<Credit> Credits { get; private set; }
     }

Elwig/Models/Entities/Season.cs

@@ -55,6 +55,14 @@ namespace Elwig.Models.Entities {
             set => PenaltyNoneValue = value != null ? DecToDb(value.Value) : null;
         }
 
+        [Column("bs_value")]
+        public long? BusinessShareValueValue { get; set; }
+        [NotMapped]
+        public decimal? BusinessShareValue {
+            get => BusinessShareValueValue != null ? DecFromDb(BusinessShareValueValue.Value) : null;
+            set => BusinessShareValueValue = value != null ? DecToDb(value.Value) : null;
+        }
+
         [Column("start_date")]
         public string? StartDateString { get; set; }
 

Elwig/Models/Entities/WineAttr.cs

@@ -23,6 +23,13 @@ namespace Elwig.Models.Entities {
         [Column("fill_lower")]
         public int FillLower { get; set; }
 
+        public WineAttr() { }
+
+        public WineAttr(string attrId, string name) {
+            AttrId = attrId;
+            Name = name;
+        }
+
         public override string ToString() {
             return Name;
         }

Elwig/Models/Entities/WineVar.cs

@@ -21,6 +21,13 @@ namespace Elwig.Models.Entities {
         public bool IsRed => Type == "R";
         public bool IsWhite => Type == "W";
 
+        public WineVar() { }
+
+        public WineVar(string sortId, string name) {
+            SortId = sortId;
+            Name = name;
+        }
+
         public override string ToString() {
             return Name;
         }

Elwig/Properties/PublishProfiles/FolderProfile.pubxml

@@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishDir>bin\Publish</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <_TargetId>Folder</_TargetId>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Elwig/Resources/Schemas/PaymentVariantData.json

@@ -0,0 +1,108 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "required": ["mode"],
+  "anyOf": [{
+    "required": ["version", "payment", "curves"],
+    "additionalProperties": false,
+    "properties": {
+      "mode": {"enum": ["elwig"]},
+      "version": {"enum": [1]},
+      "consider_delivery_modifiers": {"type": "boolean"},
+      "consider_contract_penalties": {"type": "boolean"},
+      "consider_total_penalty": {"type": "boolean"},
+      "consider_auto_business_shares": {"type": "boolean"},
+      "payment": {"$ref": "#/definitions/payment_1"},
+      "quality": {"$ref": "#/definitions/quality_1"},
+      "curves": {
+        "type": "array",
+        "items": {"$ref": "#/definitions/curve"}
+      }
+    }
+  }, {
+    "required": ["AuszahlungSorten", "Kurven"],
+    "properties": {
+      "mode": {"enum": ["wgmaster"]},
+      "AuszahlungSorten": {"$ref": "#/definitions/payment_1"},
+      "AuszahlungSortenQualitätsstufe": {"$ref": "#/definitions/quality_1"},
+      "Kurven": {
+        "type": "array",
+        "items": {"$ref": "#/definitions/curve"}
+      }
+    }
+  }],
+  "definitions": {
+    "payment_1": {
+      "type": ["number", "string", "object"],
+      "pattern": "^curve:[0-9]+$",
+      "additionalProperties": false,
+      "properties": {
+        "default": {
+          "type": ["number", "string"],
+          "pattern": "^curve:[0-9]+$"
+        }
+      },
+      "patternProperties": {
+        "^([A-Z]{2})?(\/[A-Z]*)?$": {
+          "type": ["number", "string"],
+          "pattern": "^curve:[0-9]+$"
+        }
+      }
+    },
+    "quality_1": {
+      "type": "object",
+        "additionalProperties": false,
+        "patternProperties": {
+          "^[A-Z]{3}$": {
+            "type": ["number", "string", "object"],
+            "pattern": "^curve:[0-9]+$",
+            "additionalProperties": false,
+            "properties": {
+              "default": {
+                "type": ["number", "string"],
+                "pattern": "^curve:[0-9]+$"
+              }
+            },
+            "patternProperties": {
+              "^([A-Z]{2})?(\/[A-Z]*)?$": {
+                "type": ["number", "string"],
+                "pattern": "^curve:[0-9]+$"
+              }
+            }
+          }
+        }
+    },
+    "curve": {
+      "type": "object",
+      "required": ["id", "mode", "data"],
+      "additionalProperties": false,
+      "properties": {
+        "id": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "mode": {"enum": ["oe", "kmw"]},
+        "data": {
+          "anyOf": [
+            {"type": "number"},
+            {"$ref": "#/definitions/curve_data"}
+          ]
+        },
+        "geb": {
+          "anyOf": [
+            {"type": "number"},
+            {"$ref": "#/definitions/curve_data"}
+          ]
+        }
+      }
+    },
+    "curve_data": {
+      "type": "object",
+      "additionalProperties": false,
+      "minProperties": 1,
+      "patternProperties": {
+        "^[<>]?([0-9]+(\\.[0-9]+)?)(oe|kmw)$": {"type": "number"}
+      }
+    }
+  }
+}

Elwig/Resources/Sql/01-02.sql

@@ -0,0 +1,7 @@
+-- schema version 1 to 2
+
+DROP VIEW v_area_commitment;
+
+ALTER TABLE delivery_part DROP COLUMN weighing_reason;
+
+ALTER TABLE delivery_part ADD COLUMN weighing_reason TEXT CHECK(NOT (manual_weighing = FALSE AND weighing_reason IS NOT NULL));

Elwig/Resources/Sql/02-03.sql

@@ -0,0 +1,96 @@
+-- schema version 2 to 3
+
+CREATE TABLE delivery_part_bin (
+    year     INTEGER NOT NULL,
+    did      INTEGER NOT NULL,
+    dpnr     INTEGER NOT NULL,
+    binnr    INTEGER NOT NULL,
+
+    discr    TEXT    NOT NULL,
+    value    INTEGER NOT NULL,
+
+    CONSTRAINT pk_delivery_part_bin PRIMARY KEY (year, did, dpnr, binnr),
+    CONSTRAINT fk_delivery_part_bin_delivery_part FOREIGN KEY (year, did, dpnr) REFERENCES delivery_part (year, did, dpnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE
+) STRICT;
+
+INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
+SELECT year, did, dpnr, 0, '_', bucket_2 + bucket_3
+FROM payment_delivery_part
+WHERE COALESCE(bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9) IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
+SELECT d.year, d.did, d.dpnr, 1, COALESCE(attributes, ''), bucket_1
+FROM payment_delivery_part p
+    JOIN v_delivery d ON (d.year, d.did, d.dpnr) = (p.year, p.did, p.dpnr)
+WHERE COALESCE(bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9) IS NOT NULL
+ON CONFLICT DO NOTHING;
+
+ALTER TABLE payment_delivery_part DROP COLUMN bucket_1;
+ALTER TABLE payment_delivery_part DROP COLUMN bucket_2;
+ALTER TABLE payment_delivery_part DROP COLUMN bucket_3;
+ALTER TABLE payment_delivery_part DROP COLUMN bucket_4;
+ALTER TABLE payment_delivery_part DROP COLUMN bucket_5;
+ALTER TABLE payment_delivery_part DROP COLUMN bucket_6;
+ALTER TABLE payment_delivery_part DROP COLUMN bucket_7;
+ALTER TABLE payment_delivery_part DROP COLUMN bucket_8;
+ALTER TABLE payment_delivery_part DROP COLUMN bucket_9;
+ALTER TABLE payment_variant DROP COLUMN bucket_1_name;
+ALTER TABLE payment_variant DROP COLUMN bucket_2_name;
+ALTER TABLE payment_variant DROP COLUMN bucket_3_name;
+ALTER TABLE payment_variant DROP COLUMN bucket_4_name;
+ALTER TABLE payment_variant DROP COLUMN bucket_5_name;
+ALTER TABLE payment_variant DROP COLUMN bucket_6_name;
+ALTER TABLE payment_variant DROP COLUMN bucket_7_name;
+ALTER TABLE payment_variant DROP COLUMN bucket_8_name;
+ALTER TABLE payment_variant DROP COLUMN bucket_9_name;
+
+ALTER TABLE delivery_part ADD COLUMN gebunden INTEGER CHECK (gebunden IN (TRUE, FALSE)) DEFAULT NULL;
+
+DROP VIEW v_delivery;
+CREATE VIEW v_delivery AS
+SELECT s.*, GROUP_CONCAT(o.modid) AS modifiers
+FROM (SELECT p.year, p.did, p.dpnr,
+             d.date, d.time, d.zwstid, d.lnr, d.lsnr,
+             m.mgnr, m.family_name, m.given_name,
+             p.sortid, p.weight, p.kmw, ROUND(p.kmw * (4.54 + 0.022 * p.kmw), 0) AS oe, p.qualid, p.hkid, p.kgnr, p.rdnr,
+             p.gerebelt, p.gebunden,
+             p.qualid IN (SELECT l.qualid FROM wine_quality_level l WHERE NOT l.predicate AND (p.kmw >= l.min_kmw OR l.min_kmw IS NULL) ORDER BY l.min_kmw DESC LIMIT 1,100) AS abgewertet,
+             p.qualid NOT IN ('WEI', 'RSW', 'LDW') AS min_quw,
+             GROUP_CONCAT(a.attrid) AS attributes,
+             COALESCE(SUM(a.fill_lower_bins), 0) AS attribute_prio,
+             d.comment, p.comment AS part_comment
+      FROM delivery_part p
+          JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
+          JOIN member m ON m.mgnr = d.mgnr
+          LEFT JOIN delivery_part_attribute pa ON (pa.year, pa.did, pa.dpnr) = (p.year, p.did, p.dpnr)
+          LEFT JOIN wine_attribute a ON a.attrid = pa.attrid
+      GROUP BY p.year, p.did, p.dpnr
+      ORDER BY p.year, p.did, p.dpnr, a.attrid) s
+LEFT JOIN delivery_part_modifier o ON (o.year, o.did, o.dpnr) = (s.year, s.did, s.dpnr)
+GROUP BY s.year, s.lsnr, s.dpnr
+ORDER BY s.year, s.lsnr, s.dpnr, o.modid;
+
+DROP VIEW v_bucket;
+
+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;
+
+CREATE VIEW v_payment_bin AS
+SELECT d.year, d.mgnr,
+       sortid || discr AS bin,
+       SUM(value) AS weight
+FROM v_delivery d
+    JOIN delivery_part_bin b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
+GROUP BY d.year, d.mgnr, bin
+HAVING SUM(value) > 0
+ORDER BY d.year, d.mgnr, bin;
+
+ALTER TABLE wine_attribute ADD COLUMN fill_lower_bins INTEGER NOT NULL CHECK (fill_lower_bins IN (0, 1, 2)) DEFAULT 0;

Elwig/Resources/Sql/03-04.sql

@@ -0,0 +1,24 @@
+-- schema version 3 to 4
+
+DROP VIEW v_payment_bin;
+CREATE VIEW v_payment_bin AS
+SELECT d.year, d.mgnr,
+       sortid || discr AS bin,
+       SUM(value) AS weight
+FROM v_delivery d
+    JOIN delivery_part_bin b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
+GROUP BY d.year, d.mgnr, bin
+HAVING SUM(value) > 0
+ORDER BY d.year, d.mgnr, LENGTH(bin) DESC, bin;
+
+CREATE VIEW v_area_commitment_bin AS
+SELECT s.year, c.mgnr,
+       c.vtrgid AS bin,
+       CAST(ROUND(SUM(COALESCE(area * min_kg_per_ha, 0)) / 10000.0, 0) AS INTEGER) AS min_kg,
+       CAST(ROUND(SUM(COALESCE(area * max_kg_per_ha, 0)) / 10000.0, 0) AS INTEGER) AS max_kg
+FROM area_commitment c, season s
+    JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
+WHERE (year_from IS NULL OR year_from <= s.year) AND
+      (year_to IS NULL OR year_to >= s.year)
+GROUP BY s.year, c.mgnr, c.vtrgid
+ORDER BY s.year, c.mgnr, LENGTH(c.vtrgid) DESC, c.vtrgid;

Elwig/Resources/Sql/04-05.sql

@@ -0,0 +1,100 @@
+-- schema version 4 to 5
+
+CREATE TABLE _area_commitment_type (
+    vtrgid         TEXT NOT NULL CHECK (vtrgid = sortid || COALESCE(attrid, '') || disc),
+    sortid         TEXT NOT NULL,
+    attrid         TEXT,
+    disc           TEXT DEFAULT NULL CHECK (disc REGEXP '^[A-Z0-9]+$'),
+
+    min_kg_per_ha  INTEGER,
+    max_kg_per_ha  INTEGER,
+    penalty_amount INTEGER,
+
+    CONSTRAINT pk_area_commitment_type PRIMARY KEY (vtrgid),
+    CONSTRAINT sk_area_commitment_type_sort_attr UNIQUE (sortid, attrid, disc),
+    CONSTRAINT fk_area_commitment_type_wine_variety FOREIGN KEY (sortid) REFERENCES wine_variety (sortid)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT,
+    CONSTRAINT fk_area_commitment_type_wine_attribute FOREIGN KEY (attrid) REFERENCES wine_attribute (attrid)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT
+) STRICT;
+
+INSERT INTO _area_commitment_type (vtrgid, sortid, attrid, disc, min_kg_per_ha, max_kg_per_ha, penalty_amount)
+SELECT vtrgid, sortid, attrid_1, disc, min_kg_per_ha, max_kg_per_ha, penalty_amount FROM area_commitment_type;
+
+PRAGMA writable_schema = ON;
+DROP TABLE area_commitment_type;
+ALTER TABLE _area_commitment_type RENAME TO area_commitment_type;
+PRAGMA writable_schema = OFF;
+
+ALTER TABLE delivery_part ADD COLUMN attrid TEXT DEFAULT NULL REFERENCES wine_attribute (attrid)
+    ON UPDATE CASCADE
+    ON DELETE RESTRICT;
+
+UPDATE delivery_part
+SET attrid = (SELECT attrid
+              FROM delivery_part_attribute a
+              WHERE (delivery_part.year, delivery_part.did, delivery_part.dpnr) = (a.year, a.did, a.dpnr)
+              ORDER BY attrid DESC
+              LIMIT 1);
+
+DROP TRIGGER t_delivery_part_attribute_i_mtime_delivery_part;
+DROP TRIGGER t_delivery_part_attribute_u_mtime_delivery_part;
+DROP TRIGGER t_delivery_part_attribute_d_mtime_delivery_part;
+DROP TABLE delivery_part_attribute;
+
+DROP VIEW v_delivery;
+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, a.attrid,
+       p.weight, p.kmw, ROUND(p.kmw * (4.54 + 0.022 * p.kmw), 0) AS oe, p.qualid,
+       p.hkid, p.kgnr, p.rdnr,
+       p.gerebelt, p.gebunden,
+       p.qualid IN (SELECT l.qualid FROM wine_quality_level l WHERE NOT l.predicate AND (p.kmw >= l.min_kmw OR l.min_kmw IS NULL) ORDER BY l.min_kmw DESC LIMIT 1,100) AS abgewertet,
+       p.qualid NOT IN ('WEI', 'RSW', 'LDW') AS min_quw,
+       COALESCE(a.fill_lower_bins, 0) AS attribute_prio,
+       GROUP_CONCAT(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 wine_attribute a ON a.attrid = p.attrid
+    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, o.modid;
+
+DROP VIEW v_delivery_bin;
+CREATE VIEW v_delivery_bin AS
+SELECT year, mgnr,
+       sortid || IIF(min_quw, COALESCE(attrid, ''), '_') AS bin,
+       SUM(weight) AS weight
+FROM v_delivery
+GROUP BY year, mgnr, bin
+ORDER BY year, mgnr, LENGTH(bin) DESC, bin;
+
+DROP VIEW v_stat_attr;
+CREATE VIEW v_stat_attr AS
+SELECT year, attrid,
+       SUM(weight) as sum,
+       ROUND(SUM(kmw * weight) / SUM(weight), 2) AS kmw,
+       ROUND(SUM(oe * weight) / SUM(weight), 1) AS oe,
+       COUNT(DISTINCT did) AS lieferungen,
+       COUNT(DISTINCT mgnr) AS mitglieder
+FROM v_delivery
+GROUP BY year, attrid
+ORDER BY year, attrid;
+
+DROP VIEW v_stat_sort_attr;
+CREATE VIEW v_stat_sort_attr AS
+SELECT year, sortid, attrid,
+       SUM(weight) as sum,
+       ROUND(SUM(kmw * weight) / SUM(weight), 2) AS kmw,
+       ROUND(SUM(oe * weight) / SUM(weight), 1) AS oe,
+       COUNT(DISTINCT did) AS lieferungen,
+       COUNT(DISTINCT mgnr) AS mitglieder
+FROM v_delivery
+GROUP BY year, sortid, attrid
+ORDER BY year, sortid, attrid;

Elwig/Resources/Sql/05-06.sql

@@ -0,0 +1,150 @@
+-- schema version 5 to 6
+
+DROP VIEW IF EXISTS v_area_commitment;
+
+PRAGMA writable_schema = ON;
+ALTER TABLE wine_attribute DROP COLUMN fill_lower_bins;
+ALTER TABLE wine_attribute ADD COLUMN strict INTEGER NOT NULL CHECK (strict IN (TRUE, FALSE)) DEFAULT FALSE;
+ALTER TABLE wine_attribute ADD COLUMN fill_lower INTEGER NOT NULL CHECK (fill_lower IN (0, 1, 2)) DEFAULT 0;
+DROP VIEW v_delivery;
+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, a.attrid,
+       p.weight, p.kmw, ROUND(p.kmw * (4.54 + 0.022 * p.kmw), 0) AS oe, p.qualid,
+       p.hkid, p.kgnr, p.rdnr,
+       p.gerebelt, p.gebunden,
+       p.qualid IN (SELECT l.qualid FROM wine_quality_level l WHERE NOT l.predicate AND (p.kmw >= l.min_kmw OR l.min_kmw IS NULL) ORDER BY l.min_kmw DESC LIMIT 1,100) AS abgewertet,
+       p.qualid NOT IN ('WEI', 'RSW', 'LDW') AS min_quw,
+       IIF(a.strict, COALESCE(a.fill_lower, 0), 0) AS attribute_prio,
+       GROUP_CONCAT(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 wine_attribute a ON a.attrid = p.attrid
+    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, o.modid;
+PRAGMA writable_schema = OFF;
+
+DROP VIEW v_area_commitment_bin;
+DROP VIEW v_delivery_bin;
+DROP VIEW v_payment_bin;
+
+ALTER TABLE area_commitment_type DROP COLUMN max_kg_per_ha;
+ALTER TABLE area_commitment_type ADD COLUMN penalty_per_kg INTEGER DEFAULT NULL;
+ALTER TABLE area_commitment_type ADD COLUMN penalty_none INTEGER DEFAULT NULL;
+
+ALTER TABLE wine_cultivation ADD COLUMN description TEXT DEFAULT NULL;
+ALTER TABLE member ADD COLUMN organic INTEGER NOT NULL CHECK (organic IN (TRUE, FALSE)) DEFAULT FALSE;
+
+ALTER TABLE season ADD COLUMN max_kg_per_ha INTEGER NOT NULL DEFAULT 10000;
+ALTER TABLE season ADD COLUMN vat_normal REAL NOT NULL DEFAULT 0.10;
+ALTER TABLE season ADD COLUMN vat_flatrate REAL NOT NULL DEFAULT 0.13;
+ALTER TABLE season ADD COLUMN min_kg_per_bs INTEGER NOT NULL DEFAULT 750;
+ALTER TABLE season ADD COLUMN max_kg_per_bs INTEGER NOT NULL DEFAULT 3000;
+ALTER TABLE season ADD COLUMN penalty_per_kg INTEGER DEFAULT NULL;
+ALTER TABLE season ADD COLUMN penalty_amount INTEGER DEFAULT NULL;
+ALTER TABLE season ADD COLUMN penalty_none INTEGER DEFAULT NULL;
+
+DELETE FROM client_parameter WHERE param IN ('DELIVERY_RIGHT', 'DELIVERY_OBLIGATION', 'VAT_NORMAL', 'VAT_REDUCED', 'VAT_FLATRATE');
+
+CREATE TABLE delivery_part_bucket (
+    year     INTEGER NOT NULL,
+    did      INTEGER NOT NULL,
+    dpnr     INTEGER NOT NULL,
+    bktnr    INTEGER NOT NULL,
+
+    discr    TEXT    NOT NULL,
+    value    INTEGER NOT NULL,
+
+    CONSTRAINT pk_delivery_part_bucket PRIMARY KEY (year, did, dpnr, bktnr),
+    CONSTRAINT fk_delivery_part_bucket_delivery_part FOREIGN KEY (year, did, dpnr) REFERENCES delivery_part (year, did, dpnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE
+) STRICT;
+
+INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+SELECT year, did, dpnr, binnr, discr, value
+FROM delivery_part_bin;
+
+DROP TABLE delivery_part_bin;
+
+CREATE VIEW v_area_commitment_bucket_strict AS
+SELECT s.year, c.mgnr,
+        t.sortid || COALESCE(a.attrid, '') AS bucket,
+        t.sortid, a.attrid,
+        CAST(ROUND(SUM(area) * COALESCE(t.min_kg_per_ha, 0) / 10000.0, 0) AS INTEGER) AS min_kg,
+        CAST(ROUND(SUM(area) * MIN(COALESCE(a.max_kg_per_ha, s.max_kg_per_ha), s.max_kg_per_ha) / 10000.0, 0) AS INTEGER) AS max_kg,
+        CAST(ROUND(SUM(area) * s.max_kg_per_ha / 10000.0, 0) AS INTEGER) AS upper_max_kg
+FROM season s, area_commitment c
+    JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
+    LEFT JOIN wine_attribute a ON a.attrid = t.attrid
+WHERE (year_from IS NULL OR year_from <= s.year) AND
+      (year_to IS NULL OR year_to >= s.year)
+GROUP BY s.year, c.mgnr, bucket
+ORDER BY s.year, c.mgnr, bucket;
+
+CREATE VIEW v_area_commitment_bucket AS
+SELECT year, mgnr, bucket, min_kg, max_kg
+FROM v_area_commitment_bucket_strict
+WHERE attrid IS NOT NULL
+UNION ALL
+SELECT b.year, b.mgnr, b.sortid,
+       SUM(b.min_kg) AS min_kg,
+       SUM(b.upper_max_kg) AS max_kg
+FROM v_area_commitment_bucket_strict b
+    LEFT JOIN wine_attribute a ON a.attrid = b.attrid
+WHERE a.strict IS NULL OR a.strict = FALSE
+GROUP BY b.year, b.mgnr, b.sortid
+ORDER BY year, mgnr, bucket;
+
+CREATE VIEW v_delivery_bucket_strict AS
+SELECT year, mgnr,
+       sortid || IIF(min_quw, COALESCE(attrid, ''), '_') AS bucket,
+       sortid, IIF(min_quw, attrid, NULL) AS attrid,
+       SUM(weight) AS weight,
+       min_quw
+FROM v_delivery
+GROUP BY year, mgnr, bucket
+ORDER BY year, mgnr, bucket;
+
+CREATE VIEW v_delivery_bucket AS
+SELECT year, mgnr, bucket, weight
+FROM v_delivery_bucket_strict
+WHERE attrid IS NOT NULL OR NOT min_quw
+UNION ALL
+SELECT b.year, b.mgnr, b.sortid,
+       SUM(b.weight) AS weight
+FROM v_delivery_bucket_strict b
+    LEFT JOIN wine_attribute a ON a.attrid = b.attrid
+WHERE min_quw AND (a.strict IS NULL OR a.strict = FALSE)
+GROUP BY b.year, b.mgnr, b.sortid
+ORDER BY year, mgnr, bucket;
+
+CREATE VIEW v_payment_bucket_strict AS
+SELECT d.year, d.mgnr,
+       d.sortid || b.discr AS bucket,
+       d.sortid, IIF(b.discr IN ('', '_'), NULL, b.discr) AS attrid,
+       SUM(b.value) AS weight,
+       b.discr != '_' AS gebunden
+FROM v_delivery d
+    LEFT JOIN delivery_part_bucket b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
+GROUP BY d.year, d.mgnr, bucket
+HAVING SUM(b.value) > 0
+ORDER BY d.year, d.mgnr, bucket;
+
+CREATE VIEW v_payment_bucket AS
+SELECT year, mgnr, bucket, weight
+FROM v_payment_bucket_strict
+WHERE attrid IS NOT NULL OR NOT gebunden
+UNION ALL
+SELECT b.year, b.mgnr, b.sortid,
+       SUM(b.weight) AS weight
+FROM v_payment_bucket_strict b
+    LEFT JOIN wine_attribute a ON a.attrid = b.attrid
+WHERE gebunden AND (a.strict IS NULL OR a.strict = FALSE)
+GROUP BY b.year, b.mgnr, b.sortid
+ORDER BY year, mgnr, bucket;

Elwig/Resources/Sql/06-07.sql

@@ -0,0 +1,40 @@
+-- schema version 6 to 7
+
+DROP VIEW v_area_commitment_bucket_strict;
+CREATE VIEW v_area_commitment_bucket_strict AS
+SELECT s.year, c.mgnr,
+       t.sortid || COALESCE(a.attrid, '') AS bucket,
+       t.sortid, a.attrid,
+       SUM(area) AS area,
+       CAST(ROUND(SUM(area) * COALESCE(t.min_kg_per_ha, 0) / 10000.0, 0) AS INTEGER) AS min_kg,
+       CAST(ROUND(SUM(area) * MIN(COALESCE(a.max_kg_per_ha, s.max_kg_per_ha), s.max_kg_per_ha) / 10000.0, 0) AS INTEGER) AS max_kg,
+       CAST(ROUND(SUM(area) * s.max_kg_per_ha / 10000.0, 0) AS INTEGER) AS upper_max_kg
+FROM season s, area_commitment c
+    JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
+    LEFT JOIN wine_attribute a ON a.attrid = t.attrid
+WHERE (year_from IS NULL OR year_from <= s.year) AND
+      (year_to IS NULL OR year_to >= s.year)
+GROUP BY s.year, c.mgnr, bucket
+ORDER BY s.year, c.mgnr, bucket;
+
+CREATE VIEW v_under_delivery_bucket_strict AS
+SELECT c.year, c.mgnr, c.bucket, c.min_kg, COALESCE(p.weight, 0) AS weight
+FROM v_area_commitment_bucket_strict c
+    LEFT JOIN v_payment_bucket_strict p ON (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket)
+ORDER BY c.year, c.mgnr, c.bucket;
+
+CREATE VIEW v_under_delivery_bucket AS
+SELECT u.year, u.mgnr, u.bucket, u.min_kg,
+       u.weight + SUM(MAX(COALESCE(p.weight - s.min_kg, 0), 0)) AS weight
+FROM v_under_delivery_bucket_strict u
+    LEFT JOIN v_payment_bucket_strict p ON (p.year, p.mgnr, p.sortid) = (u.year, u.mgnr, u.bucket) AND p.attrid IS NOT NULL
+    LEFT JOIN wine_attribute a ON a.attrid = p.attrid
+    LEFT JOIN v_area_commitment_bucket_strict s ON (s.year, s.mgnr, s.bucket) = (p.year, p.mgnr, p.bucket)
+WHERE (p.gebunden IS NULL OR p.gebunden) AND (a.strict IS NULL OR a.strict = FALSE)
+GROUP BY u.year, u.mgnr, u.bucket
+ORDER BY u.year, u.mgnr, u.bucket;
+
+CREATE VIEW v_under_delivery AS
+SELECT year, mgnr, bucket, min_kg, weight, weight - min_kg AS diff
+FROM v_under_delivery_bucket
+WHERE diff < 0;

Elwig/Resources/Sql/07-08.sql

@@ -0,0 +1,63 @@
+-- schema version 7 to 8
+
+INSERT INTO wb_gem
+SELECT a.gkz, 'WLNO'
+FROM AT_gem a
+    LEFT JOIN wb_gem w ON w.gkz = a.gkz
+WHERE a.gkz / 10000 = 3 AND w.hkid IS NULL;
+
+INSERT INTO wb_gem
+SELECT gkz, 'SLVL'
+FROM AT_gem
+WHERE gkz / 100 IN (617, 622, 623);
+
+INSERT INTO wb_gem
+SELECT gkz, 'SLSS'
+FROM AT_gem
+WHERE gkz / 100 = 610;
+
+UPDATE wb_gem
+SET hkid = 'SLVL'
+WHERE gkz IN (61007, 61052, 61001, 61055, 61027, 61057, 61008, 61057);
+
+INSERT INTO wb_gem
+SELECT gkz, 'SLWS'
+FROM AT_gem
+WHERE gkz / 100 IN (603, 616) OR gkz IN (60101, 60663, 60651, 60659, 60664, 60647, 60641, 60639, 60665, 60669, 60618, 60629, 60608, 60670, 60624, 60660, 60656, 60655);
+
+INSERT INTO wb_gem
+SELECT g.gkz, 'SLVL'
+FROM AT_gem g
+    LEFT JOIN wb_gem w ON w.gkz = g.gkz
+WHERE g.gkz / 100 = 606 AND w.hkid IS NULL;
+
+INSERT INTO wb_gem
+SELECT g.gkz, 'SLST'
+FROM AT_gem g
+    LEFT JOIN wb_gem w ON w.gkz = g.gkz
+WHERE g.gkz / 10000 = 6 AND w.hkid IS NULL;
+
+INSERT INTO wb_gem
+SELECT gkz, 'BLOO'
+FROM AT_gem
+WHERE gkz / 10000 = 4;
+
+INSERT INTO wb_gem
+SELECT gkz, 'BLKA'
+FROM AT_gem
+WHERE gkz / 10000 = 2;
+
+INSERT INTO wb_gem
+SELECT gkz, 'BLSB'
+FROM AT_gem
+WHERE gkz / 10000 = 5;
+
+INSERT INTO wb_gem
+SELECT gkz, 'BLTI'
+FROM AT_gem
+WHERE gkz / 10000 = 7;
+
+INSERT INTO wb_gem
+SELECT gkz, 'BLVO'
+FROM AT_gem
+WHERE gkz / 10000 = 8;

Elwig/Resources/Sql/08-09.sql

@@ -0,0 +1,85 @@
+-- schema version 8 to 9
+
+CREATE TABLE payment_delivery_part_bucket (
+    year   INTEGER NOT NULL,
+    did    INTEGER NOT NULL,
+    dpnr   INTEGER NOT NULL,
+    bktnr  INTEGER NOT NULL,
+    avnr   INTEGER NOT NULL,
+
+    price  INTEGER NOT NULL,
+    amount INTEGER NOT NULL,
+
+    CONSTRAINT pk_payment_delivery_part_bucket PRIMARY KEY (year, did, dpnr, bktnr, avnr),
+    CONSTRAINT fk_payment_delivery_part_bucket_delivery_part_bucket FOREIGN KEY (year, did, dpnr, bktnr) REFERENCES delivery_part_bucket (year, did, dpnr, bktnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE,
+    CONSTRAINT fk_payment_delivery_part_bucket_payment_variant FOREIGN KEY (year, avnr) REFERENCES payment_variant (year, avnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE
+) STRICT;
+
+DROP TRIGGER IF EXISTS t_payment_delivery_part_i;
+DROP TRIGGER IF EXISTS t_payment_delivery_part_u;
+DROP TRIGGER IF EXISTS t_payment_delivery_part_d;
+ALTER TABLE payment_delivery_part RENAME COLUMN amount TO net_amount;
+ALTER TABLE payment_delivery_part ADD COLUMN amount INTEGER NOT NULL GENERATED ALWAYS AS (ROUND(net_amount * (1 + mod_rel) + mod_abs)) VIRTUAL;
+
+CREATE TRIGGER t_payment_delivery_part_bucket_i
+    AFTER INSERT ON payment_delivery_part_bucket FOR EACH ROW
+BEGIN
+    INSERT INTO payment_delivery_part (year, did, dpnr, avnr, net_amount)
+    VALUES (NEW.year, NEW.did, NEW.dpnr, NEW.avnr, NEW.amount)
+    ON CONFLICT DO UPDATE SET net_amount = net_amount + NEW.amount;
+END;
+
+CREATE TRIGGER t_payment_delivery_part_bucket_u
+    AFTER UPDATE OF amount ON payment_delivery_part_bucket FOR EACH ROW
+BEGIN
+    UPDATE payment_delivery_part
+    SET net_amount = net_amount - OLD.amount
+    WHERE (year, did, dpnr, avnr) = (NEW.year, NEW.did, NEW.dpnr, NEW.avnr);
+    UPDATE payment_delivery_part
+    SET net_amount = net_amount + NEW.amount
+    WHERE (year, did, dpnr, avnr) = (NEW.year, NEW.did, NEW.dpnr, NEW.avnr);
+END;
+
+CREATE TRIGGER t_payment_delivery_part_bucket_d
+    AFTER DELETE ON payment_delivery_part_bucket FOR EACH ROW
+BEGIN
+    UPDATE payment_delivery_part
+    SET net_amount = net_amount - OLD.amount
+    WHERE (year, did, dpnr, avnr) = (OLD.year, OLD.did, OLD.dpnr, OLD.avnr);
+END;
+
+ALTER TABLE payment_member RENAME COLUMN amount TO net_amount;
+ALTER TABLE payment_member ADD COLUMN mod_abs INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE payment_member ADD COLUMN mod_rel REAL NOT NULL DEFAULT 0;
+ALTER TABLE payment_member ADD COLUMN amount INTEGER NOT NULL GENERATED ALWAYS AS (ROUND(net_amount * (1 + mod_rel) + mod_rel)) VIRTUAL;
+
+CREATE TRIGGER t_payment_delivery_part_i
+    AFTER INSERT ON payment_delivery_part FOR EACH ROW
+BEGIN
+    INSERT INTO payment_member (year, avnr, mgnr, net_amount)
+    VALUES (NEW.year, NEW.avnr, (SELECT mgnr FROM delivery WHERE (year, did) = (NEW.year, NEW.did)), NEW.amount)
+    ON CONFLICT DO UPDATE SET net_amount = net_amount + excluded.net_amount;
+END;
+
+CREATE TRIGGER t_payment_delivery_part_u
+    AFTER UPDATE OF amount ON payment_delivery_part FOR EACH ROW
+BEGIN
+    UPDATE payment_member
+    SET net_amount = net_amount - OLD.amount
+    WHERE (year, avnr, mgnr) = (NEW.year, NEW.avnr, (SELECT mgnr FROM delivery WHERE (year, did) = (NEW.year, NEW.did)));
+    UPDATE payment_member
+    SET net_amount = net_amount + NEW.amount
+    WHERE (year, avnr, mgnr) = (NEW.year, NEW.avnr, (SELECT mgnr FROM delivery WHERE (year, did) = (NEW.year, NEW.did)));
+END;
+
+CREATE TRIGGER t_payment_delivery_part_d
+    AFTER DELETE ON payment_delivery_part FOR EACH ROW
+BEGIN
+    UPDATE payment_member
+    SET net_amount = net_amount - OLD.amount
+    WHERE (year, avnr, mgnr) = (OLD.year, OLD.avnr, (SELECT mgnr FROM delivery WHERE (year, did) = (OLD.year, OLD.did)));
+END;

Elwig/Resources/Sql/09-10.sql

@@ -0,0 +1,19 @@
+-- schema version 9 to 10
+
+UPDATE wine_quality_level SET min_kmw = 10.6 WHERE qualid = 'RSW';
+
+DROP VIEW v_area_commitment_bucket;
+CREATE VIEW v_area_commitment_bucket AS
+SELECT year, mgnr, bucket, area, min_kg, max_kg
+FROM v_area_commitment_bucket_strict
+WHERE attrid IS NOT NULL
+UNION ALL
+SELECT b.year, b.mgnr, b.sortid,
+        SUM(b.area) AS area,
+        SUM(b.min_kg) AS min_kg,
+        SUM(b.upper_max_kg) AS max_kg
+FROM v_area_commitment_bucket_strict b
+    LEFT JOIN wine_attribute a ON a.attrid = b.attrid
+WHERE a.strict IS NULL OR a.strict = FALSE
+GROUP BY b.year, b.mgnr, b.sortid
+ORDER BY year, mgnr, bucket;

Elwig/Resources/Sql/10-11.sql

@@ -0,0 +1,73 @@
+-- schema version 10 to 11
+
+CREATE TABLE payment_delivery_part_new (
+    year       INTEGER NOT NULL,
+    did        INTEGER NOT NULL,
+    dpnr       INTEGER NOT NULL,
+    avnr       INTEGER NOT NULL,
+
+    net_amount INTEGER NOT NULL,
+    mod_abs    INTEGER NOT NULL DEFAULT 0,
+    mod_rel    REAL    NOT NULL DEFAULT 0,
+    amount     INTEGER NOT NULL GENERATED ALWAYS AS (ROUND(net_amount * (1 + mod_rel) + mod_abs)) STORED,
+
+    CONSTRAINT pk_payment_delivery_part PRIMARY KEY (year, did, dpnr, avnr),
+    CONSTRAINT fk_payment_delivery_part_delivery_part FOREIGN KEY (year, did, dpnr) REFERENCES delivery_part (year, did, dpnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE,
+    CONSTRAINT fk_payment_delivery_part_payment_variant FOREIGN KEY (year, avnr) REFERENCES payment_variant (year, avnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE
+) STRICT;
+INSERT INTO payment_delivery_part_new (year, did, dpnr, avnr, net_amount, mod_abs, mod_rel)
+SELECT year, did, dpnr, avnr, net_amount, mod_abs, mod_rel
+FROM payment_delivery_part;
+PRAGMA writable_schema = ON;
+DROP TABLE payment_delivery_part;
+ALTER TABLE payment_delivery_part_new RENAME TO payment_delivery_part;
+PRAGMA writable_schema = OFF;
+
+DROP TRIGGER IF EXISTS t_payment_delivery_part_i;
+CREATE TRIGGER t_payment_delivery_part_i
+    AFTER INSERT ON payment_delivery_part FOR EACH ROW
+BEGIN
+    INSERT INTO payment_member (year, avnr, mgnr, net_amount)
+    SELECT year, NEW.avnr, mgnr, NEW.amount FROM delivery WHERE (year, did) = (NEW.year, NEW.did)
+    ON CONFLICT DO UPDATE SET net_amount = net_amount + excluded.net_amount;
+END;
+
+DROP TRIGGER IF EXISTS t_payment_delivery_part_u;
+CREATE TRIGGER t_payment_delivery_part_u
+    AFTER UPDATE ON payment_delivery_part FOR EACH ROW
+BEGIN
+    UPDATE payment_member
+    SET net_amount = net_amount - OLD.amount
+    WHERE (year, avnr, mgnr) IN (SELECT year, OLD.avnr, mgnr FROM delivery WHERE (year, did) = (OLD.year, OLD.did));
+    INSERT INTO payment_member (year, avnr, mgnr, net_amount)
+    SELECT year, NEW.avnr, mgnr, NEW.amount FROM delivery WHERE (year, did) = (NEW.year, NEW.did)
+    ON CONFLICT DO UPDATE SET net_amount = net_amount + excluded.net_amount;
+END;
+
+DROP TRIGGER IF EXISTS t_payment_delivery_part_d;
+CREATE TRIGGER t_payment_delivery_part_d
+    AFTER DELETE ON payment_delivery_part FOR EACH ROW
+BEGIN
+    UPDATE payment_member
+    SET net_amount = net_amount - OLD.amount
+    WHERE (year, avnr, mgnr) IN (SELECT year, OLD.avnr, mgnr FROM delivery WHERE (year, did) = (OLD.year, OLD.did));
+END;
+
+DROP TRIGGER IF EXISTS t_payment_delivery_part_bucket_u;
+CREATE TRIGGER t_payment_delivery_part_bucket_u
+    AFTER UPDATE ON payment_delivery_part_bucket FOR EACH ROW
+BEGIN
+    UPDATE payment_delivery_part
+    SET net_amount = net_amount - OLD.amount
+    WHERE (year, did, dpnr, avnr) = (OLD.year, OLD.did, OLD.dpnr, OLD.avnr);
+    UPDATE payment_delivery_part
+    SET net_amount = net_amount + NEW.amount
+    WHERE (year, did, dpnr, avnr) = (NEW.year, NEW.did, NEW.dpnr, NEW.avnr);
+END;
+
+ALTER TABLE payment_member DROP COLUMN amount;
+ALTER TABLE payment_member ADD COLUMN amount INTEGER NOT NULL GENERATED ALWAYS AS (ROUND(net_amount * (1 + mod_rel) + mod_abs)) VIRTUAL;

Elwig/Resources/Sql/11-12.sql

@@ -0,0 +1,11 @@
+-- schema version 11 to 12
+
+CREATE VIEW v_stat_member AS
+SELECT year, mgnr,
+       SUM(weight) AS sum,
+       ROUND(SUM(kmw * weight) / SUM(weight), 2) AS kmw,
+       ROUND(SUM(oe * weight) / SUM(weight), 1) AS oe,
+       COUNT(DISTINCT did) AS lieferungen
+FROM v_delivery
+GROUP BY year, mgnr
+ORDER BY year, mgnr;

Elwig/Resources/Sql/12-13.sql

@@ -0,0 +1,31 @@
+-- schema version 12 to 13
+
+ALTER TABLE season ADD COLUMN bs_value INTEGER;
+
+CREATE TABLE member_history (
+    mgnr            INTEGER NOT NULL,
+    date            TEXT    NOT NULL CHECK (date REGEXP '^[1-9][0-9]{3}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$') DEFAULT CURRENT_DATE,
+
+    business_shares INTEGER NOT NULL,
+    type            TEXT    NOT NULL CHECK (type REGEXP '^[a-z_]+$'),
+    comment         TEXT DEFAULT NULL,
+
+    CONSTRAINT pk_member_history PRIMARY KEY (mgnr, date),
+    CONSTRAINT fk_member_history_member FOREIGN KEY (mgnr) REFERENCES member (mgnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE
+) STRICT;
+
+CREATE VIEW v_total_under_delivery AS
+SELECT s.year, m.mgnr, m.business_shares,
+       m.business_shares * s.min_kg_per_bs AS min_kg,
+       m.business_shares * s.max_kg_per_bs AS max_kg,
+       COALESCE(d.sum, 0) AS weight,
+       IIF(COALESCE(d.sum, 0) < m.business_shares * s.min_kg_per_bs,
+           COALESCE(d.sum, 0) - m.business_shares * s.min_kg_per_bs,
+           IIF(COALESCE(d.sum, 0) > m.business_shares * s.max_kg_per_bs,
+               COALESCE(d.sum, 0) - m.business_shares * s.max_kg_per_bs,
+               0)) AS diff
+FROM member m, season s
+    LEFT JOIN v_stat_member d ON (d.year, d.mgnr) = (s.year, m.mgnr)
+ORDER BY s.year, m.mgnr;

Elwig/Resources/Sql/13-14.sql

@@ -0,0 +1,33 @@
+-- schema version 13 to 14
+
+CREATE VIEW v_penalty_area_commitments AS
+SELECT year, mgnr,
+      SUM(COALESCE(IIF(u.weight = 0, -t.penalty_none, 0), 0) +
+          COALESCE(IIF(u.diff < 0, -t.penalty_amount, 0), 0) +
+          COALESCE(u.diff * t.penalty_per_kg, 0)
+      ) AS total_penalty
+FROM v_under_delivery u
+   JOIN area_commitment_type t ON t.vtrgid = u.bucket
+GROUP BY year, mgnr
+HAVING total_penalty < 0
+ORDER BY year, mgnr;
+
+CREATE VIEW v_penalty_business_shares AS
+SELECT s.year, u.mgnr,
+       (COALESCE(IIF(u.weight = 0, -s.penalty_none, 0), 0) +
+        COALESCE(IIF(u.diff < 0, -s.penalty_amount, 0), 0) +
+        COALESCE(u.diff * s.penalty_per_kg, 0)
+       ) AS total_penalty
+FROM v_total_under_delivery u
+   JOIN season s ON s.year = u.year
+WHERE u.diff < 0 AND total_penalty < 0
+ORDER BY s.year, u.mgnr;
+
+CREATE VIEW v_auto_business_shares AS
+SELECT s.year, h.mgnr,
+       SUM(h.business_shares) AS business_shares,
+       SUM(h.business_shares) * s.bs_value AS total_amount
+FROM member_history h, season s
+WHERE h.type = 'auto' AND h.date >= s.year || '-01-01' AND h.date <= s.year || '-12-31'
+GROUP BY s.year, h.mgnr
+ORDER BY s.year, h.mgnr;

Elwig/Windows/AdministrationWindow.cs

@@ -427,8 +427,9 @@ namespace Elwig.Windows {
         }
 
         protected void TextBox_TextChanged(object sender, RoutedEventArgs? evt) {
-            var input = (TextBox)sender;
-            if (SenderIsRequired(input) && input.Text.Length == 0) {
+            var input = (Control)sender;
+            var tb = input as TextBox ?? (input as UnitTextBox)?.TextBox;
+            if (SenderIsRequired(input) && tb?.Text.Length == 0) {
                 ValidateInput(input, false);
                 ControlUtils.SetInputInvalid(input);
             } else {
@@ -472,11 +473,13 @@ namespace Elwig.Windows {
         }
 
         protected void IntegerInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            InputTextChanged((TextBox)sender, Validator.CheckInteger);
+            // FIXME
+            InputTextChanged((sender as UnitTextBox)?.TextBox ?? (TextBox)sender, Validator.CheckInteger);
         }
 
         protected void DecimalInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            InputTextChanged((TextBox)sender, Validator.CheckDecimal);
+            // FIXME
+            InputTextChanged((sender as UnitTextBox)?.TextBox ?? (TextBox)sender, Validator.CheckDecimal);
         }
 
         protected void PartialDateInput_TextChanged(object sender, TextChangedEventArgs evt) {

Elwig/Windows/BaseDataWindow.xaml

@@ -375,14 +375,14 @@
                 </Grid>
             </TabItem>
 
-            <TabItem Header="Saisons">
+            <TabItem Header="Saisons" x:Name="Seasons">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="180"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="180"/>
+                        <RowDefinition Height="205"/>
                         <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
 
@@ -446,6 +446,10 @@
                         <Label Content="Strafe (Nicht-Lieferung):" Margin="10,130,0,10" Grid.Column="2"/>
                         <ctrl:UnitTextBox x:Name="SeasonPenaltyNoneInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
                                           Grid.Column="3" Width="68" Margin="0,130,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="GA-Wert:" Margin="10,160,0,10" Grid.Column="2"/>
+                        <ctrl:UnitTextBox x:Name="SeasonBsValueInput" Unit="€/GA" TextChanged="SeasonPenaltyInput_TextChanged"
+                                          Grid.Column="3" Width="85" Margin="0,160,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                     </Grid>
 
                     <GroupBox Grid.Column="1" Grid.Row="1" Header="Zu-/Abschläge" Margin="0,0,10,10" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
@@ -531,15 +535,18 @@
                         </GroupBox>
                         <GroupBox Header="Anlieferungsbestätigung" Margin="10,10,10,10" Height="250">
                             <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                </Grid.ColumnDefinitions>
-
                                 <TextBox x:Name="TextElementDeliveryConfirmation" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible" AcceptsReturn="True"
                                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" Height="Auto"
                                          TextChanged="TextBox_TextChanged"/>
                             </Grid>
                         </GroupBox>
+                        <GroupBox Header="Traubengutschrift" Margin="10,10,10,10" Height="250">
+                            <Grid>
+                                <TextBox x:Name="TextElementCreditNote" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible" AcceptsReturn="True"
+                                         HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" Height="Auto"
+                                         TextChanged="TextBox_TextChanged"/>
+                            </Grid>
+                        </GroupBox>
                     </StackPanel>
                 </ScrollViewer>
             </TabItem>

Elwig/Windows/BaseDataWindow.xaml.Branch.cs

@@ -125,6 +125,7 @@ namespace Elwig.Windows {
             if (old != null) _branches[old] = id;
             branch.ZwstId = id;
             branch.Name = BranchNameInput.Text;
+            branch.CountryNum = 40;
             branch.PostalDestId = (BranchOrtInput.SelectedItem as AT_PlzDest)?.Id;
             branch.Address = BranchAddressInput.Text;
             branch.PhoneNr = BranchPhoneNrInput.Text;

Elwig/Windows/BaseDataWindow.xaml.Mod.cs

@@ -52,13 +52,13 @@ namespace Elwig.Windows {
 
             var year = (SeasonList.SelectedItem as Season)?.Year;
             foreach (var (modid, _) in _mods.Where(m => m.Value == null)) {
-                Context.Remove(Context.Modifiers.Find(new object?[] { year, modid }));
+                Context.Remove(Context.Modifiers.Find(year, modid));
             }
             foreach (var (mod, old) in _modIds) {
                 mod.ModId = old;
             }
             foreach (var (old, modid) in _mods.Where(m => m.Value != null)) {
-                Context.Update(Context.Modifiers.Find(new object?[] { year, old }));
+                Context.Update(Context.Modifiers.Find(year, old));
             }
             await Context.SaveChangesAsync();
 
@@ -102,8 +102,9 @@ namespace Elwig.Windows {
             if (_modList == null || SeasonList.SelectedItem is not Season s) return;
             _modChanged = true;
             var idx = (SeasonModifierList.SelectedIndex != -1) ? SeasonModifierList.SelectedIndex + 1 : _modList.Count;
-            var item = Context.CreateProxy<Modifier>();
-            item.Year = s.Year;
+            var item = new Modifier {
+                Year = s.Year
+            };
             _modList.Insert(idx, item);
             SeasonModifierList.SelectedIndex = idx;
             UpdateButtons();

Elwig/Windows/BaseDataWindow.xaml.Season.cs

@@ -43,12 +43,14 @@ namespace Elwig.Windows {
                 SeasonPenaltyPerKgInput.Text = s.PenaltyPerKg?.ToString() ?? "";
                 SeasonPenaltyInput.Text = s.PenaltyAmount?.ToString() ?? "";
                 SeasonPenaltyNoneInput.Text = s.PenaltyNone?.ToString() ?? "";
+                SeasonBsValueInput.Text = s.BusinessShareValue?.ToString() ?? "";
 
                 var sym = s.Currency.Symbol ?? "";
                 SeasonModifierAbsInput.Unit = $"{sym}/kg";
                 SeasonPenaltyPerKgInput.Unit = $"{sym}/kg";
                 SeasonPenaltyInput.Unit = sym;
                 SeasonPenaltyNoneInput.Unit = sym;
+                SeasonBsValueInput.Unit = $"{sym}/GA";
                 AreaCommitmentTypePenaltyPerKgInput.Unit = $"{sym}/kg";
                 AreaCommitmentTypePenaltyInput.Unit = sym;
                 AreaCommitmentTypePenaltyNoneInput.Unit = sym;
@@ -64,6 +66,7 @@ namespace Elwig.Windows {
                 SeasonPenaltyPerKgInput.Text = "";
                 SeasonPenaltyInput.Text = "";
                 SeasonPenaltyNoneInput.Text = "";
+                SeasonBsValueInput.Text = "";
             }
             _seasonUpdate = false;
         }
@@ -85,6 +88,7 @@ namespace Elwig.Windows {
             s.PenaltyPerKg = (SeasonPenaltyPerKgInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerKgInput.Text) : null;
             s.PenaltyAmount = (SeasonPenaltyInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyInput.Text) : null;
             s.PenaltyNone = (SeasonPenaltyNoneInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyNoneInput.Text) : null;
+            s.BusinessShareValue = (SeasonBsValueInput.Text.Length > 0) ? decimal.Parse(SeasonBsValueInput.Text) : null;
 
             UpdateButtons();
         }

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -12,11 +12,11 @@ namespace Elwig.Windows {
 
         public BaseDataWindow() {
             InitializeComponent();
-            RequiredInputs = new Control[] {
+            RequiredInputs = [
                 ClientNameInput, ClientNameTypeInput, ClientNameTokenInput, ClientNameShortInput,
                 ClientAddressInput, ClientPlzInput, ClientOrtInput,
-            };
-            ExemptInputs = new Control[] {
+            ];
+            ExemptInputs = [
                 ClientNameFull,
                 BranchIdInput, BranchNameInput, BranchPlzInput, BranchOrtInput,
                 BranchAddressInput, BranchPhoneNrInput, BranchFaxNrInput, BranchMobileNrInput,
@@ -27,9 +27,10 @@ namespace Elwig.Windows {
                 AreaCommitmentTypeMinKgPerHaInput.TextBox, AreaCommitmentTypePenaltyPerKgInput.TextBox,
                 AreaCommitmentTypePenaltyInput.TextBox, AreaCommitmentTypePenaltyNoneInput.TextBox,
                 SeasonMaxKgPerHaInput.TextBox, SeasonVatNormalInput.TextBox, SeasonVatFlatrateInput.TextBox, SeasonStartInput, SeasonEndInput,
-                SeasonMinKgPerBsInput.TextBox, SeasonMaxKgPerBsInput.TextBox, SeasonPenaltyPerKgInput.TextBox, SeasonPenaltyInput.TextBox, SeasonPenaltyNoneInput.TextBox,
+                SeasonMinKgPerBsInput.TextBox, SeasonMaxKgPerBsInput.TextBox, SeasonBsValueInput.TextBox,
+                SeasonPenaltyPerKgInput.TextBox, SeasonPenaltyInput.TextBox, SeasonPenaltyNoneInput.TextBox,
                 SeasonModifierIdInput, SeasonModifierNameInput, SeasonModifierRelInput.TextBox, SeasonModifierAbsInput.TextBox,
-            };
+            ];
             WineAttributeFillLowerInput.Visibility = Visibility.Hidden;
             WineAttributeFillLowerLabel.Visibility = Visibility.Hidden;
         }
@@ -72,6 +73,7 @@ namespace Elwig.Windows {
             SeasonPenaltyPerKgInput.TextBox.IsReadOnly = true;
             SeasonPenaltyInput.TextBox.IsReadOnly = true;
             SeasonPenaltyNoneInput.TextBox.IsReadOnly = true;
+            SeasonBsValueInput.TextBox.IsReadOnly = true;
 
             SeasonModifierIdInput.IsReadOnly = true;
             SeasonModifierNameInput.IsReadOnly = true;
@@ -117,6 +119,7 @@ namespace Elwig.Windows {
             SeasonPenaltyPerKgInput.TextBox.IsReadOnly = false;
             SeasonPenaltyInput.TextBox.IsReadOnly = false;
             SeasonPenaltyNoneInput.TextBox.IsReadOnly = false;
+            SeasonBsValueInput.TextBox.IsReadOnly = false;
 
             SeasonModifierIdInput.IsReadOnly = false;
             SeasonModifierNameInput.IsReadOnly = false;
@@ -261,6 +264,8 @@ namespace Elwig.Windows {
             ClearInputStates();
             FillInputs(App.Client);
             LockInputs();
+
+            await HintContextChange();
         }
 
         private void FillInputs(ClientParameters p) {
@@ -292,6 +297,7 @@ namespace Elwig.Windows {
                 case 3: ModeDeliveryNoteFull.IsChecked = true; break;
             }
             TextElementDeliveryConfirmation.Text = p.TextDeliveryConfirmation;
+            TextElementCreditNote.Text = p.TextCreditNote;
 
             FinishInputFilling();
         }
@@ -317,6 +323,7 @@ namespace Elwig.Windows {
             p.TextDeliveryNote = TextElementDeliveryNote.Text.Length > 0 ? TextElementDeliveryNote.Text : null;
             p.ModeDeliveryNoteStats = (ModeDeliveryNoteNone.IsChecked == true) ? 0 : (ModeDeliveryNoteGaOnly.IsChecked == true) ? 1 : (ModeDeliveryNoteShort.IsChecked == true) ? 2 : (ModeDeliveryNoteFull.IsChecked == true) ? 3 : 2;
             p.TextDeliveryConfirmation = TextElementDeliveryConfirmation.Text.Length > 0 ? TextElementDeliveryConfirmation.Text : null;
+            p.TextCreditNote = TextElementCreditNote.Text.Length > 0 ? TextElementCreditNote.Text : null;
 
             await p.UpdateValues();
         }

Elwig/Windows/ChartWindow.xaml

@@ -1,15 +1,17 @@
-<local:AdministrationWindow
+<local:ContextWindow
         x:Class="Elwig.Windows.ChartWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        xmlns:ScottPlot="clr-namespace:ScottPlot;assembly=ScottPlot.WPF"
+        xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
         mc:Ignorable="d"
-        Title="Auszahlung - Elwig" Height="700" Width="1500"
-        Loaded="Window_Loaded">
+        Title="Auszahlung - Elwig" Height="700" Width="1500" MinWidth="1000" MinHeight="500"
+        Loaded="Window_Loaded"
+        Closing="Window_Closing">
 
     <Window.Resources>
         <Style TargetType="Label">
@@ -43,94 +45,82 @@
 
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="19"/>
+            <RowDefinition Height="40"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="330"/>
+            <ColumnDefinition Width="300"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="200"/>
         </Grid.ColumnDefinitions>
 
-        <Grid Grid.Row="1" Margin="5,0,0,0">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="42"/>
-            </Grid.RowDefinitions>
+        <Grid Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="3">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="560"/>
+                <ColumnDefinition Width="100"/>
             </Grid.ColumnDefinitions>
-            
-            <DataGrid x:Name="GraphList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
-                      CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
-                      SelectionChanged="GraphList_SelectionChanged"
-                      Margin="5,15,5,0" Grid.Row="0" FontSize="14" Grid.ColumnSpan="3">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="Nr."    Binding="{Binding Num}"       Width="40">
-                        <DataGridTextColumn.ElementStyle>
-                            <Style>
-                                <Setter Property="TextBlock.TextWrapping" Value="Wrap" />
-                            </Style>
-                        </DataGridTextColumn.ElementStyle>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Header="Typ"    Binding="{Binding Type}"       Width="40"/>
-                    <DataGridTextColumn Header="Angewandte Verträge" Binding="{Binding Contracts}" Width="4*"/>
-                </DataGrid.Columns>
-            </DataGrid>
 
-            <Button x:Name="NewButton" Content="Neu"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
-                    Click="NewButton_Click"/>
-            <Button x:Name="EditButton" Content="Bearbeiten" IsEnabled="False"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
-                    Click="EditButton_Click"/>
-            <Button x:Name="DeleteButton" Content="Löschen" IsEnabled="False"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
-                    Click="DeleteButton_Click"/>
+            <Label Content="Für:" Margin="10,-2,0,0" FontSize="14" Grid.Column="0" VerticalAlignment="Center"/>
+            <xctk:CheckComboBox x:Name="VaributeInput" Margin="50,0,0,0" Grid.Column="0" Width="500" Height="25" HorizontalAlignment="Left"
+                                IsSelectAllActive="True" SelectAllContent="Alle Sorten" Delimiter=", " AllItemsSelectedContent="Alle Sorten"
+                                IsEnabled="False" ItemSelectionChanged="VaributeInput_Changed">
+                <xctk:CheckComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{Binding Variety.Name}" Width="150"/>
+                            <TextBlock Text="{Binding Variety.Type}" Width="30"/>
+                            <TextBlock Text="{Binding Attribute.Name}" Width="120"/>
+                            <TextBlock Text="{Binding AssignedGraphId}" Width="30"/>
+                            <TextBlock Text="{Binding AssignedAbgewGraphId}" Width="30"/>
+                        </StackPanel>
+                    </DataTemplate>
+                </xctk:CheckComboBox.ItemTemplate>
+            </xctk:CheckComboBox>
 
-            <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False" Visibility="Hidden"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
-                    Click="SaveButton_Click"/>
-            <Button x:Name="ResetButton" Content="Zurücksetzen" IsEnabled="False" Visibility="Hidden"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
-                    Click="ResetButton_Click"/>
-            <Button x:Name="CancelButton" Content="Abbrechen" IsEnabled="False" Visibility="Hidden" IsCancel="True"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
-                    Click="CancelButton_Click"/>
+            <CheckBox x:Name="AbgewertetInput" Content="Abgewertet" IsEnabled="False" Checked="AbgewertetInput_Changed" Unchecked="AbgewertetInput_Changed"
+                              VerticalAlignment="Center" HorizontalAlignment="Left" Margin="0,0,0,0" Grid.Column="1"/>
         </Grid>
 
-        <Grid Grid.Row="1" Grid.Column="1">
-            <ScottPlot:WpfPlot x:Name="OechslePricePlot" MouseMove="OechslePricePlot_MouseMove" MouseDown="OechslePricePlot_MouseDown" IsEnabled="False"/>
+        <ListBox x:Name="GraphList" Margin="10,10,35,42" Grid.Column="0" Grid.Row="0" Grid.RowSpan="2" SelectionChanged="GraphList_SelectionChanged">
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="{Binding Id}" Width="30"/>
+                        <TextBlock Text="{Binding VaributeStringSimple}" ToolTip="{Binding VaributeString}"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+
+        <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False"
+            HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="10,5,35,10" Grid.Column="0" Grid.Row="2"
+            Click="SaveButton_Click"/>
+
+        <Button x:Name="AddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" ToolTip="Neue Auszahlungsvariante hinzufügen"
+            VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,60" Grid.Column="0" Grid.RowSpan="2" Grid.Row="0"
+            Click="AddButton_Click"/>
+        <Button x:Name="CopyButton" Content="&#xE8C8;" FontFamily="Segoe MDL2 Assets" FontSize="12" Padding="0,0,0,0" IsEnabled="False" ToolTip="Ausgewählte Auszahlungsvariante duplizieren"
+            VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="0,0,5,0" Grid.Column="0" Grid.RowSpan="2" Grid.Row="0"
+            Click="CopyButton_Click"/>
+        <Button x:Name="DeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False" ToolTip="Ausgewählte Auszahlungsvariante löschen"
+                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,60,5,0" Grid.Column="0" Grid.RowSpan="2" Grid.Row="0"
+                Click="DeleteButton_Click"/>
+
+        <Grid Grid.Row="1" Grid.Column="1" Margin="0,0,10,10">
+            <ScottPlot:WpfPlot x:Name="OechslePricePlot" IsEnabled="False"
+                               MouseWheel="OechslePricePlot_MouseWheel" MouseMove="OechslePricePlot_MouseMove" MouseDown="OechslePricePlot_MouseDown"/>
         </Grid>
 
-        <Grid Grid.Row="1" Grid.Column="2" Margin="0,0,5,0">
+        <Grid Grid.Row="1" Grid.Column="2" Margin="0,0,5,36">
             <Grid.RowDefinitions>
                 <RowDefinition Height="120"/>
-                <RowDefinition Height="120"/>
+                <RowDefinition Height="90"/>
                 <RowDefinition Height="210"/>
+                <RowDefinition Height="1*"/>
                 <RowDefinition Height="110"/>
-                <RowDefinition Height="42"/>
             </Grid.RowDefinitions>
 
-            <GroupBox Header="Graph" Grid.Row="0" Margin="0,5,5,5">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="85"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <Label Content="Nummer:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="GraphNumberInput" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0" Text="" Width="90" TextChanged="GraphNumberInput_TextChanged" LostFocus="GraphNumberInput_LostFocus"/>
-
-                    <Label Content="Typ:" Margin="10,45,0,0" Grid.Column="0"/>
-                    <RadioButton x:Name="OechsleGraphType_Input" GroupName="GraphType" Grid.Column="1" Margin="0,45,0,0">Oechsle</RadioButton>
-                    <RadioButton x:Name="KmwGraphType_Input" GroupName="GraphType" Grid.Column="1" Margin="0,60,0,0">KMW</RadioButton>
-                </Grid>
-            </GroupBox>
-
-            <GroupBox Header="Datenpunkt" Grid.Row="1" Margin="0,5,5,5">
+            <GroupBox Header="Datenpunkt" Grid.Row="0" Margin="0,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="85"/>
@@ -138,35 +128,44 @@
                     </Grid.ColumnDefinitions>
 
                     <Label Content="Oechsle:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="OechsleInput" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0" Text="" Width="90" TextChanged="OechsleInput_TextChanged" LostFocus="OechsleInput_LostFocus"/>
+                    <ctrl:UnitTextBox x:Name="OechsleInput" Unit="°Oe" TextChanged="OechsleInput_TextChanged" IsEnabled="False" LostFocus="OechsleInput_LostFocus"
+                        Grid.Column="1" Width="90" Margin="0,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
-                    <Label Content="Preis pro kg:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="PriceInput" Grid.Column="1" HorizontalAlignment="Left" Margin="0,40,0,0" Text="" Width="90" TextChanged="PriceInput_TextChanged" LostFocus="PriceInput_LostFocus"/>
 
+                    <Label Content="Preis:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <ctrl:UnitTextBox x:Name="PriceInput" Unit="€/kg" TextChanged="PriceInput_TextChanged" IsEnabled="False" LostFocus="PriceInput_LostFocus"
+                        Grid.Column="1" Width="90" Margin="0,40,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                </Grid>
+            </GroupBox>
+
+            <GroupBox Header="Gebunden Aufschlag" Grid.Row="1" Margin="0,5,5,5">
+                <Grid>
+
+                    <StackPanel Margin="10,10,0,0">
+                        <RadioButton x:Name="GebundenTypeFixed" GroupName="GebundenType" Checked="GebundenType_Checked" IsEnabled="False">Fix</RadioButton>
+                        <RadioButton x:Name="GebundenTypeGraph" GroupName="GebundenType" Checked="GebundenType_Checked" IsEnabled="False">Frei</RadioButton>
+                        <RadioButton x:Name="GebundenTypeNone" GroupName="GebundenType" Checked="GebundenType_Checked" IsEnabled="False">Nein</RadioButton>
+                    </StackPanel>
+
+                    <ctrl:UnitTextBox x:Name="GebundenFlatBonus" Unit="€/kg" TextChanged="GebundenFlatBonus_TextChanged" IsEnabled="False"
+                                      Width="90" Margin="5,5,5,5" HorizontalAlignment="Right" VerticalAlignment="Top" Grid.Column="1"/>
                 </Grid>
             </GroupBox>
 
             <GroupBox Header="Aktionen" Grid.Row="2" Margin="0,5,5,5">
                 <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-
                     <Button x:Name="LeftFlatButton" Content="Links flach" Click="LeftFlatButton_Click" IsEnabled="False"
                             HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="10,10,10,10"/>
-
                     <Button x:Name="RightFlatButton" Content="Rechts flach" Click="RightFlatButton_Click" IsEnabled="False"
-                            HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="10,50,10,10"/>
-
+                            HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="10,45,10,10"/>
                     <Button x:Name="InterpolateButton" Content="Interpolieren" Click="InterpolateButton_Click" IsEnabled="False"
-                            HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="10,90,10,10"/>
-
+                            HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="10,80,10,10"/>
                     <Button x:Name="LinearIncreaseButton" Content="Linear wachsen" Click="LinearIncreaseButton_Click" IsEnabled="False"
-                            HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="10,130,10,10"/>
+                            HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="10,115,10,10"/>
                 </Grid>
             </GroupBox>
 
-            <GroupBox Header="Optionen" Grid.Row="3" Margin="0,5,5,5">
+            <GroupBox Header="Optionen" Grid.Row="4" Margin="0,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -186,4 +185,4 @@
             </GroupBox>
         </Grid>
     </Grid>
-</local:AdministrationWindow>
+</local:ContextWindow>

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -92,8 +92,27 @@
             </Grid.ColumnDefinitions>
 
             <TextBox x:Name="SearchInput" Grid.ColumnSpan="3" Margin="5,10,161,0" IsReadOnly="False"
-                     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;)"/>
+                     TextChanged="SearchInput_TextChanged">
+                <TextBox.ToolTip>
+                    <TextBlock>
+                        Lieferungen filtern und durchsuchen. Die Filter sind beliebig kombinierbar.<LineBreak/>
+                        Groß- und Kleinschreibung ist in den meisten Fällen egal.<LineBreak/>
+                        <LineBreak/>
+                        Filtern nach:<LineBreak/>
+                        <Bold>Sorte</Bold>: z.B. GV, ZW, rr, sa, !gv (ausgenommen GV), ...<LineBreak/>
+                        <Bold>Rot/Weiß</Bold>: z.B. r, Rot, w, weiß, ...<LineBreak/>
+                        <Bold>Qualitätsstufe</Bold>: z.B. QUW, kab, !ldw (ausgenommen LDW), abgew[ertet], ...<LineBreak/>
+                        <Bold>Gradation</Bold>: z.B. &gt;73, &lt;15, 17-18, 15-, &gt;17,5, 62-75, ...<LineBreak/>
+                        <Bold>Mitglied</Bold>: z.B. 1234, 987, ...<LineBreak/>
+                        <Bold>Saison</Bold>: z.B. 2020, &gt;2015, 2017-2019, &lt;2005, 2019-, ...<LineBreak/>
+                        <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
+                        <Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
+                        <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...<LineBreak/>
+                        <Bold>Uhrzeit</Bold>: z.B. 06:00-08:00, 18:00-, ...<LineBreak/>
+                        <Bold>Freitext</Bold>: z.B. Lieferscheinnummern, Anmerkung, "quw" (sucht nach dem Text "quw")
+                    </TextBlock>
+                </TextBox.ToolTip>
+            </TextBox>
             <xctk:IntegerUpDown x:Name="SeasonInput" Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1000" Maximum="9999"
                                 Margin="0,10,100,0" VerticalAlignment="Top" HorizontalAlignment="Right"
                                 ValueChanged="SeasonInput_ValueChanged"/>
@@ -129,21 +148,21 @@
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Sorte" Binding="{Binding SortIdString}" Width="50">
+                    <DataGridTextColumn Header="Sorte" Binding="{Binding FilteredSortIdString}" 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 Header="Gewicht" Binding="{Binding FilteredWeight, 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 Header="Gradation" Binding="{Binding FilteredKmw, StringFormat='{}{0:N1}° '}" Width="50">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -8,7 +8,9 @@ using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -25,8 +27,11 @@ namespace Elwig.Windows {
         private bool IsUpdatingGradation = false;
         private Member? Member = null;
         private readonly DispatcherTimer Timer;
-        private List<string> TextFilter = new();
-        private readonly RoutedCommand CtrlF = new();
+        private List<string> TextFilter = [];
+
+        private readonly RoutedCommand CtrlF = new("CtrlF", typeof(DeliveryAdminWindow), [new KeyGesture(Key.F, ModifierKeys.Control)]);
+        private readonly RoutedCommand CtrlP = new("CtrlP", typeof(DeliveryAdminWindow), [new KeyGesture(Key.P, ModifierKeys.Control)]);
+        private readonly RoutedCommand CtrlShiftP = new("CtrlShiftP", typeof(DeliveryAdminWindow), [new KeyGesture(Key.P, ModifierKeys.Control | ModifierKeys.Shift)]);
 
         private string? LastScaleError = null;
         private string? ManualWeighingReason = null;
@@ -36,24 +41,25 @@ namespace Elwig.Windows {
 
         public DeliveryAdminWindow(bool receipt = false) {
             InitializeComponent();
-            CtrlF.InputGestures.Add(new KeyGesture(Key.F, ModifierKeys.Control));
             CommandBindings.Add(new CommandBinding(CtrlF, FocusSearchInput));
-            RequiredInputs = new Control[] {
+            CommandBindings.Add(new CommandBinding(CtrlP, Menu_Print_ShowDeliveryNote_Click));
+            CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_Print_PrintDeliveryNote_Click));
+            RequiredInputs = [
                 MgNrInput, MemberInput,
                 LsNrInput, DateInput, BranchInput,
                 SortIdInput, WineVarietyInput,
                 GradationOeInput.TextBox, GradationKmwInput.TextBox, WineQualityLevelInput,
                 WineOriginInput, WineKgInput,
                 WeightInput.TextBox
-            };
-            ExemptInputs = new Control[] {
+            ];
+            ExemptInputs = [
                 SearchInput, SeasonInput, TodayOnlyInput, AllSeasonsInput,
                 DeliveryList, DeliveryPartList,
                 MemberAddressField,
-            };
-            WeighingButtons = new Button[] {
+            ];
+            WeighingButtons = [
                 WeighingAButton, WeighingBButton, WeighingCButton, WeighingDButton,
-            };
+            ];
             IsReceipt = receipt;
 
             Timer = new DispatcherTimer();
@@ -67,7 +73,7 @@ namespace Elwig.Windows {
             DoShowWarningWindows = false;
 
             if (IsReceipt) {
-                Title = "Übernahme - Elwig";
+                Title = $"Übernahme - {App.BranchName} - Elwig";
                 TodayOnlyInput.IsChecked = true;
                 var n = App.Scales.Count;
                 if (n < 1) WeighingAButton.Visibility = Visibility.Hidden;
@@ -167,7 +173,7 @@ namespace Elwig.Windows {
 
         private async void Menu_Print_DeliveryJournal_ShowFilter_Click(object sender, RoutedEventArgs evt) {
             Mouse.OverrideCursor = Cursors.AppStarting;
-            var (f, _, d, _) = await GetFilters();
+            var (f, _, d, _, _) = await GetFilters();
             var doc = new DeliveryJournal(string.Join(" / ", f), d);
             await doc.Generate();
             Mouse.OverrideCursor = null;
@@ -176,7 +182,7 @@ namespace Elwig.Windows {
 
         private async void Menu_Print_DeliveryJournal_PrintFilter_Click(object sender, RoutedEventArgs evt) {
             Mouse.OverrideCursor = Cursors.AppStarting;
-            var (f, _, d, _) = await GetFilters();
+            var (f, _, d, _, _) = await GetFilters();
             var doc = new DeliveryJournal(string.Join(" / ", f), d);
             await doc.Generate();
             Mouse.OverrideCursor = null;
@@ -295,8 +301,8 @@ namespace Elwig.Windows {
             await RefreshDeliveryListQuery();
         }
 
-        private async Task<(List<string>, IQueryable<Delivery>, IQueryable<DeliveryPart>, List<string>)> GetFilters() {
-            List<string> filterNames = new();
+        private async Task<(List<string>, IQueryable<Delivery>, IQueryable<DeliveryPart>, Predicate<DeliveryPart>, List<string>)> GetFilters() {
+            List<string> filterNames = [];
             IQueryable<Delivery> deliveryQuery = Context.Deliveries;
             if (IsReceipt && App.BranchNum > 1) {
                 deliveryQuery = deliveryQuery.Where(d => d.ZwstId == App.ZwstId);
@@ -315,16 +321,13 @@ namespace Elwig.Windows {
                 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);
+
+            Expression<Func<DeliveryPart, bool>> prd = p => true;
 
             var filterVar = new List<string>();
             var filterNotVar = new List<string>();
             var filterQual = new List<string>();
+            var filterNotQual = new List<string>();
             var filterMgNr = new List<int>();
             var filterZwst = new List<string>();
             var filterAttr = new List<string>();
@@ -345,7 +348,15 @@ namespace Elwig.Windows {
 
                 for (int i = 0; i < filter.Count; i++) {
                     var e = filter[i];
-                    if (e.Length == 2 && var.ContainsKey(e.ToUpper())) {
+                    if (e.ToLower() is "r" or "rot") {
+                        filterVar.AddRange(var.Values.Where(v => v.IsRed).Select(v => v.SortId));
+                        filter.RemoveAt(i--);
+                        filterNames.Add("Rotweinsorten");
+                    } else if (e.ToLower() is "w" or "weiß" or "weiss") {
+                        filterVar.AddRange(var.Values.Where(v => v.IsWhite).Select(v => v.SortId));
+                        filter.RemoveAt(i--);
+                        filterNames.Add("Weißweinsorten");
+                    } else if (e.Length == 2 && var.ContainsKey(e.ToUpper())) {
                         filterVar.Add(e.ToUpper());
                         filter.RemoveAt(i--);
                         filterNames.Add(var[e.ToUpper()].Name);
@@ -354,13 +365,27 @@ namespace Elwig.Windows {
                         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());
+                        var qualId = e.ToUpper();
+                        filterQual.Add(qualId);
                         filter.RemoveAt(i--);
-                        filterNames.Add(qual[e.ToUpper()].Name);
-                    } else if (e.All(char.IsAsciiDigit) && mgnr.ContainsKey(e)) {
+                        filterNames.Add(qualId == "WEI" ? "abgewertet" : qual[e.ToUpper()].Name);
+                    } else if (e[0] == '!' && qual.ContainsKey(e[1..].ToUpper())) {
+                        var qualId = e[1..].ToUpper();
+                        filterNotQual.Add(qualId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add(qualId == "WEI" ? "nicht abgewertet" : "außer " + qual[e[1..].ToUpper()].Name);
+                    } else if (e.Length >= 5 && e.Length <= 10 && "abgewertet".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
+                        filterQual.Add("WEI");
+                        filter.RemoveAt(i--);
+                        filterNames.Add("abgewertet");
+                    } else if (e.Length >= 6 && e.Length <= 11 && "!abgewertet".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
+                        filterNotQual.Add("WEI");
+                        filter.RemoveAt(i--);
+                        filterNames.Add("nicht abgewertet");
+                    } else if (e.All(char.IsAsciiDigit) && mgnr.TryGetValue(e, out var member)) {
                         filterMgNr.Add(int.Parse(e));
                         filter.RemoveAt(i--);
-                        filterNames.Add(mgnr[e].AdministrativeName);
+                        filterNames.Add(member.AdministrativeName);
                     } else if (attr.ContainsKey(e.ToLower())) {
                         var a = attr[e.ToLower()];
                         filterAttr.Add(a.AttrId);
@@ -376,7 +401,7 @@ namespace Elwig.Windows {
                         filterZwst.Add(b.ZwstId);
                         filter.RemoveAt(i--);
                         filterNames.Add($"Zweigstelle {b.Name}");
-                    } else if (e.StartsWith(">") || e.StartsWith("<")) {
+                    } else if (e.StartsWith('>') || e.StartsWith('<')) {
                         if (double.TryParse(e[1..], out var num)) {
                             switch ((e[0], num)) {
                                 case ('>', <= 30): filterKmwGt = num; break;
@@ -391,8 +416,8 @@ namespace Elwig.Windows {
                         if (e.Length == 1) filter.RemoveAt(i--);
                     } else if (e.Length > 1 && Utils.FromToRegex.IsMatch(e)) {
                         var parts = e.Split("-");
-                        double? from = (parts[0].Length > 0) ? double.Parse(parts[0].Replace(".", ",")) : null;
-                        double? to = (parts[1].Length > 0) ? double.Parse(parts[1].Replace(".", ",")) : null;
+                        double? from = (parts[0].Length > 0) ? double.Parse(parts[0], CultureInfo.InvariantCulture) : null;
+                        double? to = (parts[1].Length > 0) ? double.Parse(parts[1], CultureInfo.InvariantCulture) : null;
                         switch ((from, to)) {
                             case ( <= 30, <= 30):
                             case ( <= 30, null):
@@ -466,38 +491,39 @@ namespace Elwig.Windows {
                                 filterNames.Add($"bis zum {n2}");
                             }
                         }
-                    } else if (e.Length > 2 && e.StartsWith("\"") && e.EndsWith("\"")) {
+                    } else if (e.Length > 2 && e.StartsWith('"') && e.EndsWith('"')) {
                         filter[i] = e[1..^1];
                     } else if (e.Length <= 2) {
                         filter.RemoveAt(i--);
                     }
                 }
 
-                if (filterYearGt > 0) dpq = dpq.Where(p => p.Year >= filterYearGt);
-                if (filterYearLt > 0) dpq = dpq.Where(p => p.Year < filterYearLt);
-                if (filterMgNr.Count > 0) dpq = dpq.Where(p => filterMgNr.Contains(p.Delivery.MgNr));
+                if (filterYearGt > 0) prd = prd.And(p => p.Year >= filterYearGt);
+                if (filterYearLt > 0) prd = prd.And(p => p.Year < filterYearLt);
+                if (filterMgNr.Count > 0) prd = prd.And(p => filterMgNr.Contains(p.Delivery.MgNr));
                 if (filterDate.Count > 0) {
                     var pr = PredicateBuilder.New<DeliveryPart>(false);
                     foreach (var (d1, d2) in filterDate)
                         pr.Or(p => (d1 == null || d1.CompareTo(p.Delivery.DateString.Substring(10 - d1.Length)) <= 0) && (d2 == null || d2.CompareTo(p.Delivery.DateString.Substring(10 - d2.Length)) >= 0));
-                    dpq = dpq.Where(pr);
+                    prd = prd.And(pr);
                 }
                 if (filterTime.Count > 0) {
                     var pr = PredicateBuilder.New<DeliveryPart>(false);
                     foreach (var (t1, t2) in filterTime)
                         pr.Or(p => (t1 == null || t1.CompareTo(p.Delivery.TimeString) <= 0) && (t2 == null || t2.CompareTo(p.Delivery.TimeString) > 0));
-                    dpq = dpq.Where(p => p.Delivery.TimeString != null).Where(pr);
+                    prd = prd.And(p => p.Delivery.TimeString != null).And(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) dpq = dpq.Where(p => p.AttrId != null && filterAttr.Contains(p.AttrId));
-                if (filterNotAttr.Count > 0) dpq = dpq.Where(p => p.AttrId == null || !filterAttr.Contains(p.AttrId));
-                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 (filterVar.Count > 0) prd = prd.And(p => filterVar.Contains(p.SortId));
+                if (filterNotVar.Count > 0) prd = prd.And(p => !filterNotVar.Contains(p.SortId));
+                if (filterQual.Count > 0) prd = prd.And(p => filterQual.Contains(p.QualId));
+                if (filterNotQual.Count > 0) prd = prd.And(p => !filterNotQual.Contains(p.QualId));
+                if (filterZwst.Count > 0) prd = prd.And(p => filterZwst.Contains(p.Delivery.ZwstId));
+                if (filterAttr.Count > 0) prd = prd.And(p => p.AttrId != null && filterAttr.Contains(p.AttrId));
+                if (filterNotAttr.Count > 0) prd = prd.And(p => p.AttrId == null || !filterNotAttr.Contains(p.AttrId));
+                if (filterKmwGt > 0) prd = prd.And(p => p.Kmw >= filterKmwGt);
+                if (filterKmwLt > 0) prd = prd.And(p => p.Kmw < filterKmwLt);
+                if (filterOeGt > 0) prd = prd.And(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt);
+                if (filterOeLt > 0) prd = prd.And(p => p.Kmw * (4.54 + 0.022 * p.Kmw) < filterOeLt);
 
                 if (filterYearGt > 0 && filterYearLt > 0) {
                     filterNames.Insert(0, $"{filterYearGt}–{filterYearLt - 1}");
@@ -522,7 +548,15 @@ namespace Elwig.Windows {
                 }
             }
 
-            return (filterNames, dpq.Select(p => p.Delivery).Distinct().OrderBy(d => d.DateString).ThenBy(d => d.TimeString), dpq, filter);
+            IQueryable<DeliveryPart> dpq = deliveryQuery
+                .SelectMany(d => d.Parts)
+                .Where(prd)
+                .OrderBy(p => p.Delivery.DateString)
+                .ThenBy(p => p.Delivery.TimeString)
+                .ThenBy(p => p.Delivery.LsNr)
+                .ThenBy(p => p.DPNr);
+
+            return (filterNames, dpq.Select(p => p.Delivery).Distinct().OrderBy(d => d.DateString).ThenBy(d => d.TimeString), dpq, prd.Invoke, filter);
         }
 
         private static void AddToolTipCell(Grid grid, string text, int row, int col, int colSpan = 1, bool bold = false, bool alignRight = false, bool alignCenter = false) {
@@ -558,7 +592,7 @@ namespace Elwig.Windows {
         }
 
         private async Task RefreshDeliveryListQuery(bool updateSort = false) {
-            var (_, deliveryQuery, deliveryPartsQuery, filter) = await GetFilters();
+            var (_, deliveryQuery, deliveryPartsQuery, predicate, filter) = await GetFilters();
             var deliveries = await deliveryQuery.ToListAsync();
             deliveries.Reverse();
 
@@ -574,8 +608,10 @@ namespace Elwig.Windows {
                     .ToList();
             }
 
+            deliveries.ForEach(d => { d.PartFilter = predicate; });
             ControlUtils.RenewItemsSource(DeliveryList, deliveries, d => ((d as Delivery)?.Year, (d as Delivery)?.DId),
                 DeliveryList_SelectionChanged, filter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
+            await RefreshDeliveryParts();
 
             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))})" : "");
@@ -707,7 +743,7 @@ namespace Elwig.Windows {
             Menu_Export_Bki.Items.Clear();
             foreach (var s in await Context.Seasons.OrderByDescending(s => s.Year).ToListAsync()) {
                 var i = new MenuItem {
-                    Header = $"Season {s.Year}",
+                    Header = $"Saison {s.Year}",
                 };
                 i.Click += Menu_Export_Bki_Click;
                 Menu_Export_Bki.Items.Add(i);
@@ -745,7 +781,7 @@ namespace Elwig.Windows {
         private async Task RefreshDeliveryParts() {
             if (DeliveryList.SelectedItem is Delivery d) {
                 ControlUtils.RenewItemsSource(ModifiersInput, await Context.Modifiers.Where(m => m.Year == d.Year).OrderBy(m => m.Ordering).ToListAsync(), i => (i as Modifier)?.ModId);
-                ControlUtils.RenewItemsSource(DeliveryPartList, d.Parts.OrderBy(p => p.DPNr).ToList(), i => ((i as DeliveryPart)?.Year, (i as DeliveryPart)?.DId, (i as DeliveryPart)?.DPNr), DeliveryPartList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
+                ControlUtils.RenewItemsSource(DeliveryPartList, d.FilteredParts.OrderBy(p => p.DPNr).ToList(), i => ((i as DeliveryPart)?.Year, (i as DeliveryPart)?.DId, (i as DeliveryPart)?.DPNr), DeliveryPartList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
             } else {
                 ControlUtils.RenewItemsSource(ModifiersInput, await Context.Modifiers.Where(m => m.Year == Utils.CurrentLastSeason).OrderBy(m => m.Ordering).ToListAsync(), i => (i as Modifier)?.ModId);
                 DeliveryPartList.ItemsSource = null;
@@ -874,7 +910,7 @@ namespace Elwig.Windows {
             p.Acid = (AcidInput.Text == "") ? null : double.Parse(AcidInput.Text);
             p.Comment = (PartCommentInput.Text == "") ? null : PartCommentInput.Text;
 
-            p.Weight = int.Parse(WeightInput.Text.Replace("\u202f", ""));
+            p.Weight = int.Parse(WeightInput.Text.Replace(Utils.GroupSeparator, ""));
             p.ManualWeighing = ManualWeighingInput.IsChecked ?? false;
             p.ScaleId = ScaleId;
             p.WeighingId = WeighingId;
@@ -1119,7 +1155,7 @@ namespace Elwig.Windows {
             } else {
                 // switch to last delivery part
                 DeliveryPartList.IsEnabled = true;
-                DeliveryPartList.SelectedItem = d.Parts.Last();
+                DeliveryPartList.SelectedItem = d.FilteredParts.Last();
             }
         }
 
@@ -1589,7 +1625,7 @@ namespace Elwig.Windows {
         }
 
         private void GradationKmwInput_LostFocus(object sender, RoutedEventArgs evt) {
-            if (GradationKmwInput.Text.EndsWith(",")) GradationKmwInput.Text += "0";
+            if (GradationKmwInput.Text.EndsWith(',')) GradationKmwInput.Text += "0";
             InputLostFocus((TextBox)sender, Validator.CheckGradationKmw);
             if (GradationKmwInput.Text.Length != 0 && !GradationKmwInput.Text.Contains(','))
                 GradationKmwInput.Text += ",0";
@@ -1687,7 +1723,7 @@ namespace Elwig.Windows {
             if (sender is not TextBox tb) return;
             if (tb.Text.Length > 0) {
                 if (!tb.Text.Contains(',')) tb.Text += ",0";
-                if (tb.Text.EndsWith(",")) tb.Text += "0";
+                if (tb.Text.EndsWith(',')) tb.Text += "0";
             }
             InputLostFocus(tb, Validator.CheckDecimal(tb, false, 2, 1));
         }

Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs

@@ -74,9 +74,9 @@ namespace Elwig.Dialogs {
             }
 
             IEnumerable<Member> list = await members.ToListAsync();
-            var data = await DeliveryConfirmationData.ForSeason(Context.DeliveryParts, Year);
+            var data = await DeliveryConfirmationDeliveryData.ForSeason(Context.DeliveryParts, Year);
             using var doc = Document.Merge(list.Select(m =>
-                new DeliveryConfirmation(Context, Year, m, data[m.MgNr]) {
+                new DeliveryConfirmation(Context, Year, m, data.TryGetValue(m.MgNr, out var d) ? d : DeliveryConfirmationDeliveryData.CreateEmpty(Year, m)) {
                     //DoubleSided = true
                 }
             ));

Elwig/Windows/MainWindow.xaml.cs

@@ -27,11 +27,6 @@ namespace Elwig.Windows {
             w.Show();
         }
 
-        private void MemberListButton_Click(object sender, RoutedEventArgs evt) {
-            var w = new MemberListWindow();
-            w.Show();
-        }
-
         private void ReceiptButton_Click(object sender, RoutedEventArgs evt) {
             App.FocusReceipt();
         }

Elwig/Windows/MemberAdminWindow.xaml

@@ -1,8 +1,7 @@
-<local:AdministrationWindow x:Class="Elwig.Windows.MemberAdminWindow"
+<local:AdministrationWindow
+        x:Class="Elwig.Windows.MemberAdminWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
         Title="Mitglieder - Elwig" Height="700" Width="1250" MinHeight="650" MinWidth="1150"
         Loaded="Window_Loaded">
@@ -53,8 +52,10 @@
             <MenuItem Header="Drucken">
                 <MenuItem x:Name="Menu_Print_Letterhead" Header="Briefkopf drucken"
                           Click="Menu_Print_Letterhead_Click"/>
-                <MenuItem x:Name="Menu_Show_Memberdata" Header="Stammdatenblatt anzeigen" Click="Menu_Show_Memberdata_Click"/>
-                <MenuItem x:Name="Menu_Print_Memberdata" Header="Stammdatenblatt drucken" Click="Menu_Print_Memberdata_Click"/>
+                <MenuItem x:Name="Menu_Show_MemberDataSheet" Header="Stammdatenblatt anzeigen" IsEnabled="False" Tag="Print"
+                          Click="Menu_Show_MemberDataSheet_Click"/>
+                <MenuItem x:Name="Menu_Print_MemberDataSheet" Header="Stammdatenblatt drucken" IsEnabled="False" Tag="Print"
+                          Click="Menu_Print_MemberDataSheet_Click"/>
                 <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"/>
@@ -86,7 +87,29 @@
             </Grid.ColumnDefinitions>
 
             <TextBox x:Name="SearchInput" Grid.ColumnSpan="3" Margin="5,7,145,0" IsReadOnly="False"
-                     TextChanged="SearchInput_TextChanged"/>
+                     TextChanged="SearchInput_TextChanged">
+                <TextBox.ToolTip>
+                    <TextBlock>
+                        Mitglieder filtern und durchsuchen. Die Filter sind beliebig kombinierbar.<LineBreak/>
+                        Groß- und Kleinschreibung ist in den meisten Fällen egal.<LineBreak/>
+                        <LineBreak/>
+                        Filtern nach:<LineBreak/>
+                        <Bold>MgNr.</Bold>: z.B. 1234, 89, ...<LineBreak/>
+                        <Bold>Vor-/Nachname</Bold>: z.B. Max Mustermann... <LineBreak/>
+                        <Bold>Stamm-Zweigstelle</Bold>: z.B. zwst:Matzen, zwst:wolkersdorf, ...<LineBreak/>
+                        <Bold>Stammgemeinde</Bold>: z.B. matzen, Wolkersdorf, ...<LineBreak/>
+                        <Bold>UID</Bold>: z.B. ATU12345678, ...<LineBreak/>
+                        <Bold>Betriebs-Nr.</Bold>: z.B. 0123456, ...<LineBreak/>
+                        <Bold>Bio-Betrieb</Bold>: BIO, !bio (ausgenommen Bio)<LineBreak/>
+                        <Bold>Buchführend</Bold>: buchf[ührend], Pauschal[iert], !buchf[ührend]<LineBreak/>
+                        <Bold>Volllieferant</Bold>: voll[lieferant], !Voll[lieferant] (nicht-Volllieferant)<LineBreak/>
+                        <Bold>Funktionär</Bold>: Funkt[ionär], !funkt[ionär] (nicht-Funktionär)<LineBreak/>
+                        <Bold>Telefon-Nr.</Bold>: z.B. +436641234, ....<LineBreak/>
+                        <Bold>Flächenbindungen</Bold>: z.B. zw, GVK, WRB, ... (Mitglieder mit aktiven Flächenbindungen)<LineBreak/>
+                        <Bold>Freitext</Bold>: z.B. Rechnungsaddresse, Anmerkung, "matzen" (sucht nach dem Text "matzen")
+                    </TextBlock>
+                </TextBox.ToolTip>
+            </TextBox>
             <CheckBox x:Name="ActiveMemberInput" Content="Nur aktive anzeigen"
                       Checked="ActiveMemberInput_Changed" Unchecked="ActiveMemberInput_Changed"
                       HorizontalAlignment="Right" Margin="0,12,10,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
@@ -140,11 +163,11 @@
 
         <Grid Grid.Column="2" Grid.Row="1">
             <Grid.RowDefinitions>
-                <RowDefinition Height="0.8*"/>
-                <RowDefinition Height="0.8*"/>
-                <RowDefinition Height="0.2*"/>
-                <RowDefinition Height="1.3*"/>
-                <RowDefinition Height="0.8*"/>
+                <RowDefinition Height="108"/>
+                <RowDefinition Height="120"/>
+                <RowDefinition Height="18"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="113"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
@@ -214,14 +237,42 @@
                         <ColumnDefinition Width="2*"/>
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="E-Mail-Adresse (1):" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label x:Name="EmailAddress1Label" Content="E-Mail-Adresse:" Margin="10,10,0,0" Grid.Column="0"/>
                     <TextBox x:Name="EmailAddress1Input" Margin="0,10,10,0" Grid.Column="1" Grid.ColumnSpan="2"
                              TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
 
-                    <Label Content="E-Mail-Adresse (2):" Margin="10,40,0,0" Grid.Column="0"/>
+                    <Label x:Name="EmailAddress2Label" Content="E-Mail-Adresse:" Margin="10,40,0,0" Grid.Column="0"/>
                     <TextBox x:Name="EmailAddress2Input" Margin="0,40,10,0" Grid.Column="1" Grid.ColumnSpan="2"
                              TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
 
+                    <Label x:Name="EmailAddress3Label" Content="E-Mail-Adresse:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="EmailAddress3Input" Margin="0,70,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+
+                    <Label x:Name="EmailAddress4Label" Content="E-Mail-Adresse:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="EmailAddress4Input" Margin="0,100,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+
+                    <Label x:Name="EmailAddress5Label" Content="E-Mail-Adresse:" Margin="10,130,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="EmailAddress5Input" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+
+                    <Label x:Name="EmailAddress6Label" Content="E-Mail-Adresse:" Margin="10,160,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="EmailAddress6Input" Margin="0,160,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+
+                    <Label x:Name="EmailAddress7Label" Content="E-Mail-Adresse:" Margin="10,190,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="EmailAddress7Input" Margin="0,190,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+
+                    <Label x:Name="EmailAddress8Label" Content="E-Mail-Adresse:" Margin="10,210,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="EmailAddress8Input" Margin="0,210,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+
+                    <Label x:Name="EmailAddress9Label" Content="E-Mail-Adresse:" Margin="10,250,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="EmailAddress9Input" Margin="0,250,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+
                     <ComboBox x:Name="PhoneNr1TypeInput" DisplayMemberPath="Value" Margin="6,70,5,0" FontSize="12" Padding="6,4,4,4"/>
                     <TextBox x:Name="PhoneNr1Input" Margin="0,70,5,0" Grid.Column="1"
                              TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
@@ -285,11 +336,11 @@
                     </Grid.ColumnDefinitions>
 
                     <Label Content="IBAN:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="IbanInput" Margin="0,10,10,0" Grid.Column="1"
+                    <TextBox x:Name="IbanInput" Margin="0,10,10,0" Grid.Column="1" Width="290" HorizontalAlignment="Left"
                              TextChanged="IbanInput_TextChanged" LostFocus="IbanInput_LostFocus"/>
 
                     <Label Content="BIC:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="BicInput" Margin="0,40,10,0" Grid.Column="1"
+                    <TextBox x:Name="BicInput" Margin="0,40,10,0" Grid.Column="1" Width="150" HorizontalAlignment="Left"
                              TextChanged="BicInput_TextChanged" LostFocus="BicInput_LostFocus"/>
                 </Grid>
             </GroupBox>
@@ -316,6 +367,9 @@
                     <CheckBox x:Name="OrganicInput" Content="Bio" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
                               Grid.Column="2" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                    <Button x:Name="OrganicButton" Content="easy-cert.com" Height="25" FontSize="12" IsEnabled="False"
+                            Click="OrganicButton_Click"
+                            Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="60,40,0,0"/>
                 </Grid>
             </GroupBox>
             <GroupBox Header="Rechnungsadresse (optional)" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
@@ -388,16 +442,17 @@
                             Grid.Column="2" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,160,10,10"/>
 
                     <Label Content="Anmerkung:" Margin="10,190,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="CommentInput" Margin="0,190,10,0" Grid.Column="1" Grid.ColumnSpan="2"
-                             TextChanged="TextBox_TextChanged"/>
+                    <TextBox x:Name="CommentInput" Margin="0,190,10,70" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="TextBox_TextChanged"
+                             VerticalAlignment="Stretch" Height="auto" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible"/>
 
-                    <Label Content="Kontaktart:" Margin="10,220,0,0" Grid.Column="0"/>
+                    <Label Content="Kontaktart:" Margin="10,10,0,10" Grid.Column="0" VerticalAlignment="Bottom"/>
                     <CheckBox x:Name="ContactPostalInput" Content="Post" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                              HorizontalAlignment="Left" Margin="0,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+                              HorizontalAlignment="Left" Margin="0,0,0,15" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
                     <CheckBox x:Name="ContactEmailInput" Content="E-Mail" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                              HorizontalAlignment="Left" Margin="60,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+                              HorizontalAlignment="Left" Margin="60,0,0,15" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
 
                     <Button x:Name="DeliveryButton" Content="Lieferungen" Click="DeliveryButton_Click" IsEnabled="False"
                             HorizontalAlignment="Right" Margin="10,00,10,37" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -11,33 +11,46 @@ using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using System.Collections.ObjectModel;
 using Elwig.Documents;
+using System.Diagnostics;
 
 namespace Elwig.Windows {
     public partial class MemberAdminWindow : AdministrationWindow {
 
-        private List<string> TextFilter = new();
-        private readonly RoutedCommand CtrlF = new();
-        private readonly (ComboBox, TextBox, TextBox)[] PhoneNrInputs;
+        private List<string> TextFilter = [];
+        private readonly (ComboBox Type, TextBox Number, TextBox Comment)[] PhoneNrInputs;
+        private readonly (Label Label, TextBox Address)[] EmailAddressInputs;
 
-        private static ObservableCollection<KeyValuePair<string, string>> PhoneNrTypes { get; set; } = new() {
-            new("landline", "Tel.-Nr. (Festnetz)"),
-            new("mobile", "Tel.-Nr. (mobil)"),
-            new("fax", "Fax-Nr."),
-        };
+        private readonly RoutedCommand CtrlF = new("CtrlF", typeof(MemberAdminWindow), [new KeyGesture(Key.F, ModifierKeys.Control)]);
+        private readonly RoutedCommand CtrlP = new("CtrlP", typeof(MemberAdminWindow), [new KeyGesture(Key.P, ModifierKeys.Control)]);
+        private readonly RoutedCommand CtrlShiftP = new("CtrlShiftP", typeof(MemberAdminWindow), [new KeyGesture(Key.P, ModifierKeys.Control | ModifierKeys.Shift)]);
+
+        private static ObservableCollection<KeyValuePair<string, string>> PhoneNrTypes { get; set; } = new(Utils.PhoneNrTypes);
 
         public MemberAdminWindow() {
             InitializeComponent();
-            CtrlF.InputGestures.Add(new KeyGesture(Key.F, ModifierKeys.Control));
             CommandBindings.Add(new CommandBinding(CtrlF, FocusSearchInput));
-            ExemptInputs = new Control[] {
+            CommandBindings.Add(new CommandBinding(CtrlP, Menu_Show_MemberDataSheet_Click));
+            CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_Print_MemberDataSheet_Click));
+            ExemptInputs = [
                 SearchInput, ActiveMemberInput, MemberList,
-            };
-            RequiredInputs = new Control[] {
+            ];
+            RequiredInputs = [
                 MgNrInput, GivenNameInput, FamilyNameInput,
                 AddressInput, PlzInput, OrtInput, BillingOrtInput,
                 BusinessSharesInput, BranchInput, DefaultKgInput
-            };
-            PhoneNrInputs = new (ComboBox, TextBox, TextBox)[] {
+            ];
+            EmailAddressInputs = [
+                (EmailAddress1Label, EmailAddress1Input),
+                (EmailAddress2Label, EmailAddress2Input),
+                (EmailAddress3Label, EmailAddress3Input),
+                (EmailAddress4Label, EmailAddress4Input),
+                (EmailAddress5Label, EmailAddress5Input),
+                (EmailAddress6Label, EmailAddress6Input),
+                (EmailAddress7Label, EmailAddress7Input),
+                (EmailAddress8Label, EmailAddress8Input),
+                (EmailAddress9Label, EmailAddress9Input),
+            ];
+            PhoneNrInputs = [
                 (PhoneNr1TypeInput, PhoneNr1Input, PhoneNr1CommentInput),
                 (PhoneNr2TypeInput, PhoneNr2Input, PhoneNr2CommentInput),
                 (PhoneNr3TypeInput, PhoneNr3Input, PhoneNr3CommentInput),
@@ -47,7 +60,7 @@ namespace Elwig.Windows {
                 (PhoneNr7TypeInput, PhoneNr7Input, PhoneNr7CommentInput),
                 (PhoneNr8TypeInput, PhoneNr8Input, PhoneNr8CommentInput),
                 (PhoneNr9TypeInput, PhoneNr9Input, PhoneNr9CommentInput),
-            };
+            ];
             foreach (var input in PhoneNrInputs) input.Item1.ItemsSource = PhoneNrTypes;
 
             InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
@@ -57,11 +70,12 @@ 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;
-            Menu_Show_Memberdata.IsEnabled = App.IsPrintingReady;
-            Menu_Print_Memberdata.IsEnabled = App.IsPrintingReady;
+            Menu_Print_Letterheads_Plz.IsEnabled = App.IsPrintingReady;
+            Menu_Show_MemberDataSheet.IsEnabled = App.IsPrintingReady;
+            Menu_Print_MemberDataSheet.IsEnabled = App.IsPrintingReady;
 
             ActiveMemberInput.IsChecked = true;
-            UpdatePhoneNrInputVisibility();
+            UpdateContactInfoVisibility();
             LockInputs();
         }
 
@@ -72,14 +86,98 @@ namespace Elwig.Windows {
 
         private async Task RefreshMemberListQuery(bool updateSort = false) {
             IQueryable<Member> memberQuery = Context.Members;
-            if (ActiveMemberInput.IsChecked == true)
-                memberQuery = memberQuery.Where(m => m.IsActive);
+            if (ActiveMemberInput.IsChecked == true) memberQuery = memberQuery.Where(m => m.IsActive);
+
+            var filterMgNr = new List<int>();
+            var filterZwst = new List<string>();
+            var filterKgNr = new List<int>();
+            var filterLfbisNr = new List<string>();
+            var filterUstIdNr = new List<string>();
+            var filterAreaCom = new List<string>();
+
+            var filter = TextFilter.ToList();
+            if (filter.Count > 0) {
+                var branches = await Context.Branches.ToListAsync();
+                var mgnr = await Context.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
+                var kgs = await Context.WbKgs.ToDictionaryAsync(k => k.AtKg.Name.ToLower(), k => k.AtKg);
+                var areaComs = await Context.AreaCommitmentTypes.ToDictionaryAsync(t => $"{t.SortId}{t.AttrId}", t => t);
+
+                for (int i = 0; i < filter.Count; i++) {
+                    var e = filter[i];
+
+                    if (e.Length >= 5 && e.Length <= 10 && "funktionär".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => m.IsFunktionär);
+                        filter.RemoveAt(i--);
+                    } else if (e.Length >= 6 && e.Length <= 11 && e[0] == '!' && "funktionär".StartsWith(e[1..], StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => !m.IsFunktionär);
+                        filter.RemoveAt(i--);
+                    } else if (e.Equals("bio", StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => m.IsOrganic);
+                        filter.RemoveAt(i--);
+                    } else if (e.Equals("!bio", StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => !m.IsOrganic);
+                        filter.RemoveAt(i--);
+                    } else if (e.Length >= 4 && e.Length <= 13 && "volllieferant".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => m.IsVollLieferant);
+                        filter.RemoveAt(i--);
+                    } else if (e.Length >= 5 && e.Length <= 14 && e[0] == '!' && "volllieferant".StartsWith(e[1..], StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => !m.IsVollLieferant);
+                        filter.RemoveAt(i--);
+                    } else if (e.Length >= 5 && e.Length <= 11 && "buchführend".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => m.IsBuchführend);
+                        filter.RemoveAt(i--);
+                    } else if (e.Length >= 6 && e.Length <= 12 && e[0] == '!' && "buchführend".StartsWith(e[1..], StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => !m.IsBuchführend);
+                        filter.RemoveAt(i--);
+                    } else if (e.Length >= 8 && e.Length <= 12 && "pauschaliert".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => !m.IsBuchführend);
+                        filter.RemoveAt(i--);
+                    } else if (e.Length >= 9 && e.Length <= 13 && e[0] == '!' && "pauschaliert".StartsWith(e[1..], StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => m.IsBuchführend);
+                        filter.RemoveAt(i--);
+                    } else if (e.All(char.IsAsciiDigit) && mgnr.ContainsKey(e)) {
+                        filterMgNr.Add(int.Parse(e));
+                        filter.RemoveAt(i--);
+                    } else if (kgs.TryGetValue(e, out var kg)) {
+                        filterKgNr.Add(kg.KgNr);
+                        filter.RemoveAt(i--);
+                    } else if (e.StartsWith("zwst:")) {
+                        try {
+                            filterZwst.Add(branches.Where(b => b.Name.StartsWith(e[5..], StringComparison.CurrentCultureIgnoreCase)).Single().ZwstId);
+                            filter.RemoveAt(i--);
+                        } catch (InvalidOperationException) { }
+                    } else if (e.StartsWith('+') && e[1..].All(char.IsAsciiDigit)) {
+                        memberQuery = memberQuery.Where(m => m.TelephoneNumbers.Any(t => t.Number.Replace(" ", "").StartsWith(e)));
+                        filter.RemoveAt(i--);
+                    } else if (areaComs.ContainsKey(e.ToUpper())) {
+                        filterAreaCom.Add(e.ToUpper());
+                        filter.RemoveAt(i--);
+                    } else if (Validator.CheckLfbisNr(e)) {
+                        filterLfbisNr.Add(e);
+                        filter.RemoveAt(i--);
+                    } else if (Validator.CheckUstIdNr(e.ToUpper())) {
+                        filterUstIdNr.Add(e.ToUpper());
+                        filter.RemoveAt(i--);
+                    } else if (e.Length > 2 && e.StartsWith('"') && e.EndsWith('"')) {
+                        filter[i] = e[1..^1];
+                    } else if (e.Length <= 2) {
+                        filter.RemoveAt(i--);
+                    }
+                }
+
+                if (filterMgNr.Count > 0) memberQuery = memberQuery.Where(m => filterMgNr.Contains(m.MgNr));
+                if (filterKgNr.Count > 0) memberQuery = memberQuery.Where(m => m.DefaultKgNr != null && filterKgNr.Contains((int)m.DefaultKgNr));
+                if (filterZwst.Count > 0) memberQuery = memberQuery.Where(m => m.ZwstId != null && filterZwst.Contains(m.ZwstId));
+                if (filterAreaCom.Count > 0) memberQuery = memberQuery.Where(m => m.AreaCommitments.Where(c => c.YearFrom <= Utils.CurrentYear && (c.YearTo ?? int.MaxValue) >= Utils.CurrentYear).Any(c => filterAreaCom.Contains(c.VtrgId)));
+                if (filterLfbisNr.Count > 0) memberQuery = memberQuery.Where(m => m.LfbisNr != null && filterLfbisNr.Contains(m.LfbisNr));
+                if (filterUstIdNr.Count > 0) memberQuery = memberQuery.Where(m => m.UstIdNr != null && filterUstIdNr.Contains(m.UstIdNr));
+            }
 
             List<Member> members = await memberQuery.ToListAsync();
 
-            if (TextFilter.Count > 0) {
+            if (filter.Count > 0 && members.Count > 0) {
                 var dict = members.AsParallel()
-                    .ToDictionary(m => m, m => m.SearchScore(TextFilter))
+                    .ToDictionary(m => m, m => m.SearchScore(filter))
                     .OrderByDescending(a => a.Value)
                     .ThenBy(a => a.Key.FamilyName)
                     .ThenBy(a => a.Key.GivenName);
@@ -106,12 +204,14 @@ namespace Elwig.Windows {
                 DeleteMemberButton.IsEnabled = true;
                 AreaCommitmentButton.IsEnabled = true;
                 DeliveryButton.IsEnabled = true;
+                OrganicButton.IsEnabled = true;
                 FillInputs(m);
             } else {
                 EditMemberButton.IsEnabled = false;
                 DeleteMemberButton.IsEnabled = false;
                 AreaCommitmentButton.IsEnabled = false;
                 DeliveryButton.IsEnabled = false;
+                OrganicButton.IsEnabled = false;
                 ClearOriginalValues();
                 ClearDefaultValues();
                 ClearInputs(validate);
@@ -148,27 +248,55 @@ namespace Elwig.Windows {
 
         private void SetPhoneNrInput(int nr, string? type, string? number, string? comment) {
             var inputs = PhoneNrInputs[nr];
-            inputs.Item1.SelectedItem = (type == null) ? null : inputs.Item1.ItemsSource.Cast<KeyValuePair<string, string>>().FirstOrDefault(p => p.Key == type);
-            inputs.Item2.Text = number;
-            inputs.Item3.Text = comment;
+            inputs.Type.SelectedItem = (type == null) ? null : inputs.Type.ItemsSource.Cast<KeyValuePair<string, string>>().FirstOrDefault(p => p.Key == type);
+            inputs.Number.Text = number;
+            inputs.Comment.Text = comment;
+        }
+
+        private void SetEmailAddressInput(int nr, string? address) {
+            var inputs = EmailAddressInputs[nr];
+            inputs.Address.Text = address;
         }
 
         private (string, string, string?)? GetPhoneNrInput(int nr) {
             var inputs = PhoneNrInputs[nr];
-            var number = inputs.Item2.Text;
+            var number = inputs.Number.Text;
             if (string.IsNullOrEmpty(number))
                 return null;
-            var type = (inputs.Item1.SelectedItem as KeyValuePair<string, string>?)?.Key ?? (number.StartsWith("+43 ") && number[4] == '6' ? "mobile" : "landline");
-            var comment = inputs.Item3.Text;
+            var type = (inputs.Type.SelectedItem as KeyValuePair<string, string>?)?.Key ?? (number.StartsWith("+43 ") && number[4] == '6' ? "mobile" : "landline");
+            var comment = inputs.Comment.Text;
             return (type, number, comment == "" ? null : comment);
         }
 
-        private void SetPhoneNrInputVisible(int nr, bool visible) {
+        private string? GetEmailAddressInput(int nr) {
+            var inputs = EmailAddressInputs[nr];
+            return inputs.Address.Text == "" ? null : inputs.Address.Text;
+        }
+
+        private void SetPhoneNrInputVisible(int nr, bool visible, int? position = null) {
             var inputs = PhoneNrInputs[nr];
+            if (position is int p) {
+                var mt = 10 + p * 30;
+                inputs.Type.Margin = new(6, mt, 5, 0);
+                inputs.Number.Margin = new(0, mt, 5, 0);
+                inputs.Comment.Margin = new(0, mt, 10, 0);
+            }
             var vis = visible ? Visibility.Visible : Visibility.Hidden;
-            inputs.Item1.Visibility = vis;
-            inputs.Item2.Visibility = vis;
-            inputs.Item3.Visibility = vis;
+            inputs.Type.Visibility = vis;
+            inputs.Number.Visibility = vis;
+            inputs.Comment.Visibility = vis;
+        }
+
+        private void SetEmailAddressInputVisible(int nr, bool visible, int? position = null) {
+            var inputs = EmailAddressInputs[nr];
+            if (position is int p) {
+                var mt = 10 + p * 30;
+                inputs.Label.Margin = new(10, mt, 0, 0);
+                inputs.Address.Margin = new(0, mt, 10, 0);
+            }
+            var vis = visible ? Visibility.Visible : Visibility.Hidden;
+            inputs.Label.Visibility = vis;
+            inputs.Address.Visibility = vis;
         }
 
         private void MemberList_SelectionChanged(object sender, RoutedEventArgs evt) {
@@ -186,7 +314,7 @@ namespace Elwig.Windows {
             HideNewEditDeleteButtons();
             ShowSaveResetCancelButtons();
             UnlockInputs();
-            UpdatePhoneNrInputVisibility(true);
+            UpdateContactInfoVisibility(true);
             InitInputs();
             LockSearchInputs();
         }
@@ -201,7 +329,7 @@ namespace Elwig.Windows {
             HideNewEditDeleteButtons();
             ShowSaveResetCancelButtons();
             UnlockInputs();
-            UpdatePhoneNrInputVisibility(true);
+            UpdateContactInfoVisibility(true);
             LockSearchInputs();
         }
 
@@ -227,7 +355,7 @@ namespace Elwig.Windows {
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();
             LockInputs();
-            UpdatePhoneNrInputVisibility();
+            UpdateContactInfoVisibility();
             UnlockSearchInputs();
             FinishInputFilling();
             await RefreshMemberList();
@@ -254,7 +382,7 @@ namespace Elwig.Windows {
             ShowNewEditDeleteButtons();
             RefreshInputs();
             LockInputs();
-            UpdatePhoneNrInputVisibility();
+            UpdateContactInfoVisibility();
             UnlockSearchInputs();
         }
 
@@ -339,7 +467,7 @@ namespace Elwig.Windows {
             await PrintLetterheads(2);
         }
 
-        private async void Menu_Print_Memberdata_Click(object sender, RoutedEventArgs evt) {
+        private async void Menu_Print_MemberDataSheet_Click(object sender, RoutedEventArgs evt) {
             if (MemberList.SelectedItem is not Member m)
                 return;
             Mouse.OverrideCursor = Cursors.AppStarting;
@@ -353,7 +481,7 @@ namespace Elwig.Windows {
             }
         }
 
-        private async void Menu_Show_Memberdata_Click(object sender, RoutedEventArgs evt) {
+        private async void Menu_Show_MemberDataSheet_Click(object sender, RoutedEventArgs evt) {
             if (MemberList.SelectedItem is not Member m)
                 return;
             Mouse.OverrideCursor = Cursors.AppStarting;
@@ -416,13 +544,24 @@ namespace Elwig.Windows {
             ActiveMemberInput.IsEnabled = true;
         }
 
-        private void UpdatePhoneNrInputVisibility(bool extra = false) {
-            bool lastVisible = true;
-            var m = (Member)MemberList.SelectedItem;
+        private void UpdateContactInfoVisibility(bool extra = false) {
+            var m = MemberList.SelectedItem as Member;
+            bool lastVisible;
+            int num = 0;
+            lastVisible = true;
+            for (int i = 0; i < EmailAddressInputs.Length; i++) {
+                var input = EmailAddressInputs[i];
+                var vis = !string.IsNullOrEmpty(input.Address.Text) || (m?.EmailAddresses.Any(a => a.Nr - 1 == i) ?? false);
+                var cVis = vis || (extra && lastVisible);
+                SetEmailAddressInputVisible(i, cVis, cVis ? num++ : null);
+                lastVisible = vis;
+            }
+            lastVisible = true;
             for (int i = 0; i < PhoneNrInputs.Length; i++) {
                 var input = PhoneNrInputs[i];
-                var vis = !string.IsNullOrEmpty(input.Item2.Text) || (m?.TelephoneNumbers.Any(p => p.Nr - 1 == i) ?? false);
-                SetPhoneNrInputVisible(i, vis || (extra && lastVisible));
+                var vis = !string.IsNullOrEmpty(input.Number.Text) || (m?.TelephoneNumbers.Any(n => n.Nr - 1 == i) ?? false);
+                var cVis = vis || (extra && lastVisible);
+                SetPhoneNrInputVisible(i, cVis, cVis ? num++ : null);
                 lastVisible = vis;
             }
         }
@@ -517,17 +656,17 @@ namespace Elwig.Windows {
                     }
                 }
 
-                for (int i = 0; i < 2; i++) {
-                    var input = i == 0 ? EmailAddress1Input : EmailAddress2Input;
+                for (int i = 0; i < EmailAddressInputs.Length; i++) {
+                    var input = GetEmailAddressInput(i);
                     var emailAddr = m.EmailAddresses.FirstOrDefault(a => a.Nr - 1 == i);
-                    if (input.Text == "") {
+                    if (input == null || input == "") {
                         if (emailAddr != null) {
                             Context.Remove(emailAddr);
                         }
                     } else {
                         MemberEmailAddr a = emailAddr ?? Context.CreateProxy<MemberEmailAddr>();
                         a.Nr = i + 1;
-                        a.Address = input.Text;
+                        a.Address = input ?? "";
                         a.Comment = null;
                         if (emailAddr == null) {
                             a.MgNr = newMgNr;
@@ -590,8 +729,14 @@ namespace Elwig.Windows {
             }
 
             var emailAddrs = m.EmailAddresses.OrderBy(a => a.Nr).ToList();
-            EmailAddress1Input.Text = emailAddrs.Count > 0 ? emailAddrs[0].Address : "";
-            EmailAddress2Input.Text = emailAddrs.Count > 1 ? emailAddrs[1].Address : "";
+            for (int i = 0; i< EmailAddressInputs.Length; i++) {
+                if (i < emailAddrs.Count) {
+                    var emailAddr = emailAddrs[i];
+                    SetEmailAddressInput(i, emailAddr.Address);
+                } else {
+                    SetEmailAddressInput(i, null);
+                }
+            }
 
             var phoneNrs = m.TelephoneNumbers.OrderBy(p => p.Nr).ToList();
             for (int i = 0; i < PhoneNrInputs.Length; i++) {
@@ -602,7 +747,7 @@ namespace Elwig.Windows {
                     SetPhoneNrInput(i, null, null, null);
                 }
             }
-            UpdatePhoneNrInputVisibility(IsEditing || IsCreating);
+            UpdateContactInfoVisibility(IsEditing || IsCreating);
 
             IbanInput.Text = m.Iban;
             BicInput.Text = m.Bic;
@@ -649,8 +794,8 @@ namespace Elwig.Windows {
 
             Menu_Member_SendEmail.IsEnabled = m.EmailAddresses.Count > 0;
             Menu_Print_Letterhead.IsEnabled = true;
-            Menu_Show_Memberdata.IsEnabled = true;
-            Menu_Print_Memberdata.IsEnabled = true;
+            Menu_Show_MemberDataSheet.IsEnabled = true;
+            Menu_Print_MemberDataSheet.IsEnabled = true;
 
             FinishInputFilling();
         }
@@ -658,8 +803,8 @@ namespace Elwig.Windows {
         new protected void ClearInputs(bool validate = false) {
             Menu_Member_SendEmail.IsEnabled = false;
             Menu_Print_Letterhead.IsEnabled = false;
-            Menu_Show_Memberdata.IsEnabled = false;
-            Menu_Print_Memberdata.IsEnabled = false;
+            Menu_Show_MemberDataSheet.IsEnabled = false;
+            Menu_Print_MemberDataSheet.IsEnabled = false;
             StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): -";
             StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): -";
             StatusAreaCommitment.Text = "Gebundene Fläche: -";
@@ -698,9 +843,14 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckPredecessorMgNr);
         }
 
+        private new void EmailAddressInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            base.EmailAddressInput_TextChanged(sender, evt);
+            UpdateContactInfoVisibility(IsEditing || IsCreating);
+        }
+
         private new void PhoneNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
             base.PhoneNrInput_TextChanged(sender, evt);
-            UpdatePhoneNrInputVisibility(IsEditing || IsCreating);
+            UpdateContactInfoVisibility(IsEditing || IsCreating);
         }
 
         private void KgDetailsButton_Click(object sender, RoutedEventArgs evt) {
@@ -710,5 +860,17 @@ namespace Elwig.Windows {
                 App.FocusOriginHierarchy();
             }
         }
+
+        private void OrganicButton_Click(object sender, RoutedEventArgs evt) {
+            if (MemberList.SelectedItem is not Member m)
+                return;
+            var url = "https://www.easy-cert.com/htm/suchergebnis.htm?" +
+                //$"CustomerNumber={m.LfbisNr}&" +
+                $"Name={(m.BillingAddress?.Name ?? m.Name).Replace(' ', '+')}&" +
+                $"PostalCode={(m.BillingAddress?.PostalDest ?? m.PostalDest).AtPlz?.Plz}";
+            Process.Start(new ProcessStartInfo(url) {
+                UseShellExecute = true,
+            });
+        }
     }
 }

Elwig/Windows/MemberListWindow.xaml

@@ -1,22 +0,0 @@
-<Window x:Class="Elwig.Windows.MemberListWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Elwig.Windows"
-        mc:Ignorable="d"
-        Title="Mitgliederliste - Elwig" Height="450" Width="800">
-    <Grid>
-        <DataGrid x:Name="MemberList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
-                  CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" FontSize="14">
-            <DataGrid.Columns>
-                <DataGridTextColumn Header="MgNr."          Binding="{Binding MgNr}"        Width="70"/>
-                <DataGridTextColumn Header="Präfix"         Binding="{Binding Prefix}"      Width="100"/>
-                <DataGridTextColumn Header="Vorname"        Binding="{Binding GivenName}"   Width="100"/>
-                <DataGridTextColumn Header="Weitere Namen"  Binding="{Binding MiddleName}"  Width="100"/>
-                <DataGridTextColumn Header="Nachname"       Binding="{Binding FamilyName}"  Width="100"/>
-                <DataGridTextColumn Header="Suffix"         Binding="{Binding Suffix}"      Width="100"/>
-            </DataGrid.Columns>
-        </DataGrid>
-    </Grid>
-</Window>

Elwig/Windows/MemberListWindow.xaml.cs

@@ -1,27 +0,0 @@
-using Elwig.Helpers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace Elwig.Windows {
-    public partial class MemberListWindow : Window {
-        private readonly AppDbContext Context = new();
-
-        public MemberListWindow() {
-            InitializeComponent();
-            MemberList.ItemsSource = Context.Members.ToList();
-        }
-
-
-    }
-}

Elwig/Windows/PaymentVariantsWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
         mc:Ignorable="d"
-        Title="Auszahlungsvarianten - Elwig" Height="450" Width="800" MinHeight="400" MinWidth="700">
+        Title="Auszahlungsvarianten - Elwig" Height="510" Width="820" MinHeight="500" MinWidth="820">
     <Window.Resources>
         <Style TargetType="Label">
             <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -41,8 +41,8 @@
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="200"/>
             <RowDefinition Height="*"/>
+            <RowDefinition Height="220"/>
         </Grid.RowDefinitions>
 
         <ListBox x:Name="PaymentVariantList" Margin="10,10,35,10" Grid.RowSpan="2" SelectionChanged="PaymentVariantList_SelectionChanged">
@@ -55,45 +55,160 @@
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
-        <Button x:Name="AddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0"
-                Click="AddButton_Click"
-                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,60" Grid.RowSpan="2"/>
-        <Button x:Name="CopyButton" Content="&#xE8C8;" FontFamily="Segoe MDL2 Assets" FontSize="12" Padding="0,0,0,0" IsEnabled="False"
-                Click="CopyButton_Click"
-                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,0" Grid.RowSpan="2"/>
-        <Button x:Name="DeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
-                Click="DeleteButton_Click"
-                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,60,5,0" Grid.RowSpan="2"/>
+        <Button x:Name="AddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" ToolTip="Neue Auszahlungsvariante hinzufügen"
+                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,60" Grid.RowSpan="2"
+                Click="AddButton_Click"/>
+        <Button x:Name="CopyButton" Content="&#xE8C8;" FontFamily="Segoe MDL2 Assets" FontSize="12" Padding="0,0,0,0" IsEnabled="False" ToolTip="Ausgewählte Auszahlungsvariante duplizieren"
+                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,0" Grid.RowSpan="2"
+                Click="CopyButton_Click"/>
+        <Button x:Name="DeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False" ToolTip="Ausgewählte Auszahlungsvariante löschen"
+                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,60,5,0" Grid.RowSpan="2"
+                Click="DeleteButton_Click"/>
+
+        <TextBox x:Name="DataInput" Margin="10,200,35,10" Grid.Column="0" Grid.RowSpan="2"
+                 HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="auto"
+                 AcceptsReturn="True" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Auto"
+                 FontFamily="Cascadia Code Light" FontSize="13"
+                 TextChanged="DataInput_TextChanged"/>
 
         <Label Content="Name:" Margin="10,10,0,0" Grid.Column="1"/>
-        <TextBox x:Name="NameInput" Width="200" Grid.Column="2" HorizontalAlignment="Left" Margin="0,10,0,0"/>
+        <TextBox x:Name="NameInput" Width="200" Grid.Column="2" HorizontalAlignment="Left" Margin="0,10,0,0"
+                 TextChanged="NameInput_TextChanged"/>
 
         <Label Content="Beschreibung:" Margin="10,40,0,0" Grid.Column="1"/>
-        <TextBox x:Name="CommentInput" Grid.Column="2" HorizontalAlignment="Stretch" Margin="0,40,10,0"/>
+        <TextBox x:Name="CommentInput" Grid.Column="2" HorizontalAlignment="Stretch" Margin="0,40,10,0"
+                 TextChanged="CommentInput_TextChanged"/>
 
         <Label Content="Erstellt am:" Margin="10,70,0,0" Grid.Column="1"/>
-        <TextBox x:Name="DateInput" Grid.Column="2" Width="77" HorizontalAlignment="Left" Margin="0,70,10,0"/>
+        <TextBox x:Name="DateInput" Grid.Column="2" Width="77" HorizontalAlignment="Left" Margin="0,70,10,0" IsReadOnly="True"/>
 
         <Label Content="Überwiesen am:" Margin="10,100,0,0" Grid.Column="1"/>
-        <TextBox x:Name="TransferDateInput" Grid.Column="2" Width="77" HorizontalAlignment="Left" Margin="0,100,10,0"/>
-        <Button x:Name="CalculateButton" Content="Berechnen" Grid.Column="1" Grid.ColumnSpan="2"
-                Click="CalculateButton_Click"
-                VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="100" Margin="10,10,115,10"/>
-        <Button x:Name="EditButton" Content="Bearbeiten" Grid.Column="1" Grid.ColumnSpan="2"
-                Click="EditButton_Click"
-                VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="100" Margin="10,10,10,10"/>
+        <TextBox x:Name="TransferDateInput" Grid.Column="2" Width="77" HorizontalAlignment="Left" Margin="0,100,10,0"
+                 TextChanged="TransferDateInput_TextChanged"/>
 
-        <GroupBox Header="Abschluss" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="10,0,10,10">
-            <Grid>
-                <ProgressBar x:Name="ProgressBar" Margin="10,0,0,74" Height="27" Width="180"
-                             VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
-                <Button x:Name="ShowButton" Content="Vorschau" FontSize="14" Width="180" Margin="10,10,10,42" Height="27" Tag="Print" IsEnabled="False"
-                        Click="ShowButton_Click"
-                        VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
-                <Button x:Name="PrintButton" Content="Drucken" FontSize="14" Width="180" Margin="10,10,10,10" Height="27" Tag="Print" IsEnabled="False"
-                        Click="PrintButton_Click"
-                        VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
-            </Grid>
-        </GroupBox>
+        <Label Content="Berücksichtigen:" Margin="90,70,10,10" Grid.Column="2"/>
+        <CheckBox x:Name="ConsiderModifiersInput" Content="Zu-/Abschläge bei Lieferungen"
+                  Margin="110,95,10,10" Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top"
+                  Checked="ConsiderModifiersInput_Changed" Unchecked="ConsiderModifiersInput_Changed"/>
+        <CheckBox x:Name="ConsiderPenaltiesInput" Content="Pönalen bei Unterlieferungen (FB)"
+                  Margin="110,115,10,10" Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top"
+                  Checked="ConsiderPenaltiesInput_Changed" Unchecked="ConsiderPenaltiesInput_Changed"/>
+        <CheckBox x:Name="ConsiderPenaltyInput" Content="Strafen bei Unterlieferungen (GA)"
+                  Margin="110,135,10,10" Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top"
+                  Checked="ConsiderPenaltyInput_Changed" Unchecked="ConsiderPenaltyInput_Changed"/>
+        <CheckBox x:Name="ConsiderAutoInput" Content="Automatische Nachzeichnungen der GA"
+                  Margin="110,155,10,10" Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top"
+                  Checked="ConsiderAutoInput_Changed" Unchecked="ConsiderAutoInput_Changed"/>
+        <Label Content="&#xF0AE;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="0" Grid.Column="2" Margin="108,175,10,10"/>
+
+        <Grid Grid.Column="1" Grid.ColumnSpan="2" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="10,10,10,10">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="110"/>
+                <ColumnDefinition Width="27"/>
+                <ColumnDefinition Width="110"/>
+                <ColumnDefinition Width="27"/>
+                <ColumnDefinition Width="110"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="27"/>
+                <RowDefinition Height="5"/>
+                <RowDefinition Height="27"/>
+            </Grid.RowDefinitions>
+
+            <Grid.Resources>
+                <Style TargetType="Label">
+                    <Setter Property="HorizontalAlignment" Value="Center"/>
+                    <Setter Property="VerticalAlignment" Value="Center"/>
+                    <Setter Property="Padding" Value="0"/>
+                    <Setter Property="Height" Value="auto"/>
+                </Style>
+                <Style TargetType="Button">
+                    <Setter Property="HorizontalAlignment" Value="Stretch"/>
+                    <Setter Property="FontSize" Value="14"/>
+                </Style>
+            </Grid.Resources>
+
+            <Button x:Name="ModifierButton" Content="Zu-/Abschläge" Grid.Column="0" Grid.Row="0"
+                    Click="ModifierButton_Click"/>
+            <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="0" Grid.Column="1" RenderTransformOrigin="0.5,0.5" >
+                <Label.RenderTransform>
+                    <TransformGroup>
+                        <RotateTransform Angle="45"/>
+                        <TranslateTransform Y="5"/>
+                    </TransformGroup>
+                </Label.RenderTransform>
+            </Label>
+            <Button x:Name="EditButton" Content="Bearbeiten" Grid.Column="0" Grid.Row="2"
+                    Click="EditButton_Click"/>
+            <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="1"/>
+            <Button x:Name="CalculateButton" Content="Berechnen" Grid.Column="2" Grid.Row="2"
+                    Click="CalculateButton_Click"/>
+            <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="3" x:Name="Arrow3"/>
+            <Button x:Name="CommitButton" Content="Festsetzen" Grid.Column="4" Grid.Row="2"
+                    Click="CommitButton_Click"/>
+            <Button x:Name="RevertButton" Content="Freigeben" Grid.Column="4" Grid.Row="2"
+                    Click="RevertButton_Click"/>
+            <Button x:Name="SaveButton" Content="Speichern" Grid.Column="4" Grid.Row="0"
+                    Click="SaveButton_Click"/>
+        </Grid>
+
+        <Grid Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="250"/>
+            </Grid.ColumnDefinitions>
+
+            <GroupBox Header="Abschluss" Margin="10,0,5,10">
+                <Grid>
+                    <Button x:Name="ExportButton" Content="Exportieren" FontSize="14" Width="180" Margin="10,10,10,10" Height="27" IsEnabled="False"
+                            Click="ExportButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                    <Button x:Name="TransactionButton" Content="Buchungsliste" FontSize="14" Width="180" Margin="10,42,10,10" Height="27" IsEnabled="False"
+                            Click="TransactionButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Left"/>
+
+                    <ProgressBar x:Name="ProgressBar" Margin="10,10,10,74" Height="27" Width="180"
+                                 VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+                    <Button x:Name="ShowButton" Content="Vorschau" FontSize="14" Width="180" Margin="10,10,10,42" Height="27" Tag="Print" IsEnabled="False"
+                            Click="ShowButton_Click"
+                            VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+                    <Button x:Name="PrintButton" Content="Drucken" FontSize="14" Width="180" Margin="10,10,10,10" Height="27" Tag="Print" IsEnabled="False"
+                            Click="PrintButton_Click"
+                            VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+                </Grid>
+            </GroupBox>
+
+            <GroupBox Header="Ergebnis" Margin="5,0,10,10" Grid.Column="1">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.Resources>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="Grid.Column" Value="1"/>
+                            <Setter Property="VerticalAlignment" Value="Top"/>
+                            <Setter Property="FontSize" Value="14"/>
+                            <Setter Property="TextAlignment" Value="Right"/>
+                        </Style>
+                    </Grid.Resources>
+
+                    <Label Content="Zu-/Abschläge:" Margin="10,10,0,0"/>
+                    <TextBlock x:Name="ModifierSum" Margin="0,12,10,0"/>
+
+                    <Label Content="Gesamtbeträge:" Margin="10,40,0,0"/>
+                    <TextBlock x:Name="TotalSum" Margin="0,42,10,0"/>
+
+                    <Label Content="Mehrwertsteuer:" Margin="10,70,0,0"/>
+                    <TextBlock x:Name="VatSum" Margin="0,72,10,0"/>
+
+                    <Label Content="Abzüge:" Margin="10,100,0,0"/>
+                    <TextBlock x:Name="DeductionSum" Margin="0,102,10,0"/>
+
+                    <Label Content="Auszuzahlen:" Margin="10,130,0,0"/>
+                    <TextBlock x:Name="PaymentSum" Margin="0,132,10,0"/>
+                </Grid>
+            </GroupBox>
+        </Grid>
     </Grid>
 </local:ContextWindow>

Elwig/Windows/PaymentVariantsWindow.xaml.cs

@@ -11,16 +11,28 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using Elwig.Helpers.Billing;
+using Elwig.Helpers.Export;
+using Microsoft.Win32;
+using System.Text.Json;
 
 namespace Elwig.Windows {
     public partial class PaymentVariantsWindow : ContextWindow {
 
         public readonly int Year;
+        public readonly bool SeasonLocked;
+        private bool DataValid, DataChanged, NameChanged, CommentChanged, TransferDateValid, TransferDateChanged;
+        private BillingData? BillingData;
+
+        private static readonly JsonSerializerOptions JsonOpt = new() { WriteIndented = true };
 
         public PaymentVariantsWindow(int year) {
             InitializeComponent();
             Year = year;
+            SeasonLocked = Context.Seasons.Find(Year + 1) != null;
             Title = $"Auszahlungsvarianten - Lese {Year} - Elwig";
+            if (!App.Config.Debug) {
+                DataInput.Visibility = Visibility.Hidden;
+            }
         }
 
         protected override async Task OnRenewContext() {
@@ -30,26 +42,123 @@ namespace Elwig.Windows {
 
         private void Update() {
             if (PaymentVariantList.SelectedItem is PaymentVar v) {
-                var locked = v.TransferDate != null || !v.TestVariant;
+                var locked = !v.TestVariant;
                 DeleteButton.IsEnabled = !locked;
                 CalculateButton.IsEnabled = !locked;
+                CommitButton.IsEnabled = !locked && !SeasonLocked;
+                CommitButton.Visibility = !locked ? Visibility.Visible : Visibility.Hidden;
+                RevertButton.IsEnabled = locked && !SeasonLocked;
+                RevertButton.Visibility = locked ? Visibility.Visible : Visibility.Hidden;
+                Arrow3.Content = locked ? "\xF0B0" : "\xF0AF";
                 CopyButton.IsEnabled = true;
+                EditButton.Content = locked ? "Ansehen" : "Bearbeiten";
                 EditButton.IsEnabled = true;
+                SaveButton.IsEnabled = !locked;
                 ShowButton.IsEnabled = true;
                 PrintButton.IsEnabled = true;
+                ExportButton.IsEnabled = locked;
+                TransactionButton.IsEnabled = locked;
 
                 NameInput.Text = v.Name;
+                NameInput.IsReadOnly = false;
                 CommentInput.Text = v.Comment;
+                CommentInput.IsReadOnly = false;
+                DateInput.Text = $"{v.Date:dd.MM.yyyy}";
+                DateInput.IsReadOnly = false;
+                TransferDateInput.Text = $"{v.TransferDate:dd.MM.yyyy}";
+                TransferDateInput.IsReadOnly = false;
+                try {
+                    BillingData = BillingData.FromJson(v.Data);
+                    ConsiderModifiersInput.IsChecked = BillingData.ConsiderDelieryModifiers;
+                    ConsiderPenaltiesInput.IsChecked = BillingData.ConsiderContractPenalties;
+                    ConsiderPenaltyInput.IsChecked = BillingData.ConsiderTotalPenalty;
+                    ConsiderAutoInput.IsChecked = BillingData.ConsiderAutoBusinessShares;
+                    DataInput.Text = JsonSerializer.Serialize(BillingData.Data, JsonOpt);
+                } catch {
+                    BillingData = null;
+                    ConsiderModifiersInput.IsChecked = false;
+                    ConsiderPenaltiesInput.IsChecked = false;
+                    ConsiderPenaltyInput.IsChecked = false;
+                    ConsiderAutoInput.IsChecked = false;
+                    DataInput.Text = v.Data;
+                }
+                ConsiderModifiersInput.IsEnabled = !locked;
+                ConsiderPenaltiesInput.IsEnabled = !locked;
+                ConsiderPenaltyInput.IsEnabled = !locked;
+                ConsiderAutoInput.IsEnabled = !locked;
+                DataInput.IsReadOnly = locked;
             } else {
+                EditButton.Content = "Bearbeiten";
                 EditButton.IsEnabled = false;
+                SaveButton.IsEnabled = false;
                 CopyButton.IsEnabled = false;
                 CalculateButton.IsEnabled = false;
+                CommitButton.IsEnabled = false;
+                CommitButton.Visibility = Visibility.Visible;
+                RevertButton.IsEnabled = false;
+                RevertButton.Visibility = Visibility.Hidden;
+                Arrow3.Content = "\xF0AF";
                 DeleteButton.IsEnabled = false;
                 ShowButton.IsEnabled = false;
                 PrintButton.IsEnabled = false;
+                ExportButton.IsEnabled = false;
+                TransactionButton.IsEnabled = false;
 
+                BillingData = null;
                 NameInput.Text = "";
+                NameInput.IsReadOnly = true;
                 CommentInput.Text = "";
+                CommentInput.IsReadOnly = true;
+                DateInput.Text = "";
+                DateInput.IsReadOnly = true;
+                TransferDateInput.Text = "";
+                TransferDateInput.IsReadOnly = true;
+                ConsiderModifiersInput.IsChecked = false;
+                ConsiderModifiersInput.IsEnabled = false;
+                ConsiderPenaltiesInput.IsChecked = false;
+                ConsiderPenaltiesInput.IsEnabled = false;
+                ConsiderPenaltyInput.IsChecked = false;
+                ConsiderPenaltyInput.IsEnabled = false;
+                ConsiderAutoInput.IsChecked = false;
+                ConsiderAutoInput.IsEnabled = false;
+                DataInput.Text = "";
+                DataInput.IsReadOnly = true;
+            }
+            UpdateSums();
+            UpdateSaveButton();
+        }
+
+        private void UpdateSaveButton() {
+            SaveButton.IsEnabled = PaymentVariantList.SelectedItem != null &&
+                ((DataChanged && DataValid) || NameChanged || CommentChanged ||
+                (TransferDateChanged && TransferDateValid) ||
+                (ConsiderModifiersInput.IsChecked != BillingData?.ConsiderDelieryModifiers) ||
+                (ConsiderPenaltiesInput.IsChecked != BillingData?.ConsiderContractPenalties) ||
+                (ConsiderPenaltyInput.IsChecked != BillingData?.ConsiderTotalPenalty) ||
+                (ConsiderAutoInput.IsChecked != BillingData?.ConsiderAutoBusinessShares));
+            CalculateButton.IsEnabled = !SaveButton.IsEnabled && PaymentVariantList.SelectedItem is PaymentVar { TestVariant: true };
+        }
+
+        private void UpdateSums() {
+            if (PaymentVariantList.SelectedItem is PaymentVar v) {
+                var sym = v.Season.Currency.Symbol;
+                ModifierSum.Text = $"{v.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount):N2} {sym}";
+                TotalSum.Text = $"{v.MemberPayments.Sum(p => p.Amount):N2} {sym}";
+                if (v.Credits.Count == 0) {
+                    VatSum.Text = $"- {sym}";
+                    DeductionSum.Text = $"- {sym}";
+                    PaymentSum.Text = $"- {sym}";
+                } else {
+                    VatSum.Text = $"{v.Credits.Sum(c => c.VatAmount):N2} {sym}";
+                    DeductionSum.Text = $"{-v.Credits.Sum(c => c.Modifiers ?? 0):N2} {sym}";
+                    PaymentSum.Text = $"{v.Credits.Sum(c => c.Amount):N2} {sym}";
+                }
+            } else {
+                ModifierSum.Text = "-";
+                TotalSum.Text = "-";
+                VatSum.Text = "-";
+                DeductionSum.Text = "-";
+                PaymentSum.Text = "-";
             }
         }
 
@@ -57,16 +166,64 @@ namespace Elwig.Windows {
             Update();
         }
 
-        private void AddButton_Click(object sender, RoutedEventArgs evt) {
+        private async void AddButton_Click(object sender, RoutedEventArgs evt) {
+            try {
+                PaymentVar v = Context.CreateProxy<PaymentVar>();
 
+                v.Year = Year;
+                v.AvNr = await Context.NextAvNr(Year);
+                v.Name = "Neue Auszahlungsvariante";
+                v.TestVariant = true;
+                v.DateString = $"{DateTime.Today:yyyy-MM-dd}";
+                v.Data = "{\"mode\": \"elwig\", \"version\": 1, \"payment\": {}, \"curves\": []}";
+
+                await Context.AddAsync(v);
+                await Context.SaveChangesAsync();
+                await App.HintContextChange();
+
+                ControlUtils.SelectListBoxItem(PaymentVariantList, v, v => (v as PaymentVar)?.AvNr);
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Auszahlungsvariante erstellen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
         }
 
-        private void CopyButton_Click(object sender, RoutedEventArgs evt) {
+        private async void CopyButton_Click(object sender, RoutedEventArgs evt) {
+            if (PaymentVariantList.SelectedItem is not PaymentVar orig) return;
+            try {
+                PaymentVar n = Context.CreateProxy<PaymentVar>();
 
+                n.Year = orig.Year;
+                n.AvNr = await Context.NextAvNr(Year);
+                n.Name = $"{orig.Name} (Kopie)";
+                n.TestVariant = true;
+                n.DateString = $"{DateTime.Today:yyyy-MM-dd}";
+                n.Data = orig.Data;
+
+                await Context.AddAsync(n);
+                await Context.SaveChangesAsync();
+                await App.HintContextChange();
+
+                ControlUtils.SelectListBoxItem(PaymentVariantList, n, v => (v as PaymentVar)?.AvNr);
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Auszahlungsvariante kopieren", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
         }
 
-        private void DeleteButton_Click(object sender, RoutedEventArgs evt) {
-
+        private async void DeleteButton_Click(object sender, RoutedEventArgs evt) {
+            if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant) return;
+            try {
+                Context.Remove(v);
+                await Context.SaveChangesAsync();
+                await HintContextChange();
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Auszahlungsvariante löschen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
         }
 
         private async void CalculateButton_Click(object sender, RoutedEventArgs evt) {
@@ -74,8 +231,13 @@ namespace Elwig.Windows {
                 return;
             CalculateButton.IsEnabled = false;
             Mouse.OverrideCursor = Cursors.AppStarting;
-            var b = new BillingVariant(v.Year, v.AvNr);
-            await b.CalculatePrices();
+            try {
+                var b = new BillingVariant(v.Year, v.AvNr);
+                await b.Calculate();
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            await App.HintContextChange();
             Mouse.OverrideCursor = null;
             CalculateButton.IsEnabled = true;
         }
@@ -94,6 +256,249 @@ namespace Elwig.Windows {
             await Generate(2);
         }
 
+        private async void CommitButton_Click(object sender, RoutedEventArgs evt) {
+            if (PaymentVariantList.SelectedValue is not PaymentVar v)
+                return;
+            CommitButton.IsEnabled = false;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var b = new BillingVariant(v.Year, v.AvNr);
+                await b.Commit();
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            Mouse.OverrideCursor = null;
+            RevertButton.IsEnabled = true;
+            await App.HintContextChange();
+        }
+
+        private async void RevertButton_Click(object sender, RoutedEventArgs evt) {
+            if (PaymentVariantList.SelectedValue is not PaymentVar v)
+                return;
+            var res = MessageBox.Show(
+                "Sollen wirklich alle festgesetzten Traubengutschriften der ausgewählten Auszahlungsvariante unwiderruflich gelöscht werden?\n\n" +
+                "Dies ist im Allgemeinen nie empfohlen. Handelt es sich um die aktuellste Auszahlungsvariante könnte das eine Ausnahme sein.",
+                "Traubengutschriften löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+            if (res != MessageBoxResult.Yes)
+                return;
+            RevertButton.IsEnabled = false;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            var b = new BillingVariant(v.Year, v.AvNr);
+            await b.Revert();
+            Mouse.OverrideCursor = null;
+            CommitButton.IsEnabled = true;
+            await App.HintContextChange();
+        }
+
+        private async void ExportButton_Click(object sender, RoutedEventArgs evt) {
+            if (PaymentVariantList.SelectedValue is not PaymentVar v) {
+                return;
+            } else if (v.TransferDate == null) {
+                MessageBox.Show("Überweisungsdatum muss gesetzt sein!", "Exportieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+            var d = new SaveFileDialog() {
+                FileName = $"{App.Client.NameToken}-Überweisungsdaten-{v.Year}-{v.Name.Trim().Replace(' ', '-')}.{Ebics.FileExtension}",
+                DefaultExt = Ebics.FileExtension,
+                Filter = "EBICS-Datei (*.xml)|*.xml",
+                Title = $"Überweisungsdaten speichern unter - Elwig",
+            };
+            if (d.ShowDialog() == true) {
+                ExportButton.IsEnabled = false;
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                using var e = new Ebics(v, d.FileName);
+                await e.ExportAsync(Transaction.FromPaymentVariant(v));
+                Mouse.OverrideCursor = null;
+                ExportButton.IsEnabled = true;
+            }
+        }
+
+        private async void TransactionButton_Click(object sender, RoutedEventArgs evt) {
+            if (PaymentVariantList.SelectedValue is not PaymentVar v) {
+                return;
+            }
+            var d = new SaveFileDialog() {
+                FileName = $"{App.Client.NameToken}-Buchungsliste-{v.Year}-{v.Name.Trim().Replace(' ', '-')}.ods",
+                DefaultExt = "ods",
+                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
+                Title = $"Buchungsliste speichern unter - Elwig"
+            };
+            if (d.ShowDialog() == true) {
+                TransactionButton.IsEnabled = false;
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    var tbl = await CreditNoteData.ForPaymentVariant(Context, v.Year, v.AvNr);
+                    using var ods = new OdsFile(d.FileName);
+                    await ods.AddTable(tbl);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+                Mouse.OverrideCursor = null;
+                TransactionButton.IsEnabled = true;
+            }
+        }
+
+        private async void SaveButton_Click(object sender, RoutedEventArgs evt) {
+            if (PaymentVariantList.SelectedItem is not PaymentVar v || BillingData == null) return;
+            try {
+                v.Name = NameInput.Text;
+                v.Comment = (CommentInput.Text != "") ? CommentInput.Text : null;
+                v.TransferDateString = (TransferDateInput.Text != "") ? string.Join("-", TransferDateInput.Text.Split(".").Reverse()) : null;
+                var d = App.Config.Debug ? BillingData.FromJson(DataInput.Text) : BillingData;
+                d.ConsiderDelieryModifiers = ConsiderModifiersInput.IsChecked ?? false;
+                d.ConsiderContractPenalties = ConsiderPenaltiesInput.IsChecked ?? false;
+                d.ConsiderTotalPenalty = ConsiderPenaltyInput.IsChecked ?? false;
+                d.ConsiderAutoBusinessShares = ConsiderAutoInput.IsChecked ?? false;
+                v.Data = JsonSerializer.Serialize(d.Data);
+                Context.Update(v);
+                await Context.SaveChangesAsync();
+                await App.HintContextChange();
+                CommentInput_TextChanged(null, null);
+                ConsiderModifiersInput_Changed(null, null);
+                ConsiderPenaltiesInput_Changed(null, null);
+                ConsiderPenaltyInput_Changed(null, null);
+                ConsiderAutoInput_Changed(null, null);
+            } catch (Exception exc) {
+                await HintContextChange();
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Auszahlungsvariante aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void ModifierButton_Click(object sender, RoutedEventArgs evt) {
+            App.FocusBaseDataSeason(Year);
+        }
+
+        private void NameInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            if (PaymentVariantList.SelectedItem is not PaymentVar v) {
+                ControlUtils.ClearInputState(NameInput);
+                return;
+            }
+            if (NameInput.Text != v.Name) {
+                ControlUtils.SetInputChanged(NameInput);
+                NameChanged = true;
+            } else {
+                ControlUtils.ClearInputState(NameInput);
+                NameChanged = false;
+            }
+            UpdateSaveButton();
+        }
+
+        private void CommentInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
+            if (PaymentVariantList.SelectedItem is not PaymentVar v) {
+                ControlUtils.ClearInputState(CommentInput);
+                return;
+            }
+            if (CommentInput.Text != (v.Comment ?? "")) {
+                ControlUtils.SetInputChanged(CommentInput);
+                CommentChanged = true;
+            } else {
+                ControlUtils.ClearInputState(CommentInput);
+                CommentChanged = false;
+            }
+            UpdateSaveButton();
+        }
+
+        private void TransferDateInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            if (PaymentVariantList.SelectedItem is not PaymentVar v) {
+                ControlUtils.ClearInputState(TransferDateInput);
+                return;
+            }
+            var res = Validator.CheckDate(TransferDateInput, false);
+            if (!res.IsValid) {
+                ControlUtils.SetInputInvalid(TransferDateInput);
+                TransferDateValid = false;
+            } else if (TransferDateInput.Text != $"{v.TransferDate:dd.MM.yyyy}") {
+                ControlUtils.SetInputChanged(TransferDateInput);
+                TransferDateValid = true;
+                TransferDateChanged = true;
+            } else {
+                ControlUtils.ClearInputState(TransferDateInput);
+                TransferDateValid = true;
+                TransferDateChanged = false;
+            }
+            UpdateSaveButton();
+        }
+
+        private void DataInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            if (PaymentVariantList.SelectedItem is not PaymentVar v) {
+                ControlUtils.ClearInputState(DataInput);
+                return;
+            }
+            try {
+                var data = BillingData.FromJson(DataInput.Text);
+                var origJson = v.Data;
+                try {
+                    origJson = JsonSerializer.Serialize(BillingData.FromJson(v.Data).Data);
+                } catch { }
+                DataValid = true;
+                if (JsonSerializer.Serialize(data.Data) != origJson) {
+                    ControlUtils.SetInputChanged(DataInput);
+                    DataChanged = true;
+                } else {
+                    ControlUtils.ClearInputState(DataInput);
+                    DataChanged = false;
+                }
+            } catch {
+                ControlUtils.SetInputInvalid(DataInput);
+                DataValid = false;
+            }
+            UpdateSaveButton();
+        }
+
+        private void ConsiderModifiersInput_Changed(object? sender, RoutedEventArgs? evt) {
+            if (BillingData == null) {
+                ControlUtils.ClearInputState(ConsiderModifiersInput);
+                return;
+            }
+            if (BillingData.ConsiderDelieryModifiers != ConsiderModifiersInput.IsChecked) {
+                ControlUtils.SetInputChanged(ConsiderModifiersInput);
+            } else {
+                ControlUtils.ClearInputState(ConsiderModifiersInput);
+            }
+            UpdateSaveButton();
+        }
+
+        private void ConsiderPenaltiesInput_Changed(object? sender, RoutedEventArgs? evt) {
+            if (BillingData == null) {
+                ControlUtils.ClearInputState(ConsiderPenaltiesInput);
+                return;
+            }
+            if (BillingData.ConsiderContractPenalties != ConsiderPenaltiesInput.IsChecked) {
+                ControlUtils.SetInputChanged(ConsiderPenaltiesInput);
+            } else {
+                ControlUtils.ClearInputState(ConsiderPenaltiesInput);
+            }
+            UpdateSaveButton();
+        }
+
+        private void ConsiderPenaltyInput_Changed(object? sender, RoutedEventArgs? evt) {
+            if (BillingData == null) {
+                ControlUtils.ClearInputState(ConsiderPenaltyInput);
+                return;
+            }
+            if (BillingData.ConsiderTotalPenalty != ConsiderPenaltyInput.IsChecked) {
+                ControlUtils.SetInputChanged(ConsiderPenaltyInput);
+            } else {
+                ControlUtils.ClearInputState(ConsiderPenaltyInput);
+            }
+            UpdateSaveButton();
+        }
+
+        private void ConsiderAutoInput_Changed(object? sender, RoutedEventArgs? evt) {
+            if (BillingData == null) {
+                ControlUtils.ClearInputState(ConsiderAutoInput);
+                return;
+            }
+            if (BillingData.ConsiderAutoBusinessShares != ConsiderAutoInput.IsChecked) {
+                ControlUtils.SetInputChanged(ConsiderAutoInput);
+            } else {
+                ControlUtils.ClearInputState(ConsiderAutoInput);
+            }
+            UpdateSaveButton();
+        }
+
         private async Task Generate(int mode) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
@@ -110,10 +515,11 @@ namespace Elwig.Windows {
             members = members.OrderBy(m => m.MgNr);
 
             IEnumerable<Member> list = await members.ToListAsync();
-            var data = await CreditNoteData.ForPaymentVariant(Context.CreditNoteRows, v.Year, v.AvNr);
+            var data = await CreditNoteDeliveryData.ForPaymentVariant(Context.CreditNoteDeliveryRows, Context.Seasons, v.Year, v.AvNr);
             var payments = await Context.MemberPayments.Where(p => p.Year == v.Year && p.AvNr == v.AvNr).ToDictionaryAsync(c => c.MgNr);
+            await Context.GetMemberAreaCommitmentBuckets(Year, 0);
             using var doc = Document.Merge(list.Select(m =>
-                new CreditNote(Context, payments[m.MgNr], data[m.MgNr])
+                new CreditNote(Context, payments[m.MgNr], data[m.MgNr], Context.GetMemberUnderDelivery(Year, m.MgNr).GetAwaiter().GetResult())
             ));
             await doc.Generate(new Progress<double>(v => {
                 ProgressBar.Value = v;

Elwig/Windows/SeasonFinishWindow.xaml

@@ -37,14 +37,18 @@
 
         <Button x:Name="DeliveryConfirmationButton" Content="Anlieferungsbestätigungen"
                 Click="DeliveryConfirmationButton_Click"
-                Margin="50,122,0,0"/>
+                Margin="50,120,0,0"/>
 
         <Button x:Name="OverUnderDeliveryButton" Content="Über-/Unterlieferungen"
                 Click="OverUnderDeliveryButton_Click"
-                Margin="50,164,0,0"/>
+                Margin="50,160,0,0"/>
+
+        <Button x:Name="AutoBusinessSharesButton" Content="Autom. GA nachzeichen"
+                Click="AutoBusinessSharesButton_Click"
+                Margin="50,200,0,0"/>
 
         <Button x:Name="PaymentButton" Content="Auszahlung"
                 Click="PaymentButton_Click"
-                Margin="50,206,0,0"/>
+                Margin="50,240,0,0"/>
     </Grid>
 </local:ContextWindow>

Elwig/Windows/SeasonFinishWindow.xaml.cs

@@ -31,6 +31,7 @@ namespace Elwig.Windows {
             CalculateBucketsButton.IsEnabled = valid && last;
             DeliveryConfirmationButton.IsEnabled = valid;
             OverUnderDeliveryButton.IsEnabled = valid;
+            AutoBusinessSharesButton.IsEnabled = valid;
             PaymentButton.IsEnabled = valid;
         }
 
@@ -82,6 +83,27 @@ namespace Elwig.Windows {
             Mouse.OverrideCursor = null;
         }
 
+        private async void AutoBusinessSharesButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            if (false && App.Client.IsMatzen) {
+                AutoBusinessSharesButton.IsEnabled = false;
+                Mouse.OverrideCursor = Cursors.AppStarting;
+
+                var b = new Billing(year);
+                await b.AutoAdjustBusinessShare();
+
+                Mouse.OverrideCursor = null;
+                AutoBusinessSharesButton.IsEnabled = true;
+            } else {
+                MessageBox.Show(
+                    "Es ist kein automatisches Nachzeichnen der Geschäftsanteile\n" +
+                    "für diese Genossenschaft eingestellt!\n" +
+                    "Bitte wenden Sie sich an die Programmierer!", "Fehler",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+        }
+
         private void PaymentButton_Click(object sender, RoutedEventArgs evt) {
             if (SeasonInput.Value is not int year)
                 return;

Elwig/Windows/TestWindow.xaml.cs

@@ -48,7 +48,7 @@ namespace Elwig.Windows {
         private async void ZipButton_Click(object sender, RoutedEventArgs evt) {
             using var ctx = new AppDbContext();
             using var ods = new OdsFile(@"C:\Users\Lorenz\Desktop\test.ods");
-            await ods.AddTable(await DeliveryConfirmationData.ForMember(ctx.DeliveryParts, 2023, ctx.Members.Find(2948)));
+            await ods.AddTable(await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, 2023, ctx.Members.Find(2948)));
         }
     }
 }

Elwig/fetch-resources.bat

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