Printing: Replace WinziPrint with iText

2026-02-18 23:02:18 +01:00
20 changed files with 72 additions and 175 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,33 +2,6 @@
 Changelog
 =========

-[v1.0.3.4][v1.0.3.4] (2026-02-19) {#v1.0.3.4}
---------------------------------------------
-
-### Neue Funktionen {#v1.0.3.4-features}
-
-* Bei Anlieferungsbestätigungen (`DeliveryConfirmation`) wird nun auch die Summe aller abgewerteten Lieferungen angeführt. (9e5f709d42)
-* Bei der Auszahlung werden Traubengutschriften (`CreditNote`) nur noch für Mitglieder erstellt, die einen positiven Betrag ausgezahlt bekommen. (432c511b85)
-
-### Behobene Fehler {#v1.0.3.4-bugfixes}
-
-* Im Haupt-Fenster (`MainWindow`) wurde der Tooltip für den Knopf _Sorten-/Qual.aufschlüssel_ korrigiert. (2c0b000073)
-* Falsch gesetzte `xtime` und `mtime` bei Lieferungen korrigiert. (23db4de1ee)
-* Beim Import von Lieferungen ohne `kgnr` tritt nun kein Fehler auf. (6818491ae3)
-* Beim Abfragen von neuen Daten zum Synchronisieren werden alle Fehler abgefangen. (a47904cf0b)
-
-### Sonstiges {#v1.0.3.4-misc}
-
-* Pdfium wird nun direkt importiert (anstatt über PdfiumViewer). (4cd7ef85a1)
-* Auszahlungsvarianten von vergangenen Saisons sind nun nicht mehr für eine Bearbeitung gesperrt. (7e22759c33)
-* Im Rundschreiben-Fenster (`MailWindow`) ist es nun möglich Dokumente durch Doppelklick an-/abzuwählen. (6f081811c4)
-* Abhängigkeiten aktualisiert. (19c3322ef2, 0e2b004b0d)
-
-[v1.0.3.4]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.3.4
-
-
-
-
 [v1.0.3.3][v1.0.3.3] (2026-02-05) {#v1.0.3.3}
 ---------------------------------------------

@@ -330,7 +303,7 @@ Changelog
 * Bei Traubengutschriften (`CreditNote`) wurde der Rebelzuschlag immer angeführt, auch wenn dieser in der zugrundeliegenden Berechnung nicht berücksichtigt wurde. (336aef5c70)
 * In den Variantendaten einer Auszahlungsvariante (`PaymentVariantSummary`) wurde neben den Spalten _gebunden_ und _ungebunden_ noch _attributlos gebunden_ hinzugefügt. Ohne diese neue Spalte wären die Werte der anderen beiden falsch. ([#58][i58])
 * Das erste Laden des Ausgangs-Protokoll-Fensters (`MailLogWindow`) hat nicht funktioniert. ([#65][i65])
-* Im Lieferungen-Fenster (`DeliveryAdminWindow`) und im Mitglieder-Fenster (`MemberAdminWindow`) wird der Tooltip für Gewicht/Gradation mit korrektem Layout angezeigt. (e9f389b885)
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) und im Mitglieder-Fenster (`MemberAdminWindow`) wird der Tool-Tip für Gewicht/Gradation mit korrektem Layout angezeigt. (e9f389b885)
 * Bei Traubengutschriften (`CreditNote`) werden längere Freitexte vollständig angezeigt statt abgeschnitten. ([#62][i62])

 ### Sonstiges {#v1.0.0.0-misc}
--- a/Elwig/Documents/DeliveryConfirmation.cshtml
+++ b/Elwig/Documents/DeliveryConfirmation.cshtml
@@ -100,12 +100,6 @@
                <td></td>
                <td></td>
            </tr>
-            <tr>
-                <td colspan="8">Davon abgewertet:</td>
-                <td colspan="2" class="number">@($"{Model.Data.Rows.Where(p => p.IsDepreciated).Sum(p => p.Weight):N0}")</td>
-                <td></td>
-                <td></td>
-            </tr>
        </tbody>
    </table>
    @Raw(BusinessDocument.PrintSortenaufteilung(Model.MemberStats))
--- 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.3.4</Version>
+    <Version>1.0.3.3</Version>
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -28,20 +28,20 @@
    <PackageReference Include="itext" Version="9.5.0" />
    <PackageReference Include="itext.bouncy-castle-adapter" Version="9.5.0" />
    <PackageReference Include="itext.pdfhtml" Version="6.3.1" />
-    <PackageReference Include="LinqKit" Version="1.3.11" />
-    <PackageReference Include="MailKit" Version="4.15.0" />
+    <PackageReference Include="LinqKit" Version="1.3.9" />
+    <PackageReference Include="MailKit" Version="4.14.1" />
    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.3" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3800.47" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.2" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3650.58" />
    <PackageReference Include="NJsonSchema" Version="11.5.2" />
    <PackageReference Include="RazorLight" Version="2.3.1" />
    <PackageReference Include="ScottPlot.WPF" Version="5.1.57" />
    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
-    <PackageReference Include="System.IO.Hashing" Version="10.0.3" />
-    <PackageReference Include="System.IO.Ports" Version="10.0.3" />
-    <PackageReference Include="System.Management" Version="10.0.3" />
+    <PackageReference Include="System.IO.Hashing" Version="10.0.2" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.2" />
+    <PackageReference Include="System.Management" Version="10.0.2" />
  </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 = 37;
+        public static readonly int RequiredSchemaVersion = 36;

        private static int VersionOffset = 0;

--- a/Elwig/Helpers/Billing/BillingVariant.cs
+++ b/Elwig/Helpers/Billing/BillingVariant.cs
@@ -80,7 +80,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};
                    """);
            await cnx.ExecuteBatch($"""
                UPDATE payment_variant SET test_variant = FALSE WHERE (year, avnr) = ({Year}, {AvNr});
--- a/Elwig/Helpers/Export/ElwigData.cs
+++ b/Elwig/Helpers/Export/ElwigData.cs
@@ -783,15 +783,15 @@ namespace Elwig.Helpers.Export {
                Comment = json["comment"]?.AsValue().GetValue<string>(),
                ImportedAt = DateTime.Now,
            }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => {
-                var kgnr = p["kgnr"]?.AsValue().GetValue<int>();
+                var kgnr = p["kgnr"]!.AsValue().GetValue<int>();
                var ried = p["ried"]?.AsValue().GetValue<string>();
                WbRd? rd = null;
-                if (ried != null && kgnr != null) {
-                    var rde = riede.GetValueOrDefault(kgnr.Value, []);
+                if (ried != null) {
+                    var rde = riede.GetValueOrDefault(kgnr, []);
                    rd = rde.FirstOrDefault(r => r.Name == ried);
                    if (rd == null) {
                        rd = new WbRd {
-                            KgNr = kgnr.Value,
+                            KgNr = kgnr,
                            RdNr = (rde.Count == 0 ? 1 : rde.Max(r => r.RdNr)) + 1,
                            Name = ried,
                        };
--- a/Elwig/Helpers/Weighing/GassnerScale.cs
+++ b/Elwig/Helpers/Weighing/GassnerScale.cs
@@ -53,16 +53,9 @@ namespace Elwig.Helpers.Weighing {
            return line[1..^1];
        }

-        protected async Task<WeighingResult> Weigh(bool incIdentNr, bool retry = true) {
-            string record;
-            try {
-                await SendCommand(incIdentNr ? '\x05' : '?');
-                record = await ReceiveResponse();
-            } catch (IOException) {
-                if (!retry || Tcp == null) throw;
-                ReconnectTcp();
-                return await Weigh(incIdentNr, false);
-            }
+        protected async Task<WeighingResult> Weigh(bool incIdentNr) {
+            await SendCommand(incIdentNr ? '\x05' : '?');
+            string record = await ReceiveResponse();
            if (record.Length != 45)
                throw new FormatException("Invalid response from scale: Received record has invalid size");
            var line = record[2..];
--- a/Elwig/Helpers/Weighing/Scale.cs
+++ b/Elwig/Helpers/Weighing/Scale.cs
@@ -10,7 +10,6 @@ namespace Elwig.Helpers.Weighing {

        protected enum Output { RTS, DTR, OUT1, OUT2 };

-        protected readonly string Connection;
        protected SerialPort? Serial = null;
        protected SerialPort? ControlSerialEmpty = null, ControlSerialFilling = null;
        protected TcpClient? Tcp = null;
@@ -38,7 +37,6 @@ namespace Elwig.Helpers.Weighing {
        }

        protected Scale(string cnx, string? empty, string? filling, int? limit, string? log, bool softFail = false, bool failSilent = false) {
-            Connection = cnx;
            if (cnx.StartsWith("serial:")) {
                try {
                    Serial = Utils.OpenSerialConnection(cnx);
@@ -97,14 +95,6 @@ namespace Elwig.Helpers.Weighing {
            GC.SuppressFinalize(this);
        }

-        protected void ReconnectTcp() {
-            if (Connection.StartsWith("tcp:")) {
-                Tcp = Utils.OpenTcpConnection(Connection);
-                Stream = Tcp.GetStream();
-                Reader = new(Stream, Encoding.ASCII, false, 512);
-            }
-        }
-
        protected static Output? ConvertOutput(string? value) {
            return value switch {
                null => null,
--- a/Elwig/Helpers/Weighing/SysTecITScale.cs
+++ b/Elwig/Helpers/Weighing/SysTecITScale.cs
@@ -33,9 +33,7 @@ namespace Elwig.Helpers.Weighing {
        protected async Task<string> ReceiveResponse() {
            var line = await Reader.ReadUntilAsync("\r\n");
            if (LogPath != null) await File.AppendAllTextAsync(LogPath, line);
-            if (line == null) {
-                throw new IOException("Verbindung zu Waage verloren");
-            } else if (line.Length < 4 || !line.StartsWith('<') || !line.EndsWith(">\r\n")) {
+            if (line == null || line.Length < 4 || !line.StartsWith('<') || !line.EndsWith(">\r\n")) {
                throw new FormatException("Invalid response from scale");
            }

@@ -74,16 +72,9 @@ namespace Elwig.Helpers.Weighing {
            return line[1..^3];
        }

-        protected async Task<WeighingResult> Weigh(bool incIdentNr, bool retry = true) {
-            string record;
-            try {
-                await SendCommand(incIdentNr ? $"RN{InternalScaleNr}" : $"RM{InternalScaleNr}");
-                record = await ReceiveResponse();
-            } catch (IOException) {
-                if (!retry || Tcp == null) throw;
-                ReconnectTcp();
-                return await Weigh(incIdentNr, false);
-            }
+        protected async Task<WeighingResult> Weigh(bool incIdentNr) {
+            await SendCommand(incIdentNr ? $"RN{InternalScaleNr}" : $"RM{InternalScaleNr}");
+            string record = await ReceiveResponse();
            if (record.Length != 62)
                throw new FormatException("Invalid response from scale: Received record has invalid size");
            var line = record[2..];
--- a/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs
+++ b/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs
@@ -75,7 +75,6 @@ namespace Elwig.Models.Dtos {
        public string? Attribute;
        public string? Cultivation;
        public string QualityLevel;
-        public bool IsDepreciated;
        public (double Oe, double Kmw) Gradation;
        public string[] Modifiers;
        public int Weight;
@@ -90,15 +89,17 @@ namespace Elwig.Models.Dtos {
            Attribute = p.Attribute?.Name;
            Cultivation = p.Cultivation?.Name;
            QualityLevel = p.Quality.Name;
-            IsDepreciated = p.QualId == "WEI";
            Gradation = (p.Oe, p.Kmw);
-            Modifiers = [.. p.Modifiers.Select(m => m.Name)];
+            Modifiers = p.Modifiers
+                .Select(m => m.Name)
+                .ToArray();
            Weight = p.Weight;
            IsNetWeight = p.IsNetWeight;
-            Buckets = [.. p.Buckets
+            Buckets = p.Buckets
                .Where(b => b.Value > 0)
                .OrderByDescending(b => b.BktNr)
-                .Select(b => (b.Discr == "_" ? "ungeb." : $"geb. {p.SortId}{b.Discr}", b.Value))];
+                .Select(b => (b.Discr == "_" ? "ungeb." : $"geb. {p.SortId}{b.Discr}", b.Value))
+                .ToArray();
        }
    }
 }
--- a/Elwig/Resources/Sql/34-35.sql
+++ b/Elwig/Resources/Sql/34-35.sql
@@ -1,8 +1,6 @@
 -- schema version 34 to 35

-UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
 ALTER TABLE delivery_part ADD COLUMN unloading TEXT DEFAULT NULL;
 UPDATE delivery_part SET unloading = 'pumped' WHERE lesewagen;
 UPDATE delivery_part SET unloading = 'box' WHERE (SELECT zwstid IN ('H','S') FROM delivery d WHERE (d.year, d.did) = (delivery_part.year, delivery_part.did));
 ALTER TABLE delivery_part DROP COLUMN lesewagen;
-UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';
--- a/Elwig/Resources/Sql/36-37.sql
+++ b/Elwig/Resources/Sql/36-37.sql
@@ -1,12 +0,0 @@
-- schema version 36 to 37
-
-UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
-
-- fix old deliveries
-UPDATE delivery         SET xtime = NULL, mtime = ctime WHERE year <= 2022 AND mtime >= 1768521600 AND mtime < 1772323200;
-UPDATE delivery_part    SET xtime = NULL, mtime = ctime WHERE year <= 2022 AND mtime >= 1768521600 AND mtime < 1772323200;
-- clear xtime at one laptop to force updates from this one
-UPDATE delivery         SET xtime = NULL WHERE year >= 2023 AND xtime >= 1771200000 AND xtime < 1771286400;
-UPDATE delivery_part    SET xtime = NULL WHERE year >= 2023 AND xtime >= 1771200000 AND xtime < 1771286400;
-
-UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';
--- a/Elwig/Services/SyncService.cs
+++ b/Elwig/Services/SyncService.cs
@@ -271,11 +271,7 @@ namespace Elwig.Services {
        }

        public static async Task<bool> ChangesAvailable(AppDbContext ctx, string url, string username, string password) {
-            try {
-                return await ctx.Members.AnyAsync(ChangedMembers) || await ctx.Deliveries.AnyAsync(ChangedDeliveries) || (Utils.HasInternetConnectivity() && (await GetFilesToImport(url, username, password)).Count > 0);
-            } catch {
-                return false;
-            }
+            return await ctx.Members.AnyAsync(ChangedMembers) || await ctx.Deliveries.AnyAsync(ChangedDeliveries) || (Utils.HasInternetConnectivity() && (await GetFilesToImport(url, username, password)).Count > 0);
        }
    }
 }
--- a/Elwig/ViewModels/PaymentVariantsViewModel.cs
+++ b/Elwig/ViewModels/PaymentVariantsViewModel.cs
@@ -14,7 +14,7 @@ namespace Elwig.ViewModels {
        private IEnumerable<PaymentVar> _paymentVariants = [];

        public BillingData? BillingData;
-        public bool SeasonLocked = false;  // never locked
+        public bool SeasonLocked;
        public bool WeightModifierChanged;

        [ObservableProperty]
--- a/Elwig/Windows/MailWindow.xaml
+++ b/Elwig/Windows/MailWindow.xaml
@@ -69,7 +69,7 @@
                               Grid.Column="0" Margin="10,8,10,10"/>
                        <ListBox x:Name="AvaiableDocumentsList"
                                 Grid.Column="0" Margin="10,30,10,10"
-                                 SelectionChanged="AvaiableDocumentsList_SelectionChanged" MouseDoubleClick="AvaiableDocumentsList_MouseDoubleClick"/>
+                                 SelectionChanged="AvaiableDocumentsList_SelectionChanged"/>

                        <Button x:Name="DocumentAddButton" Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="14"
                                Grid.Column="1" Margin="0,0,0,30" VerticalAlignment="Center" Height="25" IsEnabled="False"
@@ -82,7 +82,7 @@
                               Grid.Column="2" Margin="10,8,10,10"/>
                        <ListBox x:Name="SelectedDocumentsList" DisplayMemberPath="Name"
                                 Grid.Column="2" Margin="10,30,10,37"
-                                 SelectionChanged="SelectedDocumentsList_SelectionChanged" MouseDoubleClick="SelectedDocumentsList_MouseDoubleClick">
+                                 SelectionChanged="SelectedDocumentsList_SelectionChanged">
                            <ListBox.InputBindings>
                                <KeyBinding Key="Delete" Command="{Binding Path=DeleteCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>
                            </ListBox.InputBindings>
@@ -138,61 +138,58 @@
                            <RadioButton GroupName="Recipients" x:Name="RecipientsNonDeliveryMembersInput" Content="Nicht-Lieferanten der Saison"
                                         Margin="10,90,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                         Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                            <RadioButton GroupName="Recipients" x:Name="RecipientsCreditMembersInput" Content="Empfänger von Gutschriften"
+                            <RadioButton GroupName="Recipients" x:Name="RecipientsCustomInput" Content="Benutzerdefiniert"
                                         Margin="10,110,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                         Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                            <RadioButton GroupName="Recipients" x:Name="RecipientsCustomInput" Content="Benutzerdefiniert"
-                                         Margin="10,130,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                                         Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>

-                            <Label Content="Zwst.:" x:Name="MemberBranchLabel" Margin="10,160,0,10"/>
+                            <Label Content="Zwst.:" x:Name="MemberBranchLabel" Margin="10,140,0,10"/>
                            <ctrl:CheckComboBox x:Name="MemberBranchInput" AllItemsSelectedContent="Alle Stammzweigstellen" Delimiter=", " DisplayMemberPath="Name"
-                                                Margin="50,160,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                Margin="50,140,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                                SelectionChanged="MemberInput_SelectionChanged"/>

-                            <Label Content="Gem.:" x:Name="MemberKgLabel" Margin="10,190,0,10"/>
+                            <Label Content="Gem.:" x:Name="MemberKgLabel" Margin="10,170,0,10"/>
                            <ctrl:CheckComboBox x:Name="MemberKgInput" AllItemsSelectedContent="Alle Stammgemeinden" Delimiter=", " DisplayMemberPath="Name"
                                                IsSelectAllActive="True" SelectAllContent="Alle Stammgemeinden"
-                                                Margin="50,190,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                Margin="50,170,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                                SelectionChanged="MemberInput_SelectionChanged"/>

-                            <Label Content="Bio-Betrieb:" x:Name="MemberOrganicLabel" Margin="10,220,0,10"/>
+                            <Label Content="Bio-Betrieb:" x:Name="MemberOrganicLabel" Margin="10,200,0,10"/>
                            <RadioButton x:Name="MemberOrganicYesInput" Content="Ja" GroupName="MemberOrganic"
-                                         Margin="80,225,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Margin="80,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                         Checked="MemberInput_Checked"/>
                            <RadioButton x:Name="MemberOrganicNoInput" Content="Nein" GroupName="MemberOrganic"
-                                         Margin="125,225,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Margin="125,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                         Checked="MemberInput_Checked"/>
                            <RadioButton x:Name="MemberOrganicIndifferentInput" Content="Egal" GroupName="MemberOrganic"
-                                         Margin="180,225,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Margin="180,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                         Checked="MemberInput_Checked"/>

-                            <Label Content="Funktionär:" x:Name="MemberFunktionärLabel" Margin="10,250,0,10"/>
+                            <Label Content="Funktionär:" x:Name="MemberFunktionärLabel" Margin="10,230,0,10"/>
                            <RadioButton x:Name="MemberFunktionärYesInput" Content="Ja" GroupName="MemberFunktionär"
-                                         Margin="80,255,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Margin="80,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                         Checked="MemberInput_Checked"/>
                            <RadioButton x:Name="MemberFunktionärNoInput" Content="Nein" GroupName="MemberFunktionär"
-                                         Margin="125,255,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Margin="125,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                         Checked="MemberInput_Checked"/>
                            <RadioButton x:Name="MemberFunktionärIndifferentInput" Content="Egal" GroupName="MemberFunktionär"
-                                         Margin="180,255,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Margin="180,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                         Checked="MemberInput_Checked"/>

-                            <Label Content="Vtrg.:" x:Name="MemberAreaComLabel" Margin="10,280,0,10"/>
+                            <Label Content="Vtrg.:" x:Name="MemberAreaComLabel" Margin="10,260,0,10"/>
                            <ctrl:CheckComboBox x:Name="MemberAreaComInput" AllItemsSelectedContent="Alle Vertragsarten" Delimiter=", " DisplayMemberPath="VtrgId"
                                                IsSelectAllActive="True" SelectAllContent="Alle Vertragsarten"
-                                                Margin="50,280,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                Margin="50,260,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                                SelectionChanged="MemberInput_SelectionChanged"/>

-                            <Label Content="Tag:" x:Name="MemberDeliveryAncmtLabel" Margin="10,280,0,10"/>
+                            <Label Content="Tag:" x:Name="MemberDeliveryAncmtLabel" Margin="10,260,0,10"/>
                            <ctrl:CheckComboBox x:Name="MemberDeliveryAncmtInput" AllItemsSelectedContent="Alle Lesepläne" Delimiter=", " DisplayMemberPath="Identifier"
                                                IsSelectAllActive="True" SelectAllContent="Alle Lesepläne"
-                                                Margin="50,280,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                Margin="50,260,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                                SelectionChanged="MemberInput_SelectionChanged"/>

                            <ctrl:CheckComboBox x:Name="MemberCustomInput" AllItemsSelectedContent="Alle Mitglieder" Delimiter=", " DisplayMemberPath="AdministrativeName"
                                                IsSelectAllActive="True" SelectAllContent="Alle Mitglieder"
-                                                Margin="10,160,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                Margin="10,140,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                                SelectionChanged="MemberInput_SelectionChanged"/>
                        </Grid>
                    </GroupBox>
--- a/Elwig/Windows/MailWindow.xaml.cs
+++ b/Elwig/Windows/MailWindow.xaml.cs
@@ -333,35 +333,7 @@ namespace Elwig.Windows {
            }
        }

-        private void AvaiableDocumentsList_MouseDoubleClick(object sender, MouseEventArgs evt) {
-            if (evt.LeftButton != MouseButtonState.Pressed) return;
-            var src = evt.OriginalSource;
-            if (src is Border b) {
-                src = (b.Child as ContentPresenter)?.Content.ToString();
-            } else if (src is TextBlock t) {
-                src = t.Text;
-            } else {
-                return;
-            }
-            AvaiableDocumentsList.SelectedIndex = AvaiableDocumentsList.ItemsSource.Cast<object?>().ToList().IndexOf(src);
-            DocumentAddButton_Click(sender, null);
-        }
-
-        private void SelectedDocumentsList_MouseDoubleClick(object sender, MouseEventArgs evt) {
-            if (evt.LeftButton != MouseButtonState.Pressed) return;
-            var src = evt.OriginalSource;
-            if (src is Border b) {
-                src = (b.Child as ContentPresenter)?.Content.ToString();
-            } else if (src is TextBlock t) {
-                src = t.Text;
-            } else {
-                return;
-            }
-            SelectedDocumentsList.SelectedItem = SelectedDocs.FirstOrDefault(d => d.Name == (string?)src);
-            DocumentRemoveButton_Click(sender, null);
-        }
-
-        private async void DocumentAddButton_Click(object sender, RoutedEventArgs? evt) {
+        private async void DocumentAddButton_Click(object sender, RoutedEventArgs evt) {
            var idx = AvaiableDocumentsList.SelectedIndex;
            using var ctx = new AppDbContext();
            if (AvaiableDocumentsList.SelectedItem is not string s)
@@ -375,13 +347,13 @@ namespace Elwig.Windows {
                var name = s.Split(" – ")[^1];
                var pv = await ctx.PaymentVariants.SingleAsync(v => v.Year == Year && v.Name == name)!;
                SelectedDocs.Add(new(DocType.CreditNote, s, (pv.Year, pv.AvNr)));
-                RecipientsCreditMembersInput.IsChecked = true;
+                RecipientsDeliveryMembersInput.IsChecked = true;
            }
            SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
            await UpdateRecipients(ctx);
        }

-        private async void DocumentRemoveButton_Click(object sender, RoutedEventArgs? evt) {
+        private async void DocumentRemoveButton_Click(object sender, RoutedEventArgs evt) {
            DeleteCommand.Execute(null);
            using var ctx = new AppDbContext();
            await UpdateRecipients(ctx);
@@ -482,11 +454,8 @@ namespace Elwig.Windows {
                    query = query.Where(m => m.Deliveries.Any(d => d.Year == Year));
                } else if (RecipientsNonDeliveryMembersInput.IsChecked == true) {
                    query = query.Where(m => m.IsActive && !m.Deliveries.Any(d => d.Year == Year));
-                } else if (RecipientsActiveMembersInput.IsChecked == true && SelectedDocs.Any(d => d.Type == DocType.DeliveryConfirmation || d.Type == DocType.CreditNote)) {
+                } else if  (RecipientsActiveMembersInput.IsChecked == true && SelectedDocs.Any(d => d.Type == DocType.DeliveryConfirmation || d.Type == DocType.CreditNote)) {
                    query = query.Where(m => m.IsActive || m.Deliveries.Any(d => d.Year == Year));
-                } else if (RecipientsCreditMembersInput.IsChecked == true) {
-                    var avnrs = SelectedDocs.Where(d => d.Type == DocType.CreditNote).Select(d => (((int,int)?)d.Details)?.Item2).ToList();
-                    query = query.Where(m => m.Credits.Any(c => c.Year == Year && avnrs.Contains(c.AvNr)));
                } else {
                    query = query.Where(m => m.IsActive);
                }
@@ -787,7 +756,7 @@ namespace Elwig.Windows {

            var hasPreviewDocs = memberDocs.Any(m => m.Docs.Any(d => d.Doc.IsPreview));
            if (hasPreviewDocs) {
-                var res = MessageBox.Show("Einige der ausgewählten Dokumente sind nur als vorläufig zu betrachten und können daher nicht verschickt/ausgedruckt werden!\n\nDies könnte an einer noch nicht festgesetzen Auszahlungsvariante liegen oder daran, dass nicht alle Adressaten/Empfänger eine Traubengutschrift erhalten\n(\"Empfänger von Gutschriften\").\n\nSoll mit dem Generieren fortgefahren werden?",
+                var res = MessageBox.Show("Einige der ausgewählten Dokumente sind nur als vorläufig zu betrachten und können daher nicht verschickt/ausgedruckt werden!\n\nDies könnte an einer noch nicht festgesetzen Auszahlungsvariante liegen.\n\nSoll mit dem Generieren fortgefahren werden?",
                    "Vorläufige Dokumente", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
                if (res != MessageBoxResult.OK) {
                    UnlockInputs();
@@ -1045,7 +1014,7 @@ namespace Elwig.Windows {
            var pv = ctx.PaymentVariants.Single(v => v.Year == Year && v.Name == name)!;
            SelectedDocs.Add(new(DocType.CreditNote, s, (pv.Year, pv.AvNr)));
            SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
-            RecipientsCreditMembersInput.IsChecked = true;
+            RecipientsDeliveryMembersInput.IsChecked = true;
        }

        private void DocumentInput_TextChanged(object sender, TextChangedEventArgs evt) {
--- a/Elwig/Windows/PaymentAdjustmentWindow.xaml.cs
+++ b/Elwig/Windows/PaymentAdjustmentWindow.xaml.cs
@@ -16,14 +16,16 @@ namespace Elwig.Windows {
    public partial class PaymentAdjustmentWindow : ContextWindow {

        public readonly int Year;
-        public readonly bool SeasonLocked = false;  // never locked
+        public readonly bool SeasonLocked;

        public Dictionary<int, PaymentCustom>? CustomPayments;

        public PaymentAdjustmentWindow(int year) {
            InitializeComponent();
            Year = year;
-            // using (var ctx = new AppDbContext()) { SeasonLocked = ctx.Seasons.Find(Year + 1) != null; }
+            using (var ctx = new AppDbContext()) {
+                SeasonLocked = ctx.Seasons.Find(Year + 1) != null;
+            }
            Title = $"Auszahlung anpassen - Lese {Year} - Elwig";
            AutoAdjustBsButton.IsEnabled = !SeasonLocked;
            UnAdjustBsButton.IsEnabled = !SeasonLocked;
--- a/Elwig/Windows/PaymentVariantsWindow.xaml.cs
+++ b/Elwig/Windows/PaymentVariantsWindow.xaml.cs
@@ -1,9 +1,12 @@
 using Elwig.Helpers;
 using Elwig.Helpers.Billing;
+using Elwig.Helpers.Export;
+using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
 using Elwig.Services;
 using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Win32;
 using System;
 using System.Linq;
 using System.Text.Json;
@@ -32,7 +35,9 @@ namespace Elwig.Windows {
            CommandBindings.Add(new CommandBinding(CtrlÜ, Menu_EbicsSave_Click));
            CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_SummaryPrint_Click));
            Year = year;
-            // using (var ctx = new AppDbContext()) { ViewModel.SeasonLocked = ctx.Seasons.Find(Year + 1) != null; }
+            using (var ctx = new AppDbContext()) {
+                ViewModel.SeasonLocked = ctx.Seasons.Find(Year + 1) != null;
+            }
            Title = $"Auszahlungsvarianten - Lese {Year} - Elwig";
            if (!App.Config.Debug) {
                DataInput.Visibility = Visibility.Hidden;
--- 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.3.4 ([Changelog](./CHANGELOG.md))  
+**Version:** 1.0.3.3 ([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.3.4 ([Änderungsprotokoll](./CHANGELOG.md))  
+**Version:** 1.0.3.3 ([Änderungsprotokoll](./CHANGELOG.md))  
 **Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Quellcode:** https://git.necronda.net/winzer/elwig  
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -22,13 +22,13 @@
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
    <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
    <PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
-    <PackageReference Include="NUnit" Version="4.5.0" />
+    <PackageReference Include="NUnit" Version="4.4.0" />
    <PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
    <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="8.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>