[#46] Windows: Add PaymentAdjustmentWindow

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/Documents/CreditNote.cs

@@ -18,7 +18,8 @@ namespace Elwig.Documents {
         public string MemberModifier;
         public IEnumerable<(string Name, int Kg, decimal Amount)>? MemberUnderDeliveries;
         public decimal MemberTotalUnderDelivery;
-        public decimal MemberAutoBusinessShares;
+        public int MemberAutoBusinessShares;
+        public decimal MemberAutoBusinessSharesAmount;
 
         public CreditNote(
             AppDbContext ctx,
@@ -66,7 +67,8 @@ namespace Elwig.Documents {
                 MemberAutoBusinessShares = ctx.MemberHistory
                     .Where(h => h.MgNr == p.Member.MgNr && h.Type == "auto")
                     .Where(h => h.DateString.CompareTo(fromDate) >= 0 && h.DateString.CompareTo(toDate) <= 0)
-                    .Sum(h => h.BusinessShares) * (-season.BusinessShareValue ?? 0);
+                    .Sum(h => h.BusinessShares);
+                MemberAutoBusinessSharesAmount = MemberAutoBusinessShares * (-season.BusinessShareValue ?? 0);
             }
             if (considerContractPenalties) {
                 var varieties = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);

Elwig/Documents/CreditNote.cshtml

@@ -153,9 +153,9 @@
                 @Raw(FormatRow("Unterlieferung (GA)", Model.MemberTotalUnderDelivery, add: true));
                 penalty += Model.MemberTotalUnderDelivery;
             }
-            @if (Model.MemberAutoBusinessShares != 0) {
-                @Raw(FormatRow("Autom. Nachz. von GA", Model.MemberAutoBusinessShares, add: true));
-                penalty += Model.MemberAutoBusinessShares;
+            @if (Model.MemberAutoBusinessSharesAmount != 0) {
+                @Raw(FormatRow($"Autom. Nachz. von GA ({Model.MemberAutoBusinessShares})", Model.MemberAutoBusinessSharesAmount, add: true));
+                penalty += Model.MemberAutoBusinessSharesAmount;
             }
 
             @if (Model.Credit == null) {

Elwig/Documents/PaymentVariantSummary.cshtml

@@ -66,6 +66,12 @@
                 <th colspan="2" class="lborder">Automatische Nachzeichnung der GA:</th>
                 <td class="center">@(Model.BillingData.ConsiderAutoBusinessShares ? "Ja" : "Nein")</td>
             </tr>
+            <tr>
+                <th>Berechnung:</th>
+                <td colspan="3" class="center">@($"{Model.Variant.CalcTime:dd.MM.yyyy, HH:mm:ss}")</td>
+                <th colspan="2" class="lborder">Benutzerdef. Zu-/Abschläge pro Mitglied:</th>
+                <td class="center">@(Model.BillingData.ConsiderCustomModifiers ? "Ja" : "Nein")</td>
+            </tr>
             <tr class="sectionheading">
                 <th colspan="4">Beträge</th>
                 <th colspan="3" class="lborder">Statistik</th>

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,44 @@ 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;
+
+                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
+                WHERE s.year = {Year} AND bs >= {addMinBs}
+                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;
+
+                DELETE FROM member_history WHERE date = '{Year}-11-30' AND type = 'auto';
                 """);
         }
 

Elwig/Helpers/Billing/BillingData.cs

@@ -41,6 +41,10 @@ namespace Elwig.Helpers.Billing {
             get => GetConsider("consider_auto_business_shares");
             set => SetConsider(value, "consider_auto_business_shares");
         }
+        public bool ConsiderCustomModifiers {
+            get => GetConsider("consider_custom_modifiers");
+            set => SetConsider(value, "consider_custom_modifiers");
+        }
 
         public double NetWeightModifier {
             get => GetWeightModifier("net_weight_modifier", "Rebelzuschlag");

Elwig/Helpers/ControlUtils.cs

@@ -134,19 +134,31 @@ namespace Elwig.Helpers {
         public static void RenewItemsSource(ListBox listBox, IEnumerable? source, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None) {
             if (listBox.ItemsSource == source)
                 return;
-            var selectedId = Utils.GetEntityIdentifier(listBox.SelectedItem);
-            object? selItem = null;
-            if (selectedId != 0 && source != null)
-                selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(Utils.GetEntityIdentifier(i)));
-            if (source != null && selItem == null) {
-                if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) {
-                    selItem = source.Cast<object>().FirstOrDefault();
+            if (listBox.SelectionMode == SelectionMode.Single) {
+                var selectedId = Utils.GetEntityIdentifier(listBox.SelectedItem);
+                object? selItem = null;
+                if (selectedId != 0 && source != null)
+                    selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(Utils.GetEntityIdentifier(i)));
+                if (source != null && selItem == null) {
+                    if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) {
+                        selItem = source.Cast<object>().FirstOrDefault();
+                    }
                 }
+                if (handler != null && selItem != null) listBox.SelectionChanged -= handler;
+                listBox.ItemsSource = source;
+                if (handler != null && selItem != null) listBox.SelectionChanged += handler;
+                listBox.SelectedItem = selItem;
+            } else {
+                var selectedIds = listBox.SelectedItems.Cast<object>().Select(Utils.GetEntityIdentifier).ToList();
+                if (handler != null && selectedIds != null) listBox.SelectionChanged -= handler;
+                listBox.ItemsSource = source;
+                if (source != null && selectedIds != null) {
+                    listBox.SelectedItems.Clear();
+                    foreach (var i in source.Cast<object>().Where(i => selectedIds.Contains(Utils.GetEntityIdentifier(i))))
+                        listBox.SelectedItems.Add(i);
+                }
+                if (handler != null && selectedIds != null) listBox.SelectionChanged += handler;
             }
-            if (handler != null && selItem != null) listBox.SelectionChanged -= handler;
-            listBox.ItemsSource = source;
-            if (handler != null && selItem != null) listBox.SelectionChanged += handler;
-            listBox.SelectedItem = selItem;
         }
 
         public static object? GetItemFromSource(IEnumerable source, int? hash) {

Elwig/Helpers/Export/Ebics.cs

@@ -38,8 +38,11 @@ namespace Elwig.Helpers.Export {
         }
 
         public async Task ExportAsync(IEnumerable<Transaction> transactions, IProgress<double>? progress = null) {
-            if (transactions.Any(tx => tx.Amount < 0))
+            if (transactions.Any(tx => tx.Amount < 0)) {
                 throw new ArgumentException("Tranaction amount may not be negative");
+            } else if (App.Client.Iban == null) {
+                throw new ArgumentException("Client IBAN has to be set");
+            }
             progress?.Report(0.0);
             var nbOfTxs = transactions.Count();
             int count = nbOfTxs + 2, i = 0;
@@ -86,9 +89,11 @@ namespace Elwig.Helpers.Export {
                     var full = ShowAddresses == AddressMode.Full;
                     await Writer.WriteLineAsync($"""
                              <PstlAdr>
-                              {(full ? $"<StrtNm>{SecurityElement.Escape(a1?[..Math.Min(70, a1.Length)])}</StrtNm> <BldgNb>{SecurityElement.Escape(a2?[..Math.Min(16, a2.Length)])}</BldgNb>" : $"<AdrLine>{a.Address[..Math.Min(70, a.Address.Length)]}</AdrLine>")}
+                              {(full ? "" : $"<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{(full ? "" : "--")}>
+                              {(full ? $"<Ctry>{a.PostalDest.Country.Alpha2}</Ctry>" : "")}
                              </PstlAdr>
                         """);
                 }

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/Models/Entities/PaymentVar.cs

@@ -17,7 +17,6 @@ namespace Elwig.Models.Entities {
 
         [Column("date")]
         public required string DateString { get; set; }
-
         [NotMapped]
         public DateOnly Date {
             get => DateOnly.ParseExact(DateString, "yyyy-MM-dd");
@@ -26,7 +25,6 @@ namespace Elwig.Models.Entities {
 
         [Column("transfer_date")]
         public string? TransferDateString { get; set; }
-
         [NotMapped]
         public DateOnly? TransferDate {
             get => TransferDateString != null ? DateOnly.ParseExact(TransferDateString, "yyyy-MM-dd") : null;
@@ -37,7 +35,9 @@ namespace Elwig.Models.Entities {
         public bool TestVariant { get; set; }
 
         [Column("calc_time")]
-        public int? CalcTime { get; set; }
+        public int? CalcTimeUnix { get; set; }
+        [NotMapped]
+        public DateTime? CalcTime => CalcTimeUnix != null ? DateTimeOffset.FromUnixTimeSeconds((long)CalcTimeUnix).UtcDateTime.ToLocalTime() : null;
 
         [Column("comment")]
         public string? Comment { get; set; }

Elwig/Resources/Schemas/PaymentVariantData.json

@@ -12,6 +12,7 @@
       "consider_contract_penalties": {"type": "boolean"},
       "consider_total_penalty": {"type": "boolean"},
       "consider_auto_business_shares": {"type": "boolean"},
+      "consider_custom_modifiers": {"type": "boolean"},
       "net_weight_modifier": {"type": "number"},
       "gross_weight_modifier": {"type": "number"},
       "payment": {"$ref": "#/definitions/payment_1"},

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/MainWindow.xaml

@@ -76,25 +76,21 @@
                                     Margin="0,13,0,0" VerticalAlignment="Top" HorizontalAlignment="Center"
                                     TextChanged="SeasonInput_TextChanged"/>
 
-                <Button x:Name="DeliveryConfirmationButton" Content="Anlieferungsbestätigung"
-                        Click="DeliveryConfirmationButton_Click"
-                        Margin="0,50,195,10" Width="190"/>
-
-                <Button x:Name="PaymentButton" Content="Auszahlung"
-                        Click="PaymentButton_Click"
-                        Margin="195,50,0,10" Width="190"/>
-
                 <Button x:Name="OverUnderDeliveryButton" Content="Über-/Unterlieferungen"
                         Click="OverUnderDeliveryButton_Click"
-                        Margin="0,90,195,10" Width="190"/>
+                        Margin="0,50,195,10" Width="190"/>
 
-                <Button x:Name="PaymentAdjustmentButton" Content="Anpassung"
-                        Click="PaymentAdjustmentButton_Click" IsEnabled="False"
-                        Margin="195,90,0,10" Width="190"/>
+                <Button x:Name="DeliveryConfirmationButton" Content="Anlieferungsbestätigung"
+                        Click="DeliveryConfirmationButton_Click"
+                        Margin="195,50,0,10" Width="190"/>
 
                 <Button x:Name="BreakdownButton" Content="Sorten-/Qual.aufteilung"
                         Click="BreakdownButton_Click"
-                        Margin="0,130,195,10" Width="190"/>
+                        Margin="0,90,195,10" Width="190"/>
+
+                <Button x:Name="PaymentButton" Content="Auszahlung"
+                        Click="PaymentButton_Click"
+                        Margin="195,90,0,10" Width="190"/>
             </Grid>
         </Expander>
     </Grid>

Elwig/Windows/MainWindow.xaml.cs

@@ -153,7 +153,7 @@ namespace Elwig.Windows {
         }
 
         private void SeasonFinish_Expanded(object sender, RoutedEventArgs evt) {
-            Height = 570;
+            Height = 530;
         }
 
         private void SeasonFinish_Collapsed(object sender, RoutedEventArgs evt) {
@@ -166,7 +166,6 @@ namespace Elwig.Windows {
             var valid = (s0 != null);
             DeliveryConfirmationButton.IsEnabled = valid;
             OverUnderDeliveryButton.IsEnabled = valid;
-            PaymentAdjustmentButton.IsEnabled = valid && false;
             PaymentButton.IsEnabled = valid;
             BreakdownButton.IsEnabled = valid;
         }
@@ -211,27 +210,6 @@ namespace Elwig.Windows {
             Mouse.OverrideCursor = null;
         }
 
-        private async void PaymentAdjustmentButton_Click(object sender, RoutedEventArgs evt) {
-            if (SeasonInput.Value is not int year)
-                return;
-            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 PaymentButton_Click(object sender, RoutedEventArgs evt) {
             if (SeasonInput.Value is not int year)
                 return;

Elwig/Windows/PaymentAdjustmentWindow.xaml

@@ -0,0 +1,105 @@
+<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="800" MinHeight="400" MinWidth="700">
+    <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="300"/>
+            <ColumnDefinition Width="2.5*"/>
+        </Grid.ColumnDefinitions>
+
+        <Menu Grid.ColumnSpan="2" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
+        </Menu>
+
+        <Grid Grid.Row="1">
+            <ListBox x:Name="MemberList" Margin="10,10,10,10">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{Binding MgNr}" Width="30" TextAlignment="Right" Margin="0,0,10,0"/>
+                            <TextBlock Text="{Binding FamilyName}" Width="100"/>
+                            <TextBlock Text="{Binding GivenName}" Width="60"/>
+                            <TextBlock Text="{Binding BusinessShares}" Width="40" TextAlignment="Right"/>
+                        </StackPanel>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+        </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,40" 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,92 @@
+using Elwig.Helpers;
+using Elwig.Helpers.Billing;
+using Microsoft.EntityFrameworkCore;
+using System;
+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";
+        }
+
+        protected override async Task OnRenewContext(AppDbContext ctx) {
+            MemberList.ItemsSource = 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)
+                .Select(h => new {
+                    h.Key.MgNr,
+                    h.Key.FamilyName,
+                    h.Key.GivenName,
+                    BusinessShares = h.Sum(g => g.BusinessShares),
+                })
+                .OrderBy(h => h.FamilyName)
+                .ThenBy(h => h.GivenName)
+                .ThenBy(h => h.MgNr)
+                .ToListAsync();
+        }
+
+        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);
+
+                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

@@ -6,8 +6,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
-        mc:Ignorable="d"
-        Title="Auszahlungsvarianten - Elwig" Height="450" Width="820" MinHeight="380" MinWidth="820">
+        Title="Auszahlungsvarianten - Elwig" Height="480" Width="850" MinHeight="400" MinWidth="830">
     <Window.Resources>
         <Style TargetType="Label">
             <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -142,9 +141,12 @@
             <CheckBox x:Name="ConsiderAutoInput" Content="Automatische Nachzeichnungen der GA"
                       Margin="110,155,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderAutoInput_Changed" Unchecked="ConsiderAutoInput_Changed"/>
-            <Label Content="&#xF0AE;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="0" Grid.Column="1" Margin="108,175,10,10"/>
+            <CheckBox x:Name="ConsiderCustomInput" Content="Benutzerdefinierte Zu-/Abschläge pro Mitglied"
+                      Margin="110,175,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
+                      Checked="ConsiderCustomInput_Changed" Unchecked="ConsiderCustomInput_Changed"/>
+            <Label Content="&#xF0AE;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="0" Grid.Column="1" Margin="108,195,10,10"/>
 
-            <Grid Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="50,180,10,10">
+            <Grid Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="50,200,10,10">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="110"/>
                     <ColumnDefinition Width="27"/>
@@ -156,6 +158,8 @@
                     <RowDefinition Height="27"/>
                     <RowDefinition Height="5"/>
                     <RowDefinition Height="27"/>
+                    <RowDefinition Height="5"/>
+                    <RowDefinition Height="27"/>
                 </Grid.RowDefinitions>
 
                 <Grid.Resources>
@@ -184,6 +188,16 @@
                 <Button x:Name="EditButton" Content="Bearbeiten" Grid.Column="0" Grid.Row="2"
                         Click="EditButton_Click"/>
                 <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="1"/>
+                <Button x:Name="PaymentAdjustmentButton" Content="Anpassen" Grid.Column="0" Grid.Row="4"
+                        Click="PaymentAdjustmentButton_Click"/>
+                <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="1" RenderTransformOrigin="0.5,0.5" >
+                    <Label.RenderTransform>
+                        <TransformGroup>
+                            <RotateTransform Angle="-45"/>
+                            <TranslateTransform Y="-5"/>
+                        </TransformGroup>
+                    </Label.RenderTransform>
+                </Label>
                 <Button x:Name="CalculateButton" Content="Berechnen" Grid.Column="2" Grid.Row="2"
                         Click="CalculateButton_Click"/>
                 <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="3" x:Name="Arrow3"/>

Elwig/Windows/PaymentVariantsWindow.xaml.cs

@@ -91,6 +91,7 @@ namespace Elwig.Windows {
                     ConsiderPenaltiesInput.IsChecked = BillingData.ConsiderContractPenalties;
                     ConsiderPenaltyInput.IsChecked = BillingData.ConsiderTotalPenalty;
                     ConsiderAutoInput.IsChecked = BillingData.ConsiderAutoBusinessShares;
+                    ConsiderCustomInput.IsChecked = BillingData.ConsiderCustomModifiers;
                     if (BillingData.NetWeightModifier != 0) {
                         WeightModifierInput.Text = $"{Math.Round(BillingData.NetWeightModifier * 100.0, 8)}";
                     } else if (BillingData.GrossWeightModifier != 0) {
@@ -105,6 +106,7 @@ namespace Elwig.Windows {
                     ConsiderPenaltiesInput.IsChecked = false;
                     ConsiderPenaltyInput.IsChecked = false;
                     ConsiderAutoInput.IsChecked = false;
+                    ConsiderCustomInput.IsChecked = false;
                     WeightModifierInput.Text = "";
                     DataInput.Text = v.Data;
                 }
@@ -113,6 +115,7 @@ namespace Elwig.Windows {
                 ConsiderPenaltiesInput.IsEnabled = !locked;
                 ConsiderPenaltyInput.IsEnabled = !locked;
                 ConsiderAutoInput.IsEnabled = !locked;
+                ConsiderCustomInput.IsEnabled = !locked;
                 DataInput.IsReadOnly = locked;
             } else {
                 EditButton.Content = "Bearbeiten";
@@ -153,6 +156,8 @@ namespace Elwig.Windows {
                 ConsiderPenaltyInput.IsEnabled = false;
                 ConsiderAutoInput.IsChecked = false;
                 ConsiderAutoInput.IsEnabled = false;
+                ConsiderCustomInput.IsChecked = false;
+                ConsiderCustomInput.IsEnabled = false;
                 DataInput.Text = "";
                 DataInput.IsReadOnly = true;
             }
@@ -168,6 +173,7 @@ namespace Elwig.Windows {
                 (ConsiderPenaltiesInput.IsChecked != BillingData?.ConsiderContractPenalties) ||
                 (ConsiderPenaltyInput.IsChecked != BillingData?.ConsiderTotalPenalty) ||
                 (ConsiderAutoInput.IsChecked != BillingData?.ConsiderAutoBusinessShares) ||
+                (ConsiderCustomInput.IsChecked != BillingData?.ConsiderCustomModifiers) ||
                 WeightModifierChanged);
             CalculateButton.IsEnabled = !SaveButton.IsEnabled && PaymentVariantList.SelectedItem is PaymentVar { TestVariant: true };
             CommitButton.IsEnabled = CalculateButton.IsEnabled;
@@ -295,6 +301,10 @@ namespace Elwig.Windows {
             App.FocusChartWindow(v.Year, v.AvNr);
         }
 
+        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;
@@ -471,6 +481,7 @@ namespace Elwig.Windows {
                 d.ConsiderContractPenalties = ConsiderPenaltiesInput.IsChecked ?? false;
                 d.ConsiderTotalPenalty = ConsiderPenaltyInput.IsChecked ?? false;
                 d.ConsiderAutoBusinessShares = ConsiderAutoInput.IsChecked ?? false;
+                d.ConsiderCustomModifiers = ConsiderCustomInput.IsChecked ?? false;
                 var modVal = WeightModifierInput.Text.Length > 0 ? double.Parse(WeightModifierInput.Text) : 0;
                 d.NetWeightModifier = modVal > 0 ? modVal / 100.0 : 0;
                 d.GrossWeightModifier = modVal < 0 ? modVal / 100.0 : 0;
@@ -488,6 +499,7 @@ namespace Elwig.Windows {
                 ConsiderPenaltiesInput_Changed(null, null);
                 ConsiderPenaltyInput_Changed(null, null);
                 ConsiderAutoInput_Changed(null, null);
+                ConsiderCustomInput_Changed(null, null);
                 WeightModifierInput_TextChanged(null, null);
             } catch (Exception exc) {
                 await HintContextChange();
@@ -630,6 +642,19 @@ namespace Elwig.Windows {
             UpdateSaveButton();
         }
 
+        private void ConsiderCustomInput_Changed(object? sender, RoutedEventArgs? evt) {
+            if (BillingData == null) {
+                ControlUtils.ClearInputState(ConsiderCustomInput);
+                return;
+            }
+            if (BillingData.ConsiderCustomModifiers != ConsiderCustomInput.IsChecked) {
+                ControlUtils.SetInputChanged(ConsiderCustomInput);
+            } else {
+                ControlUtils.ClearInputState(ConsiderCustomInput);
+            }
+            UpdateSaveButton();
+        }
+
         private void WeightModifierInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
             var res = Validator.CheckDecimal(WeightModifierInput, false, 3, 2, true);
             if (BillingData == null) {

Tests/DocumentTests/MemberListTest.cs

@@ -16,9 +16,9 @@ namespace Tests.DocumentTests {
                 Assert.That(text, Contains.Substring("Mitgliederliste"));
                 Assert.That(text, Contains.Substring("Alle Mitglieder"));
                 Assert.That(text, Contains.Substring("""
-                     101 MUSTERMANN Max                 Winzerstraße 1             2223   Hohenruppersdorf   1472583     0   Hohenruppersdorf
-                     102 WEINBAUER Wernhardt            Winzerstraße 2             2223   Hohenruppersdorf   4725836     0   Hohenruppersdorf
-                         W&B Weinbauer GesbR            Winzerstraße 2             2223   Hohenruppersdorf
+                     101 MUSTERMANN Max                 Winzerstraße 1            2223   Hohenruppersdorf   1472583     0   Hohenruppersdorf
+                     102 WEINBAUER Wernhardt            Winzerstraße 2            2223   Hohenruppersdorf   4725836     0   Hohenruppersdorf
+                         W&B Weinbauer GesbR            Winzerstraße 2            2223   Hohenruppersdorf
                     """));
             });
         }

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"