Bump version to 1.0.5.5

CHANGELOG.md

@@ -2,6 +2,24 @@
 Changelog
 =========
 
+[v1.0.5.5][v1.0.5.5] (2026-06-24) {#v1.0.5.5}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.5.5-bugfixes}
+
+* Beim Exportieren der Überweisungsdaten (EBICS) im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) kam es zu einem Absturz. (3f65b2350b)
+* Einige Einstellungen einer Auszahlungsvariante wurden vom Auszahlungsvariante-Fenster (`ChartWindow`) beim Speichern überschrieben. (f32ff945ec)
+
+### Sonstiges {#v1.0.5.5-misc}
+
+* Traubengutschriften mit negativem Betrag sind nun wieder möglich. (ba3f66591e)
+* Abhängigkeiten aktualisiert. (4e027a9add)
+
+[v1.0.5.5]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.5
+
+
+
+
 [v1.0.5.4][v1.0.5.4] (2026-06-22) {#v1.0.5.4}
 ---------------------------------------------
 

Elwig/Elwig.csproj

@@ -9,7 +9,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>1.0.5.4</Version>
+    <Version>1.0.5.5</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -33,7 +33,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.9" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4022.49" />
     <PackageReference Include="NJsonSchema" Version="11.6.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.1.58" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.1.59" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
     <PackageReference Include="System.IO.Hashing" Version="10.0.9" />
     <PackageReference Include="System.IO.Ports" Version="10.0.9" />

Elwig/Helpers/Billing/BillingData.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 
@@ -92,6 +93,14 @@ namespace Elwig.Helpers.Billing {
             Mode = (mode == "elwig") ? CalculationMode.Elwig : CalculationMode.WgMaster;
         }
 
+        public BillingData() {
+            Data = new JsonObject {
+                ["mode"] = "elwig",
+                ["version"] = 1,
+            };
+            Mode = CalculationMode.Elwig;
+        }
+
         protected static JsonObject ParseJson(string json) {
             if (Schema == null) throw new InvalidOperationException("Schema has to be initialized first");
             try {
@@ -107,6 +116,10 @@ namespace Elwig.Helpers.Billing {
             return new(ParseJson(json));
         }
 
+        public string ToJsonString(JsonSerializerOptions? options = null) {
+            return Data.ToJsonString(options);
+        }
+
         protected JsonArray GetCurvesEntry() {
             return Data[Mode == CalculationMode.Elwig ? "curves" : "Kurven"]?.AsArray() ?? throw new InvalidOperationException();
         }
@@ -412,7 +425,7 @@ namespace Elwig.Helpers.Billing {
             }
         }
 
-        public static JsonObject FromGraphEntries(
+        public static BillingData FromGraphEntries(
             IEnumerable<GraphEntry> graphEntries,
             BillingData? origData = null,
             IEnumerable<RawVaribute>? vaributes = null,
@@ -449,37 +462,30 @@ namespace Elwig.Helpers.Billing {
             CollapsePaymentData(payment, payment.DeepClone().AsObject(), vaributes ?? payment.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultPayment);
             CollapsePaymentData(qualityWei, qualityWei.DeepClone().AsObject(), vaributes ?? qualityWei.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultQuality);
 
-            var data = new JsonObject {
-                ["mode"] = "elwig",
-                ["version"] = 1,
-            };
-
-            if (origData?.ConsiderDelieryModifiers == true)
-                data["consider_delivery_modifiers"] = true;
-            if (origData?.ConsiderContractPenalties == true)
-                data["consider_contract_penalties"] = true;
-            if (origData?.ConsiderTotalPenalty == true)
-                data["consider_total_penalty"] = true;
-            if (origData?.ConsiderAutoBusinessShares == true)
-                data["consider_auto_business_shares"] = true;
+            BillingData data;
+            if (origData != null && origData.Mode == CalculationMode.Elwig) {
+                data = new BillingData((JsonObject)origData.Data.DeepClone());
+            } else {
+                data = new BillingData();
+            }
 
             if (payment.Count == 0) {
-                data["payment"] = 0;
+                data.Data["payment"] = 0;
             } else if (payment.Count == 1 && payment.First().Key == "default") {
-                data["payment"] = payment.Single().Value?.DeepClone();
+                data.Data["payment"] = payment.Single().Value?.DeepClone();
             } else {
-                data["payment"] = payment;
+                data.Data["payment"] = payment;
             }
             if (qualityWei.Count == 1 && qualityWei.First().Key == "default") {
-                data["quality"] = new JsonObject() {
+                data.Data["quality"] = new JsonObject() {
                     ["WEI"] = qualityWei.Single().Value?.DeepClone()
                 };
             } else if (qualityWei.Count >= 1) {
-                data["quality"] = new JsonObject() {
+                data.Data["quality"] = new JsonObject() {
                     ["WEI"] = qualityWei
                 };
             }
-            data["curves"] = curves;
+            data.Data["curves"] = curves;
 
             return data;
         }

README.md

@@ -13,7 +13,7 @@ About
 **Product:** Elwig  
 **Description:** Electronic Management for Vintners' Cooperatives  
 **Type:** ERP system  
-**Version:** 1.0.5.4 ([Changelog](./CHANGELOG.md))  
+**Version:** 1.0.5.5 ([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.4 ([Änderungsprotokoll](./CHANGELOG.md))  
+**Version:** 1.0.5.5 ([Änderungsprotokoll](./CHANGELOG.md))  
 **Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Quellcode:** https://git.necronda.net/winzer/elwig