Bump version to 1.0.5.3

CHANGELOG.md

@@ -2,6 +2,34 @@
 Changelog
 =========
 
+[v1.0.5.3][v1.0.5.3] (2026-04-29) {#v1.0.5.3}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.5.3-bugfixes}
+
+* Manche Anlieferungsbestätigungen und Traubengutschriften konnten nicht angezeigt werden. Dies lag an einem internen Fehler, der manchmal bei Zu-/Abschlägen auftrat. (72155fc54e, 9dfe71d6d0)
+
+[v1.0.5.3]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.3
+
+
+
+
+[v1.0.5.2][v1.0.5.2] (2026-04-24) {#v1.0.5.2}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.5.2-bugfixes}
+
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) sind Attribut/Bewirtschaftungsart in der Liste für Teil-Lieferungen nicht angezeigt worden. (5c2fae1855)
+
+### Sonstiges {#v1.0.5.2-misc}
+
+* Abhängigkeiten aktualisiert. (2915f08a6b)
+
+[v1.0.5.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.2
+
+
+
+
 [v1.0.5.1][v1.0.5.1] (2026-04-20) {#v1.0.5.1}
 ---------------------------------------------
 

Elwig/Documents/CreditNote.cs

@@ -296,11 +296,14 @@ namespace Elwig.Documents {
                         if (p.QualId == "WEI") varibute.Add(Italic("abgew."));
                         sub.AddCell(NewCell(colspan: 2))
                             .AddCell(NewTd(varibute, colspan: 3).SetPaddingTop(0));
-                    } else if (i - (rows - p.Modifiers.Length) < p.Modifiers.Length) {
-                        sub.AddCell(NewCell(colspan: 2))
-                            .AddCell(NewTd(p.Modifiers[i - (rows - p.Modifiers.Length)], 8, colspan: 3).SetPaddingTop(0).SetPaddingLeftMM(5));
                     } else {
-                        sub.AddCell(NewCell(colspan: 5));
+                        var idx = i - (rows - p.Modifiers.Length);
+                        if (idx >= 0 && idx < p.Modifiers.Length) {
+                            sub.AddCell(NewCell(colspan: 2))
+                                .AddCell(NewTd(p.Modifiers[idx], 8, colspan: 3).SetPaddingTop(0).SetPaddingLeftMM(5));
+                        } else {
+                            sub.AddCell(NewCell(colspan: 5));
+                        }
                     }
 
                     if (i < p.Buckets.Length) {

Elwig/Documents/DeliveryConfirmation.cs

@@ -114,13 +114,14 @@ namespace Elwig.Documents {
                     } else if (i == 1 && attr) {
                         sub.AddCell(NewCell(colspan: 2))
                             .AddCell(NewTd($"{p.Attribute}{(p.Attribute != null && p.Cultivation != null ? " / " : "")}{p.Cultivation}", 8, colspan: 2)
-                                .SetPaddingsMM(0.125f, 1, 0.125f, 1))
+                                .SetPaddingTop(0))
                             .AddCell(NewCell(colspan: 2));
                     } else {
                         sub.AddCell(NewCell(colspan: 2));
-                        if (i - (rows - p.Modifiers.Length) < p.Modifiers.Length) {
+                        var idx = i - (rows - p.Modifiers.Length);
-                            sub.AddCell(NewTd(p.Modifiers[i - (rows - p.Modifiers.Length)], 8, colspan: 2)
+                        if (idx >= 0 && idx < p.Modifiers.Length) {
-                                .SetPaddingsMM(0.125f, 0, 0.125f, 5));
+                            sub.AddCell(NewTd(p.Modifiers[idx], 8, colspan: 2)
+                                .SetPaddingTop(0).SetPaddingLeftMM(5));
                         } else {
                             sub.AddCell(NewCell(colspan: 2));
                         }
@@ -129,14 +130,15 @@ namespace Elwig.Documents {
 
                     if (i < p.Buckets.Length) {
                         var bucket = p.Buckets[i];
-                        sub.AddCell(NewTd($"{bucket.Name}:", 8).SetHeight(10).SetPaddingsMM(0.125f, 0, 0.125f, 0));
+                        var pad = i == 0 ? 0.5f : 0;
-                        sub.AddCell(NewTd($"{bucket.Value:N0}", right: true));
+                        sub.AddCell(NewTd($"{bucket.Name}:", 8).SetHeight(10).SetPaddingTopMM(pad));
+                        sub.AddCell(NewTd($"{bucket.Value:N0}", right: true).SetPaddingTopMM(pad));
                     } else {
                         sub.AddCell(NewCell(colspan: 2));
                     }
 
                     if (i == p.Buckets.Length - 1) {
-                        sub.AddCell(NewTd($"{p.Weight:N0}", right: true));
+                        sub.AddCell(NewTd($"{p.Weight:N0}", right: true).SetPaddingTop(0));
                         sub.AddCell(NewTd(p.IsNetWeight ? "\u2611" : "\u2610", 7, right: true).SetFont(SF).SetPadding(0));
                     } else {
                         sub.AddCell(NewCell(colspan: 2));

Elwig/Elwig.csproj

@@ -9,7 +9,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>1.0.5.1</Version>
+    <Version>1.0.5.3</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -29,15 +29,15 @@
     <PackageReference Include="itext.bouncy-castle-adapter" Version="9.6.0" />
     <PackageReference Include="LinqKit" Version="1.3.11" />
     <PackageReference Include="MailKit" Version="4.16.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.7" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.7" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3912.50" />
-    <PackageReference Include="NJsonSchema" Version="11.6.0" />
+    <PackageReference Include="NJsonSchema" Version="11.6.1" />
     <PackageReference Include="ScottPlot.WPF" Version="5.1.58" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
-    <PackageReference Include="System.IO.Hashing" Version="10.0.6" />
+    <PackageReference Include="System.IO.Hashing" Version="10.0.7" />
-    <PackageReference Include="System.IO.Ports" Version="10.0.6" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.7" />
-    <PackageReference Include="System.Management" Version="10.0.6" />
+    <PackageReference Include="System.Management" Version="10.0.7" />
   </ItemGroup>
 
 </Project>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -431,6 +431,8 @@ namespace Elwig.Windows {
                 var deliveries = await deliveryQuery
                     .Include(d => d.Parts).ThenInclude(p => p.PartModifiers).ThenInclude(m => m.Modifier)
                     .Include(d => d.Parts).ThenInclude(p => p.Variety)
+                    .Include(d => d.Parts).ThenInclude(p => p.Attribute)
+                    .Include(d => d.Parts).ThenInclude(p => p.Cultivation)
                     .IgnoreAutoIncludes()
                     .AsSplitQuery()
                     .ToListAsync();

README.md

@@ -13,7 +13,7 @@ About
 **Product:** Elwig  
 **Description:** Electronic Management for Vintners' Cooperatives  
 **Type:** ERP system  
-**Version:** 1.0.5.1 ([Changelog](./CHANGELOG.md))  
+**Version:** 1.0.5.3 ([Changelog](./CHANGELOG.md))  
 **License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Source code:** https://git.necronda.net/winzer/elwig  
@@ -33,7 +33,7 @@ Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
 **Produkt:** Elwig  
 **Beschreibung:** Elektronische Winzergenossenschaftsverwaltung  
 **Typ:** Warenwirtschaftssystem (ERP-System)  
-**Version:** 1.0.5.1 ([Änderungsprotokoll](./CHANGELOG.md))  
+**Version:** 1.0.5.3 ([Änderungsprotokoll](./CHANGELOG.md))  
 **Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Quellcode:** https://git.necronda.net/winzer/elwig