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 @@ } <tr><td></td><td colspan="5"> @Raw(part.IsManualWeighing ? "<i>Handwiegung</i>" : $"<i>Waage:</i> {part.ScaleId ?? "?"}, <i>ID:</i> {part.WeighingId ?? "?"}") - (@(part.IsNetWeight ? "gerebelt gewogen" : "nicht gerebelt gewogen"))@Raw(part.WeighingReason != null ? $", <i>Begründung:</i>" : "") @part.WeighingReason + (@(part.IsNetWeight ? "netto/gerebelt gewogen" : "brutto/nicht gerebelt gewogen"))@Raw(part.WeighingReason != null ? $", <i>Begründung:</i>" : "") @part.WeighingReason </td></tr> @if (part.Comment != null) { <tr><td></td><td colspan="5"><i>Anmerkung:</i> @part.Comment</td></tr> 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 @@ </Grid> </GroupBox> - <GroupBox Header="Sorte" Grid.Column="1" Grid.Row="0" Margin="5,5,5,5"> + <GroupBox Header="Sorte" Grid.Column="1" Grid.Row="0" Margin="5,5,5,5"> <Grid> <Grid.ColumnDefinitions> <ColumnDefinition Width="80"/> @@ -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"/> - <CheckBox x:Name="GerebeltGewogenInput" Content="Gerebelt gewogen" + <CheckBox x:Name="GerebeltGewogenInput" Content="Netto (gerebelt gewogen)" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2" Checked="GerebeltGewogenInput_Changed" Unchecked="GerebeltGewogenInput_Changed"/>