Bump version to 1.0.5.5

Elwig: Update dependencies
BillingData: Preserve all settings when using FromGraphEntries()
2026-06-24 14:36:44 +02:00 · 2026-06-24 14:24:25 +02:00 · 2026-06-24 14:24:15 +02:00 · 2026-06-24 13:20:46 +02:00 · 2026-06-24 10:36:28 +02:00 · 2026-06-22 20:23:46 +02:00
26 changed files with 272 additions and 76 deletions
@@ -7,3 +7,4 @@ Tests/Resources/Sql/Create.sql
 *.exe
 !WinziPrint.exe
 *.sqlite3
+*.zip
@@ -2,6 +2,108 @@
 Changelog
 =========

+[v1.0.5.5][v1.0.5.5] (2026-06-24) {#v1.0.5.5}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.5.5-bugfixes}
+
+* Beim Exportieren der Überweisungsdaten (EBICS) im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) kam es zu einem Absturz. (3f65b2350b)
+* Einige Einstellungen einer Auszahlungsvariante wurden vom Auszahlungsvariante-Fenster (`ChartWindow`) beim Speichern überschrieben. (f32ff945ec)
+
+### Sonstiges {#v1.0.5.5-misc}
+
+* Traubengutschriften mit negativem Betrag sind nun wieder möglich. (ba3f66591e)
+* Abhängigkeiten aktualisiert. (4e027a9add)
+
+[v1.0.5.5]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.5
+
+
+
+
+[v1.0.5.4][v1.0.5.4] (2026-06-22) {#v1.0.5.4}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.5.4-bugfixes}
+
+* Seit [v1.0.5.0](#v1.0.5.0) (2026-04-08) war es bei nicht-aktiven Mitgliedern nicht möglich Lieferungen oder Flächenbindungen anzusehen. (d0ce377d92)
+
+### Sonstiges {#v1.0.5.4-misc}
+
+* Bei der Installation wird nun auch der Quellcode mit ausgeliefert. (5db5876905)
+* Abhängigkeiten aktualisiert. (b4ab8349b4, f8b3147c72, 7a993585c3)
+
+[v1.0.5.4]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.4
+
+
+
+
+[v1.0.5.3][v1.0.5.3] (2026-04-29) {#v1.0.5.3}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.5.3-bugfixes}
+
+* Manche Anlieferungsbestätigungen und Traubengutschriften konnten nicht angezeigt werden. Dies lag an einem internen Fehler, der manchmal bei Zu-/Abschlägen auftrat. (72155fc54e, 9dfe71d6d0)
+
+[v1.0.5.3]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.3
+
+
+
+
+[v1.0.5.2][v1.0.5.2] (2026-04-24) {#v1.0.5.2}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.5.2-bugfixes}
+
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) sind Attribut/Bewirtschaftungsart in der Liste für Teil-Lieferungen nicht angezeigt worden. (5c2fae1855)
+
+### Sonstiges {#v1.0.5.2-misc}
+
+* Abhängigkeiten aktualisiert. (2915f08a6b)
+
+[v1.0.5.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.2
+
+
+
+
+[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}
 ---------------------------------------------

@@ -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]
@@ -296,11 +296,14 @@ namespace Elwig.Documents {
                        if (p.QualId == "WEI") varibute.Add(Italic("abgew."));
                        sub.AddCell(NewCell(colspan: 2))
                            .AddCell(NewTd(varibute, colspan: 3).SetPaddingTop(0));
-                    } else if (i - (rows - p.Modifiers.Length) < p.Modifiers.Length) {
-                        sub.AddCell(NewCell(colspan: 2))
-                            .AddCell(NewTd(p.Modifiers[i - (rows - p.Modifiers.Length)], 8, colspan: 3).SetPaddingTop(0).SetPaddingLeftMM(5));
                    } else {
-                        sub.AddCell(NewCell(colspan: 5));
+                        var idx = i - (rows - p.Modifiers.Length);
+                        if (idx >= 0 && idx < p.Modifiers.Length) {
+                            sub.AddCell(NewCell(colspan: 2))
+                                .AddCell(NewTd(p.Modifiers[idx], 8, colspan: 3).SetPaddingTop(0).SetPaddingLeftMM(5));
+                        } else {
+                            sub.AddCell(NewCell(colspan: 5));
+                        }
                    }

                    if (i < p.Buckets.Length) {
@@ -321,7 +324,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)
@@ -114,13 +114,14 @@ namespace Elwig.Documents {
                    } else if (i == 1 && attr) {
                        sub.AddCell(NewCell(colspan: 2))
                            .AddCell(NewTd($"{p.Attribute}{(p.Attribute != null && p.Cultivation != null ? " / " : "")}{p.Cultivation}", 8, colspan: 2)
-                                .SetPaddingsMM(0.125f, 1, 0.125f, 1))
+                                .SetPaddingTop(0))
                            .AddCell(NewCell(colspan: 2));
                    } else {
                        sub.AddCell(NewCell(colspan: 2));
-                        if (i - (rows - p.Modifiers.Length) < p.Modifiers.Length) {
-                            sub.AddCell(NewTd(p.Modifiers[i - (rows - p.Modifiers.Length)], 8, colspan: 2)
-                                .SetPaddingsMM(0.125f, 0, 0.125f, 5));
+                        var idx = i - (rows - p.Modifiers.Length);
+                        if (idx >= 0 && idx < p.Modifiers.Length) {
+                            sub.AddCell(NewTd(p.Modifiers[idx], 8, colspan: 2)
+                                .SetPaddingTop(0).SetPaddingLeftMM(5));
                        } else {
                            sub.AddCell(NewCell(colspan: 2));
                        }
@@ -129,14 +130,15 @@ namespace Elwig.Documents {

                    if (i < p.Buckets.Length) {
                        var bucket = p.Buckets[i];
-                        sub.AddCell(NewTd($"{bucket.Name}:", 8).SetHeight(10).SetPaddingsMM(0.125f, 0, 0.125f, 0));
-                        sub.AddCell(NewTd($"{bucket.Value:N0}", right: true));
+                        var pad = i == 0 ? 0.5f : 0;
+                        sub.AddCell(NewTd($"{bucket.Name}:", 8).SetHeight(10).SetPaddingTopMM(pad));
+                        sub.AddCell(NewTd($"{bucket.Value:N0}", right: true).SetPaddingTopMM(pad));
                    } else {
                        sub.AddCell(NewCell(colspan: 2));
                    }

                    if (i == p.Buckets.Length - 1) {
-                        sub.AddCell(NewTd($"{p.Weight:N0}", right: true));
+                        sub.AddCell(NewTd($"{p.Weight:N0}", right: true).SetPaddingTop(0));
                        sub.AddCell(NewTd(p.IsNetWeight ? "\u2611" : "\u2610", 7, right: true).SetFont(SF).SetPadding(0));
                    } else {
                        sub.AddCell(NewCell(colspan: 2));
@@ -30,7 +30,7 @@ namespace Elwig.Documents {

        public static async Task<MemberDataSheet> Initialize(int mgnr) {
            using var ctx = new AppDbContext();
-            return new MemberDataSheet(await ctx.FetchMembers(mgnr, true, true).SingleAsync());
+            return new MemberDataSheet(await ctx.FetchMembers(mgnr, includeContactInfo: true).SingleAsync());
        }

        protected override async Task LoadData(AppDbContext ctx) {
@@ -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))
@@ -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.5</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.7776" />
+    <PackageReference Include="bblanchon.PDFium.Win32" Version="151.0.7906" />
    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
    <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.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="MailKit" Version="4.17.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4022.49" />
+    <PackageReference Include="NJsonSchema" Version="11.6.1" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.1.59" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
+    <PackageReference Include="System.IO.Hashing" Version="10.0.9" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.9" />
+    <PackageReference Include="System.Management" Version="10.0.9" />
  </ItemGroup>

 </Project>
@@ -338,9 +338,9 @@ namespace Elwig.Helpers {

        public IAsyncEnumerable<Member> FetchMembers(int? mgnr = null, bool includeNotActive = false, bool includeContactInfo = false) {
            if (includeContactInfo) {
-                return _compiledQueryMembersContactInfo.Invoke(this, mgnr, includeNotActive);
+                return _compiledQueryMembersContactInfo.Invoke(this, mgnr, mgnr != null || includeNotActive);
            } else {
-                return _compiledQueryMembers.Invoke(this, mgnr, includeNotActive);
+                return _compiledQueryMembers.Invoke(this, mgnr, mgnr != null || includeNotActive);
            }
        }

@@ -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;

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;

@@ -92,6 +93,14 @@ namespace Elwig.Helpers.Billing {
            Mode = (mode == "elwig") ? CalculationMode.Elwig : CalculationMode.WgMaster;
        }

+        public BillingData() {
+            Data = new JsonObject {
+                ["mode"] = "elwig",
+                ["version"] = 1,
+            };
+            Mode = CalculationMode.Elwig;
+        }
+
        protected static JsonObject ParseJson(string json) {
            if (Schema == null) throw new InvalidOperationException("Schema has to be initialized first");
            try {
@@ -107,6 +116,10 @@ namespace Elwig.Helpers.Billing {
            return new(ParseJson(json));
        }

+        public string ToJsonString(JsonSerializerOptions? options = null) {
+            return Data.ToJsonString(options);
+        }
+
        protected JsonArray GetCurvesEntry() {
            return Data[Mode == CalculationMode.Elwig ? "curves" : "Kurven"]?.AsArray() ?? throw new InvalidOperationException();
        }
@@ -412,7 +425,7 @@ namespace Elwig.Helpers.Billing {
            }
        }

-        public static JsonObject FromGraphEntries(
+        public static BillingData FromGraphEntries(
            IEnumerable<GraphEntry> graphEntries,
            BillingData? origData = null,
            IEnumerable<RawVaribute>? vaributes = null,
@@ -449,37 +462,30 @@ namespace Elwig.Helpers.Billing {
            CollapsePaymentData(payment, payment.DeepClone().AsObject(), vaributes ?? payment.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultPayment);
            CollapsePaymentData(qualityWei, qualityWei.DeepClone().AsObject(), vaributes ?? qualityWei.Select(e => new RawVaribute(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;
+            BillingData data;
+            if (origData != null && origData.Mode == CalculationMode.Elwig) {
+                data = new BillingData((JsonObject)origData.Data.DeepClone());
+            } else {
+                data = new BillingData();
+            }

            if (payment.Count == 0) {
-                data["payment"] = 0;
+                data.Data["payment"] = 0;
            } else if (payment.Count == 1 && payment.First().Key == "default") {
-                data["payment"] = payment.Single().Value?.DeepClone();
+                data.Data["payment"] = payment.Single().Value?.DeepClone();
            } else {
-                data["payment"] = payment;
+                data.Data["payment"] = payment;
            }
            if (qualityWei.Count == 1 && qualityWei.First().Key == "default") {
-                data["quality"] = new JsonObject() {
+                data.Data["quality"] = new JsonObject() {
                    ["WEI"] = qualityWei.Single().Value?.DeepClone()
                };
            } else if (qualityWei.Count >= 1) {
-                data["quality"] = new JsonObject() {
+                data.Data["quality"] = new JsonObject() {
                    ["WEI"] = qualityWei
                };
            }
-            data["curves"] = curves;
+            data.Data["curves"] = curves;

            return data;
        }
@@ -98,7 +98,7 @@ namespace Elwig.Helpers.Billing {
                        LEFT JOIN v_penalty_area_commitments u ON (u.year, u.mgnr) = (s.year, m.mgnr)
                        LEFT JOIN v_auto_business_shares a ON (a.year, a.mgnr) = (s.year, m.mgnr)
                        LEFT JOIN payment_custom x ON (x.year, x.mgnr) = (s.year, m.mgnr)
-                    WHERE s.year = {Year} AND v.avnr = {AvNr} AND p.amount > COALESCE(lp.amount, 0);
+                    WHERE s.year = {Year} AND v.avnr = {AvNr} AND p.amount != COALESCE(lp.amount, 0);
                    """);
            await cnx.ExecuteBatch($"""
                UPDATE payment_variant SET test_variant = FALSE WHERE (year, avnr) = ({Year}, {AvNr});
@@ -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)
@@ -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);
@@ -8,6 +8,7 @@ using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Win32;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
@@ -142,7 +143,7 @@ namespace Elwig.Services {
            });

            var credits = ctx.Credits.Where(c => c.Year == v.Year && c.AvNr == v.AvNr);
-            if (!credits.Any()) {
+            if (!(await credits.AnyAsync())) {
                long lastTotalSum = 0;
                decimal vatSum = 0;
                var currentPayments = await ctx.MemberPayments
@@ -150,8 +151,7 @@ namespace Elwig.Services {
                        .ToDictionaryAsync(p => p.MgNr);
                var lastV = await ctx.PaymentVariants
                    .Where(l => l.Year == v.Year && !l.TestVariant)
-                    .OrderByDescending(l => l.TransferDateString ?? l.DateString)
-                    .ThenByDescending(l => l.AvNr)
+                    .OrderByDescending(l => l.TransferDateString ?? l.DateString).ThenByDescending(l => l.AvNr)
                    .FirstOrDefaultAsync();
                if (lastV != null) {
                    var lastPayments = await ctx.MemberPayments
@@ -160,8 +160,8 @@ namespace Elwig.Services {
                    lastTotalSum = lastPayments.Sum(e => e.Value.AmountValue);
                    foreach (int mgnr in currentPayments.Keys) {
                        var c = currentPayments[mgnr];
-                        var l = lastPayments[mgnr];
-                        vatSum += (c.Amount - l.Amount) * (decimal)(c.Member.IsBuchführend ? v.Season.VatNormal : v.Season.VatFlatrate);
+                        var l = lastPayments.GetValueOrDefault(mgnr);
+                        vatSum += (c.Amount - (l?.Amount ?? 0)) * (decimal)(c.Member.IsBuchführend ? v.Season.VatNormal : v.Season.VatFlatrate);
                    }
                } else {
                    vatSum = currentPayments.Sum(e => e.Value.Amount * (decimal)(e.Value.Member.IsBuchführend ? v.Season.VatNormal : v.Season.VatFlatrate));
@@ -226,7 +226,7 @@ namespace Elwig.Services {

        public static async Task GenerateEbics(int year, int avnr) {
            using var ctx = new AppDbContext();
-            var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
+            var v = await ctx.PaymentVariants.Include(v => v.Credits).Where(v => v.Year == year && v.AvNr == avnr).SingleAsync();

            var withoutIban = v.Credits.Count(c => c.Member.Iban == null);
            if (withoutIban > 0) {
@@ -369,10 +369,42 @@ namespace Elwig.Services {
        }

        public static async Task Commit(int year, int avnr) {
+            List<Member> membersLess = [];
+            using (var ctx = new AppDbContext()) {
+                var lastAvNr = await ctx.PaymentVariants
+                    .Where(v => v.Year == year && !v.TestVariant)
+                    .OrderByDescending(v => v.TransferDateString ?? v.DateString).ThenByDescending(v => v.AvNr)
+                    .Select(v => v.AvNr)
+                    .FirstOrDefaultAsync();
+                if (lastAvNr != 0) {
+                    var cur = await ctx.MemberPayments.Include(p => p.Member).Where(p => p.Year == year && p.AvNr == avnr).ToDictionaryAsync(p => p.Member.MgNr, p => p);
+                    var last = await ctx.MemberPayments.Include(p => p.Member).Where(p => p.Year == year && p.AvNr == lastAvNr).ToDictionaryAsync(p => p.Member.MgNr, p => p);
+                    membersLess = [.. last.Where(p => (cur.TryGetValue(p.Key, out var c) ? c.Amount : 0) < p.Value.Amount).Select(p => p.Value.Member)];
+                }
+            }
+            if (membersLess.Count > 0) {
+                var res = MessageBox.Show($"Achtung: Bei {membersLess.Count:N0} Mitglied(ern) ist der Soll-Betrag der Auszahlung (\"Gesamtbetrag\") kleiner als bei der letzten Auszahlung. Das sollte nicht vorkommen!\n\n" +
+                    $"{string.Join(", ", membersLess.Select(m => $"{m.AdministrativeName} ({m.MgNr})"))}\n\n" +
+                    "Soll trotzdem forgefahren werden?",
+                    "Kleinerer Gesamtbetrag", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+                if (res != MessageBoxResult.OK)
+                    return;
+            }
+
            await Task.Run(async () => {
                var b = await BillingVariant.Create(year, avnr);
                await b.Commit();
            });
+
+            List<Member> membersNeg = [];
+            using (var ctx = new AppDbContext()) {
+                membersNeg = await ctx.Credits.Where(c => c.Year == year && c.AvNr == avnr && c.AmountValue < 0).Select(c => c.Member).ToListAsync();
+            }
+            if (membersNeg.Count > 0) {
+                var res = MessageBox.Show($"Achtung: Bei {membersNeg.Count:N0} Mitglied(ern) ist der Auszahlungsbetrag negativ!\n\n" +
+                    $"{string.Join(", ", membersNeg.Select(m => $"{m.AdministrativeName} ({m.MgNr})"))}",
+                    "Negativer Auszahlungsbetrag", MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
        }

        public static async Task Revert(int year, int avnr) {
@@ -15,7 +15,7 @@
            <Bold>Website:</Bold> <Hyperlink NavigateUri="https://elwig.at/" RequestNavigate="Hyperlink_RequestNavigate">https://elwig.at/</Hyperlink><LineBreak/>
            <Bold>Entwickler:</Bold> Lorenz Stechauner, Thomas Hilscher<LineBreak/>
            <Bold>Kontakt:</Bold> <Hyperlink NavigateUri="mailto:lorenz.stechauner@necronda.net" RequestNavigate="Hyperlink_RequestNavigate">lorenz.stechauner@necronda.net</Hyperlink>, <Hyperlink NavigateUri="mailto:thomas.hilscher@gmail.com" RequestNavigate="Hyperlink_RequestNavigate">thomas.hilscher@gmail.com</Hyperlink><LineBreak/>
-            <Bold>Quellcode:</Bold> <Hyperlink NavigateUri="https://git.necronda.net/winzer/elwig" RequestNavigate="Hyperlink_RequestNavigate">https://git.necronda.net/winzer/elwig</Hyperlink><LineBreak/>
+            <Bold>Quellcode:</Bold> <Hyperlink NavigateUri="C:\Program Files\Elwig\src" RequestNavigate="Hyperlink_RequestNavigate_Explorer">C:\Program Files\Elwig\src</Hyperlink>, <Hyperlink NavigateUri="https://git.necronda.net/winzer/elwig" RequestNavigate="Hyperlink_RequestNavigate">https://git.necronda.net/winzer/elwig</Hyperlink><LineBreak/>
            <Bold>Entwicklungszeitraum:</Bold> 2022–2026<LineBreak/>
            <LineBreak/>
            <Bold>Verwendete Technologien:</Bold><LineBreak/>
@@ -11,7 +11,15 @@ namespace Elwig.Windows {
        }

        private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e) {
-            Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri) { UseShellExecute = true });
+            try {
+                Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri) { UseShellExecute = true });
+            } catch { }
+        }
+
+        private void Hyperlink_RequestNavigate_Explorer(object sender, RequestNavigateEventArgs e) {
+            try {
+                Process.Start("explorer.exe", e.Uri.AbsoluteUri);
+            } catch { }
        }
    }
 }
@@ -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"/>
@@ -431,6 +431,8 @@ namespace Elwig.Windows {
                var deliveries = await deliveryQuery
                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers).ThenInclude(m => m.Modifier)
                    .Include(d => d.Parts).ThenInclude(p => p.Variety)
+                    .Include(d => d.Parts).ThenInclude(p => p.Attribute)
+                    .Include(d => d.Parts).ThenInclude(p => p.Cultivation)
                    .IgnoreAutoIncludes()
                    .AsSplitQuery()
                    .ToListAsync();
@@ -527,7 +529,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,
                };
@@ -0,0 +1,17 @@
+
+Elwig
+=====
+
+Source code
+C:\Program Files\Elwig\src\
+https://git.necronda.net/winzer/elwig
+
+Installation folder
+C:\Program Files\Elwig\
+
+Data and configuration folder
+C:\ProgramData\Elwig\
+- config.ini       : main configuration file
+- database.sqlite3 : stores all data
+- imported.txt     : list of all imported *.elwig.zip files to not automatically import them again
+- mails\           : sent/outgoing email log
@@ -3,7 +3,9 @@
  <Fragment>
    <!-- C:\Program Files (x86)\Elwig or C:\Program Files\Elwig -->
    <StandardDirectory Id="ProgramFiles64Folder">
-      <Directory Id="InstallFolder" Name="!(bind.Property.ProductName)" />
+      <Directory Id="InstallFolder" Name="!(bind.Property.ProductName)">
+        <Directory Id="SourceFolder" Name="src"/>
+      </Directory>
    </StandardDirectory>

    <!-- C:\ProgramData\Elwig -->
@@ -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>
@@ -33,7 +34,11 @@
      <DefineConstants>ProductVersion=$(ElwigFileVersion);BuildPath=..\Elwig\bin\Publish;ElwigProjectDir=..\Elwig</DefineConstants>
    </PropertyGroup>
  </Target>
+  <Target Name="CreateSourceArchive" BeforeTargets="BeforeBuild">
+    <Exec Command="git -C .. archive -o $(ProjectDir)\Files\elwig.zip HEAD" />
+  </Target>
  <ItemGroup>
    <None Include="Files\config.ini" />
+    <None Include="Files\README.txt" />
  </ItemGroup>
 </Project>
@@ -4,9 +4,15 @@
      <Component Directory="InstallFolder">
        <File Source="$(var.ElwigProjectDir)\bin\Publish\Elwig.exe" Id="Elwig.exe"/>
      </Component>
+      <Component Directory="SourceFolder">
+        <File Source="$(ProjectDir)\Files\elwig.zip" Id="elwig.zip"/>
+      </Component>
      <Component Directory="ConfigFolder" Permanent="true" NeverOverwrite="true">
        <File Source="$(ProjectDir)\Files\config.ini" Id="config.ini"/>
      </Component>
+      <Component Directory="ConfigFolder">
+        <File Source="$(ProjectDir)\Files\README.txt" Id="README.txt"/>
+      </Component>
    </ComponentGroup>
  </Fragment>
 </Wix>
@@ -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.5 ([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.5 ([Änderungsprotokoll](./CHANGELOG.md))  
 **Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Quellcode:** https://git.necronda.net/winzer/elwig  
@@ -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>
@@ -19,16 +19,16 @@
  </Target>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
    <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
    <PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
-    <PackageReference Include="NUnit" Version="4.5.1" />
+    <PackageReference Include="NUnit" Version="4.6.1" />
    <PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.12.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.14.0">
      <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.1">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
@@ -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	5cbad9a195	Bump version to 1.0.5.5 Test / Run tests (push) Successful in 6m43s Details Deploy / Build and Deploy (push) Successful in 2m10s Details	2026-06-24 14:36:44 +02:00
lorenz.stechauner	4e027a9add	Elwig: Update dependencies Test / Run tests (push) Successful in 4m40s Details	2026-06-24 14:24:25 +02:00
lorenz.stechauner	f32ff945ec	BillingData: Preserve all settings when using FromGraphEntries()	2026-06-24 14:24:15 +02:00
lorenz.stechauner	ba3f66591e	BilllingVariant: Allow for credits with negative value	2026-06-24 13:20:46 +02:00
lorenz.stechauner	3f65b2350b	PaymentVariantService: Fix crash in GenerateEbics() Test / Run tests (push) Successful in 2m48s Details	2026-06-24 10:36:28 +02:00
lorenz.stechauner	7a6a77419b	Bump version to 1.0.5.4 Test / Run tests (push) Successful in 2m17s Details Deploy / Build and Deploy (push) Successful in 2m6s Details	2026-06-22 20:23:46 +02:00
lorenz.stechauner	7a993585c3	Elwig: Update dependencies Test / Run tests (push) Successful in 2m3s Details	2026-06-22 20:08:18 +02:00
lorenz.stechauner	d0ce377d92	AppDbContext: Fix FetchMembers when using for specific MgNr Test / Run tests (push) Successful in 2m59s Details	2026-06-22 20:06:34 +02:00
lorenz.stechauner	f8b3147c72	Tests: Update dependencies Test / Run tests (push) Successful in 2m52s Details	2026-06-18 12:25:22 +02:00
lorenz.stechauner	b4ab8349b4	Elwig: Update dependencies	2026-06-18 12:25:09 +02:00
lorenz.stechauner	5db5876905	Installer: Bundle and ship source code together with binaries Test / Run tests (push) Successful in 3m14s Details	2026-05-01 15:10:19 +02:00
lorenz.stechauner	0617726139	Bump version to 1.0.5.3 Test / Run tests (push) Successful in 2m7s Details Deploy / Build and Deploy (push) Successful in 2m13s Details	2026-04-29 11:42:05 +02:00
lorenz.stechauner	9dfe71d6d0	DeliveryConfirmation: Adapt spacing between rows to CreditNote Test / Run tests (push) Successful in 2m52s Details	2026-04-29 11:37:09 +02:00
lorenz.stechauner	72155fc54e	Documents: Fix error because of modifiers in CreditNote and DeliveryConfirmation	2026-04-29 11:29:16 +02:00
lorenz.stechauner	61bdb2f3b5	Bump version to 1.0.5.2 Test / Run tests (push) Successful in 2m15s Details Deploy / Build and Deploy (push) Successful in 2m0s Details	2026-04-24 10:27:37 +02:00
lorenz.stechauner	2915f08a6b	Elwig: Update dependencies Test / Run tests (push) Successful in 3m7s Details	2026-04-24 09:49:06 +02:00
lorenz.stechauner	5c2fae1855	DeliveryAdminWindow: Fix attributes and cultivations in DeliveryPartList	2026-04-24 09:48:14 +02:00
lorenz.stechauner	95fabe3633	Bump version to 1.0.5.1 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 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 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 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