Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0617726139 | |||
| 9dfe71d6d0 | |||
| 72155fc54e |
@@ -2,6 +2,18 @@
|
|||||||
Changelog
|
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}
|
[v1.0.5.2][v1.0.5.2] (2026-04-24) {#v1.0.5.2}
|
||||||
---------------------------------------------
|
---------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -296,11 +296,14 @@ namespace Elwig.Documents {
|
|||||||
if (p.QualId == "WEI") varibute.Add(Italic("abgew."));
|
if (p.QualId == "WEI") varibute.Add(Italic("abgew."));
|
||||||
sub.AddCell(NewCell(colspan: 2))
|
sub.AddCell(NewCell(colspan: 2))
|
||||||
.AddCell(NewTd(varibute, colspan: 3).SetPaddingTop(0));
|
.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 {
|
} 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) {
|
if (i < p.Buckets.Length) {
|
||||||
|
|||||||
@@ -114,13 +114,14 @@ namespace Elwig.Documents {
|
|||||||
} else if (i == 1 && attr) {
|
} else if (i == 1 && attr) {
|
||||||
sub.AddCell(NewCell(colspan: 2))
|
sub.AddCell(NewCell(colspan: 2))
|
||||||
.AddCell(NewTd($"{p.Attribute}{(p.Attribute != null && p.Cultivation != null ? " / " : "")}{p.Cultivation}", 8, 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));
|
.AddCell(NewCell(colspan: 2));
|
||||||
} else {
|
} else {
|
||||||
sub.AddCell(NewCell(colspan: 2));
|
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 {
|
} else {
|
||||||
sub.AddCell(NewCell(colspan: 2));
|
sub.AddCell(NewCell(colspan: 2));
|
||||||
}
|
}
|
||||||
@@ -129,14 +130,15 @@ namespace Elwig.Documents {
|
|||||||
|
|
||||||
if (i < p.Buckets.Length) {
|
if (i < p.Buckets.Length) {
|
||||||
var bucket = p.Buckets[i];
|
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 {
|
} else {
|
||||||
sub.AddCell(NewCell(colspan: 2));
|
sub.AddCell(NewCell(colspan: 2));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i == p.Buckets.Length - 1) {
|
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));
|
sub.AddCell(NewTd(p.IsNetWeight ? "\u2611" : "\u2610", 7, right: true).SetFont(SF).SetPadding(0));
|
||||||
} else {
|
} else {
|
||||||
sub.AddCell(NewCell(colspan: 2));
|
sub.AddCell(NewCell(colspan: 2));
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@
|
|||||||
<UseWindowsForms>true</UseWindowsForms>
|
<UseWindowsForms>true</UseWindowsForms>
|
||||||
<PreserveCompilationContext>true</PreserveCompilationContext>
|
<PreserveCompilationContext>true</PreserveCompilationContext>
|
||||||
<ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
|
<ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
|
||||||
<Version>1.0.5.2</Version>
|
<Version>1.0.5.3</Version>
|
||||||
<SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
|
<SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
|
||||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ About
|
|||||||
**Product:** Elwig
|
**Product:** Elwig
|
||||||
**Description:** Electronic Management for Vintners' Cooperatives
|
**Description:** Electronic Management for Vintners' Cooperatives
|
||||||
**Type:** ERP system
|
**Type:** ERP system
|
||||||
**Version:** 1.0.5.2 ([Changelog](./CHANGELOG.md))
|
**Version:** 1.0.5.3 ([Changelog](./CHANGELOG.md))
|
||||||
**License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)
|
**License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)
|
||||||
**Website:** https://elwig.at/
|
**Website:** https://elwig.at/
|
||||||
**Source code:** https://git.necronda.net/winzer/elwig
|
**Source code:** https://git.necronda.net/winzer/elwig
|
||||||
@@ -33,7 +33,7 @@ Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
|
|||||||
**Produkt:** Elwig
|
**Produkt:** Elwig
|
||||||
**Beschreibung:** Elektronische Winzergenossenschaftsverwaltung
|
**Beschreibung:** Elektronische Winzergenossenschaftsverwaltung
|
||||||
**Typ:** Warenwirtschaftssystem (ERP-System)
|
**Typ:** Warenwirtschaftssystem (ERP-System)
|
||||||
**Version:** 1.0.5.2 ([Änderungsprotokoll](./CHANGELOG.md))
|
**Version:** 1.0.5.3 ([Änderungsprotokoll](./CHANGELOG.md))
|
||||||
**Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)
|
**Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)
|
||||||
**Website:** https://elwig.at/
|
**Website:** https://elwig.at/
|
||||||
**Quellcode:** https://git.necronda.net/winzer/elwig
|
**Quellcode:** https://git.necronda.net/winzer/elwig
|
||||||
|
|||||||
Reference in New Issue
Block a user