Bump version to 0.8.5

Elwig/App.xaml.cs

@@ -296,6 +296,10 @@ namespace Elwig {
             return FocusWindow<PaymentVariantsWindow>(() => new(year), w => w.Year == year);
         }
 
+        public static PaymentAdjustmentWindow FocusPaymentAdjustment(int year) {
+            return FocusWindow<PaymentAdjustmentWindow>(() => new(year), w => w.Year == year);
+        }
+
         public static ChartWindow FocusChartWindow(int year, int avnr) {
             return FocusWindow<ChartWindow>(() => new(year, avnr), w => w.Year == year && w.AvNr == avnr);
         }

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.8.4</Version>
+    <Version>0.8.5</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>

Elwig/Helpers/AppDbUpdater.cs

@@ -9,7 +9,7 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 20;
+        public static readonly int RequiredSchemaVersion = 21;
 
         private static int VersionOffset = 0;
 

Elwig/Helpers/Billing/Billing.cs

@@ -3,6 +3,7 @@ using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -33,15 +34,45 @@ namespace Elwig.Helpers.Billing {
                 """);
         }
 
-        public async Task AutoAdjustBusinessShare() {
+        public async Task AutoAdjustBusinessShares(DateOnly date, int allowanceKg = 0, double allowanceBs = 0, int allowanceKgPerBs = 0, double allowanceRel = 0, int addMinBs = 1) {
+            if (addMinBs < 1) addMinBs = 1;
             using var cnx = await AppDbContext.ConnectAsync();
             await AppDbContext.ExecuteBatch(cnx, $"""
-                INSERT INTO member_history (mgnr, date, business_shares, type)
-                SELECT u.mgnr, '{Utils.Today:yyyy-MM-dd}', u.diff / s.max_kg_per_bs AS bs, 'auto'
+                UPDATE member
+                SET business_shares = member.business_shares - h.business_shares
+                FROM member_history h
+                WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr AND member.active;
+
+                INSERT INTO member_history (mgnr, date, type, business_shares)
+                SELECT u.mgnr,
+                       '{date:yyyy-MM-dd}',
+                       'auto',
+                       CEIL((u.diff - {allowanceKg}.0 - {allowanceKgPerBs}.0 * u.business_shares) / s.max_kg_per_bs
+                            - {allowanceBs.ToString(CultureInfo.InvariantCulture)}
+                            - {allowanceRel.ToString(CultureInfo.InvariantCulture)} * u.business_shares) AS bs
                 FROM v_total_under_delivery u
                     JOIN season s ON s.year = u.year
-                WHERE s.year = {Year} AND bs > 0
-                ON CONFLICT DO NOTHING
+                    JOIN member m ON m.mgnr = u.mgnr
+                WHERE s.year = {Year} AND bs >= {addMinBs} AND m.active
+                ON CONFLICT DO UPDATE
+                SET business_shares = excluded.business_shares;
+
+                UPDATE member
+                SET business_shares = member.business_shares + h.business_shares
+                FROM member_history h
+                WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr;
+                """);
+        }
+
+        public async Task UnAdjustBusinessShares() {
+            using var cnx = await AppDbContext.ConnectAsync();
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                UPDATE member
+                SET business_shares = member.business_shares - h.business_shares
+                FROM member_history h
+                WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr AND member.active;
+
+                DELETE FROM member_history WHERE date = '{Year}-11-30' AND type = 'auto';
                 """);
         }
 

Elwig/Helpers/ClientParameters.cs

@@ -1,6 +1,7 @@
 using Elwig.Models.Entities;
 using Microsoft.Data.Sqlite;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -69,6 +70,8 @@ namespace Elwig.Helpers {
         public int ExportEbicsVersion;
         public int ExportEbicsAddress;
 
+        public (int? AllowanceKg, double? AllowanceBs, int? AllowanceKgPerBs, double? AllowancePercent, int? MinBs) AutoAdjustBs;
+
         public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
 
         public ClientParameters(Dictionary<string, string?> parameters) {
@@ -138,6 +141,15 @@ namespace Elwig.Helpers {
                     case "LINES": ExportEbicsAddress = 1; break;
                     case "FULL": ExportEbicsAddress = 2; break;
                 }
+
+                var autoAdjust = (parameters.GetValueOrDefault("AUTOADJUST_BUSINESSSHARES") ?? "").Split(';');
+                AutoAdjustBs = autoAdjust.Length == 5 ? (
+                    int.TryParse(autoAdjust[0], out var v1) ? v1 : null,
+                    double.TryParse(autoAdjust[1], out var v2) ? v2 : null,
+                    int.TryParse(autoAdjust[2], out var v3) ? v3 : null,
+                    double.TryParse(autoAdjust[3], out var v4) ? v4 : null,
+                    int.TryParse(autoAdjust[4], out var v5) ? v5 : null
+                    ) : (null, null, null, null, null);
             } catch {
                 throw new KeyNotFoundException();
             }
@@ -171,6 +183,9 @@ namespace Elwig.Helpers {
                 case 1: exportEbicsAddress = "LINES"; break;
                 case 2: exportEbicsAddress = "FULL"; break;
             }
+            string autoAdjust = $"{AutoAdjustBs.AllowanceKg};{AutoAdjustBs.AllowanceBs?.ToString(CultureInfo.InvariantCulture)};" +
+                                $"{AutoAdjustBs.AllowanceKgPerBs};{AutoAdjustBs.AllowancePercent?.ToString(CultureInfo.InvariantCulture)};" +
+                                $"{AutoAdjustBs.MinBs}";
             return [
                 ("CLIENT_NAME_TOKEN", NameToken),
                 ("CLIENT_NAME_SHORT", NameShort),
@@ -199,6 +214,7 @@ namespace Elwig.Helpers {
                 ("TEXT_EMAIL_BODY", TextEmailBody),
                 ("EXPORT_EBICS_VERSION", ExportEbicsVersion.ToString()),
                 ("EXPORT_EBICS_ADDRESS", exportEbicsAddress),
+                ("AUTOADJUST_BUSINESSSHARES", autoAdjust),
             ];
         }
 

Elwig/Helpers/Export/Ebics.cs

@@ -88,13 +88,11 @@ namespace Elwig.Helpers.Export {
                 if (ShowAddresses != AddressMode.Omit) {
                     var full = ShowAddresses == AddressMode.Full;
                     await Writer.WriteLineAsync($"""
-                             <PstlAdr>
-                              {(full ? "" : $"<Ctry>{a.PostalDest.Country.Alpha2}</Ctry>")}
+                             <PstlAdr>{(full ? "" : $"\r\n      <Ctry>{a.PostalDest.Country.Alpha2}</Ctry>")}
                               {(full ? $"<StrtNm>{SecurityElement.Escape(a1?[..Math.Min(70, a1.Length)])}</StrtNm> <BldgNb>{SecurityElement.Escape(a2?[..Math.Min(16, a2.Length)])}</BldgNb>" :
                                        $"<AdrLine>{SecurityElement.Escape(a.Address[..Math.Min(70, a.Address.Length)])}</AdrLine>")}
                               <{(full ? "PstCd" : "AdrLine")}>{a.PostalDest.AtPlz?.Plz}{(full ? "</PstCd> <TwnNm>" : " ")}{SecurityElement.Escape(a.PostalDest.AtPlz?.Ort.Name)}</{(full ? "TwnNm" : "AdrLine")}>
-                              {(full ? $"<Ctry>{a.PostalDest.Country.Alpha2}</Ctry>" : "")}
-                             </PstlAdr>
+                             {(full ? $" <Ctry>{a.PostalDest.Country.Alpha2}</Ctry>\r\n     " : "")}</PstlAdr>
                         """);
                 }
                 await Writer.WriteLineAsync($"""

Elwig/Models/Dtos/OverUnderDeliveryData.cs

@@ -38,7 +38,7 @@ namespace Elwig.Models.Dtos {
                     LEFT JOIN AT_ort o ON o.okz = p.okz
                     LEFT JOIN season s ON s.year = {year}
                     LEFT JOIN v_delivery d ON d.mgnr = m.mgnr AND d.year = s.year
-                WHERE m.active = 1
+                WHERE m.active = TRUE OR d.weight > 0
                 GROUP BY d.year, m.mgnr
                 ORDER BY 100.0 * sum / max_kg, m.mgnr;
                 """).ToListAsync();

Elwig/Models/Entities/MemberHistory.cs

@@ -3,7 +3,7 @@ using System;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Elwig.Models.Entities {
-    [Table("member_history"), PrimaryKey("MgNr", "DateString")]
+    [Table("member_history"), PrimaryKey("MgNr", "DateString", "Type")]
     public class MemberHistory {
         [Column("mgnr")]
         public int MgNr { get; set; }
@@ -16,12 +16,12 @@ namespace Elwig.Models.Entities {
             set => value.ToString("yyyy-MM-dd");
         }
 
-        [Column("business_shares")]
-        public int BusinessShares { get; set; }
-
         [Column("type")]
         public required string Type { get; set; }
 
+        [Column("business_shares")]
+        public int BusinessShares { get; set; }
+
         [Column("comment")]
         public string? Comment { get; set; }
 

Elwig/Resources/Sql/20-21.sql

@@ -0,0 +1,16 @@
+-- schema version 20 to 21
+
+DROP TABLE member_history;
+CREATE TABLE member_history (
+    mgnr            INTEGER NOT NULL,
+    date            TEXT    NOT NULL CHECK (date REGEXP '^[1-9][0-9]{3}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$') DEFAULT CURRENT_DATE,
+    type            TEXT    NOT NULL CHECK (type REGEXP '^[a-z_]+$'),
+
+    business_shares INTEGER NOT NULL,
+    comment         TEXT DEFAULT NULL,
+
+    CONSTRAINT pk_member_history PRIMARY KEY (mgnr, date, type),
+    CONSTRAINT fk_member_history_member FOREIGN KEY (mgnr) REFERENCES member (mgnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE
+) STRICT;

Elwig/Windows/MailWindow.xaml.cs

@@ -254,11 +254,13 @@ namespace Elwig.Windows {
                 SelectedDocs.Add(new(DocType.MemberDataSheet, s, null));
             } else if (idx == 1) {
                 SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, (Year, DocumentNonDeliverersInput.IsChecked == true)));
+                RecipientsDeliveryMembersInput.IsChecked = true;
             } else if (idx >= 2) {
                 using var ctx = new AppDbContext();
                 var name = s.Split(" – ")[^1];
                 var pv = ctx.PaymentVariants.Single(v => v.Year == Year && v.Name == name)!;
                 SelectedDocs.Add(new(DocType.CreditNote, s, (pv.Year, pv.AvNr)));
+                RecipientsDeliveryMembersInput.IsChecked = true;
             }
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
         }
@@ -305,7 +307,7 @@ namespace Elwig.Windows {
             if (RecipientsCustomInput.IsChecked == true) {
                 Recipients = MemberCustomInput.SelectedItems.Cast<Member>().ToList();
             } else {
-                IQueryable<Member> query = ctx.Members.Where(m => m.IsActive);
+                IQueryable<Member> query = ctx.Members;
                 if (MemberBranchInput.SelectedItems.Count != MemberBranchInput.Items.Count) {
                     var zwst = MemberBranchInput.SelectedItems.Cast<Branch>().Select(b => b.ZwstId).ToList();
                     query = query.Where(m => zwst.Contains(m.ZwstId!));
@@ -317,11 +319,13 @@ namespace Elwig.Windows {
 
                 if (RecipientsAreaComMembersInput.IsChecked == true) {
                     var vtrg = MemberAreaComInput.SelectedItems.Cast<AreaComType>().Select(a => a.VtrgId).ToList();
-                    query = query.Where(m => m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Year)).Any(c => vtrg.Contains(c.VtrgId)));
+                    query = query.Where(m => m.IsActive && m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Year)).Any(c => vtrg.Contains(c.VtrgId)));
                 } else if (RecipientsDeliveryMembersInput.IsChecked == true) {
                     query = query.Where(m => m.Deliveries.Any(d => d.Year == Year));
                 } else if (RecipientsNonDeliveryMembersInput.IsChecked == true) {
-                    query = query.Where(m => !m.Deliveries.Any(d => d.Year == Year));
+                    query = query.Where(m => m.IsActive && !m.Deliveries.Any(d => d.Year == Year));
+                } else {
+                    query = query.Where(m => m.IsActive);
                 }
                 Recipients = await query
                     .Include(m => m.Branch)
@@ -715,6 +719,7 @@ namespace Elwig.Windows {
                 return;
             SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, (Year, DocumentNonDeliverersInput.IsChecked == true)));
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
+            RecipientsDeliveryMembersInput.IsChecked = true;
         }
 
         public void AddCreditNote(int index) {
@@ -726,6 +731,7 @@ namespace Elwig.Windows {
             var pv = ctx.PaymentVariants.Single(v => v.Year == Year && v.Name == name)!;
             SelectedDocs.Add(new(DocType.CreditNote, s, (pv.Year, pv.AvNr)));
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
+            RecipientsDeliveryMembersInput.IsChecked = true;
         }
     }
 }

Elwig/Windows/PaymentAdjustmentWindow.xaml

@@ -0,0 +1,128 @@
+<local:ContextWindow
+        x:Class="Elwig.Windows.PaymentAdjustmentWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Windows"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        Title="Auszahlung anpassen - Elwig" Height="500" Width="850" MinHeight="400" MinWidth="850">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="ctrl:UnitTextBox">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="9,3"/>
+            <Setter Property="Height" Value="27"/>
+        </Style>
+    </Window.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="19"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="24"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="450"/>
+            <ColumnDefinition Width="2.5*"/>
+        </Grid.ColumnDefinitions>
+
+        <Menu Grid.ColumnSpan="2" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
+        </Menu>
+
+        <Grid Grid.Row="1">
+            <DataGrid x:Name="MemberList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
+                      CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" Margin="10,10,10,10">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="MgNr." Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="45">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Nachname" Binding="{Binding FamilyName}" Width="100"/>
+                    <DataGridTextColumn Header="Vorname" Binding="{Binding GivenName}" Width="100"/>
+                    <DataGridTextColumn Header="GA" Binding="{Binding BusinessShares, StringFormat='{}{0} '}" Width="35">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Ü.-/U.-Lfrg." Binding="{Binding OverUnder, StringFormat='{}{0} kg '}" Width="70">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Nachz." Binding="{Binding Adjust, StringFormat='{}{0} '}" Width="45">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+        <Grid Grid.Column="1" Grid.Row="1">
+            <GroupBox Header="Automatische Nachzeichnung der Geschäftsanteile" Margin="10,10,10,10" Height="180" Width="360"
+                      VerticalAlignment="Top" HorizontalAlignment="Left">
+                <Grid>
+                    <Label Content="Absoluter Freibetrag:" Margin="10,10,10,10"/>
+                    <ctrl:UnitTextBox x:Name="AllowanceKgInput" Unit="kg" Margin="140,10,10,10" Width="70"
+                                      TextChanged="KgInput_TextChanged"/>
+                    <ctrl:UnitTextBox x:Name="AllowanceBsInput" Unit="GA" Margin="215,10,10,10" Width="60"
+                                      TextChanged="PercentInput_TextChanged"/>
+
+                    <Label Content="Relativer Freibetrag:" Margin="10,40,10,10"/>
+                    <ctrl:UnitTextBox x:Name="AllowanceKgPerBsInput" Unit="kg/GA" Margin="140,40,10,10" Width="87"
+                                      TextChanged="KgInput_TextChanged"/>
+                    <ctrl:UnitTextBox x:Name="AllowancePercentInput" Unit="%" Margin="232,40,10,10" Width="60"
+                                      TextChanged="PercentInput_TextChanged"/>
+
+                    <Label Content="Nur mind. nachz.:" Margin="10,70,10,10"/>
+                    <ctrl:UnitTextBox x:Name="MinBsInput" Unit="GA" Margin="140,70,10,10" Width="50"
+                                      TextChanged="BsInput_TextChanged"/>
+
+                    <Button x:Name="SeasonButton" Content="GA-Wert" Margin="10,10,10,42" Width="120"
+                             HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                             Click="SeasonButton_Click"/>
+                    <Button x:Name="AutoAdjustBsButton" Content="Nachzeichnen" Margin="10,10,135,10" Width="120"
+                            HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                            Click="AutoAdjustBsButton_Click"/>
+                    <Button x:Name="UnAdjustBsButton" Content="Rückgängig" Margin="10,10,10,10" Width="120"
+                            HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                            Click="UnAdjustBsButton_Click"/>
+                </Grid>
+            </GroupBox>
+        </Grid>
+
+        <StatusBar Grid.Row="2" Grid.ColumnSpan="2" BorderThickness="0,1,0,0" BorderBrush="Gray">
+        </StatusBar>
+    </Grid>
+</local:ContextWindow>

Elwig/Windows/PaymentAdjustmentWindow.xaml.cs

@@ -0,0 +1,143 @@
+using Elwig.Helpers;
+using Elwig.Helpers.Billing;
+using Elwig.Models.Dtos;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Elwig.Windows {
+    public partial class PaymentAdjustmentWindow : ContextWindow {
+
+        public readonly int Year;
+        public readonly bool SeasonLocked;
+
+        public PaymentAdjustmentWindow(int year) {
+            InitializeComponent();
+            Year = year;
+            using (var ctx = new AppDbContext()) {
+                SeasonLocked = ctx.Seasons.Find(Year + 1) != null;
+            }
+            Title = $"Auszahlung anpassen - Lese {Year} - Elwig";
+
+            AllowanceKgInput.Text = $"{App.Client.AutoAdjustBs.AllowanceKg}";
+            AllowanceBsInput.Text = $"{App.Client.AutoAdjustBs.AllowanceBs}";
+            AllowanceKgPerBsInput.Text = $"{App.Client.AutoAdjustBs.AllowanceKgPerBs}";
+            AllowancePercentInput.Text = $"{App.Client.AutoAdjustBs.AllowancePercent}";
+            MinBsInput.Text = $"{App.Client.AutoAdjustBs.MinBs}";
+        }
+
+        protected override async Task OnRenewContext(AppDbContext ctx) {
+            var members = await ctx.Members
+                .Select(m => new {
+                    m.MgNr,
+                    m.FamilyName,
+                    m.GivenName,
+                    m.BusinessShares,
+                })
+                .OrderBy(m => m.FamilyName)
+                .ThenBy(m => m.GivenName)
+                .ThenBy(m => m.MgNr)
+                .ToListAsync();
+            var season = (await ctx.Seasons.FindAsync(Year))!;
+
+            var tbl = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, Year);
+            var weight = tbl.Rows.ToDictionary(r => r.MgNr, r => r.Weight);
+
+            var history = await ctx.MemberHistory
+                .Where(h => h.DateString.CompareTo($"{Year}-01-01") >= 0 && h.DateString.CompareTo($"{Year}-12-31") <= 0 && h.Type == "auto" && h.BusinessShares > 0)
+                .GroupBy(h => h.Member)
+                .ToDictionaryAsync(h => h.Key.MgNr, h => h.Sum(g => g.BusinessShares));
+
+            var list = members
+                .Select(m => new {
+                    m.MgNr,
+                    m.FamilyName,
+                    m.GivenName,
+                    BusinessShares = m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0),
+                    DeliveryObligation = (m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0)) * season.MinKgPerBusinessShare,
+                    DeliveryRight = (m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0)) * season.MaxKgPerBusinessShare,
+                })
+                .Select(m => new {
+                    m.MgNr,
+                    m.FamilyName,
+                    m.GivenName,
+                    m.BusinessShares,
+                    OverUnder = weight.TryGetValue(m.MgNr, out int v1) ?
+                        (v1 < m.DeliveryObligation ? (int?)v1 - m.DeliveryObligation :
+                         v1 > m.DeliveryRight ? (int?)v1 - m.DeliveryRight : null)
+                        : null,
+                    Adjust = history.TryGetValue(m.MgNr, out int v2) ? (int?)v2 : null
+                })
+                .Where(m => m.OverUnder != null || m.Adjust != null)
+                .OrderByDescending(m => m.OverUnder)
+                .ThenBy(m => m.FamilyName)
+                .ThenBy(m => m.GivenName)
+                .ThenBy(m => m.MgNr)
+                .ToList();
+
+            MemberList.ItemsSource = list;
+        }
+
+        private async void AutoAdjustBsButton_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                int? kg = AllowanceKgInput.Text == "" ? null : int.Parse(AllowanceKgInput.Text);
+                double? bs = AllowanceBsInput.Text == "" ? null : double.Parse(AllowanceBsInput.Text);
+                int? kgPerBs = AllowanceKgPerBsInput.Text == "" ? null : int.Parse(AllowanceKgPerBsInput.Text);
+                double? percent = AllowancePercentInput.Text == "" ? null : double.Parse(AllowancePercentInput.Text);
+                int? minBs = MinBsInput.Text == "" ? null : int.Parse(MinBsInput.Text);
+
+                App.Client.AutoAdjustBs.AllowanceKg = kg;
+                App.Client.AutoAdjustBs.AllowanceBs = bs;
+                App.Client.AutoAdjustBs.AllowanceKgPerBs = kgPerBs;
+                App.Client.AutoAdjustBs.AllowancePercent = percent;
+                App.Client.AutoAdjustBs.MinBs = minBs;
+                await App.Client.UpdateValues();
+
+                var b = new Billing(Year);
+                await b.AutoAdjustBusinessShares(new DateOnly(Year, 11, 30), kg ?? default, bs ?? default, kgPerBs ?? default, percent / 100.0 ?? default, minBs ?? default);
+                await 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;
+                MessageBox.Show(str, "GA Nachzeichnen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            Mouse.OverrideCursor = null;
+        }
+
+        private async void UnAdjustBsButton_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var b = new Billing(Year);
+                await b.UnAdjustBusinessShares();
+                await 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;
+                MessageBox.Show(str, "GA Nachzeichnen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            Mouse.OverrideCursor = null;
+        }
+
+        private void SeasonButton_Click(object sender, RoutedEventArgs evt) {
+            App.FocusBaseDataSeason(Year);
+        }
+
+        private void KgInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            Validator.CheckInteger((TextBox)sender, false, 6);
+        }
+
+        private void BsInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            Validator.CheckInteger((TextBox)sender, false, 3);
+        }
+
+        private void PercentInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            Validator.CheckDecimal((TextBox)sender, false, 3, 2);
+        }
+    }
+}

Elwig/Windows/PaymentVariantsWindow.xaml.cs

@@ -301,26 +301,10 @@ namespace Elwig.Windows {
             App.FocusChartWindow(v.Year, v.AvNr);
         }
 
-        private async void PaymentAdjustmentButton_Click(object sender, RoutedEventArgs evt) {
-            if (false && App.Client.IsMatzen) {
-                PaymentAdjustmentButton.IsEnabled = false;
-                Mouse.OverrideCursor = Cursors.AppStarting;
-
-                var b = new Billing(Year);
-                await b.AutoAdjustBusinessShare();
-
-                Mouse.OverrideCursor = null;
-                PaymentAdjustmentButton.IsEnabled = true;
-            } else {
-                MessageBox.Show(
-                    "Es ist kein automatisches Nachzeichnen der Geschäftsanteile\n" +
-                    "für diese Genossenschaft eingestellt!\n" +
-                    "Bitte wenden Sie sich an die Programmierer!", "Fehler",
-                    MessageBoxButton.OK, MessageBoxImage.Information);
-            }
+        private void PaymentAdjustmentButton_Click(object sender, RoutedEventArgs evt) {
+            App.FocusPaymentAdjustment(Year);
         }
 
-
         private async void MailButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar pv)
                 return;

Tests/fetch-resources.bat

@@ -1 +1 @@
-curl --fail -s -L "https://elwig.at/files/create.sql?v=20" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
+curl --fail -s -L "https://elwig.at/files/create.sql?v=21" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"