Tests: Add UnitTests folder

App: Rename ExePath to InstallPath
App: Use environment variables for paths
2025-06-03 20:57:53 +02:00 · 2025-05-27 11:43:34 +02:00 · 2025-05-26 15:18:32 +02:00 · 2025-05-26 15:12:49 +02:00 · 2025-05-23 15:43:39 +02:00 · 2025-05-20 15:55:11 +02:00
78 changed files with 655 additions and 700 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,6 +3,19 @@ Changelog
 =========


+[v0.13.9][v0.13.9] (2025-05-05) {#v0.13.9}
+------------------------------------------
+
+### Sonstiges {#v0.13.9-misc}
+
+* Abhängigkeiten aktualisiert. (bf0db37872, 4af2fa256e, d1c07ee92a, 41c5288fc5)
+* Automatisches Aktualisieren der Synchroisations-URL (`https://elwig.at/clients/` -> `https://sync.elwig.at/`). (e50e7337e6)
+
+[v0.13.9]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.9
+
+
+
+
 [v0.13.8][v0.13.8] (2025-02-21) {#v0.13.8}
 ------------------------------------------

--- a/Elwig/App.xaml.cs
+++ b/Elwig/App.xaml.cs
@ -25,10 +25,13 @@ namespace Elwig {

        private readonly DispatcherTimer _autoUpdateTimer = new() { Interval = TimeSpan.FromHours(1) };

-        public static readonly string DataPath = @"C:\ProgramData\Elwig\";
+        public static readonly string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Elwig");
        public static readonly string MailsPath = Path.Combine(DataPath, "mails");
        public static readonly string ConfigPath = Path.Combine(DataPath, "config.ini");
-        public static readonly string ExePath = @"C:\Program Files\Elwig\";
+        public static readonly string InstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Elwig");
+        public static readonly string DocumentsPath = (Assembly.GetEntryAssembly()?.Location.Contains(@"\bin\") ?? false) ?
+            Path.Combine(Assembly.GetEntryAssembly()!.Location.Split(@"\bin\")[0], "../Elwig/Documents") :
+            Path.Combine(InstallPath, "resources/Documents");
        public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");

        public static Config Config { get; private set; } = new(ConfigPath);
@ -197,12 +200,10 @@ namespace Elwig {
            var ch = CurrentLastWrite;
            if (ch > CurrentApp.LastChanged)
                CurrentApp.LastChanged = ch;
-            MainDispatcher.Invoke(() => {
-                foreach (Window w in CurrentApp.Windows) {
-                    if (w is not ContextWindow c) continue;
-                    MainDispatcher.BeginInvoke(c.HintContextChange);
-                }
-            });
+            foreach (Window w in CurrentApp.Windows) {
+                if (w is not ContextWindow c) continue;
+                MainDispatcher.BeginInvoke(c.HintContextChange);
+            }
        }

        private void OnAutoUpdateTimer(object? sender, EventArgs? evt) {
--- a/Elwig/Documents/BusinessDocument.cshtml
+++ b/Elwig/Documents/BusinessDocument.cshtml
@ -2,7 +2,7 @@
@inherits TemplatePage<Elwig.Documents.BusinessDocument>
@model Elwig.Documents.BusinessDocument
@{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\BusinessDocument.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\BusinessDocument.css"/>
 <div class="info-wrapper">
    <div class="address-wrapper">
        <div class="sender">
--- a/Elwig/Documents/CreditNote.cshtml
+++ b/Elwig/Documents/CreditNote.cshtml
@ -3,7 +3,7 @@
@inherits TemplatePage<Elwig.Documents.CreditNote>
@model Elwig.Documents.CreditNote
@{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\CreditNote.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\CreditNote.css" />
 <main>
    <h1>@Model.Title</h1>
    <table class="credit">
--- a/Elwig/Documents/DeliveryAncmtList.cshtml
+++ b/Elwig/Documents/DeliveryAncmtList.cshtml
@ -2,7 +2,7 @@
@inherits TemplatePage<Elwig.Documents.DeliveryAncmtList>
@model Elwig.Documents.DeliveryAncmtList
@{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryAncmtList.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryAncmtList.css" />
 <main>
    <h1>Anmeldeliste</h1>
    <h2>@Model.Filter</h2>
@ -24,7 +24,7 @@
                <th rowspan="2" style="text-align: left;">Ort</th>
                <th rowspan="2" style="text-align: left;">Sorte</th>
                <th rowspan="2">Anmldg.</th>
-                <th>Gewicht</th>
+                <th>Menge</th>
            </tr>
            <tr>
                <th class="unit">[kg]</th>
--- a/Elwig/Documents/DeliveryConfirmation.cshtml
+++ b/Elwig/Documents/DeliveryConfirmation.cshtml
@ -3,7 +3,7 @@
@inherits TemplatePage<Elwig.Documents.DeliveryConfirmation>
@model Elwig.Documents.DeliveryConfirmation
@{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryConfirmation.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryConfirmation.css" />
 <main>
    <h1>@Model.Title</h1>
    <table class="delivery-confirmation">
@ -30,7 +30,7 @@
                <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
                <th colspan="2">Gradation</th>
                <th colspan="2">Flächenbindung</th>
-                <th>Gewicht</th>
+                <th>Menge</th>
                <th rowspan="3" style="padding: 0;">
                    <svg width="10" height="40" xmlns="http://www.w3.org/2000/svg">
                        <text x="-40" y="4" transform="rotate(270)" font-size="8pt" font-style="italic" font-family="Times New Roman"
--- a/Elwig/Documents/DeliveryDepreciationList.cshtml
+++ b/Elwig/Documents/DeliveryDepreciationList.cshtml
@ -2,7 +2,7 @@
@inherits TemplatePage<Elwig.Documents.DeliveryDepreciationList>
@model Elwig.Documents.DeliveryDepreciationList
@{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryDepreciationList.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryDepreciationList.css" />
 <main>
    <h1>Abwertungsliste</h1>
    <h2>@Model.Filter</h2>
@ -27,7 +27,7 @@
                <th rowspan="2" style="text-align: left;">Sorte</th>
                <th rowspan="2" style="text-align: left;">Attr./Bewirt.</th>
                <th colspan="2">Gradation</th>
-                <th>Gewicht</th>
+                <th>Menge</th>
            </tr>
            <tr>
                <th class="unit">[°Oe]</th>
--- a/Elwig/Documents/DeliveryJournal.cshtml
+++ b/Elwig/Documents/DeliveryJournal.cshtml
@ -2,7 +2,7 @@
@inherits TemplatePage<Elwig.Documents.DeliveryJournal>
@model Elwig.Documents.DeliveryJournal
@{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryJournal.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryJournal.css"/>
 <main>
    <h1>Lieferjournal</h1>
    <h2>@Model.Filter</h2>
@ -29,7 +29,7 @@
                <th rowspan="2" style="text-align: left;">Mitglied</th>
                <th rowspan="2" style="text-align: left;">Sorte</th>
                <th colspan="2">Gradation</th>
-                <th>Gewicht</th>
+                <th>Menge</th>
            </tr>
            <tr>
                <th class="unit">[°Oe]</th>
--- a/Elwig/Documents/DeliveryNote.cshtml
+++ b/Elwig/Documents/DeliveryNote.cshtml
@ -2,7 +2,7 @@
@inherits TemplatePage<Elwig.Documents.DeliveryNote>
@model Elwig.Documents.DeliveryNote
@{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryNote.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryNote.css" />
 <main>
 <h1>@Model.Title</h1>
 <table class="delivery large">
@ -24,7 +24,7 @@
            <th class="main" rowspan="2" colspan="2">Attribut</th>
            <th class="main" rowspan="2">Qualitätsstufe</th>
            <th colspan="2">Gradation</th>
-            <th>Gewicht</th>
+            <th>Menge</th>
        </tr>
        <tr>
            <th class="unit">[°Oe]</th>
--- a/Elwig/Documents/Document.cs
+++ b/Elwig/Documents/Document.cs
@ -23,7 +23,7 @@ namespace Elwig.Documents {
        public bool ShowFoldMarks = App.Config.Debug;
        public bool DoublePaged = false;

-        public string DataPath;
+        public string DocumentsPath;
        public int CurrentNextSeason;
        public string? DocumentId;
        public string Title;
@ -34,7 +34,7 @@ namespace Elwig.Documents {

        public Document(string title) {
            var c = App.Client;
-            DataPath = App.DataPath;
+            DocumentsPath = App.DocumentsPath;
            CurrentNextSeason = Utils.CurrentNextSeason;
            Title = title;
            Author = c.NameFull;
--- a/Elwig/Documents/Document.cshtml
+++ b/Elwig/Documents/Document.cshtml
@ -7,9 +7,9 @@
    <title>@Model.Title</title>
    <meta name="author" value="@Model.Author"/>
    <meta charset="UTF-8"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.css"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Page.css"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Table.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.css" />
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Page.css" />
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Table.css" />
    @if (Model.DoublePaged) {
        <style>
            @@page :left {
--- a/Elwig/Documents/MemberDataSheet.cshtml
+++ b/Elwig/Documents/MemberDataSheet.cshtml
@ -3,7 +3,7 @@
@inherits TemplatePage<Elwig.Documents.MemberDataSheet>
@model Elwig.Documents.MemberDataSheet
@{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberDataSheet.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\MemberDataSheet.css" />
 <main>
    <h1>@Model.Title</h1>
    <table class="member border">
--- a/Elwig/Documents/MemberList.cshtml
+++ b/Elwig/Documents/MemberList.cshtml
@ -2,7 +2,7 @@
@inherits TemplatePage<Elwig.Documents.MemberList>
@model Elwig.Documents.MemberList
@{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberList.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\MemberList.css" />
 <main>
    <h1>Mitgliederliste</h1>
    <h2>@Model.Filter</h2>
--- a/Elwig/Documents/PaymentVariantSummary.cshtml
+++ b/Elwig/Documents/PaymentVariantSummary.cshtml
@ -3,7 +3,7 @@
@inherits TemplatePage<Elwig.Documents.PaymentVariantSummary>
@model Elwig.Documents.PaymentVariantSummary
@{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\PaymentVariantSummary.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\PaymentVariantSummary.css" />
 <main>
    <h1>Auszahlungsvariante Lese @Model.Variant.Year</h1>
    <h2>@Model.Variant.Name</h2>
@ -111,8 +111,8 @@
                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(payed):N2}")</td>
                @{
                    var weiRows = Model.Data.Rows.Where(r => r.QualityLevel == "Wein");
-                    var minWei = weiRows.Min(r => r.Ungeb.Price);
-                    var maxWei = weiRows.Max(r => r.Ungeb.Price);
+                    var minWei = weiRows.Min(r => r.Ungeb.MinPrice);
+                    var maxWei = weiRows.Max(r => r.Ungeb.MaxPrice);
                }
                <th class="lborder tborder">Preis (abgewertet):</th>
                <td colspan="2" class="center tborder">@(minWei != maxWei ? $"{minWei:N4}–{maxWei:N4}" : $"{minWei:N4}") @Model.CurrencySymbol/kg</td>
@ -123,8 +123,8 @@
                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{netSum:N2}")</td>
                @{
                    var quwRows = Model.Data.Rows.Where(r => r.QualityLevel != "Wein");
-                    var minPrice = quwRows.Min(r => r.Ungeb.Price);
-                    var maxPrice = quwRows.Max(r => r.Ungeb.Price);
+                    var minPrice = quwRows.Min(r => r.Ungeb.MinPrice);
+                    var maxPrice = quwRows.Max(r => r.Ungeb.MaxPrice);
                }
                <th class="lborder">Preis (ungeb., nicht abgew.):</th>
                <td colspan="2" class="center">@(minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") @Model.CurrencySymbol/kg</td>
@ -135,8 +135,8 @@
                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(vat):N2}")</td>
                @{
                    var gebRows = Model.Data.Rows
-                    .Where(r => r.Geb.Price != null && r.Ungeb.Price != null)
-                    .Select(r => r.Geb.Price - r.Ungeb.Price);
+                        .Where(r => r.Geb.MaxPrice != null && r.Ungeb.MinPrice != null)
+                        .Select(r => r.Geb.MaxPrice - r.Ungeb.MinPrice);
                    var minGeb = gebRows.Min();
                    var maxGeb = gebRows.Max();
                }
@ -219,19 +219,22 @@
    </table>
    <table class="payment-variant-data">
        <colgroup>
-            <col style="width: 30mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 25mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 25mm;"/>
-            <col style="width: 20mm;"/>
            <col style="width: 25mm;"/>
+            <col style="width: 19mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 22mm;"/>
        </colgroup>
        <thead>
            <tr>
                <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
                <th>Gradation</th>
                <th colspan="2">ungebunden</th>
+                <th colspan="2">attributlos gebunden</th>
                <th colspan="2">gebunden</th>
                <th>Gesamt</th>
            </tr>
@ -241,6 +244,8 @@
                <th>[@(Model.CurrencySymbol)/kg]</th>
                <th>[kg]</th>
                <th>[@(Model.CurrencySymbol)/kg]</th>
+                <th>[kg]</th>
+                <th>[@(Model.CurrencySymbol)/kg]</th>
                <th>[@(Model.CurrencySymbol)]</th>
            </tr>
        </thead>
@ -258,6 +263,8 @@
                        <th colspan="2">@hdr</th>
                        <td class="number">@($"{rows.Sum(r => r.Ungeb.Weight):N0}")</td>
                        <td></td>
+                        <td class="number">@($"{rows.Sum(r => r.LowGeb.Weight):N0}")</td>
+                        <td></td>
                        <td class="number">@($"{rows.Sum(r => r.Geb.Weight):N0}")</td>
                        <td></td>
                        <td class="number">@($"{rows.Sum(r => r.Amount):N2}")</td>
@ -267,9 +274,11 @@
                    <td>@(row.QualityLevel)</td>
                    <td class="center">@($"{row.Oe:N0}")</td>
                    <td class="number">@(row.Ungeb.Weight != 0 ? $"{row.Ungeb.Weight:N0}" : "-")</td>
-                    <td class="number">@(row.Ungeb.Price != null ? $"{row.Ungeb.Price:N4}" : "-")</td>
+                    <td class="number">@(row.Ungeb.MaxPrice != null ? $"{row.Ungeb.MaxPrice:N4}" : "-")</td>
+                    <td class="number">@(row.LowGeb.Weight != 0 ? $"{row.LowGeb.Weight:N0}" : "-")</td>
+                    <td class="number">@(row.LowGeb.MaxPrice != null ? $"{row.LowGeb.MaxPrice:N4}" : "-")</td>
                    <td class="number">@(row.Geb.Weight != 0 ? $"{row.Geb.Weight:N0}" : "-")</td>
-                    <td class="number">@(row.Geb.Price != null ? $"{row.Geb.Price:N4}" : "-")</td>
+                    <td class="number">@(row.Geb.MaxPrice != null ? $"{row.Geb.MaxPrice:N4}" : "-")</td>
                    <td class="number">@($"{row.Amount:N2}")</td>
                </tr>
                lastHdr = hdr;
--- a/Elwig/Documents/WineQualityStatistics.cshtml
+++ b/Elwig/Documents/WineQualityStatistics.cshtml
@ -3,7 +3,7 @@
@inherits TemplatePage<Elwig.Documents.WineQualityStatistics>
@model Elwig.Documents.WineQualityStatistics
@{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\WineQualityStatistics.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\WineQualityStatistics.css" />
 <main>
    <h1>Qualitätsstatistik</h1>
    <h2>@Model.Filter</h2>
--- a/Elwig/Elwig.csproj
+++ b/Elwig/Elwig.csproj
@ -7,7 +7,7 @@
    <UseWPF>true</UseWPF>
    <PreserveCompilationContext>true</PreserveCompilationContext>
    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.13.8</Version>
+    <Version>0.13.9</Version>
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <ApplicationManifest>app.manifest</ApplicationManifest>
@ -20,10 +20,6 @@
    <EmbeddedResource Include="Resources\Sql\*" />
  </ItemGroup>

-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="call fetch-resources.bat" />
-  </Target>
-
  <ItemGroup>
    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
    <PackageReference Include="LinqKit" Version="1.3.8" />
--- a/Elwig/Helpers/Export/Ods.cs
+++ b/Elwig/Helpers/Export/Ods.cs
@ -317,7 +317,7 @@ namespace Elwig.Helpers.Export {
                c = $"<{ct} office:value-type=\"string\" calcext:value-type=\"string\"{add}><text:p>{SecurityElement.Escape(data.ToString())}</text:p></{ct}>";
            }

-            return $"      {c}\r\n" + (colSpan > 1 ? $"      <table:covered-table-cell table:number-rows-repeated=\"{colSpan - 1}\"/>\r\n" : "");
+            return $"      {c}\r\n" + (colSpan > 1 ? $"      <table:covered-table-cell table:number-columns-repeated=\"{colSpan - 1}\"/>\r\n" : "");
        }
    }
 }
--- a/Elwig/Helpers/Printing/Html.cs
+++ b/Elwig/Helpers/Printing/Html.cs
@ -10,7 +10,7 @@ namespace Elwig.Helpers.Printing {

        public static async Task Init(Action? evtHandler = null) {
            var e = new RazorLightEngineBuilder()
-                .UseFileSystemProject(App.DataPath + "resources")
+                .UseFileSystemProject(App.DocumentsPath)
                .UseMemoryCachingProvider()
                .Build();

--- a/Elwig/Helpers/Printing/Pdf.cs
+++ b/Elwig/Helpers/Printing/Pdf.cs
@ -14,7 +14,7 @@ using System.Drawing.Printing;
 namespace Elwig.Helpers.Printing {
    public static class Pdf {

-        private static readonly string WinziPrint = new string[] { App.ExePath }
+        private static readonly string WinziPrint = new string[] { App.InstallPath }
            .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? [])
            .Select(x => Path.Combine(x, "WinziPrint.exe"))
            .Where(File.Exists)
--- a/Elwig/Helpers/Utils.cs
+++ b/Elwig/Helpers/Utils.cs
@ -499,39 +499,34 @@ namespace Elwig.Helpers {
            if (App.Config.Smtp == null)
                return false;

-            Mouse.OverrideCursor = Cursors.Wait;
+            SmtpClient? client = null;
+            try {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                client = await GetSmtpClient();

-            var success = await Task.Run(async () => {
-                SmtpClient? client = null;
-                try {
-                    client = await GetSmtpClient();
-
-                    using var msg = new MimeMessage();
-                    msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
-                    msg.To.AddRange(member.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(member.AdministrativeName, a.Address)));
-                    msg.Subject = subject;
-                    var body = new Multipart("mixed") {
-                        new TextPart("plain") { Text = text }
-                    };
-                    foreach (var doc in docs) {
-                        var name = NormalizeFileName(doc.Title);
-                        body.Add(doc.AsEmailAttachment($"{name}.pdf"));
-                    }
-                    msg.Body = body;
-                    await client!.SendAsync(msg);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return false;
-                } finally {
-                    if (client != null)
-                        await client.DisconnectAsync(true);
-                    client?.Dispose();
+                using var msg = new MimeMessage();
+                msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
+                msg.To.AddRange(member.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(member.AdministrativeName, a.Address)));
+                msg.Subject = subject;
+                var body = new Multipart("mixed") {
+                    new TextPart("plain") { Text = text }
+                };
+                foreach (var doc in docs) {
+                    var name = NormalizeFileName(doc.Title);
+                    body.Add(doc.AsEmailAttachment($"{name}.pdf"));
                }
-                return true;
-            });
-
-            Mouse.OverrideCursor = null;
-            return success;
+                msg.Body = body;
+                await client!.SendAsync(msg);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                return false;
+            } finally {
+                if (client != null)
+                    await client.DisconnectAsync(true);
+                client?.Dispose();
+                Mouse.OverrideCursor = null;
+            }
+            return true;
        }

        public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member, string, string)? emailData = null) {
--- a/Elwig/Models/Dtos/CreditNoteDeliveryData.cs
+++ b/Elwig/Models/Dtos/CreditNoteDeliveryData.cs
@ -27,14 +27,14 @@ namespace Elwig.Models.Dtos {
            MgNr = mgnr;
        }

-        public static async Task<IDictionary<int, CreditNoteDeliveryData>> ForPaymentVariant(DbSet<CreditNoteDeliveryRowSingle> table, DbSet<Season> seasons, int year, int avnr) {
-            var variant = (await seasons.FindAsync(year))?.PaymentVariants.Where(v => v.AvNr == avnr).SingleOrDefault();
+        public static async Task<IDictionary<int, CreditNoteDeliveryData>> ForPaymentVariant(DbSet<CreditNoteDeliveryRowSingle> table, DbSet<PaymentVar> paymentVariants, int year, int avnr) {
+            var variant = await paymentVariants.FindAsync(year, avnr);
            BillingData? varData = null;
            try { varData = variant != null ? BillingData.FromJson(variant.Data) : null; } catch { }
            return (await FromDbSet(table, year, avnr))
                .GroupBy(
                    r => new { r.Year, r.AvNr, r.MgNr, r.TgNr, r.DId, r.DPNr },
-                    (k, g) => new CreditNoteDeliveryRow(g, seasons, varData?.NetWeightModifier ?? 0.0, varData?.GrossWeightModifier ?? 0.0))
+                    (k, g) => new CreditNoteDeliveryRow(g, variant, varData))
                .GroupBy(
                    r => new { r.Year, r.AvNr, r.MgNr, r.TgNr },
                    (k, g) => new CreditNoteDeliveryData(g, k.Year, k.TgNr, mgnr: k.MgNr))
@ -86,13 +86,13 @@ namespace Elwig.Models.Dtos {
        public decimal? Amount;
        public double WeighingModifier;

-        public CreditNoteDeliveryRow(IEnumerable<CreditNoteDeliveryRowSingle> rows, DbSet<Season> seasons, double netWeightModifier, double grossWeightModifier) {
+        public CreditNoteDeliveryRow(IEnumerable<CreditNoteDeliveryRowSingle> rows, PaymentVar paymentVariant, BillingData? varData) {
            var f = rows.First();
            Year = f.Year;
            TgNr = f.TgNr;
            AvNr = f.AvNr;
            MgNr = f.MgNr;
-            var season = seasons.Find(Year);
+            var season = paymentVariant.Season;

            LsNr = f.LsNr;
            DPNr = f.DPNr;
@ -115,7 +115,7 @@ namespace Elwig.Models.Dtos {
                              b.Price != null ? season?.DecFromDb((long)b.Price) : null,
                              b.Amount != null ? season?.DecFromDb((long)b.Amount) : null))
                .ToArray();
-            WeighingModifier = f.NetWeight ? netWeightModifier : grossWeightModifier;
+            WeighingModifier = (varData == null || !varData.ConsiderDelieryModifiers) ? 0 : f.NetWeight ? varData.NetWeightModifier : varData.GrossWeightModifier;
            Amount = f.TotalAmount != null ? season?.DecFromDb((long)f.TotalAmount) : null;
            var netAmount = f.NetAmount != null ? season?.DecFromDb((long)f.NetAmount) : null;
            var amt = netAmount * (decimal)(1.0 + WeighingModifier);
--- a/Elwig/Models/Dtos/DeliveryAncmtListData.cs
+++ b/Elwig/Models/Dtos/DeliveryAncmtListData.cs
@ -17,7 +17,7 @@ namespace Elwig.Models.Dtos {
            ("Name2", "Vorname", null, 40),
            ("DefaultKg", "Ort", null, 40),
            ("SortId", "Sorte", null, 10),
-            ("Weight", "Gewicht", "kg", 20),
+            ("Weight", "Menge", "kg", 20),
            ("CreatedTimestamp", "Angemeldet", null, 35),
            ("ModifiedTimestamp", "Geändert", null, 35),
            ("Status", "Status", null, 20),
--- a/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs
+++ b/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs
@ -16,7 +16,7 @@ namespace Elwig.Models.Dtos {
            ("QualityLevel", "Qualitätsstufe", null, 25),
            ("Gradation", "Gradation", "°Oe|°KMW", 32),
            ("Buckets", "Flächenbindung", "|kg", 36),
-            ("Weight", "Gewicht", "kg", 16),
+            ("Weight", "Menge", "kg", 16),
        ];

        private readonly int MgNr;
--- a/Elwig/Models/Dtos/DeliveryJournalData.cs
+++ b/Elwig/Models/Dtos/DeliveryJournalData.cs
@ -24,7 +24,7 @@ namespace Elwig.Models.Dtos {
            ("CultId", "Bewirt.", null, 15),
            ("QualId", "Qualität", null, 15),
            ("Gradation", "Gradation", "°Oe|°KMW", 40),
-            ("Weight", "Gewicht", "kg", 20),
+            ("Weight", "Menge", "kg", 20),
            ("IsNetWeight", "Gerebelt", null, 20),
            ("HkId", "Herkunft", null, 20),
            ("Modifiers", "Zu-/Abschläge", null, 40),
--- a/Elwig/Models/Dtos/PaymentVariantSummaryData.cs
+++ b/Elwig/Models/Dtos/PaymentVariantSummaryData.cs
@ -18,8 +18,9 @@ namespace Elwig.Models.Dtos {
            ("Cultivation", "Bewirt.", null, 20),
            ("QualityLevel", "Qualitätsstufe", null, 30),
            ("Oe", "Gradation", "°Oe", 20),
-            ("Ungeb", "ungebunden", "kg|€/kg", 40),
-            ("Geb", "gebunden", "kg|€/kg", 40),
+            ("Ungeb", "ungebunden", "kg|€/kg|€/kg", 60),
+            ("LowGeb", "attributlos gebunden", "kg|€/kg|€/kg", 60),
+            ("Geb", "gebunden", "kg|€/kg|€/kg", 60),
            ("Amount", "Gesamt", "€", 25),
        ];

@ -30,8 +31,9 @@ namespace Elwig.Models.Dtos {
            string? Cultivation,
            string QualityLevel,
            double Oe,
-            (int Weight, decimal? Price) Ungeb,
-            (int Weight, decimal? Price) Geb,
+            (int Weight, decimal? MinPrice, decimal? MaxPrice) Ungeb,
+            (int Weight, decimal? MinPrice, decimal? MaxPrice) LowGeb,
+            (int Weight, decimal? MinPrice, decimal? MaxPrice) Geb,
            decimal Amount
        );

@ -42,8 +44,9 @@ namespace Elwig.Models.Dtos {
        public static async Task<PaymentVariantSummaryData> ForPaymentVariant(PaymentVar v, DbSet<PaymentVariantSummaryRow> table) {
            return new(v, (await FromDbSet(table, v.Year, v.AvNr))
                .Select(r => new PaymentRow(r.Type, r.Variety, r.Attribute, r.Cultivation, r.QualityLevel, r.Oe,
-                    (r.WeightUngeb, r.PriceUngeb != null ? Utils.DecFromDb(r.PriceUngeb.Value, v.Season.Precision) : null),
-                    (r.WeightGeb, r.PriceGeb != null ? Utils.DecFromDb(r.PriceGeb.Value, v.Season.Precision) : null),
+                    (r.WeightUngeb, r.MinPriceUngeb != null ? Utils.DecFromDb(r.MinPriceUngeb.Value, v.Season.Precision) : null, r.MaxPriceUngeb != null ? Utils.DecFromDb(r.MaxPriceUngeb.Value, v.Season.Precision) : null),
+                    (r.WeightLowGeb, r.MinPriceLowGeb != null ? Utils.DecFromDb(r.MinPriceLowGeb.Value, v.Season.Precision) : null, r.MaxPriceLowGeb != null ? Utils.DecFromDb(r.MaxPriceLowGeb.Value, v.Season.Precision) : null),
+                    (r.WeightGeb, r.MinPriceGeb != null ? Utils.DecFromDb(r.MinPriceGeb.Value, v.Season.Precision) : null, r.MaxPriceGeb != null ? Utils.DecFromDb(r.MaxPriceGeb.Value, v.Season.Precision) : null),
                    Utils.DecFromDb(r.Amount, v.Season.Precision)))
                .ToArray());
        }
@ -57,19 +60,23 @@ namespace Elwig.Models.Dtos {
                       q.name AS quality_level,
                       ROUND(kmw * (4.54 + 0.022 * kmw)) AS oe,
                       SUM(IIF(w.discr = '_', w.value, 0)) AS weight_ungeb,
-                       MAX(IIF(w.discr = '_', b.price, NULL)) AS price_ungeb,
-                       SUM(IIF(w.discr != '_', w.value, 0)) AS weight_geb,
-                       MAX(IIF(w.discr != '_', b.price, NULL)) AS price_geb,
+                       MIN(IIF(w.discr = '_', b.price, NULL)) AS min_price_ungeb,
+                       MAX(IIF(w.discr = '_', b.price, NULL)) AS max_price_ungeb,
+                       SUM(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), w.value, 0)) AS weight_lowgeb,
+                       MIN(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), b.price, NULL)) AS min_price_lowgeb,
+                       MAX(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), b.price, NULL)) AS max_price_lowgeb,
+                       SUM(IIF(w.discr = COALESCE(p.attrid, ''), w.value, 0)) AS weight_geb,
+                       MIN(IIF(w.discr = COALESCE(p.attrid, ''), b.price, NULL)) AS min_price_geb,
+                       MAX(IIF(w.discr = COALESCE(p.attrid, ''), b.price, NULL)) AS max_price_geb,
                       SUM(b.amount) AS amount
                FROM payment_delivery_part_bucket b
                    LEFT JOIN delivery_part_bucket w ON (w.year, w.did, w.dpnr, w.bktnr) = (b.year, b.did, b.dpnr, b.bktnr)
                    LEFT JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (b.year, b.did, b.dpnr)
-                    LEFT JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
                    LEFT JOIN wine_variety v ON v.sortid = p.sortid
                    LEFT JOIN wine_attribute a ON a.attrid = p.attrid
                    LEFT JOIN wine_cultivation c ON c.cultid = p.cultid
                    LEFT JOIN wine_quality_level q ON q.qualid = p.qualid
-                WHERE d.year = {year} AND b.avnr = {avnr}
+                WHERE p.year = {year} AND b.avnr = {avnr}
                GROUP BY variety, attribute, cultivation, q.min_kmw, oe
                ORDER BY variety, attribute, cultivation, q.min_kmw, oe
                """).ToListAsync();
@ -92,12 +99,22 @@ namespace Elwig.Models.Dtos {
        public double Oe { get; set; }
        [Column("weight_ungeb")]
        public int WeightUngeb { get; set; }
-        [Column("price_ungeb")]
-        public long? PriceUngeb { get; set; }
+        [Column("min_price_ungeb")]
+        public long? MinPriceUngeb { get; set; }
+        [Column("max_price_ungeb")]
+        public long? MaxPriceUngeb { get; set; }
+        [Column("weight_lowgeb")]
+        public int WeightLowGeb { get; set; }
+        [Column("min_price_lowgeb")]
+        public long? MinPriceLowGeb { get; set; }
+        [Column("max_price_lowgeb")]
+        public long? MaxPriceLowGeb { get; set; }
        [Column("weight_geb")]
        public int WeightGeb { get; set; }
-        [Column("price_geb")]
-        public long? PriceGeb { get; set; }
+        [Column("min_price_geb")]
+        public long? MinPriceGeb { get; set; }
+        [Column("max_price_geb")]
+        public long? MaxPriceGeb { get; set; }
        [Column("amount")]
        public long Amount { get; set; }
    }
--- a/Elwig/Models/Dtos/WeightBreakdownData.cs
+++ b/Elwig/Models/Dtos/WeightBreakdownData.cs
@ -14,7 +14,7 @@ namespace Elwig.Models.Dtos {
            ("CultId", "Bewirt.", null, 15),
            ("QualId", "Qual.", null, 15),
            ("Geb", "gebunden", null, 20),
-            ("Weight", "Gewicht", "kg", 20),
+            ("Weight", "Menge", "kg", 20),
        ];

        public WeightBreakdownData(IEnumerable<WeightBreakdownRow> rows, int year, string name) :
--- a/Elwig/Models/Dtos/WineLocalityStatisticsData.cs
+++ b/Elwig/Models/Dtos/WineLocalityStatisticsData.cs
@ -17,7 +17,7 @@ namespace Elwig.Models.Dtos {
            ("Members", "Mitgl.", "#", 15),
            ("Deliveries", "Lfrg.", "#", 15),
            ("Parts", "Teill.", "#", 15),
-            ("Weight", "Gewicht", "kg", 20),
+            ("Weight", "Menge", "kg", 20),
            ("Gradation", "Gradation", "°Oe|°KMW", 30),
        ];

--- a/Elwig/Services/AreaComService.cs
+++ b/Elwig/Services/AreaComService.cs
@ -108,8 +108,7 @@ namespace Elwig.Services {
        public static async Task<int> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr) {
            int newFbNr = (int)vm.FbNr!;

-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
+            using (var ctx = new AppDbContext()) {
                var a = new AreaCom {
                    FbNr = oldFbNr ?? newFbNr,
                    MgNr = (int)vm.MgNr!,
@ -141,7 +140,7 @@ namespace Elwig.Services {
                if (newFbNr != a.FbNr) {
                    await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
                }
-            });
+            }

            App.HintContextChange();

@ -254,16 +253,5 @@ namespace Elwig.Services {
            }
            return grid;
        }
-
-        public static async Task DeleteAreaCom(int fbnr) {
-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
-                var l = (await ctx.AreaCommitments.FindAsync(fbnr))!;
-                ctx.Remove(l);
-                await ctx.SaveChangesAsync();
-            });
-
-            App.HintContextChange();
-        }
    }
 }
--- a/Elwig/Services/DeliveryAncmtService.cs
+++ b/Elwig/Services/DeliveryAncmtService.cs
@ -326,7 +326,7 @@ namespace Elwig.Services {

            var weight = await deliveryAncmts.SumAsync(p => p.Weight);
            text = $"{weight:N0} kg";
-            AddToolTipRow(grid, 0, "Gewicht", null, weight, null, weight);
+            AddToolTipRow(grid, 0, "Menge", null, weight, null, weight);

            if (await deliveryAncmts.AnyAsync()) {
                var attrGroups = await deliveryAncmts
--- a/Elwig/Services/DeliveryService.cs
+++ b/Elwig/Services/DeliveryService.cs
@ -430,10 +430,9 @@ namespace Elwig.Services {
        }

        public static async Task<DeliveryPart> UpdateDeliveryPart(this DeliveryAdminViewModel vm, int? oldYear, int? oldDid, int? oldDpnr, bool dateHasChanged, bool timeHasChanged, bool timeIsDefault) {
-            var p = await Task.Run(async () => {
-                DeliveryPart p;
+            DeliveryPart p;

-                using var ctx = new AppDbContext();
+            using (var ctx = new AppDbContext()) {
                int year = oldYear ?? Utils.CurrentYear;
                int did = oldDid ?? await ctx.NextDId(year);
                int dpnr = oldDpnr ?? await ctx.NextDPNr(year, did);
@ -525,9 +524,7 @@ namespace Elwig.Services {
                }

                await ctx.SaveChangesAsync();
-
-                return p;
-            });
+            }

            App.HintContextChange();

@ -535,10 +532,9 @@ namespace Elwig.Services {
        }

        public static async Task<Delivery> SplitDeliveryToMember(int year, int did, int[] weights, int mgnr) {
-            var n = await Task.Run(async () => {
-                Delivery n;
+            Delivery n;

-                using var ctx = new AppDbContext();
+            using (var ctx = new AppDbContext()) {
                bool anyLeft = false;
                var d = (await ctx.Deliveries.FindAsync(year, did))!;
                var lnr = await ctx.NextLNr(d.Date, d.ZwstId);
@ -581,9 +577,7 @@ namespace Elwig.Services {
                await ctx.SaveChangesAsync();
                if (!anyLeft)
                    await ctx.Database.ExecuteSqlAsync($"DELETE FROM delivery WHERE (year, did) = ({d.Year}, {d.DId})");
-
-                return n;
-            });
+            }

            App.HintContextChange();

@ -591,9 +585,9 @@ namespace Elwig.Services {
        }

        public static async Task<Delivery> SplitDeliveryToLsNr(int year, int did, int[] weights, string lsnr) {
-            var n = await Task.Run(async () => {
-                Delivery n;
-                using var ctx = new AppDbContext();
+            Delivery n;
+
+            using (var ctx = new AppDbContext()) {
                var anyLeft = false;
                n = (await ctx.Deliveries.FirstAsync(d => d.LsNr == lsnr))!;
                var d = (await ctx.Deliveries.FindAsync(year, did))!;
@ -622,9 +616,7 @@ namespace Elwig.Services {
                await ctx.SaveChangesAsync();
                if (!anyLeft && n.LsNr != d.LsNr)
                    await ctx.Database.ExecuteSqlAsync($"DELETE FROM delivery WHERE (year, did) = ({d.Year}, {d.DId})");
-
-                return n;
-            });
+            }

            App.HintContextChange();

@ -632,8 +624,7 @@ namespace Elwig.Services {
        }

        public static async Task DepreciateDelivery(int year, int did, int[] weights) {
-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
+            using (var ctx = new AppDbContext()) {
                var d = (await ctx.Deliveries.FindAsync(year, did))!;
                var dpnr = await ctx.NextDPNr(year, did);
                foreach (var (p, w) in d.Parts.ToList().Zip(weights)) {
@ -657,23 +648,21 @@ namespace Elwig.Services {
                    }
                }
                await ctx.SaveChangesAsync();
-            });
+            }

            App.HintContextChange();
        }

        public static async Task GenerateDeliveryNote(int year, int did, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    using var ctx = new AppDbContext();
-                    var d = (await ctx.Deliveries.FindAsync(year, did))!;
-                    using var doc = new DeliveryNote(d, ctx);
-                    await Utils.ExportDocument(doc, mode, d.LsNr, (d.Member, $"{DeliveryNote.Name} Nr. {d.LsNr}", $"Im Anhang finden Sie den {DeliveryNote.Name} Nr. {d.LsNr}"));
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                using var ctx = new AppDbContext();
+                var d = (await ctx.Deliveries.FindAsync(year, did))!;
+                using var doc = new DeliveryNote(d, ctx);
+                await Utils.ExportDocument(doc, mode, d.LsNr, (d.Member, $"{DeliveryNote.Name} Nr. {d.LsNr}", $"Im Anhang finden Sie den {DeliveryNote.Name} Nr. {d.LsNr}"));
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
            Mouse.OverrideCursor = null;
        }

@ -718,16 +707,14 @@ namespace Elwig.Services {
                    Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
                };
                if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
-                    await Task.Run(async () => {
-                        try {
-                            var data = await DeliveryJournalData.FromQuery(query, filterNames);
-                            using var ods = new OdsFile(d.FileName);
-                            await ods.AddTable(data);
-                        } catch (Exception exc) {
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        }
-                    });
+                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    try {
+                        var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                        using var ods = new OdsFile(d.FileName);
+                        await ods.AddTable(data);
+                    } catch (Exception exc) {
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
                    Mouse.OverrideCursor = null;
                }
            } else if (mode == ExportMode.Export) {
@ -738,64 +725,58 @@ namespace Elwig.Services {
                    Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
                };
                if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
-                    await Task.Run(async () => {
-                        try {
-                            await ElwigData.Export(d.FileName, await query
-                                .Select(p => p.Delivery)
-                                .Distinct()
-                                .Include(d => d.Parts)
-                                .ThenInclude(p => p.PartModifiers)
-                                .AsSplitQuery()
-                                .ToListAsync(), filterNames);
-                        } catch (Exception exc) {
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        }
-                    });
-                    Mouse.OverrideCursor = null;
-                }
-            } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
+                    Mouse.OverrideCursor = Cursors.AppStarting;
                    try {
-                        var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
-                        var path = Path.Combine(App.TempPath, filename);
-                        var list = await query
+                        await ElwigData.Export(d.FileName, await query
                            .Select(p => p.Delivery)
                            .Distinct()
                            .Include(d => d.Parts)
                            .ThenInclude(p => p.PartModifiers)
                            .AsSplitQuery()
-                            .ToListAsync();
-                        if (list.Count == 0) {
-                            MessageBox.Show("Es wurden keine Lieferungen zum Hochladen ausgewählt!", "Lieferungen hochladen",
-                                MessageBoxButton.OK, MessageBoxImage.Error);
-                        } else {
-                            await ElwigData.Export(path, list, filterNames);
-                            await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                            MessageBox.Show($"Hochladen von {list.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochgeladen",
-                                MessageBoxButton.OK, MessageBoxImage.Information);
-                        }
-                    } catch (HttpRequestException exc) {
-                        MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                    } catch (TaskCanceledException exc) {
-                        MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                            .ToListAsync(), filterNames);
                    } catch (Exception exc) {
                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
-                });
+                    Mouse.OverrideCursor = null;
+                }
+            } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
+                    var path = Path.Combine(App.TempPath, filename);
+                    var list = await query
+                        .Select(p => p.Delivery)
+                        .Distinct()
+                        .Include(d => d.Parts)
+                        .ThenInclude(p => p.PartModifiers)
+                        .AsSplitQuery()
+                        .ToListAsync();
+                    if (list.Count == 0) {
+                        MessageBox.Show("Es wurden keine Lieferungen zum Hochladen ausgewählt!", "Lieferungen hochladen",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
+                    } else {
+                        await ElwigData.Export(path, list, filterNames);
+                        await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                        MessageBox.Show($"Hochladen von {list.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochgeladen",
+                            MessageBoxButton.OK, MessageBoxImage.Information);
+                    }
+                } catch (HttpRequestException exc) {
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                } catch (TaskCanceledException exc) {
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                Mouse.OverrideCursor = null;
            } else {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
-                    try {
-                        var data = await DeliveryJournalData.FromQuery(query, filterNames);
-                        using var doc = new DeliveryJournal(string.Join(" / ", filterNames), data);
-                        await Utils.ExportDocument(doc, mode);
-                    } catch (Exception exc) {
-                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                    }
-                });
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                    using var doc = new DeliveryJournal(string.Join(" / ", filterNames), data);
+                    await Utils.ExportDocument(doc, mode);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                Mouse.OverrideCursor = null;
            }
        }
@ -817,16 +798,14 @@ namespace Elwig.Services {
                throw new ArgumentException("Invalid value for ExportSubject");
            }

-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    var data = await WineQualityStatisticsData.FromQuery(query, App.Client.OrderingMemberList);
-                    using var doc = new WineQualityStatistics(string.Join(" / ", filterNames), data);
-                    await Utils.ExportDocument(doc, mode);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var data = await WineQualityStatisticsData.FromQuery(query, App.Client.OrderingMemberList);
+                using var doc = new WineQualityStatistics(string.Join(" / ", filterNames), data);
+                await Utils.ExportDocument(doc, mode);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
            Mouse.OverrideCursor = null;
        }

@ -850,16 +829,14 @@ namespace Elwig.Services {
                Title = $"Lieferstatistik pro Ort speichern unter - Elwig"
            };
            if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
-                    try {
-                        using var ods = new OdsFile(d.FileName);
-                        var tbl = await WineLocalityStatisticsData.FromQuery(query, filterNames);
-                        await ods.AddTable(tbl);
-                    } catch (Exception exc) {
-                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                    }
-                });
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    using var ods = new OdsFile(d.FileName);
+                    var tbl = await WineLocalityStatisticsData.FromQuery(query, filterNames);
+                    await ods.AddTable(tbl);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                Mouse.OverrideCursor = null;
            }
        }
@ -898,37 +875,33 @@ namespace Elwig.Services {
                    Title = $"{DeliveryDepreciationList.Name} speichern unter - Elwig"
                };
                if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
-                    await Task.Run(async () => {
-                        try {
-                            using var ods = new OdsFile(d.FileName);
-                            var tblTotal = await DeliveryJournalData.FromQuery(query, filterNames);
-                            tblTotal.FullName = DeliveryDepreciationList.Name;
-                            tblTotal.Name = "Gesamt";
-                            await ods.AddTable(tblTotal);
-                            foreach (var branch in await ctx.Branches.OrderBy(b => b.Name).ToListAsync()) {
-                                var tbl = await DeliveryJournalData.FromQuery(query.Where(p => p.Delivery.ZwstId == branch.ZwstId), filterNames);
-                                tbl.FullName = DeliveryDepreciationList.Name;
-                                tbl.Name = branch.Name;
-                                await ods.AddTable(tbl);
-                            }
-                        } catch (Exception exc) {
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        }
-                    });
-                    Mouse.OverrideCursor = null;
-                }
-            } else {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
+                    Mouse.OverrideCursor = Cursors.AppStarting;
                    try {
-                        var data = await DeliveryJournalData.FromQuery(query, filterNames);
-                        using var doc = new DeliveryDepreciationList(string.Join(" / ", filterNames), data);
-                        await Utils.ExportDocument(doc, mode);
+                        using var ods = new OdsFile(d.FileName);
+                        var tblTotal = await DeliveryJournalData.FromQuery(query, filterNames);
+                        tblTotal.FullName = DeliveryDepreciationList.Name;
+                        tblTotal.Name = "Gesamt";
+                        await ods.AddTable(tblTotal);
+                        foreach (var branch in await ctx.Branches.OrderBy(b => b.Name).ToListAsync()) {
+                            var tbl = await DeliveryJournalData.FromQuery(query.Where(p => p.Delivery.ZwstId == branch.ZwstId), filterNames);
+                            tbl.FullName = DeliveryDepreciationList.Name;
+                            tbl.Name = branch.Name;
+                            await ods.AddTable(tbl);
+                        }
                    } catch (Exception exc) {
                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
-                });
+                    Mouse.OverrideCursor = null;
+                }
+            } else {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                    using var doc = new DeliveryDepreciationList(string.Join(" / ", filterNames), data);
+                    await Utils.ExportDocument(doc, mode);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                Mouse.OverrideCursor = null;
            }
        }
@ -973,7 +946,7 @@ namespace Elwig.Services {

            var weight = await deliveryParts.SumAsync(p => p.Weight);
            wText = $"{weight:N0} kg";
-            wGrid.Add(("Gewicht", null, weight, null, weight));
+            wGrid.Add(("Menge", null, weight, null, weight));

            if (await deliveryParts.AnyAsync()) {
                var kmwMin = await deliveryParts.MinAsync(p => p.Kmw);
@ -1097,12 +1070,10 @@ namespace Elwig.Services {
        }

        public static async Task DeleteDelivery(string lsnr) {
-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
+            using (var ctx = new AppDbContext()) {
                await ctx.Deliveries.Where(d => d.LsNr == lsnr).ExecuteDeleteAsync();
                await ctx.SaveChangesAsync();
-            });
-
+            }
            App.HintContextChange();
        }
    }
--- a/Elwig/Services/MemberService.cs
+++ b/Elwig/Services/MemberService.cs
@ -367,57 +367,51 @@ namespace Elwig.Services {
        }

        public static async Task GenerateMemberDataSheet(Member m, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    using var ctx = new AppDbContext();
-                    using var doc = new MemberDataSheet(m, ctx);
-                    await Utils.ExportDocument(doc, mode, emailData: (m, MemberDataSheet.Name, "Im Anhang finden Sie das aktuelle Stammdatenblatt"));
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                using var ctx = new AppDbContext();
+                using var doc = new MemberDataSheet(m, ctx);
+                await Utils.ExportDocument(doc, mode, emailData: (m, MemberDataSheet.Name, "Im Anhang finden Sie das aktuelle Stammdatenblatt"));
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
            Mouse.OverrideCursor = null;
        }

        public static async Task GenerateDeliveryConfirmation(Member m, int year, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    var b = new Billing(year);
-                    await b.FinishSeason();
-                    await b.CalculateBuckets();
-                    App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var b = new Billing(year);
+                await b.FinishSeason();
+                await b.CalculateBuckets();
+                App.HintContextChange();

-                    using var ctx = new AppDbContext();
-                    var data = await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, year, m);
-                    using var doc = new DeliveryConfirmation(ctx, year, m, data);
-                    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);
-                }
-            });
+                using var ctx = new AppDbContext();
+                var data = await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, year, m);
+                using var doc = new DeliveryConfirmation(ctx, year, m, data);
+                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);
+            }
            Mouse.OverrideCursor = null;
        }

        public static async Task GenerateCreditNote(Member m, int year, int avnr, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    using var ctx = new AppDbContext();
-                    var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
-                    var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, year, avnr);
-                    var p = (await ctx.MemberPayments.FindAsync(year, avnr, m.MgNr))!;
-                    var b = BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data);
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                using var ctx = new AppDbContext();
+                var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
+                var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.PaymentVariants, year, avnr);
+                var p = (await ctx.MemberPayments.FindAsync(year, avnr, m.MgNr))!;
+                var b = BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data);

-                    using var doc = new CreditNote(ctx, p, data[m.MgNr],
-                        b.ConsiderContractPenalties, b.ConsiderTotalPenalty, b.ConsiderAutoBusinessShares, b.ConsiderCustomModifiers,
-                        await ctx.GetMemberUnderDelivery(year, m.MgNr));
-                    await Utils.ExportDocument(doc, mode, emailData: (m, $"{CreditNote.Name} {v.Name}", $"Im Anhang finden Sie die Traubengutschrift {v.Name}"));
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+                using var doc = new CreditNote(ctx, p, data[m.MgNr],
+                    b.ConsiderContractPenalties, b.ConsiderTotalPenalty, b.ConsiderAutoBusinessShares, b.ConsiderCustomModifiers,
+                    await ctx.GetMemberUnderDelivery(year, m.MgNr));
+                await Utils.ExportDocument(doc, mode, emailData: (m, $"{CreditNote.Name} {v.Name}", $"Im Anhang finden Sie die Traubengutschrift {v.Name}"));
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
            Mouse.OverrideCursor = null;
        }

@ -470,16 +464,14 @@ namespace Elwig.Services {
                    Title = $"{MemberList.Name} speichern unter - Elwig"
                };
                if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
-                    await Task.Run(async () => {
-                        try {
-                            var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
-                            using var ods = new OdsFile(d.FileName);
-                            await ods.AddTable(data);
-                        } catch (Exception exc) {
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        }
-                    });
+                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    try {
+                        var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
+                        using var ods = new OdsFile(d.FileName);
+                        await ods.AddTable(data);
+                    } catch (Exception exc) {
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
                    Mouse.OverrideCursor = null;
                }
            } else if (mode == ExportMode.Export) {
@ -490,33 +482,8 @@ namespace Elwig.Services {
                    Title = $"{MemberList.Name} speichern unter - Elwig"
                };
                if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
-                    await Task.Run(async () => {
-                        try {
-                            var members = await query
-                                .OrderBy(m => m.MgNr)
-                                .Include(m => m.BillingAddress)
-                                .Include(m => m.TelephoneNumbers)
-                                .Include(m => m.EmailAddresses)
-                                .AsSplitQuery()
-                                .ToListAsync();
-                            var areaComs = await query
-                                .SelectMany(m => m.AreaCommitments)
-                                .Include(c => c.Rd)
-                                .ToListAsync();
-                            await ElwigData.Export(d.FileName, members, areaComs, filterNames);
-                        } catch (Exception exc) {
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        }
-                    });
-                    Mouse.OverrideCursor = null;
-                }
-            } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
+                    Mouse.OverrideCursor = Cursors.AppStarting;
                    try {
-                        var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
-                        var path = Path.Combine(App.TempPath, filename);
                        var members = await query
                            .OrderBy(m => m.MgNr)
                            .Include(m => m.BillingAddress)
@ -528,80 +495,99 @@ namespace Elwig.Services {
                            .SelectMany(m => m.AreaCommitments)
                            .Include(c => c.Rd)
                            .ToListAsync();
-                        if (members.Count == 0) {
-                            MessageBox.Show("Es wurden keine Mitglieder zum Hochladen ausgewählt!", "Mitglieder hochladen",
-                                MessageBoxButton.OK, MessageBoxImage.Error);
-                        } else {
-                            await ElwigData.Export(path, members, areaComs, filterNames);
-                            await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                            MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
-                                MessageBoxButton.OK, MessageBoxImage.Information);
-                        }
-                    } catch (HttpRequestException exc) {
-                        MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                    } catch (TaskCanceledException exc) {
-                        MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                        await ElwigData.Export(d.FileName, members, areaComs, filterNames);
                    } catch (Exception exc) {
                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
-                });
+                    Mouse.OverrideCursor = null;
+                }
+            } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
+                    var path = Path.Combine(App.TempPath, filename);
+                    var members = await query
+                        .OrderBy(m => m.MgNr)
+                        .Include(m => m.BillingAddress)
+                        .Include(m => m.TelephoneNumbers)
+                        .Include(m => m.EmailAddresses)
+                        .AsSplitQuery()
+                        .ToListAsync();
+                    var areaComs = await query
+                        .SelectMany(m => m.AreaCommitments)
+                        .Include(c => c.Rd)
+                        .ToListAsync();
+                    if (members.Count == 0) {
+                        MessageBox.Show("Es wurden keine Mitglieder zum Hochladen ausgewählt!", "Mitglieder hochladen",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
+                    } else {
+                        await ElwigData.Export(path, members, areaComs, filterNames);
+                        await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                        MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
+                            MessageBoxButton.OK, MessageBoxImage.Information);
+                    }
+                } catch (HttpRequestException exc) {
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                } catch (TaskCanceledException exc) {
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                Mouse.OverrideCursor = null;
            } else {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
-                    try {
-                        var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
-                        using var doc = new MemberList(string.Join(" / ", filterNames), data);
-                        await Utils.ExportDocument(doc, mode);
-                    } catch (Exception exc) {
-                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                    }
-                });
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
+                    using var doc = new MemberList(string.Join(" / ", filterNames), data);
+                    await Utils.ExportDocument(doc, mode);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                Mouse.OverrideCursor = null;
            }
        }

        public static async Task<int> UpdateMember(this MemberAdminViewModel vm, int? oldMgNr) {
            var newMgNr = (int)vm.MgNr!;
-            var m = new Member {
-                MgNr = oldMgNr ?? newMgNr,
-                PredecessorMgNr = vm.PredecessorMgNr,
-                IsJuridicalPerson = vm.IsJuridicalPerson,
-                Prefix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Prefix) ? null : vm.Prefix,
-                GivenName = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.GivenName) ? null : vm.GivenName,
-                Name = vm.Name!,
-                Suffix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Suffix) ? null : vm.Suffix,
-                ForTheAttentionOf = !vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.ForTheAttentionOf) ? null : vm.ForTheAttentionOf,
-                Birthday = string.IsNullOrEmpty(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
-                IsDeceased = vm.IsDeceased,
-                CountryNum = 40,  // Austria AT AUT
-                PostalDestId = vm.Ort!.Id,
-                Address = vm.Address!,

-                Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
-                Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,
+            using (var ctx = new AppDbContext()) {
+                var m = new Member {
+                    MgNr = oldMgNr ?? newMgNr,
+                    PredecessorMgNr = vm.PredecessorMgNr,
+                    IsJuridicalPerson = vm.IsJuridicalPerson,
+                    Prefix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Prefix) ? null : vm.Prefix,
+                    GivenName = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.GivenName) ? null : vm.GivenName,
+                    Name = vm.Name!,
+                    Suffix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Suffix) ? null : vm.Suffix,
+                    ForTheAttentionOf = !vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.ForTheAttentionOf) ? null : vm.ForTheAttentionOf,
+                    Birthday = string.IsNullOrEmpty(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
+                    IsDeceased = vm.IsDeceased,
+                    CountryNum = 40,  // Austria AT AUT
+                    PostalDestId = vm.Ort!.Id,
+                    Address = vm.Address!,

-                UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
-                LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
-                IsBuchführend = vm.IsBuchführend,
-                IsOrganic = vm.IsOrganic,
+                    Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
+                    Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,

-                EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
-                ExitDateString = string.IsNullOrEmpty(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
-                BusinessShares = (int)vm.BusinessShares!,
-                AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
-                IsActive = vm.IsActive,
-                IsVollLieferant = vm.IsVollLieferant,
-                IsFunktionär = vm.IsFunktionär,
-                ZwstId = vm.Branch?.ZwstId,
-                DefaultKgNr = vm.DefaultKg?.KgNr,
-                Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
-                ContactViaPost = vm.ContactViaPost,
-                ContactViaEmail = vm.ContactViaEmail,
-            };
+                    UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
+                    LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
+                    IsBuchführend = vm.IsBuchführend,
+                    IsOrganic = vm.IsOrganic,
+
+                    EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
+                    ExitDateString = string.IsNullOrEmpty(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
+                    BusinessShares = (int)vm.BusinessShares!,
+                    AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
+                    IsActive = vm.IsActive,
+                    IsVollLieferant = vm.IsVollLieferant,
+                    IsFunktionär = vm.IsFunktionär,
+                    ZwstId = vm.Branch?.ZwstId,
+                    DefaultKgNr = vm.DefaultKg?.KgNr,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
+                    ContactViaPost = vm.ContactViaPost,
+                    ContactViaEmail = vm.ContactViaEmail,
+                };

-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
                if (oldMgNr != null) {
                    ctx.Update(m);
                } else {
@ -684,7 +670,7 @@ namespace Elwig.Services {
                if (newMgNr != m.MgNr) {
                    await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
                }
-            });
+            }

            App.HintContextChange();

@ -692,8 +678,7 @@ namespace Elwig.Services {
        }

        public static async Task DeleteMember(int mgnr, bool deletePaymentData, bool deleteDeliveries, bool deleteAreaComs) {
-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
+            using (var ctx = new AppDbContext()) {
                var l = (await ctx.Members.FindAsync(mgnr))!;
                if (deletePaymentData) {
                    ctx.RemoveRange(l.Credits);
@ -706,8 +691,7 @@ namespace Elwig.Services {
                }
                ctx.Remove(l);
                await ctx.SaveChangesAsync();
-            });
-
+            }
            App.HintContextChange();
        }
    }
--- a/Elwig/Windows/AreaComAdminWindow.xaml.cs
+++ b/Elwig/Windows/AreaComAdminWindow.xaml.cs
@ -203,9 +203,13 @@ namespace Elwig.Windows {
                $"Soll die Flächenbindung {a.GstNr} ({a.Area} m²) wirklich unwiderruflich gelöscht werden?",
                "Flächenbindung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
            if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                try {
-                    await AreaComService.DeleteAreaCom(a.FbNr);
+                    using (var ctx = new AppDbContext()) {
+                        ctx.Remove(a);
+                        await ctx.SaveChangesAsync();
+                    }
+                    App.HintContextChange();
                } catch (Exception exc) {
                    var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@ -223,7 +227,7 @@ namespace Elwig.Windows {

        private async void AreaCommitmentSaveButton_Click(object? sender, RoutedEventArgs? evt) {
            AreaCommitmentSaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;

            int fbnr;
            try {
@ -233,8 +237,9 @@ namespace Elwig.Windows {
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                MessageBox.Show(str, "Flächenbindung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                AreaCommitmentSaveButton.IsEnabled = true;
-                Mouse.OverrideCursor = null;
                return;
+            } finally {
+                Mouse.OverrideCursor = null;
            }

            IsEditing = false;
@ -247,7 +252,6 @@ namespace Elwig.Windows {
            FinishInputFilling();
            await RefreshList();
            RefreshInputs();
-            Mouse.OverrideCursor = null;
            ViewModel.SearchQuery = "";
            ControlUtils.SelectItem(AreaCommitmentList, AreaCommitmentList.ItemsSource.Cast<AreaCom>().Where(a => a.FbNr == fbnr).FirstOrDefault());
        }
--- a/Elwig/Windows/BaseDataWindow.xaml.Season.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.Season.cs
@ -157,7 +157,7 @@ namespace Elwig.Windows {
            }
            var d = new NewSeasonDialog(s, currencies);
            if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                try {
                    using var ctx = new AppDbContext();
                    ctx.Add(new Season {
@ -209,7 +209,7 @@ namespace Elwig.Windows {
                $"Soll die Saison {s.Year} wirklich unwiderruflich gelöscht werden?",
                "Saison löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
            if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                try {
                    using var ctx = new AppDbContext();
                    ctx.Remove(s);
--- a/Elwig/Windows/BaseDataWindow.xaml.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.cs
@ -318,7 +318,8 @@ namespace Elwig.Windows {

        private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
            SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+
            try {
                await Save();
            } catch (Exception exc) {
@ -326,8 +327,9 @@ namespace Elwig.Windows {
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                MessageBox.Show(str, "Stammdaten aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                SaveButton.IsEnabled = true;
-                Mouse.OverrideCursor = null;
                return;
+            } finally {
+                Mouse.OverrideCursor = null;
            }

            IsEditing = false;
@ -347,7 +349,6 @@ namespace Elwig.Windows {
            }

            App.HintContextChange();
-            Mouse.OverrideCursor = null;
        }

        private void FillInputs(ClientParameters p, Season? s) {
--- a/Elwig/Windows/DeliveryAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml
@ -217,7 +217,7 @@
                        <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
                        <Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
                        <Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
-                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ... (gilt für Gewicht der gesamten Lieferung)<LineBreak/>
+                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ... (gilt für Menge der gesamten Lieferung)<LineBreak/>
                        <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...<LineBreak/>
                        <Bold>Uhrzeit</Bold>: z.B. 06:00-08:00, 18:00-, ...<LineBreak/>
                        <Bold>Handwiegung</Bold>: handw[iegung], !Handw[iegung] (alle ohne Handwiegung)<LineBreak/>
@ -272,7 +272,7 @@
                            </Style>
                        </DataGridTextColumn.CellStyle>
                    </DataGridTextColumn>
-                    <DataGridTextColumn Header="Gewicht" Binding="{Binding FilteredWeight, StringFormat='{}{0:N0} kg '}" Width="75">
+                    <DataGridTextColumn Header="Menge" Binding="{Binding FilteredWeight, StringFormat='{}{0:N0} kg '}" Width="75">
                        <DataGridTextColumn.CellStyle>
                            <Style>
                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@ -516,7 +516,7 @@
                </Grid>
            </GroupBox>

-            <GroupBox Header="Gewicht" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
+            <GroupBox Header="Menge" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
                <Grid>
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="70"/>
@ -669,7 +669,7 @@
            <Separator Grid.Column="5"/>
            <StatusBarItem Grid.Column="6">
                <TextBlock ToolTip="{Binding StatusWeightToolTip}">
-                    Gewicht: <Run Text="{Binding StatusWeight}"/>
+                    Menge: <Run Text="{Binding StatusWeight}"/>
                </TextBlock>
            </StatusBarItem>
            <Separator Grid.Column="7"/>
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@ -719,7 +719,7 @@ namespace Elwig.Windows {
        private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
            FinishButton.IsEnabled = false;
            NewDeliveryPartButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
            DeliveryPartList.IsEnabled = false;

            DeliveryPart? p;
@ -757,7 +757,7 @@ namespace Elwig.Windows {
        private async void FinishButton_Click(object sender, RoutedEventArgs evt) {
            FinishButton.IsEnabled = false;
            NewDeliveryPartButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
            DeliveryPartList.IsEnabled = false;

            DeliveryPart? p;
@ -888,7 +888,7 @@ namespace Elwig.Windows {
            if (res == null)
                return;

-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
            try {
                var id = res.Value.Item1;
                var weights = res.Value.Item2;
@ -959,7 +959,7 @@ namespace Elwig.Windows {
                $"Soll die Lieferung {d.LsNr} ({d.Member.AdministrativeName}, MgNr. {d.Member.MgNr}) wirklich unwiderruflich gelöscht werden?",
                "Lieferung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
            if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                try {
                    await DeliveryService.DeleteDelivery(d.LsNr);
                } catch (Exception exc) {
@ -979,7 +979,7 @@ namespace Elwig.Windows {

        private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
            SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;

            DeliveryPart? p;
            try {
@ -996,8 +996,9 @@ namespace Elwig.Windows {
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                MessageBox.Show(str, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                SaveButton.IsEnabled = true;
-                Mouse.OverrideCursor = null;
                return;
+            } finally {
+                Mouse.OverrideCursor = null;
            }

            IsEditing = false;
@ -1014,7 +1015,6 @@ namespace Elwig.Windows {
            await RefreshDeliveryParts();
            RefreshInputs();

-            Mouse.OverrideCursor = null;
            DepreciateButton.IsEnabled = true;
        }

--- a/Elwig/Windows/DeliveryAncmtAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryAncmtAdminWindow.xaml
@ -125,7 +125,7 @@
                        <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
                        <Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
                        <Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
-                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ...<LineBreak/>
+                        <Bold>Menge</Bold>: z.B. &lt;500kg, &gt;6000kg, ...<LineBreak/>
                        <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...
                    </TextBlock>
                </TextBox.ToolTip>
@ -191,7 +191,7 @@
                            </Style>
                        </DataGridTextColumn.CellStyle>
                    </DataGridTextColumn>
-                    <DataGridTextColumn Header="Gewicht" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="75">
+                    <DataGridTextColumn Header="Menge" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="75">
                        <DataGridTextColumn.CellStyle>
                            <Style>
                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@ -328,7 +328,7 @@
                        </ComboBox.ItemTemplateSelector>
                    </ComboBox>

-                    <Label Content="Gewicht:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <Label Content="Menge:" Margin="10,70,0,0" Grid.Column="0"/>
                    <ctrl:UnitTextBox x:Name="WeightInput" Unit="kg" Text="{Binding WeightString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                      Grid.Column="1" Margin="0,70,10,10" Width="61" HorizontalAlignment="Left"
                                      TextChanged="WeightInput_TextChanged" KeyUp="Input_KeyUp"/>
@ -364,7 +364,7 @@
            <Separator Grid.Column="1"/>
            <StatusBarItem Grid.Column="2">
                <TextBlock ToolTip="{Binding StatusWeightToolTip}">
-                    Gewicht: <Run Text="{Binding StatusWeight}"/>
+                    Menge: <Run Text="{Binding StatusWeight}"/>
                </TextBlock>
            </StatusBarItem>
            <Separator Grid.Column="3"/>
--- a/Elwig/Windows/DeliveryScheduleAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryScheduleAdminWindow.xaml
@ -127,7 +127,7 @@
                        </DataGridTextColumn.CellStyle>
                    </DataGridTextColumn>
                    <DataGridTextColumn Header="Beschreibung" Binding="{Binding Description}" Width="200"/>
-                    <DataGridTextColumn Header="Max. Gew." Binding="{Binding MaxWeight, StringFormat='{}{0:N0} kg'}" Width="80">
+                    <DataGridTextColumn Header="Max. Mg." Binding="{Binding MaxWeight, StringFormat='{}{0:N0} kg'}" Width="80">
                        <DataGridTextColumn.CellStyle>
                            <Style>
                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@ -211,7 +211,7 @@
                             Margin="0,40,10,10" Grid.Column="1" Grid.ColumnSpan="2"
                             TextChanged="TextBox_TextChanged"/>

-                    <Label Content="Max. Gewicht:" Margin="10,70,0,10"/>
+                    <Label Content="Max. Menge:" Margin="10,70,0,10"/>
                    <ctrl:UnitTextBox x:Name="MaxWeightInput" Unit="kg" Text="{Binding MaxWeightString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                      Margin="0,70,10,10" Grid.Column="1" Grid.ColumnSpan="2" Width="68" HorizontalAlignment="Left"
                                      TextChanged="MaxWeightInput_TextChanged"/>
--- a/Elwig/Windows/MailWindow.xaml.cs
+++ b/Elwig/Windows/MailWindow.xaml.cs
@ -671,7 +671,7 @@ namespace Elwig.Windows {
                    var avnr = details.Item2;
                    try {
                        cnData[(year, avnr)] = (
-                            await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, year, avnr),
+                            await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.PaymentVariants, year, avnr),
                            await ctx.MemberPayments.Where(p => p.Year == year && p.AvNr == avnr).ToDictionaryAsync(c => c.MgNr),
                            BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data)
                        );
--- a/Elwig/Windows/MainWindow.xaml
+++ b/Elwig/Windows/MainWindow.xaml
@ -207,7 +207,7 @@
                <Button x:Name="BreakdownButton"
                        Click="BreakdownButton_Click"
                        Margin="195,90,0,10" Width="190" Padding="3,5,5,5"
-                        ToolTip="Aufschlüsselung des Gewichts nach Zweigstelle, Mitglied, Sorte, Attribut/Bewirt., Qualitätsstufe, gebunden/ungebunden">
+                        ToolTip="Aufschlüsselung der Menge nach Zweigstelle, Mitglied, Sorte, Attribut/Bewirt., Qualitätsstufe, gebunden/ungebunden">
                    <Grid>
                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"
                                   TextAlignment="Left" HorizontalAlignment="Left" Padding="6.5,0.5,0,0"/>
@ -252,7 +252,7 @@
                    </Grid.RowDefinitions>

                    <TextBlock Grid.Row="0" Grid.Column="1" TextAlignment="Right"><Bold>Mitglieder</Bold></TextBlock>
-                    <TextBlock Grid.Row="0" Grid.Column="2" TextAlignment="Right"><Bold>Gewicht</Bold></TextBlock>
+                    <TextBlock Grid.Row="0" Grid.Column="2" TextAlignment="Right"><Bold>Menge</Bold></TextBlock>
                    <TextBlock Grid.Row="0" Grid.Column="3" TextAlignment="Right"><Bold>Fläche</Bold></TextBlock>

                    <TextBlock Grid.Row="1" Grid.Column="0">Gesamt:</TextBlock>
--- a/Elwig/Windows/MainWindow.xaml.cs
+++ b/Elwig/Windows/MainWindow.xaml.cs
@ -62,7 +62,7 @@ namespace Elwig.Windows {
        }

        private async void Menu_Help_Smtp_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
            try {
                using var client = await Utils.GetSmtpClient();
                await client!.DisconnectAsync(true);
@ -133,10 +133,8 @@ namespace Elwig.Windows {
                    Multiselect = true,
                };
                if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
-                    await Task.Run(async () => {
-                        await ElwigData.Import(d.FileNames, ElwigData.ImportMode.Interactively);
-                    });
+                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    await ElwigData.Import(d.FileNames, ElwigData.ImportMode.Interactively);
                }
            } catch (Exception exc) {
                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
@ -147,81 +145,77 @@ namespace Elwig.Windows {
        private async void DownloadButton_Click(object sender, RoutedEventArgs evt) {
            if (App.Config.SyncUrl == null)
                return;
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    var data = await Utils.GetExportMetaData(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                    var files = data
-                        .Select(f => new {
-                            Name = f!["name"]!.AsValue().GetValue<string>(),
-                            Timestamp = f!["timestamp"] != null && DateTime.TryParseExact(f!["timestamp"]!.AsValue().GetValue<string>(), "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dt) ? dt : (DateTime?)null,
-                            ZwstId = f!["meta"]?["zwstid"]?.AsValue().GetValue<string>() ?? f!["zwstid"]?.AsValue().GetValue<string>(),
-                            Device = f!["meta"]?["device"]!.AsValue().GetValue<string>(),
-                            Url = f!["url"]!.AsValue().GetValue<string>(),
-                            Size = f!["size"]!.AsValue().GetValue<long>(),
-                        })
-                        .Where(f => f.Timestamp >= new DateTime(Utils.CurrentLastSeason, 7, 1))
-                        .ToList();
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var data = await Utils.GetExportMetaData(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                var files = data
+                    .Select(f => new {
+                        Name = f!["name"]!.AsValue().GetValue<string>(),
+                        Timestamp = f!["timestamp"] != null && DateTime.TryParseExact(f!["timestamp"]!.AsValue().GetValue<string>(), "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dt) ? dt : (DateTime?)null,
+                        ZwstId = f!["meta"]?["zwstid"]?.AsValue().GetValue<string>() ?? f!["zwstid"]?.AsValue().GetValue<string>(),
+                        Device = f!["meta"]?["device"]!.AsValue().GetValue<string>(),
+                        Url = f!["url"]!.AsValue().GetValue<string>(),
+                        Size = f!["size"]!.AsValue().GetValue<long>(),
+                    })
+                    .Where(f => f.Timestamp >= new DateTime(Utils.CurrentLastSeason, 7, 1))
+                    .ToList();

-                    var imported = await ElwigData.GetImportedFiles();
-                    var import = files
-                        .Where(f => f.Device != Environment.MachineName && !imported.Contains(f.Name))
-                        .ToList();
-                    var paths = new List<string>();
-                    using (var client = Utils.GetHttpClient(App.Config.SyncUsername, App.Config.SyncPassword)) {
-                        foreach (var f in import) {
-                            var filename = Path.Combine(App.TempPath, f.Name);
-                            using var stream = new FileStream(filename, FileMode.Create);
-                            await client.DownloadAsync(f.Url, stream);
-                            paths.Add(filename);
-                        }
+                var imported = await ElwigData.GetImportedFiles();
+                var import = files
+                    .Where(f => f.Device != Environment.MachineName && !imported.Contains(f.Name))
+                    .ToList();
+                var paths = new List<string>();
+                using (var client = Utils.GetHttpClient(App.Config.SyncUsername, App.Config.SyncPassword)) {
+                    foreach (var f in import) {
+                        var filename = Path.Combine(App.TempPath, f.Name);
+                        using var stream = new FileStream(filename, FileMode.Create);
+                        await client.DownloadAsync(f.Url, stream);
+                        paths.Add(filename);
                    }
-                    await ElwigData.Import(paths, ElwigData.ImportMode.FromBranches);
-                } catch (HttpRequestException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (TaskCanceledException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
-            });
+                await ElwigData.Import(paths, ElwigData.ImportMode.FromBranches);
+            } catch (HttpRequestException exc) {
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } catch (TaskCanceledException exc) {
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
            Mouse.OverrideCursor = null;
        }

        private async void UploadButton_Click(object sender, RoutedEventArgs evt) {
            if (App.Config.SyncUrl == null)
                return;
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    var path = Path.Combine(App.TempPath, $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip");
-                    using var ctx = new AppDbContext();
-                    var deliveries = await ctx.Deliveries
-                        .Where(d => d.Year == Utils.CurrentLastSeason && d.ZwstId == App.ZwstId)
-                        .Include(d => d.Parts)
-                        .ThenInclude(p => p.PartModifiers)
-                        .OrderBy(d => d.DateString)
-                        .ThenBy(d => d.TimeString)
-                        .ThenBy(d => d.LsNr)
-                        .AsSplitQuery()
-                        .ToListAsync();
-                    if (deliveries.Count == 0) {
-                        MessageBox.Show("Es gibt keine Lieferungen, die hochgeladen werden können!", "Lieferungen hochladen",
-                            MessageBoxButton.OK, MessageBoxImage.Error);
-                    } else {
-                        await ElwigData.Export(path, deliveries, [$"{Utils.CurrentLastSeason}", $"Zweigstelle {App.BranchName}"]);
-                        await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                        MessageBox.Show($"Hochladen von {deliveries.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochladen",
-                            MessageBoxButton.OK, MessageBoxImage.Information);
-                    }
-                } catch (HttpRequestException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (TaskCanceledException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var path = Path.Combine(App.TempPath, $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip");
+                using var ctx = new AppDbContext();
+                var deliveries = await ctx.Deliveries
+                    .Where(d => d.Year == Utils.CurrentLastSeason && d.ZwstId == App.ZwstId)
+                    .Include(d => d.Parts)
+                    .ThenInclude(p => p.PartModifiers)
+                    .OrderBy(d => d.DateString)
+                    .ThenBy(d => d.TimeString)
+                    .ThenBy(d => d.LsNr)
+                    .AsSplitQuery()
+                    .ToListAsync();
+                if (deliveries.Count == 0) {
+                    MessageBox.Show("Es gibt keine Lieferungen, die hochgeladen werden können!", "Lieferungen hochladen",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
+                } else {
+                    await ElwigData.Export(path, deliveries, [$"{Utils.CurrentLastSeason}", $"Zweigstelle {App.BranchName}"]);
+                    await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                    MessageBox.Show($"Hochladen von {deliveries.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochladen",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
                }
-            });
+            } catch (HttpRequestException exc) {
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+            } catch (TaskCanceledException exc) {
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
            Mouse.OverrideCursor = null;
        }

@ -276,31 +270,24 @@ namespace Elwig.Windows {
            AreaCommitmentsButton.IsEnabled = valid;
            BreakdownMemberVarietyButton.IsEnabled = valid;

-            SeasonStatMembersTotal.Text = "-";
-            SeasonStatMembersGeb.Text = "-";
-            SeasonStatWeightTotal.Text = "-";
-            SeasonStatWeightGeb.Text = "-";
-            SeasonStatWeightUngeb.Text = "-";
-            SeasonStatArea.Text = "-";
            if (valid) {
-                await Task.Run(async () => {
-                    var membersTotal = await ctx.Deliveries.Where(d => d.Year == year).Select(d => d.Member).Distinct().CountAsync();
-                    var areaComs = Utils.ActiveAreaCommitments(ctx.AreaCommitments, year!.Value);
-                    var membersGeb = await areaComs.Select(c => c.Member).Distinct().CountAsync();
-                    var weightTotal = await ctx.DeliveryParts.Where(p => p.Year == year).SumAsync(p => p.Weight);
-                    var gebWeight = await ctx.DeliveryPartBuckets.Where(b => b.Year == year && b.Discr != "_").SumAsync(b => b.Value);
-                    var area = await areaComs.SumAsync(c => c.Area);
-                    await App.MainDispatcher.BeginInvoke(() => {
-                        if (year != SeasonInput.Value) return;
-                        SeasonStatMembersTotal.Text = $"{membersTotal:N0}";
-                        SeasonStatMembersGeb.Text = $"{membersGeb:N0}";
-                        SeasonStatWeightTotal.Text = $"{weightTotal:N0} kg";
-                        SeasonStatWeightGeb.Text = $"{gebWeight:N0} kg";
-                        SeasonStatWeightUngeb.Text = $"{weightTotal - gebWeight:N0} kg";
-                        SeasonStatArea.Text = $"{area:N0} m²";
-                    });
-                });
-            };
+                var areaComs = Utils.ActiveAreaCommitments(ctx.AreaCommitments, year!.Value);
+                var weightTotal = await ctx.DeliveryParts.Where(p => p.Year == year).SumAsync(p => p.Weight);
+                var gebWeight = await ctx.DeliveryPartBuckets.Where(b => b.Year == year && b.Discr != "_").SumAsync(b => b.Value);
+                SeasonStatMembersTotal.Text = $"{await ctx.Deliveries.Where(d => d.Year == year).Select(d => d.Member).Distinct().CountAsync():N0}";
+                SeasonStatMembersGeb.Text = $"{await areaComs.Select(c => c.Member).Distinct().CountAsync():N0}";
+                SeasonStatWeightTotal.Text = $"{weightTotal:N0} kg";
+                SeasonStatWeightGeb.Text = $"{gebWeight:N0} kg";
+                SeasonStatWeightUngeb.Text = $"{weightTotal - gebWeight:N0} kg";
+                SeasonStatArea.Text = $"{await areaComs.SumAsync(c => c.Area):N0} m²";
+            } else {
+                SeasonStatMembersTotal.Text = "-";
+                SeasonStatMembersGeb.Text = "-";
+                SeasonStatWeightTotal.Text = "-";
+                SeasonStatWeightGeb.Text = "-";
+                SeasonStatWeightUngeb.Text = "-";
+                SeasonStatArea.Text = "-";
+            }
        }

        private void DeliveryConfirmationButton_Click(object sender, RoutedEventArgs evt) {
@ -328,24 +315,22 @@ namespace Elwig.Windows {
            if (d.ShowDialog() == false)
                return;

-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    var b = new Billing(year);
-                    await b.FinishSeason();
-                    await b.CalculateBuckets();
-                    App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var b = new Billing(year);
+                await b.FinishSeason();
+                await b.CalculateBuckets();
+                App.HintContextChange();

-                    using var ctx = new AppDbContext();
-                    var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, year);
-                    var tbl2 = await AreaComUnderDeliveryData.ForSeason(ctx.AreaComUnderDeliveryRows, year);
-                    using var ods = new OdsFile(d.FileName);
-                    await ods.AddTable(tbl1);
-                    await ods.AddTable(tbl2);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+                using var ctx = new AppDbContext();
+                var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, year);
+                var tbl2 = await AreaComUnderDeliveryData.ForSeason(ctx.AreaComUnderDeliveryRows, year);
+                using var ods = new OdsFile(d.FileName);
+                await ods.AddTable(tbl1);
+                await ods.AddTable(tbl2);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
            Mouse.OverrideCursor = null;
        }

@ -361,26 +346,24 @@ namespace Elwig.Windows {
            if (d.ShowDialog() == false)
                return;

-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    var b = new Billing(year);
-                    await b.FinishSeason();
-                    await b.CalculateBuckets();
-                    App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var b = new Billing(year);
+                await b.FinishSeason();
+                await b.CalculateBuckets();
+                App.HintContextChange();

-                    using var ctx = new AppDbContext();
-                    using var ods = new OdsFile(d.FileName);
-                    var tblTotal = await WeightBreakdownData.ForSeason(ctx.WeightBreakDownRows, year);
-                    await ods.AddTable(tblTotal);
-                    foreach (var branch in await ctx.Branches.OrderBy(b => b.Name).ToListAsync()) {
-                        var tbl = await WeightBreakdownData.ForSeason(ctx.WeightBreakDownRows, year, branch);
-                        await ods.AddTable(tbl);
-                    }
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                using var ctx = new AppDbContext();
+                using var ods = new OdsFile(d.FileName);
+                var tblTotal = await WeightBreakdownData.ForSeason(ctx.WeightBreakDownRows, year);
+                await ods.AddTable(tblTotal);
+                foreach (var branch in await ctx.Branches.OrderBy(b => b.Name).ToListAsync()) {
+                    var tbl = await WeightBreakdownData.ForSeason(ctx.WeightBreakDownRows, year, branch);
+                    await ods.AddTable(tbl);
                }
-            });
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
            Mouse.OverrideCursor = null;
        }

@ -396,22 +379,20 @@ namespace Elwig.Windows {
            if (d.ShowDialog() == false)
                return;

-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    var b = new Billing(year);
-                    await b.FinishSeason();
-                    await b.CalculateBuckets();
-                    App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var b = new Billing(year);
+                await b.FinishSeason();
+                await b.CalculateBuckets();
+                App.HintContextChange();

-                    using var ctx = new AppDbContext();
-                    var tbl = await MemberAreaComsData.ForSeason(ctx.MemberAreaComsRows, year);
-                    using var ods = new OdsFile(d.FileName);
-                    await ods.AddTable(tbl);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+                using var ctx = new AppDbContext();
+                var tbl = await MemberAreaComsData.ForSeason(ctx.MemberAreaComsRows, year);
+                using var ods = new OdsFile(d.FileName);
+                await ods.AddTable(tbl);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
            Mouse.OverrideCursor = null;
        }

@ -427,22 +408,20 @@ namespace Elwig.Windows {
            if (d.ShowDialog() == false)
                return;

-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    var b = new Billing(year);
-                    await b.FinishSeason();
-                    await b.CalculateBuckets();
-                    App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var b = new Billing(year);
+                await b.FinishSeason();
+                await b.CalculateBuckets();
+                App.HintContextChange();

-                    using var ctx = new AppDbContext();
-                    var tbl = await MemberDeliveryPerVarietyData.ForSeason(ctx.MemberDeliveryPerVariantRows, year);
-                    using var ods = new OdsFile(d.FileName);
-                    await ods.AddTable(tbl);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+                using var ctx = new AppDbContext();
+                var tbl = await MemberDeliveryPerVarietyData.ForSeason(ctx.MemberDeliveryPerVariantRows, year);
+                using var ods = new OdsFile(d.FileName);
+                await ods.AddTable(tbl);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
            Mouse.OverrideCursor = null;
        }
    }
--- a/Elwig/Windows/MemberAdminWindow.xaml.cs
+++ b/Elwig/Windows/MemberAdminWindow.xaml.cs
@ -389,7 +389,7 @@ namespace Elwig.Windows {
            }
            var d = new DeleteMemberDialog(m.MgNr, m.AdministrativeName, areaComs, deliveries, credits);
            if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                try {
                    await MemberService.DeleteMember(m.MgNr, d.DeletePaymentData, d.DeleteDeliveries, d.DeleteAreaComs);
                } catch (Exception exc) {
@ -408,7 +408,7 @@ namespace Elwig.Windows {
        }

        private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
            SaveButton.IsEnabled = false;

            int mgnr;
@ -419,8 +419,9 @@ namespace Elwig.Windows {
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                MessageBox.Show(str, "Mitglied aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                SaveButton.IsEnabled = true;
-                Mouse.OverrideCursor = null;
                return;
+            } finally {
+                Mouse.OverrideCursor = null;
            }

            IsEditing = false;
@ -435,7 +436,6 @@ namespace Elwig.Windows {
            await RefreshList();
            RefreshInputs();
            ViewModel.SearchQuery = "";
-            Mouse.OverrideCursor = null;
            if (mgnr is int m)
                FocusMember(m);
        }
@ -491,17 +491,15 @@ namespace Elwig.Windows {

        private async void Menu_Contact_Letterhead_Click(object sender, RoutedEventArgs evt) {
            if (ViewModel.SelectedMember is not Member m) return;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
            try {
-                await Task.Run(async () => {
-                    using var doc = new Letterhead(m);
-                    await doc.Generate();
-                    if (!App.Config.Debug) {
-                        await doc.Print();
-                    } else {
-                        doc.Show();
-                    }
-                });
+                using var doc = new Letterhead(m);
+                await doc.Generate();
+                if (!App.Config.Debug) {
+                    await doc.Print();
+                } else {
+                    doc.Show();
+                }
            } catch (Exception exc) {
                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
            }
--- a/Elwig/Windows/PaymentVariantsWindow.xaml
+++ b/Elwig/Windows/PaymentVariantsWindow.xaml
@ -6,7 +6,7 @@
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        xmlns:local="clr-namespace:Elwig.Windows"
        xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="Auszahlungsvarianten - Elwig" Height="480" Width="850" MinHeight="400" MinWidth="830">
+        Title="Auszahlungsvarianten - Elwig" Height="480" Width="850" MinHeight="400" MinWidth="850">
    <Window.Resources>
        <Style TargetType="Label">
            <Setter Property="HorizontalAlignment" Value="Left"/>
@ -160,7 +160,7 @@
            </TextBlock>

            <Label Content="Berücksichtigen:" Margin="90,70,10,10" Grid.Column="1"/>
-            <CheckBox x:Name="ConsiderModifiersInput" Content="Zu-/Abschläge bei Lieferungen"
+            <CheckBox x:Name="ConsiderModifiersInput" Content="Zu-/Abschläge bei Lieferungen (inkl. Rebelzuschl.)"
                      Margin="110,95,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                      Checked="ConsiderModifiersInput_Changed" Unchecked="ConsiderModifiersInput_Changed"/>
            <CheckBox x:Name="ConsiderPenaltiesInput" Content="Pönalen bei Unterlieferungen (FB)"
--- a/Elwig/fetch-resources.bat
+++ b/Elwig/fetch-resources.bat
@ -1,5 +0,0 @@
-::mkdir "C:\Program Files\Elwig"
-mkdir "C:\ProgramData\Elwig\resources"
-copy /b /y Documents\*.css "C:\ProgramData\Elwig\resources"
-copy /b /y Documents\*.cshtml "C:\ProgramData\Elwig\resources"
-::copy /b /y ..\Installer\Files\*.exe "C:\Program Files\Elwig\"
--- a/Installer/Folders.wxs
+++ b/Installer/Folders.wxs
@ -1,23 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
  <Fragment>
-	<!-- C:\Program Files (x86)\Elwig oder C:\Program Files\Elwig -->
+    <!-- C:\Program Files (x86)\Elwig oder C:\Program Files\Elwig -->
    <StandardDirectory Id="ProgramFiles64Folder">
-		<Directory Id="InstallFolder" Name="!(bind.Property.ProductName)" />
+      <Directory Id="InstallFolder" Name="!(bind.Property.ProductName)">
+        <Directory Id="InstallFolderResources" Name="resources">
+          <Directory Id="InstallFolderDocuments" Name="Documents" />
+        </Directory>
+      </Directory>
    </StandardDirectory>
-	
-	<!-- C:\ProgramData\Elwig -->
-	<StandardDirectory Id="CommonAppDataFolder">
-		<Directory Id="ConfigFolder" Name="!(bind.Property.ProductName)">
-			<Directory Id="ConfigFolderResources" Name="resources" />
-		</Directory>
-	</StandardDirectory>
-	  
-	<!-- C:\ProgramData\Microsoft\Windows\Start Menu\Programs -->
-	<StandardDirectory Id="ProgramMenuFolder">
-		<Directory Id="StartMenuProgramsFolder" Name="!(bind.Property.ProductName)" />
-	</StandardDirectory>
-	  
-	<!-- C:\Users{USERNAME}\Desktop -->
-	<StandardDirectory Id="DesktopFolder" />
+
+    <!-- C:\ProgramData\Elwig -->
+    <StandardDirectory Id="CommonAppDataFolder">
+      <Directory Id="ConfigFolder" Name="!(bind.Property.ProductName)" />
+    </StandardDirectory>
+
+    <!-- C:\ProgramData\Microsoft\Windows\Start Menu\Programs -->
+    <StandardDirectory Id="ProgramMenuFolder">
+      <Directory Id="StartMenuProgramsFolder" Name="!(bind.Property.ProductName)" />
+    </StandardDirectory>
+
+    <!-- C:\Users\{USERNAME}\Desktop -->
+    <StandardDirectory Id="DesktopFolder" />
  </Fragment>
 </Wix>
--- a/Installer/HeatComponents.wxs
+++ b/Installer/HeatComponents.wxs
@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
  <Fragment>
-	  <ComponentGroup Id="HeatComponents">
-		  <Files Directory="InstallFolder" Include="..\Elwig\bin\Publish\**">
-			  <Exclude Files="..\Elwig\bin\Publish\**.exe" />
-			  <Exclude Files="..\Elwig\bin\Publish\**.pdb" />
-		  </Files>
-		  <Files Directory="ConfigFolderResources" Include="..\Elwig\Documents\**">
-			  <Exclude Files="..\Elwig\Documents\**.cs" />
-		  </Files>
-	  </ComponentGroup>
+    <ComponentGroup Id="HeatComponents">
+      <Files Directory="InstallFolder" Include="..\Elwig\bin\Publish\**">
+        <Exclude Files="..\Elwig\bin\Publish\**.exe" />
+        <Exclude Files="..\Elwig\bin\Publish\**.pdb" />
+      </Files>
+      <Files Directory="InstallFolderDocuments" Include="..\Elwig\Documents\**">
+        <Exclude Files="..\Elwig\Documents\**.cs" />
+      </Files>
+    </ComponentGroup>
  </Fragment>
 </Wix>
--- a/Tests/DocumentTests/PaymentVariantSummaryTest.cs
+++ b/Tests/DocumentTests/PaymentVariantSummaryTest.cs
@ -1,28 +0,0 @@
-using Elwig.Documents;
-using Elwig.Helpers;
-using Elwig.Models.Dtos;
-
-namespace Tests.DocumentTests {
-    [TestFixture]
-    public class PaymentVariantSummaryTest {
-
-        [Test]
-        public async Task Test_01_PaymentVariant2020() {
-            using var ctx = new AppDbContext();
-            var v = (await ctx.PaymentVariants.FindAsync(2020, 1))!;
-            var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
-            using var doc = new PaymentVariantSummary(v, data);
-            var text = await Utils.GeneratePdfText(doc);
-            Assert.Multiple(() => {
-                Assert.That(text, Contains.Substring("Auszahlungsvariante"));
-                Assert.That(text, Contains.Substring(v.Name));
-                Assert.That(text, Contains.Substring("""
-                    Gradation ungebunden gebunden Gesamt
-                    [°Oe] [kg] [€/kg] [kg] [€/kg] [€]
-                    Grüner Veltliner 3 219 0 1 609,50
-                    Qualitätswein 73 3 219 0,5000 - - 1 609,50
-                    """));
-            });
-        }
-    }
-}
--- a/Tests/E2ETests/DeliveryAdminWindowReceiptTest.cs
+++ b/Tests/E2ETests/DeliveryAdminWindowReceiptTest.cs
@ -1,6 +1,6 @@
 using OpenQA.Selenium;
 using OpenQA.Selenium.Appium.Windows;
-using Tests.WeighingTests;
+using Tests.UnitTests.WeighingTests;

 namespace Tests.E2ETests {
    [TestFixture, Order(2)]
--- a/Tests/UnitTests/DocumentTests/CreditNoteTest.cs
+++ b/Tests/UnitTests/DocumentTests/CreditNoteTest.cs
@ -3,7 +3,7 @@ using Elwig.Helpers;
 using Elwig.Models.Dtos;
 using Microsoft.EntityFrameworkCore;

-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
    [TestFixture]
    public class CreditNoteTest {

@ -12,7 +12,7 @@ namespace Tests.DocumentTests {
            using var ctx = new AppDbContext();
            var m = await ctx.Members.FindAsync(101);
            var p = await ctx.MemberPayments.Where(p => p.Year == 2020 && p.AvNr == 1).SingleAsync();
-            var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, 2020, 1);
+            var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.PaymentVariants, 2020, 1);
            using var doc = new CreditNote(ctx, p, data[m!.MgNr], false, false, false, false,
                ctx.GetMemberUnderDelivery(2020, m!.MgNr).GetAwaiter().GetResult());
            var text = await Utils.GeneratePdfText(doc);
--- a/Tests/UnitTests/DocumentTests/DeliveryAncmtListTest.cs
+++ b/Tests/UnitTests/DocumentTests/DeliveryAncmtListTest.cs
@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;

-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
    [TestFixture]
    public class DeliveryAncmtListTest {

--- a/Tests/UnitTests/DocumentTests/DeliveryConfirmationTest.cs
+++ b/Tests/UnitTests/DocumentTests/DeliveryConfirmationTest.cs
@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;

-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
    [TestFixture]
    public class DeliveryConfirmationTest {

--- a/Tests/UnitTests/DocumentTests/DeliveryDepreciationListTest.cs
+++ b/Tests/UnitTests/DocumentTests/DeliveryDepreciationListTest.cs
@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;

-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
    [TestFixture]
    public class DeliveryDepreciationListTest {

--- a/Tests/UnitTests/DocumentTests/DeliveryJournalTest.cs
+++ b/Tests/UnitTests/DocumentTests/DeliveryJournalTest.cs
@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;

-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
    [TestFixture]
    public class DeliveryJournalTest {

--- a/Tests/UnitTests/DocumentTests/DeliveryNoteTest.cs
+++ b/Tests/UnitTests/DocumentTests/DeliveryNoteTest.cs
@ -1,7 +1,7 @@
 using Elwig.Documents;
 using Elwig.Helpers;

-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
    [TestFixture]
    public class DeliveryNoteTest {

--- a/Tests/UnitTests/DocumentTests/LetterheadTest.cs
+++ b/Tests/UnitTests/DocumentTests/LetterheadTest.cs
@ -1,7 +1,7 @@
 using Elwig.Documents;
 using Elwig.Helpers;

-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
    [TestFixture]
    public class LetterheadTest {

--- a/Tests/UnitTests/DocumentTests/MemberDataSheetTest.cs
+++ b/Tests/UnitTests/DocumentTests/MemberDataSheetTest.cs
@ -1,7 +1,7 @@
 using Elwig.Documents;
 using Elwig.Helpers;

-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
    [TestFixture]
    public class MemberDataSheetTest {

--- a/Tests/UnitTests/DocumentTests/MemberListTest.cs
+++ b/Tests/UnitTests/DocumentTests/MemberListTest.cs
@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;

-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
    [TestFixture]
    public class MemberListTest {

--- a/Tests/UnitTests/DocumentTests/PaymentVariantSummaryTest.cs
+++ b/Tests/UnitTests/DocumentTests/PaymentVariantSummaryTest.cs
@ -0,0 +1,29 @@
+using Elwig.Documents;
+using Elwig.Helpers;
+using Elwig.Models.Dtos;
+
+namespace Tests.UnitTests.DocumentTests {
+    [TestFixture]
+    public class PaymentVariantSummaryTest {
+
+        [Test]
+        public async Task Test_01_PaymentVariant2020() {
+            using var ctx = new AppDbContext();
+            var v = (await ctx.PaymentVariants.FindAsync(2020, 1))!;
+            var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
+            using var doc = new PaymentVariantSummary(v, data);
+            var text = await Utils.GeneratePdfText(doc, true);
+            var table = Utils.ExtractTable(text);
+            Assert.Multiple(() => {
+                Assert.That(text, Contains.Substring("Auszahlungsvariante"));
+                Assert.That(text, Contains.Substring(v.Name));
+                Assert.That(table.Skip(17).ToArray(), Is.EqualTo(new string[][] {
+                     [                   "Gradation",   "ungebunden",   "attributlos gebunden",    "gebunden",     "Gesamt" ],
+                     [                     "[°Oe]",   "[kg]", "[€/kg]",    "[kg]", "[€/kg]",    "[kg]", "[€/kg]",    "[€]"  ],
+                     ["Grüner Veltliner",            "3 219",                 "0",                 "0",           "1 609,50"],
+                     ["Qualitätswein",      "73",    "3 219", "0,5000",       "-",      "-",       "-",      "-", "1 609,50"]
+                }));
+            });
+        }
+    }
+}
--- a/Tests/UnitTests/DocumentTests/Setup.cs
+++ b/Tests/UnitTests/DocumentTests/Setup.cs
@ -3,7 +3,7 @@ using System.Reflection;
 using Microsoft.Data.Sqlite;
 using Elwig.Helpers.Printing;

-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
    [SetUpFixture]
    public class Setup {

--- a/Tests/UnitTests/DocumentTests/Utils.cs
+++ b/Tests/UnitTests/DocumentTests/Utils.cs
@ -2,7 +2,7 @@ using Elwig.Documents;
 using NReco.PdfRenderer;
 using System.Text.RegularExpressions;

-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
    public static class Utils {

        private static readonly string FileName = Path.Combine(Path.GetTempPath(), "test_document.pdf");
--- a/Tests/UnitTests/DocumentTests/WineQualityStatisticsTest.cs
+++ b/Tests/UnitTests/DocumentTests/WineQualityStatisticsTest.cs
@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;

-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
    [TestFixture]
    public class WineQualityStatisticsTest {

--- a/Tests/UnitTests/HelperTests/BillingDataTest.cs
+++ b/Tests/UnitTests/HelperTests/BillingDataTest.cs
@ -2,7 +2,7 @@ using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using System.Text.Json;

-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
    [TestFixture]
    public class BillingDataTest {

--- a/Tests/UnitTests/HelperTests/BillingTest.cs
+++ b/Tests/UnitTests/HelperTests/BillingTest.cs
@ -3,7 +3,7 @@ using Elwig.Helpers.Billing;
 using Microsoft.Data.Sqlite;
 using System.Reflection;

-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
    [TestFixture]
    public class BillingTest {

--- a/Tests/UnitTests/HelperTests/EbicsTest.cs
+++ b/Tests/UnitTests/HelperTests/EbicsTest.cs
@ -5,7 +5,7 @@ using Elwig.Models.Entities;
 using System.Reflection;
 using System.Xml;

-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
    // see https://www.iso20022.org/iso-20022-message-definitions
    // and https://www.iso20022.org/catalogue-messages/iso-20022-messages-archive?search=pain
    [TestFixture]
--- a/Tests/UnitTests/HelperTests/UtilsTest.cs
+++ b/Tests/UnitTests/HelperTests/UtilsTest.cs
@ -1,6 +1,6 @@
 using Elwig.Helpers;

-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
    [TestFixture]
    public class UtilsTest {

--- a/Tests/UnitTests/HelperTests/ValidatorTest.cs
+++ b/Tests/UnitTests/HelperTests/ValidatorTest.cs
@ -1,7 +1,7 @@
 using Elwig.Helpers;
 using System.Windows.Controls;

-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
    [TestFixture]
    [Apartment(ApartmentState.STA)]
    public class ValidatorTest {
--- a/Tests/UnitTests/ServiceTests/DeliveryServiceTest.cs
+++ b/Tests/UnitTests/ServiceTests/DeliveryServiceTest.cs
@ -4,7 +4,7 @@ using Elwig.Services;
 using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;

-namespace Tests.ServiceTests {
+namespace Tests.UnitTests.ServiceTests {
    [TestFixture]
    public class DeliveryServiceTest {

--- a/Tests/UnitTests/ServiceTests/MemberServiceTest.cs
+++ b/Tests/UnitTests/ServiceTests/MemberServiceTest.cs
@ -4,7 +4,7 @@ using Elwig.Services;
 using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;

-namespace Tests.ServiceTests {
+namespace Tests.UnitTests.ServiceTests {
    [TestFixture]
    public class MemberServiceTest {

--- a/Tests/UnitTests/ServiceTests/Setup.cs
+++ b/Tests/UnitTests/ServiceTests/Setup.cs
@ -2,7 +2,7 @@ using Elwig.Helpers;
 using System.Reflection;
 using Microsoft.Data.Sqlite;

-namespace Tests.ServiceTests {
+namespace Tests.UnitTests.ServiceTests {
    [SetUpFixture]
    public class Setup {

--- a/Tests/UnitTests/WeighingTests/MockScale.cs
+++ b/Tests/UnitTests/WeighingTests/MockScale.cs
@ -2,7 +2,7 @@ using System.Net.Sockets;
 using System.Net;
 using System.Text;

-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
    public abstract class MockScale : IDisposable {

        protected readonly TcpListener Server;
--- a/Tests/UnitTests/WeighingTests/ScaleHandlers.cs
+++ b/Tests/UnitTests/WeighingTests/ScaleHandlers.cs
@ -1,4 +1,4 @@
-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
    public static class ScaleHandlers {

        public static (string, bool) Handle_IT3000A(string req, int weight, int tare, string? error, int identNr) {
--- a/Tests/UnitTests/WeighingTests/ScaleTestBadenL320.cs
+++ b/Tests/UnitTests/WeighingTests/ScaleTestBadenL320.cs
@ -1,6 +1,6 @@
 using Elwig.Helpers.Weighing;

-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
    [TestFixture]
    public class ScaleTestBadenL320 {

--- a/Tests/UnitTests/WeighingTests/ScaleTestGrInzersdorfL246.cs
+++ b/Tests/UnitTests/WeighingTests/ScaleTestGrInzersdorfL246.cs
@ -1,6 +1,6 @@
 using Elwig.Helpers.Weighing;

-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
    [TestFixture]
    class ScaleTestGrInzersdorfL246 {

--- a/Tests/UnitTests/WeighingTests/ScaleTestHaugsdorfDMA02.cs
+++ b/Tests/UnitTests/WeighingTests/ScaleTestHaugsdorfDMA02.cs
@ -1,6 +1,6 @@
 using Elwig.Helpers.Weighing;

-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
    [TestFixture]
    public class ScaleTestHaugsdorfDMA02 {

--- a/Tests/UnitTests/WeighingTests/ScaleTestMatzenIT3000A.cs
+++ b/Tests/UnitTests/WeighingTests/ScaleTestMatzenIT3000A.cs
@ -1,6 +1,6 @@
 using Elwig.Helpers.Weighing;

-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
    [TestFixture]
    class ScaleTestMatzenIT3000A {

--- a/Tests/UnitTests/WeighingTests/ScaleTestSitzendorfDMA03Baby.cs
+++ b/Tests/UnitTests/WeighingTests/ScaleTestSitzendorfDMA03Baby.cs
@ -1,6 +1,6 @@
 using Elwig.Helpers.Weighing;

-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
    [TestFixture]
    public class ScaleTestSitzendorfDMA03Baby {

--- a/Tests/UnitTests/WeighingTests/ScaleTestWolkersdorfIT6000E.cs
+++ b/Tests/UnitTests/WeighingTests/ScaleTestWolkersdorfIT6000E.cs
@ -1,6 +1,6 @@
 using Elwig.Helpers.Weighing;

-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
    [TestFixture]
    class ScaleTestWolkersdorfIT6000E {

--- a/Tests/UnitTests/WeighingTests/Utils.cs
+++ b/Tests/UnitTests/WeighingTests/Utils.cs
@ -1,4 +1,4 @@
-namespace Tests.WeighingTests {
+namespace Tests.UnitTests.WeighingTests {
    public static class Utils {
        public static DateOnly Today => DateOnly.FromDateTime(DateTime.Now);
        public static TimeOnly Time => new(DateTime.Now.Hour, DateTime.Now.Minute);
Author	SHA1	Message	Date
Lorenz Stechauner	3493ff6df1	Tests: Add UnitTests folder All checks were successful Test / Run tests (push) Successful in 2m24s Details	2025-06-03 20:57:53 +02:00
Lorenz Stechauner	623f55f5b0	App: Rename ExePath to InstallPath All checks were successful Test / Run tests (push) Successful in 2m13s Details	2025-05-27 11:43:34 +02:00
Lorenz Stechauner	b580e1bf79	App: Use environment variables for paths All checks were successful Test / Run tests (push) Successful in 1m42s Details	2025-05-26 15:18:32 +02:00
Lorenz Stechauner	b08ca63bed	[#59 ] Documents: Move Documents install folder from ProgramData to Program Files All checks were successful Test / Run tests (push) Successful in 2m19s Details	2025-05-26 15:12:49 +02:00
Lorenz Stechauner	6a5f4cefa9	[#58 ] PaymentVariantSummary: Add 'attributlos gebunden' columns	2025-05-23 15:43:39 +02:00
Lorenz Stechauner	0f3ce39f35	Elwig: Use 'Menge' instead of 'Gewicht' where applicable All checks were successful Test / Run tests (push) Successful in 1m59s Details	2025-05-20 15:55:11 +02:00
Lorenz Stechauner	336aef5c70	CreditNoteDeliveryData: Include WeighingModifier only if delivery modifiers are considered	2025-05-20 13:09:29 +02:00
Lorenz Stechauner	0dff3986b7	PaymentVariantsWindow: Add note, that modifiers include Rebelzuschlag All checks were successful Test / Run tests (push) Successful in 2m30s Details	2025-05-20 12:07:28 +02:00
Lorenz Stechauner	318fb5dc7b	Bump version to 0.13.9 All checks were successful Test / Run tests (push) Successful in 2m7s Details Deploy / Build and Deploy (push) Successful in 1m55s Details	2025-05-05 10:41:18 +02:00