From 049927f90c3961254977fa7da2e1907ad19fab7c Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Mon, 19 Feb 2024 22:27:00 +0100 Subject: [PATCH] Delivery: Use also 'netto'/'brutto' for 'gerebelt gewogen' --- Elwig/Documents/DeliveryNote.cshtml | 2 +- Elwig/Windows/DeliveryAdminWindow.xaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Elwig/Documents/DeliveryNote.cshtml b/Elwig/Documents/DeliveryNote.cshtml index d5b9c43..c6165bb 100644 --- a/Elwig/Documents/DeliveryNote.cshtml +++ b/Elwig/Documents/DeliveryNote.cshtml @@ -61,7 +61,7 @@ } @Raw(part.IsManualWeighing ? "Handwiegung" : $"Waage: {part.ScaleId ?? "?"}, ID: {part.WeighingId ?? "?"}") - (@(part.IsNetWeight ? "gerebelt gewogen" : "nicht gerebelt gewogen"))@Raw(part.WeighingReason != null ? $", Begründung:" : "") @part.WeighingReason + (@(part.IsNetWeight ? "netto/gerebelt gewogen" : "brutto/nicht gerebelt gewogen"))@Raw(part.WeighingReason != null ? $", Begründung:" : "") @part.WeighingReason @if (part.Comment != null) { Anmerkung: @part.Comment diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml b/Elwig/Windows/DeliveryAdminWindow.xaml index 913faa5..8f5e97f 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml +++ b/Elwig/Windows/DeliveryAdminWindow.xaml @@ -277,7 +277,7 @@ - + @@ -341,7 +341,7 @@ VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,45,10,10" Grid.Column="0" Grid.ColumnSpan="2" Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/> -