Bump version to 1.1.2.2

DeliveryAdminWindow: Show CorrectTareButton also for unloading type box
MemberAdminWindow: Add details in header and tool tips
2026-09-14 17:10:23 +02:00 · 2026-09-14 16:40:16 +02:00 · 2026-09-14 15:20:34 +02:00 · 2026-09-14 14:53:39 +02:00 · 2026-09-14 14:53:26 +02:00 · 2026-09-14 14:45:39 +02:00
24 changed files with 267 additions and 59 deletions
@@ -2,6 +2,30 @@
 Changelog
 =========

+[v1.1.2.2][v1.1.2.2] (2026-09-14) {#v1.1.2.2}
+---------------------------------------------
+
+### Neue Funktionen {#v1.1.2.2-features}
+
+* Bei einigen Fenstern werden in den Titeln nun die aktiven Filter der Suche angezeigt. (fea779bd95)
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) ist es nun möglich die Tara nachträglich zu korrigieren. (8ba051198f, 6436762e8d)
+
+### Behobene Fehler {#v1.1.2.2-bugfixes}
+
+* Bei Lieferscheinen (`DeliveryNote`) hat bei Anmerkungen zu Teil-Lfrg. ein `:` gefehlt.
+  Außerdem wurden Seitenumbrüche so platziert, dass sie nicht mehr innerhalb einer Teil-Lfrg. liegen. (e66780ccd0, f4cc443521)
+
+### Sonstiges {#v1.1.2.2-misc}
+
+* Bei Datenbank-Fehler sind die Fehlermeldungen nun genauer bzw. auf deutsch übersetzt. (cc01f92005)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) wurden Überschriften und Tooltips leicht angepasst. (6441fa4f50)
+* Abhängigkeiten aktualisiert. (4cc33b56c8, 6bed370eba)
+
+[v1.1.2.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.2.2
+
+
+
+
 [v1.1.2.1][v1.1.2.1] (2026-08-27) {#v1.1.2.1}
 ---------------------------------------------

@@ -4,6 +4,7 @@
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        xmlns:local="clr-namespace:Elwig.Dialogs"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
        WindowStartupLocation="CenterOwner"
        FocusManager.FocusedElement="{Binding ElementName=WeightInput}"
@@ -37,11 +38,9 @@
        </Grid.ColumnDefinitions>

        <Label Content="Gewicht:" Margin="10,20,10,10"/>
-        <Grid Grid.Column="1" Width="70" Height="25" Margin="0,20,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
-            <TextBox x:Name="WeightInput" TextAlignment="Right" Padding="2,2,17,2"
-                     TextChanged="WeightInput_TextChanged"/>
-            <Label Content="kg" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10" Padding="2,4,2,4"/>
-        </Grid>
+        <ctrl:UnitTextBox x:Name="WeightInput" Grid.Column="1" Width="62" Height="25" Unit="kg"
+                          Margin="0,20,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="14" Padding="2"
+                          TextChanged="WeightInput_TextChanged"/>

        <Label Content="Grund:" Margin="10,50,10,10"/>
        <TextBox x:Name="ReasonInput" Grid.Column="1" Margin="0,50,10,10"
@@ -6,8 +6,8 @@ using System.Windows.Controls;
 namespace Elwig.Dialogs {
    public partial class ManualWeighingDialog : Window {

-        public int Weight = 0;
-        public string? Reason = null;
+        public int Weight { get; private set; }
+        public string? Reason { get; private set; }

        public ManualWeighingDialog(string? reason = null) {
            InitializeComponent();
@@ -0,0 +1,55 @@
+<Window x:Class="Elwig.Dialogs.TareCorrectionDialog"
+        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.Dialogs"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        FocusManager.FocusedElement="{Binding ElementName=TargetTareInput}"
+        Title="Tara korrigieren" Height="170" Width="300">
+    <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="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="70"/>
+            <ColumnDefinition Width="3*"/>
+        </Grid.ColumnDefinitions>
+
+        <Label Content="Ist-Tara:" Margin="10,20,0,10" Grid.Column="1"/>
+        <ctrl:UnitTextBox x:Name="ActualTareInput" Grid.Column="2" Width="56" Height="25" Unit="kg" IsReadOnly="True"
+                          Margin="0,20,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="14" Padding="2"
+                          TextChanged="TareInput_TextChanged"/>
+
+        <Label Content="Soll-Tara:" Margin="10,50,0,10" Grid.Column="1"/>
+        <ctrl:UnitTextBox x:Name="TargetTareInput" Grid.Column="2" Width="56" Height="25" Unit="kg"
+                          Margin="0,50,10,10" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="14" Padding="2"
+                          TextChanged="TareInput_TextChanged"/>
+
+        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.ColumnSpan="3" IsEnabled="False" IsDefault="True"
+                Click="ConfirmButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.ColumnSpan="3" IsCancel="True"/>
+    </Grid>
+</Window>
@@ -0,0 +1,36 @@
+using Elwig.Helpers;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Dialogs {
+    public partial class TareCorrectionDialog : Window {
+
+        public int ActualTare { get; private set; }
+        public int TargetTare { get; private set; }
+
+        public TareCorrectionDialog(int actualTare, int? targetTare = null) {
+            InitializeComponent();
+            ActualTare = actualTare;
+            TargetTare = targetTare ?? actualTare;
+            ActualTareInput.Text = ActualTare.ToString();
+            TargetTareInput.Text = TargetTare.ToString();
+            TargetTareInput.SelectAll();
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            DialogResult = true;
+            TargetTare = int.Parse(TargetTareInput.Text);
+            Close();
+        }
+
+        private void UpdateButtons() {
+            ConfirmButton.IsEnabled = TargetTareInput.Text.Length > 0;
+        }
+
+        private void TareInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            if (sender is not TextBox b) return;
+            Validator.CheckInteger(b, true, 4);
+            UpdateButtons();
+        }
+    }
+}
@@ -30,7 +30,7 @@ namespace Elwig.Documents {
            _year = year;
            ShowDateAndLocation = true;
            UseBillingAddress = true;
-            DocumentId = $"Anl.-Best. {_year}/{m.MgNr}";
+            DocumentId = $"Anlfrg.-Bstng. {_year}/{m.MgNr}";
            Data = data;
        }

@@ -138,7 +138,8 @@ namespace Elwig.Documents {
            foreach (var part in Delivery.Parts.OrderBy(p => p.DPNr)) {
                var sub = new Table(ColsMM(10, 21, 25, 19.5, 19.5, 30, 12.5, 12.5, 15), true)
                    .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
-                    .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
+                    .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                    .SetKeepTogether(true);

                int rowspan = 1 + (part.Cultivation != null ? 1 : 0) + 1 + part.Modifiers.Count() + 1 + (part.Comment != null ? 1 : 0) + (part.Temperature != null || part.Acid != null ? 1 : 0);
                sub.AddCell(NewDeliveryMainTd($"{part.DPNr:N0}", center: true))
@@ -196,9 +197,17 @@ namespace Elwig.Documents {
                            .Add(Italic("Brutto:"))
                            .Add(Normal($" {info.Gross:N0} kg \u2013 "))
                            .Add(Italic("Tara:"))
-                            .Add(Normal($" {info.Tare:N0} kg \u2013 "))
+                            .Add(Normal($" {info.Tare:N0} kg "));
+                        if (info.TareCorrection != null && info.TareCorrection != 0)
+                            weighing.Add(Bold($"(Korr.: {Utils.GetSign(info.TareCorrection.Value)}{Math.Abs(info.TareCorrection.Value)} kg)")).Add(" ");
+                        weighing
+                            .Add(Normal("\u2013 "))
                            .Add(Italic("Netto:"))
-                            .Add(Normal($" {info.Net:N0} kg \u2013 "))
+                            .Add(Normal($" {info.Net:N0} kg "));
+                        if (info.TareCorrection != null && info.TareCorrection != 0)
+                            weighing.Add(Normal($"({Utils.GetSign(-info.TareCorrection.Value)}{Math.Abs(info.TareCorrection.Value)} kg) "));
+                        weighing
+                            .Add(Normal("\u2013 "))
                            .Add(Italic(part.IsNetWeight ? "gerebelt gewogen" : "nicht gerebelt gewogen"));
                    } else {
                        weighing.Add(" ")
@@ -210,7 +219,7 @@ namespace Elwig.Documents {
                    .AddCell(NewCell(colspan: 3));
                if (part.Comment != null) {
                    sub.AddCell(NewCell())
-                        .AddCell(NewCell(new KernedParagraph(8).Add(Italic("Anmerkung")).Add(Normal(" " + part.Comment)), colspan: 5))
+                        .AddCell(NewCell(new KernedParagraph(8).Add(Italic("Anmerkung:")).Add(Normal(" " + part.Comment)), colspan: 5))
                        .AddCell(NewCell(colspan: 3));
                }
                if (part.Temperature != null || part.Acid != null) {
@@ -220,7 +229,7 @@ namespace Elwig.Documents {
                    if (part.Temperature != null && part.Acid != null)
                        p.Add(Normal(", "));
                    if (part.Acid != null)
-                        p.Add(Italic("Säure")).Add(Normal($" {part.Acid:N1} g/l"));
+                        p.Add(Italic("Säure:")).Add(Normal($" {part.Acid:N1} g/l"));
                    sub.AddCell(NewCell())
                        .AddCell(NewCell(p, colspan: 5))
                        .AddCell(NewCell(colspan: 3));
@@ -9,7 +9,7 @@
    <UseWindowsForms>true</UseWindowsForms>
    <PreserveCompilationContext>true</PreserveCompilationContext>
    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>1.1.2.1</Version>
+    <Version>1.1.2.2</Version>
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <ApplicationManifest>App.manifest</ApplicationManifest>
@@ -23,21 +23,21 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="bblanchon.PDFium.Win32" Version="154.0.8021" />
+    <PackageReference Include="bblanchon.PDFium.Win32" Version="155.0.8044" />
    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
    <PackageReference Include="itext" Version="9.7.0" />
    <PackageReference Include="itext.bouncy-castle-adapter" Version="9.7.0" />
    <PackageReference Include="LinqKit" Version="1.3.11" />
-    <PackageReference Include="MailKit" Version="4.17.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.11" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.11" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4129.50" />
+    <PackageReference Include="MailKit" Version="4.18.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.12" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.12" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4191.47" />
    <PackageReference Include="NJsonSchema" Version="11.6.1" />
    <PackageReference Include="ScottPlot.WPF" Version="5.1.59" />
    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.5" />
-    <PackageReference Include="System.IO.Hashing" Version="10.0.11" />
-    <PackageReference Include="System.IO.Ports" Version="10.0.11" />
-    <PackageReference Include="System.Management" Version="10.0.11" />
+    <PackageReference Include="System.IO.Hashing" Version="10.0.12" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.12" />
+    <PackageReference Include="System.Management" Version="10.0.12" />
  </ItemGroup>

 </Project>
@@ -303,6 +303,11 @@ namespace Elwig.Helpers {
            return d.ShowDialog() == true ? (d.Weight, d.Reason) : null;
        }

+        public static int? ShowTareCorrectionDialog(int actualTare, int? targetTare = null) {
+            var d = new TareCorrectionDialog(actualTare, targetTare);
+            return d.ShowDialog() == true ? d.TargetTare - d.ActualTare : null;
+        }
+
        public static (string?, int[])? ShowDeliverySplittingDialog(Delivery delivery) {
            var d = new DeliverySplittingDialog(delivery);
            return d.ShowDialog() == true ? (d.MgNr?.ToString() ?? d.LsNr, d.Weights ?? []) : null;
@@ -712,5 +717,10 @@ namespace Elwig.Helpers {
            var filename = Path.Combine(App.MailsPath, $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{NormalizeFileName(subject)}.txt");
            await File.WriteAllTextAsync(filename, $"# {subject}\r\n# Vorgesehene Empfänger: {recipients}\r\n\r\n" + body, Utils.UTF8);
        }
+
+        public static string GetTitle(string window, IEnumerable<string> filterNames, IEnumerable<string> filter) {
+            var f = string.Join(" / ", filterNames.Union(filter.Select(f => $"\"{f}\"")));
+            return window + (f.Length == 0 ? "" : ": " + f) + " - Elwig";
+        }
    }
 }
@@ -124,7 +124,7 @@ namespace Elwig.Models.Entities {
        [Column("weighing_data")]
        public string? WeighingData { get; set; }
        [NotMapped]
-        public (string? ScaleId, string? Id, int? Gross, int? Tare, int? Net, DateOnly? Date, TimeOnly? Time) WeighingInfo {
+        public (string? ScaleId, string? Id, int? Gross, int? Tare, int? TareCorrection, int? Net, DateOnly? Date, TimeOnly? Time) WeighingInfo {
            get {
                try {
                    var obj = JsonNode.Parse(WeighingData!)!.AsObject();
@@ -133,12 +133,13 @@ namespace Elwig.Models.Entities {
                        obj["id"]?.AsValue().GetValue<string>(),
                        obj["gross_weight"]?.AsValue().GetValue<int>(),
                        obj["tare_weight"]?.AsValue().GetValue<int>(),
+                        obj["tare_correction"]?.AsValue().GetValue<int>(),
                        obj["net_weight"]?.AsValue().GetValue<int>(),
                        DateOnly.TryParseExact(obj["date"]?.AsValue().GetValue<string>(), "yyyy-MM-dd", out var d) ? d : null,
                        TimeOnly.TryParseExact(obj["time"]?.AsValue().GetValue<string>(), ["HH:mm:ss", "HH:mm"], out var t) ? t : null
                    );
                } catch {
-                    return (null, null, null, null, null, null, null);
+                    return (null, null, null, null, null, null, null, null);
                }
            }
        }
@@ -43,6 +43,8 @@ namespace Elwig.Services {
        public static async Task<(List<string>, IQueryable<AreaComContract>, IQueryable<AreaCom>, List<string>)> GetFilters(this AreaComAdminViewModel vm, AppDbContext ctx) {
            List<string> filterNames = [];
            IQueryable<AreaCom> areaComQuery = ctx.AreaCommitments.Where(a => a.MgNr == vm.FilterMember.MgNr).OrderBy(a => a.FbNr);
+            filterNames.Add(vm.FilterMember.AdministrativeName);
+
            if (vm.FilterSeason is int season) {
                areaComQuery = Utils.ActiveAreaCommitments(areaComQuery, season);
                filterNames.Add($"laufend {season}");
@@ -35,8 +35,13 @@ namespace Elwig.Services {

            vm.SortId = "";
            vm.GradationKmwString = "";
-            vm.WeightString = "";
+
+            vm.Weight = null;
+            vm.ActualTare = 0;
+            vm.TargetTare = null;
+            vm.Tare = null;
            vm.IsManualWeighing = false;
+
            vm.PartComment = "";
            vm.TemperatureString = "";
            vm.AcidString = "";
@@ -51,7 +56,11 @@ namespace Elwig.Services {
            vm.WineKg = ControlUtils.GetItemFromSourceWithPk(vm.WineKgSource, p.KgNr) as AT_Kg;
            vm.WineRd = ControlUtils.GetItemFromSourceWithPk(vm.WineRdSource, p.KgNr, p.RdNr) as WbRd;
            vm.WineOrigin = ControlUtils.GetItemFromSourceWithPk(vm.WineOriginSource, p.HkId) as WineOrigin;
-            vm.WeightString = $"{p.Weight:N0}";
+
+            vm.Weight = p.Weight;
+            vm.ActualTare = p.WeighingInfo.Tare ?? 0;
+            vm.TargetTare = vm.ActualTare + p.WeighingInfo.TareCorrection;
+            vm.Tare = vm.TargetTare ?? (vm.ActualTare != 0 ? vm.ActualTare : null);
            vm.IsManualWeighing = p.IsManualWeighing;
            vm.IsNetWeight = p.IsNetWeight;

@@ -120,6 +120,14 @@ namespace Elwig.ViewModels {
            set => WeightString = $"{value:N0}";
        }
        [ObservableProperty]
+        private string? _tareString = "-";
+        public int? Tare {
+            get => int.TryParse(TareString?.Replace(Utils.GroupSeparator, "").Replace(" kg", ""), out var w) ? w : null;
+            set => TareString = value == null ? "-" : $"{value:N0} kg{(TargetTare != null ? "*" : "")}";
+        }
+        public int ActualTare;
+        public int? TargetTare;
+        [ObservableProperty]
        private bool _isManualWeighing;
        [ObservableProperty]
        private bool? _isNetWeightValue = false;
@@ -8,6 +8,9 @@ using System.Windows.Controls;
 namespace Elwig.ViewModels {
    public partial class DeliveryAncmtAdminViewModel : ObservableObject {

+        [ObservableProperty]
+        private string _title = "Anmeldungen - Elwig";
+
        [ObservableProperty]
        private string? _searchQuery = "";
        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0) ?? []];
@@ -6,11 +6,13 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Documents;

 namespace Elwig.ViewModels {
    public partial class MemberAdminViewModel : ObservableObject {

+        [ObservableProperty]
+        private string _title = "Mitglieder - Elwig";
+
        public int? TransferPredecessorAreaComs = null;
        public int? CancelAreaComs = null;

@@ -23,7 +23,6 @@ namespace Elwig.Windows {
            CommandBindings.Add(new CommandBinding(CtrlF, FocusSearchInput));
            using var ctx = new AppDbContext();
            ViewModel.FilterMember = ctx.Members.Find(mgnr) ?? throw new ArgumentException("MgNr argument has invalid value");
-            ViewModel.Title = $"Flächenbindungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
            ExemptInputs = [
                AreaCommitmentList, RevisionList,
                NewAreaCommitmentButton, EditAreaCommitmentButton, DeleteAreaCommitmentButton, SaveButton,
@@ -51,9 +50,9 @@ namespace Elwig.Windows {
            var cursor = Mouse.OverrideCursor != null;
            if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
            var query = (vm.SearchQuery, vm.FilterSeason);
-            var (filter, contracts, areaComs, areaComCount, stat) = await Task.Run(async () => {
+            var (filterNames, filter, contracts, areaComs, areaComCount, stat) = await Task.Run(async () => {
                using var ctx = new AppDbContext();
-                var (_, contractQuery, areaComQuery, filter) = await vm.GetFilters(ctx);
+                var (filterNames, contractQuery, areaComQuery, filter) = await vm.GetFilters(ctx);
                var contracts = await contractQuery
                    .Include(c => c.Revisions).ThenInclude(a => a.Member)
                    .ToListAsync();
@@ -73,11 +72,12 @@ namespace Elwig.Windows {
                var season = await ctx.FetchSeasons().FirstOrDefaultAsync();
                var stat = await AreaComService.GenerateToolTipData(areaComQuery, season?.MaxKgPerHa ?? 10_000);

-                return (filter, contracts, areaComs, areaComCount, stat);
+                return (filterNames, filter, contracts, areaComs, areaComCount, stat);
            });
            if (!cursor) Mouse.OverrideCursor = null;
            if (query != (ViewModel.SearchQuery, ViewModel.FilterSeason)) return;

+            ViewModel.Title = Utils.GetTitle("Flächenbindungen", filterNames, filter);
            ControlUtils.RenewItemsSource(AreaCommitmentList, contracts,
                AreaCommitmentList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
            RefreshInputs();
@@ -164,7 +164,6 @@ namespace Elwig.Windows {
                return;
            }
            ViewModel.FilterMember = m;
-            ViewModel.Title = $"Flächenbindungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";

            ControlUtils.RenewItemsSource(KgInput, await ctx.WbKgs
                .Include(k => k.AtKg.WbKg!.Rds)
@@ -398,7 +398,8 @@
        <Grid Grid.Row="1" Grid.Column="2">
            <Grid.RowDefinitions>
                <RowDefinition Height="0.625*"/>
-                <RowDefinition Height="0.875*"/>
+                <RowDefinition Height="0.8125*"/>
+                <RowDefinition Height="0.0625*"/>
                <RowDefinition Height="0.875*"/>
                <RowDefinition Height="0.25*"/>
                <RowDefinition Height="*"/>
@@ -434,7 +435,7 @@
                </Grid>
            </GroupBox>

-            <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Grid.RowSpan="3" Margin="5,5,5,5">
+            <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Grid.RowSpan="4" Margin="5,5,5,5">
                <Grid>
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="100"/>
@@ -553,7 +554,7 @@
                </Grid>
            </GroupBox>

-            <GroupBox Header="Menge" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
+            <GroupBox Header="Menge" Grid.Column="1" Grid.Row="2" Grid.RowSpan="2" Margin="5,5,5,5">
                <Grid>
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="70"/>
@@ -565,16 +566,23 @@
                                      TextChanged="WeightInput_TextChanged"
                                      Grid.Column="1" Width="70" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>

+                    <Label Content="Tara:" Margin="10,40,10,10"/>
+                    <TextBlock x:Name="Tare" Text="{Binding TareString}" Width="40"
+                               Grid.Column="1" Margin="30,44,10,10" TextAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
                    <CheckBox x:Name="ManualWeighingInput" IsChecked="{Binding IsManualWeighing, Mode=TwoWay}"
                              Content="Handwiegung" IsEnabled="False"
-                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,45,10,10" Grid.Column="0" Grid.ColumnSpan="2"
+                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>

                    <CheckBox x:Name="GerebeltGewogenInput" IsChecked="{Binding IsNetWeightValue, Mode=TwoWay}"
                              Content="Gerebelt gewogen" IsThreeState="True"
-                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
+                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,100,10,10" Grid.Column="0" Grid.ColumnSpan="2"
                              Checked="GerebeltGewogenInput_Changed" Unchecked="GerebeltGewogenInput_Changed" Indeterminate="GerebeltGewogenInput_Changed"/>

+                    <Button x:Name="CorrectTareButton" Content="Tara korrigieren" Width="120" Visibility="Hidden"
+                            Click="CorrectTareButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,10,10,10" Grid.Column="2"/>
                    <Button x:Name="WeighingAButton" Content="Wiegen A" Width="120"
                            Click="WeighingButton_Click"
                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,10,10,10" Grid.Column="2"/>
@@ -593,7 +601,7 @@
                </Grid>
            </GroupBox>

-            <GroupBox Header="Sonstiges" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Margin="5,5,5,10">
+            <GroupBox Header="Sonstiges" Grid.Column="1" Grid.Row="4" Grid.RowSpan="2" Margin="5,5,5,10">
                <Grid>
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="100"/>
@@ -646,7 +654,7 @@
                </Grid>
            </GroupBox>

-            <GroupBox Header="Herkunft" Grid.Column="0" Grid.Row="4" Margin="5,5,5,10">
+            <GroupBox Header="Herkunft" Grid.Column="0" Grid.Row="5" Margin="5,5,5,10">
                <Grid>
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="100"/>
@@ -9,6 +9,7 @@ using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -103,6 +104,7 @@ namespace Elwig.Windows {
                WeighingBButton.Visibility = Visibility.Hidden;
                WeighingCButton.Visibility = Visibility.Hidden;
                WeighingDButton.Visibility = Visibility.Hidden;
+                DisableWeighingButtons();
            }

            Menu_Statistics_WineQuality_ModeOe.IsChecked = false;
@@ -126,7 +128,6 @@ namespace Elwig.Windows {
            this() {
            using var ctx = new AppDbContext();
            ViewModel.FilterMember = ctx.Members.Find(mgnr) ?? throw new ArgumentException("MgNr argument has invalid value");
-            ViewModel.Title = $"Lieferungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
            ViewModel.EnableAllSeasons = true;
        }

@@ -419,9 +420,9 @@ namespace Elwig.Windows {
            var cursor = Mouse.OverrideCursor != null;
            if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
            var query = (vm.SearchQuery, vm.FilterSeason, vm.FilterAllSeasons, vm.FilterTodayOnly);
-            var (filter, deliveries, deliveryPartsNum, varieties, members, stat) = await Task.Run(async () => {
+            var (filterNames, filter, deliveries, deliveryPartsNum, varieties, members, stat) = await Task.Run(async () => {
                using var ctx = new AppDbContext();
-                var (_, deliveryQuery, deliveryPartsQuery, predicate, filter) = await vm.GetFilters(ctx);
+                var (filterNames, deliveryQuery, deliveryPartsQuery, predicate, filter) = await vm.GetFilters(ctx);
                var deliveries = await deliveryQuery
                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers).ThenInclude(m => m.Modifier)
                    .Include(d => d.Parts).ThenInclude(p => p.Variety)
@@ -450,11 +451,13 @@ namespace Elwig.Windows {
                var members = await deliveryQuery.Select(d => d.Member).Distinct().IgnoreAutoIncludes().ToListAsync();
                var stat = await DeliveryService.GenerateToolTipData(deliveryPartsQuery);

-                return (filter, deliveries, deliveryPartsNum, varieties, members, stat);
+                return (filterNames, filter, deliveries, deliveryPartsNum, varieties, members, stat);
            });
            if (!cursor) Mouse.OverrideCursor = null;
            if (query != (ViewModel.SearchQuery, ViewModel.FilterSeason, ViewModel.FilterAllSeasons, ViewModel.FilterTodayOnly)) return;

+            if (!ViewModel.IsReceipt)
+                ViewModel.Title = Utils.GetTitle("Lieferungen", filterNames, filter);
            ControlUtils.RenewItemsSource(DeliveryList, deliveries,
                DeliveryList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
            await RefreshDeliveryParts();
@@ -488,7 +491,6 @@ namespace Elwig.Windows {
                    return;
                }
                ViewModel.FilterMember = m;
-                ViewModel.Title = $"Lieferungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
            }

            int year = 0;
@@ -612,14 +614,34 @@ namespace Elwig.Windows {
            ClearOriginalValues();
            ClearDefaultValues();
            ViewModel.FillInputs(p);
+            CorrectTareButton.Visibility = !ViewModel.IsReceipt && (ViewModel.ActualTare != 0 || ViewModel.IsUnloadingBox) ? Visibility.Visible : Visibility.Hidden;
            FinishInputFilling();
        }

        new protected void ClearInputs(bool validate = false) {
            ViewModel.ClearInputs();
+            CorrectTareButton.Visibility = Visibility.Hidden;
            base.ClearInputs(validate);
        }

+        private void CorrectTareButton_Click(object sender, RoutedEventArgs evt) {
+            var lastCorrection = (ViewModel.TargetTare ?? ViewModel.ActualTare) - ViewModel.ActualTare;
+            var correction = Utils.ShowTareCorrectionDialog(ViewModel.ActualTare, ViewModel.TargetTare);
+            if (correction == null) return;
+            ViewModel.Weight += lastCorrection - correction;
+            ViewModel.TargetTare = correction == 0 ? null : ViewModel.ActualTare + correction;
+            ViewModel.Tare = ViewModel.TargetTare ?? ViewModel.ActualTare;
+            if (ViewModel.WeighingData is string s) {
+                var obj = JsonNode.Parse(s)!.AsObject();
+                if (correction == 0) {
+                    obj.Remove("tare_correction");
+                } else {
+                    obj["tare_correction"] = correction;
+                }
+                ViewModel.WeighingData = obj.ToJsonString(Utils.JsonOpts);
+            }
+        }
+
        private void WeighingButton_Click(object sender, RoutedEventArgs evt) {
            int index = Array.IndexOf(WeighingButtons, sender as Button);
            if (index >= 0) WeighingButton_Click(index);
@@ -651,12 +673,18 @@ namespace Elwig.Windows {
        private void OnWeighingResult(IScale scale, WeighingResult res) {
            if ((res.NetWeight ?? 0) > 0 && res.FullWeighingId != null) {
                ViewModel.Weight = res.NetWeight;
+                ViewModel.ActualTare = res.TareWeight ?? 0;
+                ViewModel.TargetTare = null;
+                ViewModel.Tare = ViewModel.ActualTare != 0 ? ViewModel.ActualTare : null;
                ViewModel.ScaleTerminalId = scale.ScaleTerminalId;
                ViewModel.WeighingData = res.ToJson().ToJsonString();
                ViewModel.ManualWeighingReason = null;
                ManualWeighingInput.IsChecked = false;
            } else {
                ViewModel.Weight = null;
+                ViewModel.ActualTare = 0;
+                ViewModel.TargetTare = null;
+                ViewModel.Tare = null;
                ViewModel.ScaleTerminalId = null;
                ViewModel.WeighingData = null;
            }
@@ -971,6 +999,8 @@ namespace Elwig.Windows {
            DeliveryList.IsEnabled = false;
            DeliveryPartList.IsEnabled = false;

+            if (!ViewModel.IsReceipt)
+                EnableWeighingButtons();
            HideNewEditDeleteButtons();
            ShowSaveResetCancelButtons();
            UnlockInputs();
@@ -1034,6 +1064,8 @@ namespace Elwig.Windows {
            DeliveryList.IsEnabled = true;
            DeliveryPartList.IsEnabled = true;

+            if (!ViewModel.IsReceipt)
+                DisableWeighingButtons();
            HideSaveResetCancelButtons();
            ShowNewEditDeleteButtons();
            LockInputs();
@@ -1067,6 +1099,8 @@ namespace Elwig.Windows {
            DeliveryList.IsEnabled = true;
            DeliveryPartList.IsEnabled = true;

+            if (!ViewModel.IsReceipt)
+                DisableWeighingButtons();
            HideSaveResetCancelButtons();
            ShowNewEditDeleteButtons();
            RefreshInputs();
@@ -1171,6 +1205,7 @@ namespace Elwig.Windows {
        }

        private void DisableWeighingButtons() {
+            CorrectTareButton.IsEnabled = false;
            WeighingManualButton.IsEnabled = false;
            WeighingAButton.IsEnabled = false;
            WeighingBButton.IsEnabled = false;
@@ -1179,6 +1214,7 @@ namespace Elwig.Windows {
        }

        private void EnableWeighingButtons() {
+            CorrectTareButton.IsEnabled = true;
            WeighingManualButton.IsEnabled = true;
            var n = App.CommandScales.Count;
            WeighingAButton.IsEnabled = n > 0 && App.CommandScales[0].IsReady;
@@ -1373,6 +1409,8 @@ namespace Elwig.Windows {

        private void UnloadingInput_Checked(object sender, RoutedEventArgs evt) {
            if (!IsEditing && !IsCreating) return;
+            if (!ViewModel.IsReceipt)
+                CorrectTareButton.Visibility = ViewModel.ActualTare != 0 || ViewModel.IsUnloadingBox ? Visibility.Visible : Visibility.Hidden;
            var mod = ViewModel.Modifiers.ToList();
            var source = ViewModel.ModifiersSource.ToList();
            if (App.Client.IsMatzen) {
@@ -8,7 +8,7 @@
        xmlns:local="clr-namespace:Elwig.Windows"
        xmlns:vm="clr-namespace:Elwig.ViewModels"
        xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="Anmeldungen - Elwig" Height="700" Width="980" MinWidth="600" MinHeight="400">
+        Title="{Binding Title}" Height="700" Width="980" MinWidth="600" MinHeight="400">
    <Window.DataContext>
        <vm:DeliveryAncmtAdminViewModel/>
    </Window.DataContext>
@@ -103,9 +103,9 @@ namespace Elwig.Windows {
            var cursor = Mouse.OverrideCursor != null;
            if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
            var query = (vm.SearchQuery, vm.FilterSeason, vm.FilterOnlyUpcoming, vm.FilterOnlyUpcoming);
-            var (filter, deliveryAncmts, stat) = await Task.Run(async () => {
+            var (filterNames, filter, deliveryAncmts, stat) = await Task.Run(async () => {
                using var ctx = new AppDbContext();
-                var (_, deliveryAncmtQuery, filter) = await vm.GetFilters(ctx);
+                var (filterNames, deliveryAncmtQuery, filter) = await vm.GetFilters(ctx);
                var deliveryAncmts = await deliveryAncmtQuery.ToListAsync();

                if (filter.Count > 0 && deliveryAncmts.Count > 0) {
@@ -130,11 +130,12 @@ namespace Elwig.Windows {

                var stat = await DeliveryAncmtService.GenerateToolTipData(deliveryAncmtQuery);

-                return (filter, deliveryAncmts, stat);
+                return (filterNames, filter, deliveryAncmts, stat);
            });
            if (!cursor) Mouse.OverrideCursor = null;
            if (query != (ViewModel.SearchQuery, ViewModel.FilterSeason, ViewModel.FilterOnlyUpcoming, ViewModel.FilterOnlyUpcoming)) return;

+            ViewModel.Title = Utils.GetTitle("Anmeldungen", filterNames, filter);
            ControlUtils.RenewItemsSource(DeliveryAncmtList, deliveryAncmts,
                DeliveryAncmtList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
            if (updateSort && DeliveryAncmtList.SelectedItem != null)
@@ -5,7 +5,7 @@
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:local="clr-namespace:Elwig.Windows"
        xmlns:vm="clr-namespace:Elwig.ViewModels"
-        Title="Mitglieder - Elwig" Height="700" Width="1250" MinHeight="650" MinWidth="1150">
+        Title="{Binding Title}" Height="700" Width="1250" MinHeight="650" MinWidth="1150">
    <Window.DataContext>
        <vm:MemberAdminViewModel/>
    </Window.DataContext>
@@ -552,7 +552,7 @@
                        <ColumnDefinition/>
                    </Grid.ColumnDefinitions>

-                    <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0" ToolTip="USt-IdNr. / Umsatzsteuer-Identifikationsnummer"/>
                    <TextBox x:Name="UstIdNrInput" Text="{Binding UstIdNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                             Margin="0,10,10,0" Grid.Column="1" Width="96" HorizontalAlignment="Left"
                             TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
@@ -575,7 +575,10 @@
                            Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="60,40,0,0"/>
                </Grid>
            </GroupBox>
-            <GroupBox Header="Rechnungsadresse (optional)" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
+            <GroupBox Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
+                <GroupBox.Header>
+                    <TextBlock>Rechnungsadresse (optional) <Run FontSize="10">für Lieferschein, Anlfrg.-Bstng., Tr.-Gutschr.</Run></TextBlock>
+                </GroupBox.Header>
                <Grid>
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="65"/>
@@ -619,7 +622,7 @@
                             Margin="0,40,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>

-                    <Label Content="BH-Konto:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <Label Content="BH-Konto:" Margin="10,70,0,0" Grid.Column="0" ToolTip="Buchhaltungskonto"/>
                    <TextBox x:Name="AccountingNrInput" Text="{Binding AccountingNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                             Margin="0,70,10,0" Width="63" Grid.Column="1" HorizontalAlignment="Left"
                             TextChanged="TextBox_TextChanged"/>
@@ -147,9 +147,9 @@ namespace Elwig.Windows {
            var cursor = Mouse.OverrideCursor != null;
            if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
            var query = (vm.SearchQuery, vm.ShowOnlyActiveMembers);
-            var (members, stat) = await Task.Run(async () => {
+            var (filterNames, members, stat, filter) = await Task.Run(async () => {
                using var ctx = new AppDbContext();
-                var (_, memberQuery, filter) = await vm.GetFilters(ctx);
+                var (filterNames, memberQuery, filter) = await vm.GetFilters(ctx);
                var members = await memberQuery
                    .Include(m => m.EmailAddresses)
                    .Include(m => m.TelephoneNumbers)
@@ -184,11 +184,12 @@ namespace Elwig.Windows {
                    SharesActive = g.Sum(m => m.Shares + m.SharesRed + m.SharesWhite),
                }).ToListAsync()).Select(g => (g.Count, g.Shares, g.SharesRed, g.SharesWhite, g.SharesDormant, g.SharesTotal, g.SharesActive)).ToList();

-                return (members, stat[0]);
+                return (filterNames, members, stat[0], filter);
            });
            if (!cursor) Mouse.OverrideCursor = null;
            if (query != (ViewModel.SearchQuery, ViewModel.ShowOnlyActiveMembers)) return;

+            ViewModel.Title = Utils.GetTitle("Mitglieder", filterNames, filter);
            ControlUtils.RenewItemsSource(MemberList, members,
                MemberList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
            if (updateSort && MemberList.SelectedItem != null)
@@ -13,7 +13,7 @@ About
 **Product:** Elwig  
 **Description:** Electronic Management for Vintners' Cooperatives  
 **Type:** ERP system  
-**Version:** 1.1.2.1 ([Changelog](./CHANGELOG.md))  
+**Version:** 1.1.2.2 ([Changelog](./CHANGELOG.md))  
 **License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Source code:** https://git.necronda.net/winzer/elwig  
@@ -33,7 +33,7 @@ Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
 **Produkt:** Elwig  
 **Beschreibung:** Elektronische Winzergenossenschaftsverwaltung  
 **Typ:** Warenwirtschaftssystem (ERP-System)  
-**Version:** 1.1.2.1 ([Änderungsprotokoll](./CHANGELOG.md))  
+**Version:** 1.1.2.2 ([Änderungsprotokoll](./CHANGELOG.md))  
 **Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Quellcode:** https://git.necronda.net/winzer/elwig  
@@ -19,12 +19,12 @@
  </Target>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.0" />
    <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
    <PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
    <PackageReference Include="NUnit" Version="4.6.1" />
    <PackageReference Include="NUnit3TestAdapter" Version="6.3.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.14.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.15.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
Author	SHA1	Message	Date
lorenz.stechauner	abf06c558f	Bump version to 1.1.2.2 Test / Run tests (push) Successful in 2m8s Details	2026-09-14 17:10:23 +02:00
lorenz.stechauner	6436762e8d	DeliveryAdminWindow: Show CorrectTareButton also for unloading type box Test / Run tests (push) Successful in 2m11s Details	2026-09-14 16:40:16 +02:00
lorenz.stechauner	6441fa4f50	MemberAdminWindow: Add details in header and tool tips Test / Run tests (push) Successful in 2m3s Details	2026-09-14 15:20:34 +02:00
lorenz.stechauner	6bed370eba	Tests: Update dependencies Test / Run tests (push) Successful in 2m13s Details	2026-09-14 14:53:39 +02:00
lorenz.stechauner	4cc33b56c8	Elwig: Update dependencies	2026-09-14 14:53:26 +02:00
lorenz.stechauner	f4cc443521	DeliveryNote: Fix page breaks in delivery table Test / Run tests (push) Successful in 2m12s Details	2026-09-14 14:45:39 +02:00
lorenz.stechauner	8ba051198f	DeliveryAdminWindow: Add button to correct tare	2026-09-14 14:43:24 +02:00
lorenz.stechauner	fea779bd95	Windows: Add filters to Titles in some AdministrationWindows Test / Run tests (push) Successful in 2m21s Details	2026-09-12 22:59:57 +02:00
lorenz.stechauner	e66780ccd0	DeliveryNote: Fix missing ':' for Comment and Acid	2026-09-12 22:48:28 +02:00