Bump version to 1.0.5.1

Test: Update dependencies
Elwig: Update dependencies
2026-04-20 19:23:01 +02:00 · 2026-04-20 15:12:29 +02:00 · 2026-04-20 15:12:29 +02:00 · 2026-04-20 15:12:22 +02:00 · 2026-04-20 15:05:09 +02:00 · 2026-04-20 14:21:13 +02:00
28 changed files with 125 additions and 70 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,45 @@
 Changelog
 =========

+[v1.0.5.1][v1.0.5.1] (2026-04-20) {#v1.0.5.1}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.5.1-bugfixes}
+
+* Zu-/Abschläge mit absolutem Wert (z.B. `€/kg`) wurden bei der Auszahlung nie mit der Menge multipliziert. (ea2b6db1fc)
+* Massenaktionen im Lieferungen-Fenster (`DeliveryAdminWindow`) haben für Zu-/Abschläge nicht funktioniert. (4eac8cd629, cf48f005e2)
+
+### Sonstiges {#v1.0.5.1-misc}
+
+* Behebung von Kleinigkeiten im Layout bei Dokumenten (`CreditNote`, `PaymentVariantSummary`). (7edf395497, a852dbb242)
+* Zuordnung von zwei Gemeinden vom Weinbaugebiet Neusiedlersee (`WLNS`) zu Leithaberg (`WLLB`). (2b3c293730)
+* Abhängigkeiten aktualisiert. (20fd5d5826, 7861a15e2e)
+
+[v1.0.5.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.1
+
+
+
+
+[v1.0.5.0][v1.0.5.0] (2026-04-08) {#v1.0.5.0}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.5.0-features}
+
+* Flächenbindungen werden nun in _Verträgen_ zusammengefasst um bessere Übersicht und historische Nachvollziehbarkeit zu gewährleisten. ([#77][i77])
+
+### Sonstiges {#v1.0.5.0-misc}
+
+* Erhebliche Verbesserung der Leistung/Geschwindigkeit. ([#79][i79], e5e5e10cd7, 22fbb0772f)
+* Am Stammdatenblatt (`MemberDataSheet`) wird nun als Datum das Datum der letzten Bearbeitung angegeben. (0a9c800116)
+* Abhängigkeiten aktualisiert. (07d93dd384, ce1a55df86, cc6e31a006)
+
+[v1.0.5.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.0
+[i77]: https://git.necronda.net/winzer/elwig/issues/77
+[i79]: https://git.necronda.net/winzer/elwig/issues/79
+
+
+
+
 [v1.0.4.1][v1.0.4.1] (2026-03-27) {#v1.0.4.1}
 ---------------------------------------------

--- a/Elwig/App.xaml.cs
+++ b/Elwig/App.xaml.cs
@@ -201,6 +201,7 @@ namespace Elwig {
            BranchName = entry.Item2;
            BranchPlz = entry.Item3;
            BranchLocation = entry.Item4?
+                .Split(",")[0]
                .Split(" in ")[0]
                .Split(" im ")[0]
                .Split(" an ")[0]
--- a/Elwig/Documents/BusinessDocument.cs
+++ b/Elwig/Documents/BusinessDocument.cs
@@ -22,6 +22,7 @@ namespace Elwig.Documents {
        public bool IncludeSender = false;
        public bool UseBillingAddress = false;
        public bool ShowDateAndLocation = false;
+        public DateOnly? DateFrom;
        protected Table? Aside;

        public string Address {
@@ -47,11 +48,12 @@ namespace Elwig.Documents {
            return NewAsideCell(new KernedParagraph(text, 10), colspan, isName);
        }

-        public BusinessDocument(string title, Member m, bool includeSender = false) :
+        public BusinessDocument(string title, Member m, DateOnly? dateFrom, bool includeSender = false) :
            base(title) {
            Member = m;
            Location = App.BranchLocation;
            IncludeSender = includeSender;
+            DateFrom = dateFrom;
        }

        protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
@@ -105,7 +107,7 @@ namespace Elwig.Documents {
                }
            }

-            doc.Add(new KernedParagraph(ShowDateAndLocation ? $"{Location}, am {Date:dd.MM.yyyy}" : "", 12).SetTextAlignment(TextAlignment.RIGHT).SetVerticalAlignment(VerticalAlignment.MIDDLE).SetHeight(24).SetMargin(0));
+            doc.Add(new KernedParagraph(ShowDateAndLocation ? $"{Location}, am {DateFrom ?? Date:dd.MM.yyyy}" : "", 12).SetTextAlignment(TextAlignment.RIGHT).SetVerticalAlignment(VerticalAlignment.MIDDLE).SetHeight(24).SetMargin(0));
            doc.Add(new KernedParagraph(Title, 12).SetFont(BF).SetMargins(0, 0, 12, 0));
        }

--- a/Elwig/Documents/CreditNote.cs
+++ b/Elwig/Documents/CreditNote.cs
@@ -37,8 +37,8 @@ namespace Elwig.Documents {
        private CreditNoteDeliveryData? _data;
        private Dictionary<string, UnderDelivery>? _underDeliveries;

-        public CreditNote(PaymentMember p, BillingData? billingData = null, CreditNoteDeliveryData? data = null, Dictionary<string, UnderDelivery>? underDeliveries = null) :
-            base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.FullName)} – {p.Variant.Name}", p.Member) {
+        public CreditNote(PaymentMember p, DateOnly? dateFrom, BillingData? billingData = null, CreditNoteDeliveryData? data = null, Dictionary<string, UnderDelivery>? underDeliveries = null) :
+            base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.FullName)} – {p.Variant.Name}", p.Member, dateFrom) {
            UseBillingAddress = true;
            ShowDateAndLocation = true;
            Payment = p;
@@ -58,12 +58,12 @@ namespace Elwig.Documents {
            ConsiderCustomModifiers = billingData.ConsiderCustomModifiers;
        }

-        public static async Task<CreditNote> Initialize(int year, int avnr, int mgnr, BillingData? billingData = null, CreditNoteDeliveryData? data = null, Dictionary<string, UnderDelivery>? underDeliveries = null) {
+        public static async Task<CreditNote> Initialize(int year, int avnr, int mgnr, DateOnly? dateFrom, BillingData? billingData = null, CreditNoteDeliveryData? data = null, Dictionary<string, UnderDelivery>? underDeliveries = null) {
            using var ctx = new AppDbContext();
            var p = await ctx.MemberPayments
                .Where(p => p.Year == year && p.AvNr == avnr && p.MgNr == mgnr)
                .SingleAsync();
-            return new CreditNote(p, billingData, data, underDeliveries);
+            return new CreditNote(p, dateFrom, billingData, data, underDeliveries);
        }

        protected override async Task LoadData(AppDbContext ctx) {
@@ -321,7 +321,7 @@ namespace Elwig.Documents {
                        var totalMod = p.TotalModifiers ?? 0;
                        var pad = i == 0 ? 0.5f : 0;
                        sub.AddCell(NewTd(rebelMod == 0 ? "-" : (Utils.GetSign(rebelMod) + $"{Math.Abs(rebelMod):0.0##}"), 6, center: true)
-                                .SetPaddingTopMM(pad))
+                                .SetPaddingTopMM(pad).SetPaddingLeft(0).SetPaddingRight(0))
                            .AddCell(NewTd(totalMod == 0 ? "-" : Utils.GetSign(totalMod) + $"{Math.Abs(totalMod):N2}", center: totalMod == 0, right: true)
                                .SetPaddingTopMM(pad))
                            .AddCell(NewTd($"{p.Amount:N2}", right: true)
--- a/Elwig/Documents/DeliveryConfirmation.cs
+++ b/Elwig/Documents/DeliveryConfirmation.cs
@@ -24,8 +24,8 @@ namespace Elwig.Documents {
        public Dictionary<string, MemberBucket> MemberBuckets = [];
        public List<MemberStat> MemberStats = [];

-        public DeliveryConfirmation(int year, Member m, DeliveryConfirmationDeliveryData? data = null) :
-            base($"{Name} {year}", m) {
+        public DeliveryConfirmation(int year, Member m, DateOnly? dateFrom, DeliveryConfirmationDeliveryData? data = null) :
+            base($"{Name} {year}", m, dateFrom) {
            _year = year;
            ShowDateAndLocation = true;
            UseBillingAddress = true;
--- a/Elwig/Documents/DeliveryNote.cs
+++ b/Elwig/Documents/DeliveryNote.cs
@@ -29,14 +29,12 @@ namespace Elwig.Documents {
        public int DisplayStats = App.Client.ModeDeliveryNoteStats;

        public DeliveryNote(Delivery d) :
-            base($"{Name} Nr. {d.LsNr}", d.Member) {
+            base($"{Name} Nr. {d.LsNr}", d.Member, DateOnly.FromDateTime(d.ModifiedAt)) {
            UseBillingAddress = true;
            ShowDateAndLocation = true;
            Delivery = d;
            Text = App.Client.TextDeliveryNote;
            DocumentId = d.LsNr;
-            Date = DateOnly.FromDateTime(d.ModifiedAt);
-            IsDoublePaged = true;
        }

        public static async Task<DeliveryNote> Initialize(int year, int did) {
--- a/Elwig/Documents/Document.cs
+++ b/Elwig/Documents/Document.cs
@@ -49,14 +49,12 @@ namespace Elwig.Documents {
        public bool IsPreview = false;
        private iText.Layout.Document? _doc;

-        public int CurrentNextSeason;
        public string? DocumentId;
        public string Title;
        public string Author;
        public DateOnly Date;

        public Document(string title) {
-            CurrentNextSeason = Utils.CurrentNextSeason;
            Title = title;
            Author = App.Client.NameFull;
            Date = DateOnly.FromDateTime(Utils.Today);
--- a/Elwig/Documents/Letterhead.cs
+++ b/Elwig/Documents/Letterhead.cs
@@ -6,7 +6,7 @@ using iText.Layout;
 namespace Elwig.Documents {
    public class Letterhead : BusinessDocument {
        public Letterhead(Member m) :
-            base($"Briefkopf {m.FullName}", m, true) {
+            base($"Briefkopf {m.FullName}", m, null, includeSender: true) {
        }

        protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
--- a/Elwig/Documents/MemberDataSheet.cs
+++ b/Elwig/Documents/MemberDataSheet.cs
@@ -23,7 +23,8 @@ namespace Elwig.Documents {
        public List<AreaCom> ActiveAreaCommitments = [];

        public MemberDataSheet(Member m) :
-            base($"{Name} {m.AdministrativeName}", m) {
+            base($"{Name} {m.AdministrativeName}", m, DateOnly.FromDateTime(m.ModifiedAt)) {
+            ShowDateAndLocation = true;
            DocumentId = $"{Name} {m.MgNr}";
        }

--- a/Elwig/Documents/PaymentVariantSummary.cs
+++ b/Elwig/Documents/PaymentVariantSummary.cs
@@ -183,21 +183,21 @@ namespace Elwig.Documents {
                .AddCell(NewTd(CurrencySymbol))
                .AddCell(NewTd($"{Math.Abs(payed):N2}", right: true))
                .AddCell(NewSectionTh("Preis (abgewertet):", borderTop: true, borderLeft: true))
-                .AddCell(NewTd((minWei != maxWei ? $"{minWei:N4}\u2013{maxWei:N4}" : $"{minWei:N4}") + $" {CurrencySymbol}/kg", colspan: 2, center: true, borderTop: true))
+                .AddCell(NewTd(minWei == null && maxWei == null ? "-" : (minWei != maxWei ? $"{minWei:N4}\u2013{maxWei:N4}" : $"{minWei:N4}") + $" {CurrencySymbol}/kg", colspan: 2, center: true, borderTop: true))

                .AddCell(NewSectionTh("Nettosumme:", colspan: 2))
                .AddCell(NewTd(borderTop: true))
                .AddCell(NewTd(CurrencySymbol, borderTop: true))
                .AddCell(NewTd($"{netSum:N2}", right: true, borderTop: true))
                .AddCell(NewSectionTh("Preis (ungeb., nicht abgew.):", borderLeft: true))
-                .AddCell(NewTd((minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") + $" {CurrencySymbol}/kg", colspan: 2, center: true))
+                .AddCell(NewTd(minPrice == null && maxPrice == null ? "-" : (minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") + $" {CurrencySymbol}/kg", colspan: 2, center: true))

                .AddCell(NewSectionTh("Mehrwertsteuer:", colspan: 2))
                .AddCell(NewTd(Utils.GetSign(vat), right: true))
                .AddCell(NewTd(CurrencySymbol))
                .AddCell(NewTd($"{Math.Abs(vat):N2}", right: true))
                .AddCell(NewSectionTh("Gebunden-Zuschlag:", borderLeft: true))
-                .AddCell(NewTd(minGeb != maxGeb ? $"{minGeb:N4}\u2013{maxGeb:N4} {CurrencySymbol}/kg" : minGeb == 0 ? "-" : $"{minGeb:N4} {CurrencySymbol}/kg", colspan: 2, center: true))
+                .AddCell(NewTd(minGeb == null && maxGeb == null ? "-" : minGeb != maxGeb ? $"{minGeb:N4}\u2013{maxGeb:N4} {CurrencySymbol}/kg" : minGeb == 0 ? "-" : $"{minGeb:N4} {CurrencySymbol}/kg", colspan: 2, center: true))

                .AddCell(NewSectionTh("Bruttosumme:", colspan: 2))
                .AddCell(NewTd(borderTop: true))
--- a/Elwig/Elwig.csproj
+++ b/Elwig/Elwig.csproj
@@ -9,7 +9,7 @@
    <UseWindowsForms>true</UseWindowsForms>
    <PreserveCompilationContext>true</PreserveCompilationContext>
    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>1.0.4.1</Version>
+    <Version>1.0.5.1</Version>
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -23,21 +23,21 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="bblanchon.PDFium.Win32" Version="148.0.7749" />
+    <PackageReference Include="bblanchon.PDFium.Win32" Version="149.0.7802" />
    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
-    <PackageReference Include="itext" Version="9.5.0" />
-    <PackageReference Include="itext.bouncy-castle-adapter" Version="9.5.0" />
+    <PackageReference Include="itext" Version="9.6.0" />
+    <PackageReference Include="itext.bouncy-castle-adapter" Version="9.6.0" />
    <PackageReference Include="LinqKit" Version="1.3.11" />
-    <PackageReference Include="MailKit" Version="4.15.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.5" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3856.49" />
-    <PackageReference Include="NJsonSchema" Version="11.5.2" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.1.57" />
+    <PackageReference Include="MailKit" Version="4.16.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.6" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3912.50" />
+    <PackageReference Include="NJsonSchema" Version="11.6.0" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.1.58" />
    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
-    <PackageReference Include="System.IO.Hashing" Version="10.0.5" />
-    <PackageReference Include="System.IO.Ports" Version="10.0.5" />
-    <PackageReference Include="System.Management" Version="10.0.5" />
+    <PackageReference Include="System.IO.Hashing" Version="10.0.6" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.6" />
+    <PackageReference Include="System.Management" Version="10.0.6" />
  </ItemGroup>

 </Project>
--- a/Elwig/Helpers/AppDbUpdater.cs
+++ b/Elwig/Helpers/AppDbUpdater.cs
@@ -9,7 +9,7 @@ namespace Elwig.Helpers {
    public static class AppDbUpdater {

        // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 38;
+        public static readonly int RequiredSchemaVersion = 39;

        private static int VersionOffset = 0;

--- a/Elwig/Helpers/Billing/BillingVariant.cs
+++ b/Elwig/Helpers/Billing/BillingVariant.cs
@@ -232,7 +232,7 @@ namespace Elwig.Helpers.Billing {
                SET mod_rel = mod_rel + excluded.mod_rel;

                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)
+                SELECT d.year, d.did, d.dpnr, {AvNr}, 0, COALESCE(m.abs, 0) * d.weight, 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)
--- a/Elwig/Helpers/Export/ElwigData.cs
+++ b/Elwig/Helpers/Export/ElwigData.cs
@@ -224,7 +224,7 @@ namespace Elwig.Helpers.Export {
                }

                var importedMembers = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string? Filters)>();
-                var importedAreaComs = new List<(string FileName, string ZwstId, string Device, int Imported, int NotImported, string? Filters)>();
+                var importedAreaComs = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string? Filters)>();
                var importedDeliveries = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string? Filters)>();

                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, areaCommitments, contracts, riede, wbKgs, wbGls, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
@@ -308,9 +308,9 @@ namespace Elwig.Helpers.Export {
                    }

                    if (importDuplicateMembers) {
-                        ctx.RemoveRange(ctx.BillingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
-                        ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(n => duplicateMgNrs.Contains(n.MgNr)));
-                        ctx.RemoveRange(ctx.MemberEmailAddrs.Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.RemoveRange(ctx.BillingAddresses.IgnoreAutoIncludes().Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.RemoveRange(ctx.MemberTelephoneNrs.IgnoreAutoIncludes().Where(n => duplicateMgNrs.Contains(n.MgNr)));
+                        ctx.RemoveRange(ctx.MemberEmailAddrs.IgnoreAutoIncludes().Where(a => duplicateMgNrs.Contains(a.MgNr)));
                        ctx.UpdateRange(members.Where(m => duplicateMgNrs.Contains(m.MgNr)));
                        ctx.AddRange(billingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
                        ctx.AddRange(telephoneNumbers.Where(n => duplicateMgNrs.Contains(n.MgNr)));
@@ -329,7 +329,7 @@ namespace Elwig.Helpers.Export {
                    }

                    if (importDuplicateContracts) {
-                        ctx.RemoveRange(ctx.AreaCommitments.Where(c => duplicateFbNrs.Contains(c.FbNr)));
+                        ctx.RemoveRange(ctx.AreaCommitments.IgnoreAutoIncludes().Where(c => duplicateFbNrs.Contains(c.FbNr)));
                        ctx.UpdateRange(contracts.Where(c => duplicateFbNrs.Contains(c.FbNr)));
                        ctx.AddRange(areaCommitments.Where(c => duplicateFbNrs.Contains(c.FbNr)));
                    }
@@ -339,8 +339,9 @@ namespace Elwig.Helpers.Export {
                    }
                    if (contracts.Count > 0) {
                        ctx.AddRange(riede);
-                        var imported = contracts.Where(c => (importNewContracts && !duplicateFbNrs.Contains(c.FbNr)) || (importDuplicateContracts && duplicateFbNrs.Contains(c.FbNr))).ToList();
-                        importedAreaComs.Add((meta.FileName, meta.ZwstId, meta.Device, imported.Count, areaCommitments.Count - imported.Count, meta.AreaComFilters));
+                        var n = importNewContracts ? contracts.Count - duplicateFbNrs.Count : 0;
+                        var o = importDuplicateContracts ? duplicateFbNrs.Count : 0;
+                        importedAreaComs.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, contracts.Count - n - o, meta.AreaComFilters));
                    }

                    if (allowedDuplicateLsNrs.Count > 0) {
@@ -349,9 +350,10 @@ namespace Elwig.Helpers.Export {
                            .Select(d => (d.Year, d.DId))
                            .ToList();
                        ctx.RemoveRange(ctx.DeliveryParts
+                            .IgnoreAutoIncludes()
                            .Where(p => allowedDuplicateLsNrs.Contains(p.Delivery.LsNr))
                            .SelectMany(p => p.PartModifiers));
-                        ctx.RemoveRange(ctx.DeliveryParts.Where(p => allowedDuplicateLsNrs.Contains(p.Delivery.LsNr)));
+                        ctx.RemoveRange(ctx.DeliveryParts.IgnoreAutoIncludes().Where(p => allowedDuplicateLsNrs.Contains(p.Delivery.LsNr)));
                        ctx.UpdateRange(deliveries.Where(d => dids.Contains((d.Year, d.DId))));
                        ctx.AddRange(deliveryParts.Where(p => dids.Contains((p.Year, p.DId))));
                        ctx.AddRange(modifiers.Where(m => dids.Contains((m.Year, m.DId))));
@@ -363,9 +365,10 @@ namespace Elwig.Helpers.Export {
                            .Select(d => (d.Year, d.DId))
                            .ToList();
                        ctx.RemoveRange(ctx.DeliveryParts
+                            .IgnoreAutoIncludes()
                            .Where(p => l.Contains(p.Delivery.LsNr))
                            .SelectMany(p => p.PartModifiers));
-                        ctx.RemoveRange(ctx.DeliveryParts.Where(p => l.Contains(p.Delivery.LsNr)));
+                        ctx.RemoveRange(ctx.DeliveryParts.IgnoreAutoIncludes().Where(p => l.Contains(p.Delivery.LsNr)));
                        ctx.UpdateRange(deliveries.Where(d => dids.Contains((d.Year, d.DId))));
                        ctx.AddRange(deliveryParts.Where(p => dids.Contains((p.Year, p.DId))));
                        ctx.AddRange(modifiers.Where(m => dids.Contains((m.Year, m.DId))));
@@ -418,10 +421,10 @@ namespace Elwig.Helpers.Export {
                            $"    ({d.New} neu, {d.Overwritten} überschrieben, {d.NotImported} nicht importiert)\n" +
                            $"    Zweigstelle: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
                            $"    Filter: {d.Filters}"),
-                        $"Flächenbindungen: {importedAreaComs.Sum(d => d.Imported)}",
+                        $"Flächenbindungen: {importedAreaComs.Sum(d => d.New + d.Overwritten)}",
                        ..importedAreaComs.Select(d =>
-                            $"  {d.FileName} ({d.Imported})\n" +
-                            $"    ({d.Imported} importiert, {d.NotImported} nicht importiert)\n" +
+                            $"  {d.FileName} ({d.New + d.Overwritten})\n" +
+                            $"    ({d.New} importiert, {d.Overwritten} überschreiben, {d.NotImported} nicht importiert)\n" +
                            $"    Zweigstelle: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
                            $"    Filter: {d.Filters}"),
                        $"Lieferungen: {importedDeliveries.Sum(d => d.New + d.Overwritten)}",
--- a/Elwig/Resources/Sql/38-39.sql
+++ b/Elwig/Resources/Sql/38-39.sql
@@ -0,0 +1,8 @@
+-- schema version 38 to 39
+
+PRAGMA writable_schema = ON;
+UPDATE sqlite_schema SET sql = REPLACE(sql, '{2,}', '{2,64}')
+WHERE type = 'table' AND name = 'member_email_address';
+PRAGMA writable_schema = OFF;
+
+UPDATE wb_gem SET hkid = 'WLLB' WHERE gkz IN (10710, 10723);
--- a/Elwig/Services/MemberService.cs
+++ b/Elwig/Services/MemberService.cs
@@ -413,7 +413,7 @@ namespace Elwig.Services {
                    await b.CalculateBuckets();
                    App.HintContextChange();

-                    using var doc = new DeliveryConfirmation(year, m);
+                    using var doc = new DeliveryConfirmation(year, m, null);
                    await Utils.ExportDocument(doc, mode, emailData: (m, $"{DeliveryConfirmation.Name} {year}", $"Im Anhang finden Sie die Anlieferungsbestätigung {year}"));
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -426,7 +426,7 @@ namespace Elwig.Services {
            Mouse.OverrideCursor = Cursors.Wait;
            await Task.Run(async () => {
                try {
-                    using var doc = await CreditNote.Initialize(year, avnr, m.MgNr);
+                    using var doc = await CreditNote.Initialize(year, avnr, m.MgNr, null);
                    await Utils.ExportDocument(doc, mode, emailData: (m, $"{CreditNote.Name} {doc.Payment.Variant.Name}", $"Im Anhang finden Sie die Traubengutschrift {doc.Payment.Variant.Name}"));
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
--- a/Elwig/Windows/DeliveryAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml
@@ -529,12 +529,12 @@
                    </Grid.ColumnDefinitions>
                    <Label Content="Gradation:" Margin="10,10,10,10"/>
                    <ctrl:UnitTextBox x:Name="GradationOeInput" Unit="°Oe" Text="{Binding GradationOeString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                      TextChanged="GradationOeInput_TextChanged" KeyUp="Input_KeyUp"
+                                      TextChanged="GradationOeInput_TextChanged" LostFocus="GradationOeInput_LostFocus" KeyUp="Input_KeyUp"
                                      Grid.Column="1" Width="54" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>

                    <Label Content="=" Margin="60,10,10,10" Grid.Column="1"/>
                    <ctrl:UnitTextBox x:Name="GradationKmwInput" Unit="°KMW" Text="{Binding GradationKmwString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                      TextChanged="GradationKmwInput_TextChanged" KeyUp="Input_KeyUp"
+                                      TextChanged="GradationKmwInput_TextChanged" LostFocus="GradationKmwInput_LostFocus" KeyUp="Input_KeyUp"
                                      Grid.Column="1" Width="68" Margin="78,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>

                    <Label Content="Qualitätsstufe:" Margin="10,40,10,10"/>
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -527,7 +527,7 @@ namespace Elwig.Windows {

            Menu_BulkAction_AddModifier.Items.Clear();
            Menu_BulkAction_RemoveModifier.Items.Clear();
-            foreach (var mod in Modifiers.GetValueOrDefault(ViewModel.SelectedDelivery?.Year ?? 0, []).Where(m => m.IsActive || !IsCreating)) {
+            foreach (var mod in Modifiers.GetValueOrDefault(ViewModel.SelectedDelivery?.Year ?? year, [])) {
                var i1 = new MenuItem {
                    Header = mod.Name,
                };
--- a/Elwig/Windows/MailWindow.xaml.cs
+++ b/Elwig/Windows/MailWindow.xaml.cs
@@ -155,7 +155,7 @@ namespace Elwig.Windows {
        }

        protected override async Task OnRenewContext(AppDbContext ctx) {
-            var season = await ctx.Seasons.Include(s => s.PaymentVariants).Where(s => s.Year == Year).SingleAsync();
+            var season = await ctx.Seasons.Include(s => s.PaymentVariants).Where(s => s.Year == Year).SingleOrDefaultAsync();
            var l = new List<string> {
                MemberDataSheet.Name
            };
@@ -690,7 +690,7 @@ namespace Elwig.Windows {
                PrintButton.IsEnabled = PrintDocument != null && !hasPreviewDocs;
                EmailButton.IsEnabled = EmailDocuments != null && !hasPreviewDocs && App.Config.Smtp != null;
            } catch (Exception exc) {
-                MessageBox.Show(exc.ToString(), "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
            } finally {
                UnlockInputs();
                GenerateButton.IsEnabled = true;
@@ -742,6 +742,9 @@ namespace Elwig.Windows {
                Member = m,
                Docs = docs.SelectMany<SelectedDoc, GeneratedDoc>(doc => {
                    try {
+                        App.MainDispatcher.Invoke(() => {
+                            ProgressBar.Value = offset + 100.0 * i / 2 / totalNum;
+                        });
                        if (doc.Type == DocType.Custom) {
                            return [new GeneratedDoc((string)doc.Details!)];
                        } else if (doc.Type == DocType.MemberDataSheet) {
@@ -756,14 +759,14 @@ namespace Elwig.Windows {
                            } else {
                                return [];
                            }
-                            return [new GeneratedDoc(new DeliveryConfirmation(year, m, data) { Date = postalDate })];
+                            return [new GeneratedDoc(new DeliveryConfirmation(year, m, postalDate, data) { Date = postalDate })];
                        } else if (doc.Type == DocType.CreditNote) {
                            var details = ((int, int))doc.Details!;
                            var year = details.Item1;
                            var avnr = details.Item2;
                            var data = cnData[(year, avnr)];
                            try {
-                                return [new GeneratedDoc(new CreditNote(data.Item2[m.MgNr], data.Item3, data.Item1[m.MgNr]) { Date = postalDate })];
+                                return [new GeneratedDoc(new CreditNote(data.Item2[m.MgNr], postalDate, data.Item3, data.Item1[m.MgNr]) { Date = postalDate })];
                            } catch (Exception) {
                                return [];
                            }
--- a/Elwig/Windows/MemberAdminWindow.xaml.cs
+++ b/Elwig/Windows/MemberAdminWindow.xaml.cs
@@ -388,10 +388,9 @@ namespace Elwig.Windows {

            int areaComs = 0, deliveries = 0, credits = 0;
            using (var ctx = new AppDbContext()) {
-                var l = await ctx.FetchMembers(m.MgNr).SingleAsync();
-                areaComs = l.AreaCommitments.Count;
-                deliveries = l.Deliveries.Count;
-                credits = l.Credits.Count;
+                areaComs = await ctx.AreaCommitments.Where(c => c.MgNr == m.MgNr).CountAsync();
+                deliveries = await ctx.Deliveries.Where(d => d.MgNr == m.MgNr).CountAsync();
+                credits = await ctx.Credits.Where(c => c.MgNr == m.MgNr).CountAsync();
            }
            var d = new DeleteMemberDialog(m.MgNr, m.AdministrativeName, areaComs, deliveries, credits);
            if (d.ShowDialog() == true) {
--- a/Installer/Installer.wixproj
+++ b/Installer/Installer.wixproj
@@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/6">
+<Project Sdk="WixToolset.Sdk/7">
  <PropertyGroup>
    <HarvestFileSuppressUniqueIds>false</HarvestFileSuppressUniqueIds>
    <HarvestFileGenerateGuidsNow>true</HarvestFileGenerateGuidsNow>
@@ -11,6 +11,7 @@
    <BuildProjectReferences>False</BuildProjectReferences>
    <OutputName>Elwig</OutputName>
    <Cultures>de-AT</Cultures>
+    <AcceptEula>wix7</AcceptEula>
  </PropertyGroup>
  <UsingTask TaskName="GetFileVersion" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
    <ParameterGroup>
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ About
 **Product:** Elwig  
 **Description:** Electronic Management for Vintners' Cooperatives  
 **Type:** ERP system  
-**Version:** 1.0.4.1 ([Changelog](./CHANGELOG.md))  
+**Version:** 1.0.5.1 ([Changelog](./CHANGELOG.md))  
 **License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Source code:** https://git.necronda.net/winzer/elwig  
@@ -33,7 +33,7 @@ Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
 **Produkt:** Elwig  
 **Beschreibung:** Elektronische Winzergenossenschaftsverwaltung  
 **Typ:** Warenwirtschaftssystem (ERP-System)  
-**Version:** 1.0.4.1 ([Änderungsprotokoll](./CHANGELOG.md))  
+**Version:** 1.0.5.1 ([Änderungsprotokoll](./CHANGELOG.md))  
 **Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Quellcode:** https://git.necronda.net/winzer/elwig  
--- a/Setup/Setup.wixproj
+++ b/Setup/Setup.wixproj
@@ -1,8 +1,9 @@
-<Project Sdk="WixToolset.Sdk/6">
+<Project Sdk="WixToolset.Sdk/7">
  <PropertyGroup>
    <OutputType>Bundle</OutputType>
    <OutputName>Elwig</OutputName>
    <Cultures>de-AT</Cultures>
+    <AcceptEula>wix7</AcceptEula>
  </PropertyGroup>
  <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild">
    <Exec Command="curl --fail -s -L &quot;https://go.microsoft.com/fwlink/p/?LinkId=2124703&quot; -z &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot; -o &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot;" />
@@ -13,7 +14,7 @@
  </Target>
  <ItemGroup>
    <ProjectReference Include="..\Installer\Installer.wixproj" />
-    <PackageReference Include="WixToolset.Bal.wixext" Version="6.0.2" />
-    <PackageReference Include="WixToolset.Util.wixext" Version="6.0.2" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="7.0.0" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="7.0.0" />
  </ItemGroup>
 </Project>
--- a/Tests/E2ETests/MemberAdminWindowTest.cs
+++ b/Tests/E2ETests/MemberAdminWindowTest.cs
@@ -80,6 +80,7 @@ namespace Tests.E2ETests {

            Window.FindElement(By.WpfId("SaveButton")).Click();

+            Thread.Sleep(500);
            Window.FindElement(By.WpfId("SearchInput")).SendKeys("9999");
            Thread.Sleep(500);
            var memberListRow = Window.FindElement(By.WpfId("MemberList")).FindElement(By.ClassName("DataGridRow"));
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -19,7 +19,7 @@
  </Target>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
    <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
    <PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
    <PackageReference Include="NUnit" Version="4.5.1" />
@@ -28,7 +28,7 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="8.0.1">
+    <PackageReference Include="coverlet.collector" Version="10.0.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/Tests/UnitTests/DocumentTests/CreditNoteTest.cs
+++ b/Tests/UnitTests/DocumentTests/CreditNoteTest.cs
@@ -6,7 +6,7 @@ namespace Tests.UnitTests.DocumentTests {

        [Test]
        public async Task Test_01_VirtualCreditNote() {
-            using var doc = await CreditNote.Initialize(2020, 1, 101);
+            using var doc = await CreditNote.Initialize(2020, 1, 101, null);
            var text = await Utils.GeneratePdfText(doc);
            Assert.Multiple(() => {
                Assert.That(text, Contains.Substring("""
--- a/Tests/UnitTests/DocumentTests/DeliveryConfirmationTest.cs
+++ b/Tests/UnitTests/DocumentTests/DeliveryConfirmationTest.cs
@@ -11,7 +11,7 @@ namespace Tests.UnitTests.DocumentTests {
            using var ctx = new AppDbContext();
            var m = await ctx.FetchMembers(101).SingleAsync();
            var data = await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, 2020, m!);
-            using var doc = new DeliveryConfirmation(2020, m!, data);
+            using var doc = new DeliveryConfirmation(2020, m!, null, data);
            var text = await Utils.GeneratePdfText(doc);
            Assert.Multiple(() => {
                Assert.That(text, Contains.Substring("""
--- a/Tests/fetch-resources.bat
+++ b/Tests/fetch-resources.bat
@@ -1 +1 @@
-curl --fail -s -L "https://elwig.at/files/create.sql?v=38" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
+curl --fail -s -L "https://elwig.at/files/create.sql?v=39" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
Author	SHA1	Message	Date
Lorenz Stechauner	95fabe3633	Bump version to 1.0.5.1 All checks were successful Test / Run tests (push) Successful in 2m25s Details Deploy / Build and Deploy (push) Successful in 2m14s Details	2026-04-20 19:23:01 +02:00
Lorenz Stechauner	7861a15e2e	Test: Update dependencies All checks were successful Test / Run tests (push) Successful in 2m20s Details	2026-04-20 15:12:29 +02:00
Lorenz Stechauner	20fd5d5826	Elwig: Update dependencies	2026-04-20 15:12:29 +02:00
Lorenz Stechauner	2b3c293730	Database: Adapt to changes for examples in WLNS	2026-04-20 15:12:22 +02:00
Lorenz Stechauner	a852dbb242	PaymentVariantSummary: Fix price display when null	2026-04-20 15:05:09 +02:00
Lorenz Stechauner	7edf395497	CreditNote: Fix padding for Rbl.	2026-04-20 14:21:13 +02:00
Lorenz Stechauner	ea2b6db1fc	Billing: Fix modifiers with absolute amounts	2026-04-20 14:20:43 +02:00
Lorenz Stechauner	cf48f005e2	DeliveryAdminWindow: Fix missing LostFocus for gradation inputs All checks were successful Test / Run tests (push) Successful in 2m54s Details	2026-04-08 17:18:40 +02:00
Lorenz Stechauner	4eac8cd629	DeliveryAdminWindow: Fix modifiers for bulk actions	2026-04-08 17:18:08 +02:00
Lorenz Stechauner	360856585a	Bump version to 1.0.5.0 All checks were successful Test / Run tests (push) Successful in 1m54s Details Deploy / Build and Deploy (push) Successful in 2m14s Details	2026-04-08 00:47:15 +02:00
Lorenz Stechauner	cc6e31a006	Installer/Setup: Update to WiX 7	2026-04-08 00:31:00 +02:00
Lorenz Stechauner	ce1a55df86	Tests: Update dependencies All checks were successful Test / Run tests (push) Successful in 2m1s Details	2026-04-07 23:57:52 +02:00
Lorenz Stechauner	07d93dd384	Elwig: Update dependencies	2026-04-07 23:57:40 +02:00
Lorenz Stechauner	f6e9d429d5	[#77 ] Export/ElwigData: Fix import of AreaComContracts All checks were successful Test / Run tests (push) Successful in 2m41s Details	2026-04-07 23:51:32 +02:00
Lorenz Stechauner	7b78f9d6b9	[#79 ] Windows: Fix errors unconvered by E2E tests All checks were successful Test / Run tests (push) Successful in 2m12s Details	2026-04-07 12:34:38 +02:00
Lorenz Stechauner	22fbb0772f	MailWindow: Fix MessageBox and ProgressBar All checks were successful Test / Run tests (push) Successful in 2m11s Details	2026-04-07 12:16:50 +02:00
Lorenz Stechauner	0a9c800116	BusinessDocument: Add DateFrom to be used for ShowDateAndLocation All checks were successful Test / Run tests (push) Successful in 2m0s Details	2026-04-07 12:06:06 +02:00
Lorenz Stechauner	278d79429b	[#79 ] DeliveryAdminWindow: Cache modifiers	2026-04-07 11:15:56 +02:00
Lorenz Stechauner	e5e5e10cd7	ContextWindow: Add HasContextLoaded property	2026-04-07 11:15:34 +02:00
Lorenz Stechauner	d051a2bfcf	[#79 ] AppDbContext: Use compiled queries	2026-04-07 11:15:14 +02:00
Lorenz Stechauner	9c39a2f820	[#79 ] Entities: Remove EF proxies	2026-04-07 11:14:20 +02:00
Lorenz Stechauner	4460de9975	[#77 ] Entities: Add AreaComContract to group area commitments together	2026-04-07 11:13:54 +02:00