From badae00486f3375067c4c96757313c3741ff7b53 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 17 Jan 2022 18:45:50 +0100
Subject: [PATCH] =?UTF-8?q?Arbeit=20am=20UI=20f=C3=BCr=20WAS=5FRCPT,=20par?=
 =?UTF-8?q?t=20I.=20=C3=9Cbersetzbar,=20aber=20sehr=20unvollst=C3=A4ndig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WasteDetailControl.xaml                   | 298 ++++++++++--------
 .../WasteDetailControl.xaml.cs                |  66 ++++
 ENI2/ENI2.csproj                              |   9 +-
 ENI2/EditControls/EditWasteReceiptDialog.xaml |  40 +++
 .../EditWasteReceiptDialog.xaml.cs            |  73 +++++
 ENI2/Properties/Resources.Designer.cs         |  72 +++++
 ENI2/Properties/Resources.resx                |  24 ++
 SQL/Update_6.x_To_7.0.sql                     |   9 +
 bsmd.database/CREW.cs                         |  20 +-
 bsmd.database/Message.cs                      |   5 +-
 bsmd.database/PAS.cs                          |  39 ++-
 .../Properties/AssemblyProductInfo.cs         |   2 +-
 .../Properties/AssemblyProjectInfo.cs         |   2 +-
 bsmd.database/WAS_RCPT.cs                     |  10 +-
 14 files changed, 527 insertions(+), 142 deletions(-)
 create mode 100644 ENI2/EditControls/EditWasteReceiptDialog.xaml
 create mode 100644 ENI2/EditControls/EditWasteReceiptDialog.xaml.cs

diff --git a/ENI2/DetailViewControls/WasteDetailControl.xaml b/ENI2/DetailViewControls/WasteDetailControl.xaml
index 2f4b38f8..35c6fbb9 100644
--- a/ENI2/DetailViewControls/WasteDetailControl.xaml
+++ b/ENI2/DetailViewControls/WasteDetailControl.xaml
@@ -11,131 +11,177 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              mc:Ignorable="d" 
              d:DesignHeight="600" d:DesignWidth="800">
-    <GroupBox Name="wasGroupBox" Header="{x:Static p:Resources.textWaste}">
-        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="250" />
-                    <RowDefinition Height="330*" />
-                </Grid.RowDefinitions>
-                <Grid Grid.Row="0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="2*" />
-                        <ColumnDefinition Width="1*" />
-                        <ColumnDefinition Width="1*" />
-                        <ColumnDefinition Width="2*" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="28" />
-                        <RowDefinition Height="28" />
-                        <RowDefinition Height="28" />
-                        <RowDefinition Height="28" />
-                        <RowDefinition Height="28" />
-                        <RowDefinition Height="*" />
-                        <RowDefinition Height="28" />
-                    </Grid.RowDefinitions>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textAccurateDetailsGiven}" Name="label_AccurateDetailsGiven" Margin="0,0,10,0"/>
-                    <!--TextBlock Grid.Row="0" Grid.Column="0" Text="{x:Static p:Resources.textAccurateDetailsGiven}" Name="label_ETAToPortOfCall" Margin="0,0,10,0" TextWrapping="Wrap" FontSize="10"/-->
-                    <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textAmountOfPlannedWasteDisposal}" Name="label_AmountOfPlannedDisposal" Margin="0,0,10,0"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textWasteDateLastDisposal}" Name="label_DateOfLastDisposal" Margin="0,0,10,0"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textLastPortWasteDischarge}" Name="label_WasteLastPortDischarged" Margin="0,0,10,0"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textWasteDisposalServiceProviders}" Name="label_WasteDisposalServiceProviders" Margin="0,0,10,0"/>
-                    <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="2" Content="{x:Static p:Resources.textValidExemption}" Name="label_ValidExemption" Margin="0,0,10,0"/>
-                    <CheckBox Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Name="checkBoxAccurateCorrectDetails" IsChecked="{Binding ConfirmationOfCorrectness, Mode=TwoWay}" />
-                    <CheckBox Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" Name="checkBoxValidExemption" IsChecked="{Binding WasteDisposalValidExemption, Mode=TwoWay}" />
-                    <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxWasteDisposal" Margin="2" SelectedIndex="{Binding WasteDisposalDelivery, Mode=TwoWay}"/>
-                    <DatePicker Grid.Row="2" Grid.Column="1" Name="datePickerDateLastDisposal" Margin="2" SelectedDate="{Binding LastWasteDisposalDate, Mode=TwoWay}" DisplayDateStart="1/1/1800" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
-                        <DatePicker.BlackoutDates>
-                            <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
-                            <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
-                        </DatePicker.BlackoutDates>
-                    </DatePicker>
-                    <enictrl:LocodeControl Grid.Row="3" Grid.Column="1" x:Name="locodeCtrlLastWastePort" LocodeValue="{Binding LastWasteDisposalPort, Mode=TwoWay}" LocodeSource="SSN" />
-                    <TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Grid.RowSpan="2" Name="textBoxWasteDisposalServiceProviders" Text="{Binding WasteDisposalServiceProviderText}" Margin="2" />
-                    <Button Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="1" Name="buttonAddMissingEntries" Content="{x:Static p:Resources.textAddMissingEntries}" Margin="2" Click="buttonAddMissingEntries_Click"/>
-                    <Button Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="1" Name="buttonImportFromExcel" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Click="buttonImportFromExcel_Click" />
-                </Grid>
-                <enictrl:ENIDataGrid x:Name="dataGridWaste" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+    <TabControl Margin="10" Name="mainFrame">
+        <TabItem Header="WAS" Name="tabWAS">
+            <GroupBox Name="wasGroupBox" Header="{x:Static p:Resources.textWaste}">
+                <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="250" />
+                            <RowDefinition Height="330*" />
+                        </Grid.RowDefinitions>
+                        <Grid Grid.Row="0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="2*" />
+                                <ColumnDefinition Width="1*" />
+                                <ColumnDefinition Width="1*" />
+                                <ColumnDefinition Width="2*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="28" />
+                                <RowDefinition Height="28" />
+                                <RowDefinition Height="28" />
+                                <RowDefinition Height="28" />
+                                <RowDefinition Height="28" />
+                                <RowDefinition Height="*" />
+                                <RowDefinition Height="28" />
+                            </Grid.RowDefinitions>
+                            <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textAccurateDetailsGiven}" Name="label_AccurateDetailsGiven" Margin="0,0,10,0"/>
+                            <!--TextBlock Grid.Row="0" Grid.Column="0" Text="{x:Static p:Resources.textAccurateDetailsGiven}" Name="label_ETAToPortOfCall" Margin="0,0,10,0" TextWrapping="Wrap" FontSize="10"/-->
+                            <Label HorizontalContentAlignment="Right" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textAmountOfPlannedWasteDisposal}" Name="label_AmountOfPlannedDisposal" Margin="0,0,10,0"/>
+                            <Label HorizontalContentAlignment="Right" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textWasteDateLastDisposal}" Name="label_DateOfLastDisposal" Margin="0,0,10,0"/>
+                            <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textLastPortWasteDischarge}" Name="label_WasteLastPortDischarged" Margin="0,0,10,0"/>
+                            <Label HorizontalContentAlignment="Right" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textWasteDisposalServiceProviders}" Name="label_WasteDisposalServiceProviders" Margin="0,0,10,0"/>
+                            <Label HorizontalContentAlignment="Right" Grid.Row="0" Grid.Column="2" Content="{x:Static p:Resources.textValidExemption}" Name="label_ValidExemption" Margin="0,0,10,0"/>
+                            <CheckBox Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" Name="checkBoxAccurateCorrectDetails" IsChecked="{Binding ConfirmationOfCorrectness, Mode=TwoWay}" />
+                            <CheckBox Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" Name="checkBoxValidExemption" IsChecked="{Binding WasteDisposalValidExemption, Mode=TwoWay}" />
+                            <ComboBox Grid.Row="1" Grid.Column="1" Name="comboBoxWasteDisposal" Margin="2" SelectedIndex="{Binding WasteDisposalDelivery, Mode=TwoWay}"/>
+                            <DatePicker Grid.Row="2" Grid.Column="1" Name="datePickerDateLastDisposal" Margin="2" SelectedDate="{Binding LastWasteDisposalDate, Mode=TwoWay}" DisplayDateStart="1/1/1800" DisplayDateEnd="12/31/2199" PreviewKeyUp="DateTimePicker_PreviewKeyUpDate">
+                                <DatePicker.BlackoutDates>
+                                    <CalendarDateRange Start="1/1/0001" End="12/31/1799"/>
+                                    <CalendarDateRange Start="1/1/2199" End="1/1/9999"/>
+                                </DatePicker.BlackoutDates>
+                            </DatePicker>
+                            <enictrl:LocodeControl Grid.Row="3" Grid.Column="1" x:Name="locodeCtrlLastWastePort" LocodeValue="{Binding LastWasteDisposalPort, Mode=TwoWay}" LocodeSource="SSN" />
+                            <TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Grid.RowSpan="2" Name="textBoxWasteDisposalServiceProviders" Text="{Binding WasteDisposalServiceProviderText}" Margin="2" />
+                            <Button Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="1" Name="buttonAddMissingEntries" Content="{x:Static p:Resources.textAddMissingEntries}" Margin="2" Click="buttonAddMissingEntries_Click"/>
+                            <Button Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="1" Name="buttonImportFromExcel" Content="{x:Static p:Resources.textImportFromExcel}" Margin="2" Click="buttonImportFromExcel_Click" />
+                        </Grid>
+                        <enictrl:ENIDataGrid x:Name="dataGridWaste" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                              AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="1">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding WasteTypeDisplayGrid}" IsReadOnly="True" Width="0.2*" />
-                        <DataGridTextColumn Header="{x:Static p:Resources.textDescription}" Binding="{Binding WasteDescription}" IsReadOnly="True" Width="0.15*" />
-                        <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteAmountToBeDisposed}" FontSize="10"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextAlignment="Center" Text="{Binding WasteDisposalAmount_MTQ, StringFormat={}{0:N3}}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteMaxCapacity}" FontSize="10"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextAlignment="Center" Text="{Binding WasteCapacity_MTQ, StringFormat={}{0:N3}}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteRetained}" FontSize="10"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextAlignment="Center" Text="{Binding WasteAmountRetained_MTQ, StringFormat={}{0:N3}}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWastePortOfDelivery}" FontSize="10"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextAlignment="Center" Text="{Binding WasteDisposalPort}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn IsReadOnly="True" Width="0.12*">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteGeneratedUntilNextPort}" FontSize="9"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextAlignment="Center" Text="{Binding WasteAmountGeneratedTillNextPort_MTQ, StringFormat={}{0:N3}}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn IsReadOnly="True" Width="0.12*">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteAmountDischargedLastPort}" FontSize="9"/>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock TextAlignment="Center" Text="{Binding WasteDisposedAtLastPort_MTQ, StringFormat={}{0:N3}}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                    </DataGrid.Columns>
-                </enictrl:ENIDataGrid>
-            </Grid>
-        </ScrollViewer>
-    </GroupBox>
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textCode}" Binding="{Binding WasteTypeDisplayGrid}" IsReadOnly="True" Width="0.2*" />
+                                <DataGridTextColumn Header="{x:Static p:Resources.textDescription}" Binding="{Binding WasteDescription}" IsReadOnly="True" Width="0.15*" />
+                                <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
+                                    <DataGridTemplateColumn.HeaderTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteAmountToBeDisposed}" FontSize="10"/>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.HeaderTemplate>
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextAlignment="Center" Text="{Binding WasteDisposalAmount_MTQ, StringFormat={}{0:N3}}" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
+                                    <DataGridTemplateColumn.HeaderTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteMaxCapacity}" FontSize="10"/>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.HeaderTemplate>
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextAlignment="Center" Text="{Binding WasteCapacity_MTQ, StringFormat={}{0:N3}}" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
+                                    <DataGridTemplateColumn.HeaderTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteRetained}" FontSize="10"/>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.HeaderTemplate>
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextAlignment="Center" Text="{Binding WasteAmountRetained_MTQ, StringFormat={}{0:N3}}" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
+                                    <DataGridTemplateColumn.HeaderTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWastePortOfDelivery}" FontSize="10"/>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.HeaderTemplate>
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextAlignment="Center" Text="{Binding WasteDisposalPort}" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTemplateColumn IsReadOnly="True" Width="0.12*">
+                                    <DataGridTemplateColumn.HeaderTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteGeneratedUntilNextPort}" FontSize="9"/>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.HeaderTemplate>
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextAlignment="Center" Text="{Binding WasteAmountGeneratedTillNextPort_MTQ, StringFormat={}{0:N3}}" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTemplateColumn IsReadOnly="True" Width="0.12*">
+                                    <DataGridTemplateColumn.HeaderTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textWasteAmountDischargedLastPort}" FontSize="9"/>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.HeaderTemplate>
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <TextBlock TextAlignment="Center" Text="{Binding WasteDisposedAtLastPort_MTQ, StringFormat={}{0:N3}}" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                            </DataGrid.Columns>
+                        </enictrl:ENIDataGrid>
+                    </Grid>
+                </ScrollViewer>
+            </GroupBox>
+        </TabItem>
+        <TabItem Header="WAS RCPT" Name="tabWAS_RCPT">
+            <GroupBox Name="was_rcptGroupBox" Header="{x:Static p:Resources.textWasteReceipt}">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="80" />
+                        <RowDefinition Height="330*" />
+                    </Grid.RowDefinitions>
+                    <enictrl:ENIDataGrid x:Name="dataGridWasteReceipt" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+                                             AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="0">
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Header="" Binding="{Binding Identifier}" IsReadOnly="True" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textIdentificationNumber}" Binding="{Binding IdentificationNumber}" IsReadOnly="True" Width="Auto" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textPortReceptionFacilityName}" Binding="{Binding PortReceptionFacilityName}" IsReadOnly="True" Width="Auto" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textPortReceptionFacilityProviderName}" Binding="{Binding PortReceptionFacilityProviderName}" IsReadOnly="True" Width="Auto" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textTreatmentFacilityProviderName}" Binding="{Binding TreatmentFacilityProviderDisplay}" IsReadOnly="True" Width="Auto" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textWasteDeliveryDateFrom}" Binding="{Binding WasteDeliveryDateFrom}" IsReadOnly="True" Width="Auto" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textWasteDeliveryDateTo}" Binding="{Binding WasteDeliveryDateTo}" IsReadOnly="True" Width="Auto" />
+                        </DataGrid.Columns>
+                    </enictrl:ENIDataGrid>
+                    <enictrl:ENIDataGrid x:Name="dataGridWasteReceived" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
+                                             AutoGenerateColumns="False" Margin="0,5,0,0" Grid.Row="1">
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Header="{x:Static p:Resources.textWaste}" Binding="{Binding WasteCode}" IsReadOnly="True" Width="0.1*" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textDescription}" Binding="{Binding WasteDescription}" IsReadOnly="True" Width="0.3*" />
+                            <DataGridTemplateColumn IsReadOnly="True" Width="0.15*">
+                                <DataGridTemplateColumn.HeaderTemplate>
+                                    <DataTemplate>
+                                        <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textAmountWasteReceived_MTQ}" FontSize="10"/>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.HeaderTemplate>
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock TextAlignment="Center" Text="{Binding AmountWasteReceived_MTQ, StringFormat={}{0:N3}}" />
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn>
+                        </DataGrid.Columns>
+
+                    </enictrl:ENIDataGrid>
+                </Grid>
+            </GroupBox>
+        </TabItem>
+    </TabControl>
 </src:DetailBaseControl>
diff --git a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
index 063b9eaa..02050ddc 100644
--- a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
@@ -23,6 +23,7 @@ namespace ENI2.DetailViewControls
 
         private Message _wasMessage;
         private WAS _was;
+        private Message _wasRcptMessage;        
 
         private static readonly string[] _wasteDeliveryList =
         {
@@ -91,6 +92,7 @@ namespace ENI2.DetailViewControls
             foreach (Message aMessage in this.Messages)
             {
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.WAS) { this._wasMessage = aMessage; this.ControlMessages.Add(aMessage); }
+                if(aMessage.MessageNotificationClass == Message.NotificationClass.WAS_RCPT) { this._wasRcptMessage = aMessage; this.ControlMessages.Add(aMessage); }
             }
 
             #region init WAS
@@ -127,8 +129,72 @@ namespace ENI2.DetailViewControls
             this.checkBoxValidExemption.Unchecked += CheckBoxValidExemption_Checked;
             #endregion
 
+            #region init WAS_RCPT
+
+            if(this._wasRcptMessage == null)
+            {
+                this._wasRcptMessage = this.Core.CreateMessage(Message.NotificationClass.WAS_RCPT);
+                this.Messages.Add(this._wasRcptMessage);
+            }
+
+            this.dataGridWasteReceipt.Initialize();
+            this.dataGridWasteReceipt.ItemsSource = this._wasRcptMessage.Elements;
+            this.dataGridWasteReceipt.AddingNewItem += DataGridWasteReceipt_AddingNewItem;
+            this.dataGridWasteReceipt.EditRequested += DataGridWasteReceipt_EditRequested;
+            this.dataGridWasteReceipt.DeleteRequested += DataGridWasteReceipt_DeleteRequested;
+            this.dataGridWasteReceipt.CreateRequested += DataGridWasteReceipt_CreateRequested;
+
+            #endregion
+
         }
 
+        #region Waste receipt grid event handler
+
+        private void DataGridWasteReceipt_CreateRequested()
+        {
+            EditWasteReceiptDialog epd = new EditWasteReceiptDialog();
+            epd.WAS_RCPT = new WAS_RCPT();
+            epd.WAS_RCPT.MessageHeader = _wasRcptMessage;
+            epd.WAS_RCPT.Identifier = WAS_RCPT.GetNewIdentifier(_wasRcptMessage.Elements);            
+
+            epd.AddClicked += () =>
+            {
+                epd.CopyValuesToEntity();
+                if (!this._wasRcptMessage.Elements.Contains(epd.WAS_RCPT))
+                    this._wasRcptMessage.Elements.Add(epd.WAS_RCPT);
+                this.dataGridWaste.Items.Refresh();
+                epd.WAS_RCPT = new WAS_RCPT();
+                epd.WAS_RCPT.MessageHeader = _wasRcptMessage;
+                epd.WAS_RCPT.Identifier = WAS_RCPT.GetNewIdentifier(_wasRcptMessage.Elements);
+                this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
+            };
+
+            if (epd.ShowDialog() ?? false)
+            {
+                if (!this._wasRcptMessage.Elements.Contains(epd.WAS_RCPT))
+                    _wasRcptMessage.Elements.Add(epd.WAS_RCPT);
+                this.dataGridWaste.Items.Refresh();
+                this.SublistElementChanged(Message.NotificationClass.WAS_RCPT);
+            }
+        }
+
+        private void DataGridWasteReceipt_DeleteRequested(DatabaseEntity obj)
+        {
+            throw new NotImplementedException();
+        }
+
+        private void DataGridWasteReceipt_EditRequested(DatabaseEntity obj)
+        {
+            throw new NotImplementedException();
+        }
+
+        private void DataGridWasteReceipt_AddingNewItem(object sender, AddingNewItemEventArgs e)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+
         #region Waste grid event handler
 
         private void DataGridWaste_CreateRequested()
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 520424ff..8cf758cf 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -37,7 +37,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>6.9.19.0</ApplicationVersion>
+    <ApplicationVersion>7.0.0.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -230,6 +230,9 @@
     <Compile Include="Controls\LocodeControl.xaml.cs">
       <DependentUpon>LocodeControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="EditControls\EditWasteReceiptDialog.xaml.cs">
+      <DependentUpon>EditWasteReceiptDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Excel\ExcelBase.cs" />
     <Compile Include="Excel\ExcelManager.cs" />
     <Compile Include="Excel\ExcelReader.cs" />
@@ -618,6 +621,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="EditControls\EditWasteReceiptDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="EditControls\ErrorListDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/ENI2/EditControls/EditWasteReceiptDialog.xaml b/ENI2/EditControls/EditWasteReceiptDialog.xaml
new file mode 100644
index 00000000..307c5a4d
--- /dev/null
+++ b/ENI2/EditControls/EditWasteReceiptDialog.xaml
@@ -0,0 +1,40 @@
+<enictrl:EditWindowBase x:Class="ENI2.EditControls.EditWasteReceiptDialog"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:ENI2.EditControls"
+        xmlns:enictrl="clr-namespace:ENI2.Controls"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        xmlns:p="clr-namespace:ENI2.Properties"
+        mc:Ignorable="d"
+        Title="{x:Static p:Resources.textWasteReceipt}" Height="340" Width="800"  WindowStyle="SingleBorderWindow" Background="AliceBlue">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="56" />
+            <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
+            
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="2*" />
+        </Grid.ColumnDefinitions>
+
+        <Label Name="labelIdentificationNumber" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textIdentificationNumber}" />
+        <Label Name="labelPortReceptionFacilityName" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textPortReceptionFacilityName}" />
+        <Label Name="labelPortReceptionFacilityProviderName" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textPortReceptionFacilityProviderName}" />
+        <Label Name="labelTreatmentFacilityProvider" Grid.Row="3" Grid.Column="0" Content="{x:Static p:Resources.textTreatmentFacilityProviderName}" />
+        <Label Name="labelWasteDeliveryDateFrom" Grid.Row="4" Grid.Column="0" Content="{x:Static p:Resources.textWasteDeliveryDateFrom}" />
+        <Label Name="labelWasteDeliveryDateTo" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textWasteDeliveryDateTo}" />
+
+        <TextBox Name="textIdentificationNumber" Grid.Row="0" Grid.Column="1" Width="auto" MaxLength="20" TextWrapping="Wrap" />
+        <TextBox Name="textBoxPortReceptionFacilityName" Grid.Row="1" Grid.Column="1" Width="auto" MaxLength="70" TextWrapping="Wrap" />
+        
+
+
+    </Grid>
+</enictrl:EditWindowBase>
diff --git a/ENI2/EditControls/EditWasteReceiptDialog.xaml.cs b/ENI2/EditControls/EditWasteReceiptDialog.xaml.cs
new file mode 100644
index 00000000..5417176d
--- /dev/null
+++ b/ENI2/EditControls/EditWasteReceiptDialog.xaml.cs
@@ -0,0 +1,73 @@
+// Copyright (c) 2017- schick Informatik
+// Description: Waste receipts bearbeiten..
+//
+
+using System;
+using System.Windows;
+
+using bsmd.database;
+using ENI2.Controls;
+
+namespace ENI2.EditControls
+{
+    /// <summary>
+    /// Interaction logic for EditWasteReceiptDialog.xaml
+    /// </summary>
+    public partial class EditWasteReceiptDialog : EditWindowBase
+    {
+        public EditWasteReceiptDialog()
+        {
+            InitializeComponent();
+            Loaded += EditWasteReceiptDialog_Loaded;
+            AddClicked += () => { /* this.comboBoxWasteCode.Focus(); */ };
+        }        
+
+        public WAS_RCPT WAS_RCPT { get; set; }
+
+        private void EditWasteReceiptDialog_Loaded(object sender, RoutedEventArgs e)
+        {
+            /*
+            Dictionary<int, string> codeDict = new Dictionary<int, string>();
+            for (int i = 0; i < WAS.RequiredCodes.Length; i++)
+            {
+                codeDict[WAS.RequiredCodes[i]] = string.Format("{0} - {1}", WAS.RequiredCodes[i], WAS.RequiredTypes[i]);
+            }
+            this.comboBoxWasteCode.ItemsSource = codeDict;
+            this.comboBoxWasteCode.SelectedValue = this.Waste.WasteType;
+            this.textBoxDescription.Text = this.Waste.WasteDescription;
+            this.doubleUpDownAmountWasteDischargedLastPort.Value = this.Waste.WasteDisposedAtLastPort_MTQ;
+            this.doubleUpDownAmountDisposed.Value = this.Waste.WasteDisposalAmount_MTQ;
+            this.doubleUpDownAmountGeneratedTilNextPort.Value = this.Waste.WasteAmountGeneratedTillNextPort_MTQ;
+            this.doubleUpDownAmountRetained.Value = this.Waste.WasteAmountRetained_MTQ;
+            this.doubleUpDownMaxCapacity.Value = this.Waste.WasteCapacity_MTQ;
+            this.locodePortOfDeliveryRemainingWaste.LocodeValue = this.Waste.WasteDisposalPort;
+            */
+
+            OKClicked += EditWasteReceiptDialog_OKClicked;
+            this.AddVisible = true;
+        }
+        public void CopyValuesToEntity()
+        {
+            // copy back           
+            /*
+            if (this.comboBoxWasteCode.SelectedValue != null)
+                this.Waste.WasteType = (int)this.comboBoxWasteCode.SelectedValue;
+            else
+                this.Waste.WasteType = null;
+            this.Waste.WasteDescription = this.textBoxDescription.Text?.Trim();
+            this.Waste.WasteDisposedAtLastPort_MTQ = this.doubleUpDownAmountWasteDischargedLastPort.Value;
+            this.Waste.WasteDisposalAmount_MTQ = this.doubleUpDownAmountDisposed.Value;
+            this.Waste.WasteAmountGeneratedTillNextPort_MTQ = this.doubleUpDownAmountGeneratedTilNextPort.Value;
+            this.Waste.WasteAmountRetained_MTQ = this.doubleUpDownAmountRetained.Value;
+            this.Waste.WasteCapacity_MTQ = this.doubleUpDownMaxCapacity.Value;
+            this.Waste.WasteDisposalPort = this.locodePortOfDeliveryRemainingWaste.LocodeValue;
+            */
+        }
+
+        private void EditWasteReceiptDialog_OKClicked()
+        {
+            this.CopyValuesToEntity();
+        }
+
+    }
+}
diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs
index 486e8153..5da4564b 100644
--- a/ENI2/Properties/Resources.Designer.cs
+++ b/ENI2/Properties/Resources.Designer.cs
@@ -850,6 +850,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Amount waste received (MTQ).
+        /// </summary>
+        public static string textAmountWasteReceived_MTQ {
+            get {
+                return ResourceManager.GetString("textAmountWasteReceived_MTQ", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Anchored.
         /// </summary>
@@ -2389,6 +2398,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Identification number.
+        /// </summary>
+        public static string textIdentificationNumber {
+            get {
+                return ResourceManager.GetString("textIdentificationNumber", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Identifier.
         /// </summary>
@@ -3676,6 +3694,24 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Port reception facility name.
+        /// </summary>
+        public static string textPortReceptionFacilityName {
+            get {
+                return ResourceManager.GetString("textPortReceptionFacilityName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Port reception facility provider name.
+        /// </summary>
+        public static string textPortReceptionFacilityProviderName {
+            get {
+                return ResourceManager.GetString("textPortReceptionFacilityProviderName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Ports of call of the last 30 days.
         /// </summary>
@@ -4630,6 +4666,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Treatment facility provider name.
+        /// </summary>
+        public static string textTreatmentFacilityProviderName {
+            get {
+                return ResourceManager.GetString("textTreatmentFacilityProviderName", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Type.
         /// </summary>
@@ -4927,6 +4972,24 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Waste delivery date from.
+        /// </summary>
+        public static string textWasteDeliveryDateFrom {
+            get {
+                return ResourceManager.GetString("textWasteDeliveryDateFrom", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Waste delivery date to.
+        /// </summary>
+        public static string textWasteDeliveryDateTo {
+            get {
+                return ResourceManager.GetString("textWasteDeliveryDateTo", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Waste disposal service providers.
         /// </summary>
@@ -4972,6 +5035,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Waste receipt.
+        /// </summary>
+        public static string textWasteReceipt {
+            get {
+                return ResourceManager.GetString("textWasteReceipt", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Waste amount retained on board.
         /// </summary>
diff --git a/ENI2/Properties/Resources.resx b/ENI2/Properties/Resources.resx
index e7d27511..96162c7e 100644
--- a/ENI2/Properties/Resources.resx
+++ b/ENI2/Properties/Resources.resx
@@ -1759,4 +1759,28 @@
   <data name="textExcelExport" xml:space="preserve">
     <value>Excel export</value>
   </data>
+  <data name="textAmountWasteReceived_MTQ" xml:space="preserve">
+    <value>Amount waste received (MTQ)</value>
+  </data>
+  <data name="textIdentificationNumber" xml:space="preserve">
+    <value>Identification number</value>
+  </data>
+  <data name="textPortReceptionFacilityName" xml:space="preserve">
+    <value>Port reception facility name</value>
+  </data>
+  <data name="textPortReceptionFacilityProviderName" xml:space="preserve">
+    <value>Port reception facility provider name</value>
+  </data>
+  <data name="textTreatmentFacilityProviderName" xml:space="preserve">
+    <value>Treatment facility provider name</value>
+  </data>
+  <data name="textWasteDeliveryDateFrom" xml:space="preserve">
+    <value>Waste delivery date from</value>
+  </data>
+  <data name="textWasteDeliveryDateTo" xml:space="preserve">
+    <value>Waste delivery date to</value>
+  </data>
+  <data name="textWasteReceipt" xml:space="preserve">
+    <value>Waste receipt</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/SQL/Update_6.x_To_7.0.sql b/SQL/Update_6.x_To_7.0.sql
index 7020f238..d639ba61 100644
--- a/SQL/Update_6.x_To_7.0.sql
+++ b/SQL/Update_6.x_To_7.0.sql
@@ -100,4 +100,13 @@ GO
 
 ALTER TABLE [dbo].[IMDGPosition]
     ADD [Class7MaxActivity_Unit] TINYINT NULL;
+GO
+
+PRINT N'Altering [dbo].[PAS]...';
+
+GO
+ALTER TABLE [dbo].[PAS]
+    ADD [EmergencyCare]          NVARCHAR (255) NULL,
+        [EmergencyContactNumber] NVARCHAR (99)  NULL;
+
 GO
\ No newline at end of file
diff --git a/bsmd.database/CREW.cs b/bsmd.database/CREW.cs
index d7645db5..3e7ae4b5 100644
--- a/bsmd.database/CREW.cs
+++ b/bsmd.database/CREW.cs
@@ -119,6 +119,12 @@ namespace bsmd.database
         [ENI2Validation]
         public DateTime? CrewMemberIdentityDocumentExpiryDate { get; set; }
 
+        [ENI2Validation]
+        public bool? NotificationSchengen { get; set; }
+
+        [ENI2Validation]
+        public bool? NotificationPAX { get; set; }
+
         public string Identifier { get; set; }
 
         public string SublistCollectionKey { get { return "crew"; } }
@@ -157,6 +163,8 @@ namespace bsmd.database
             scmd.Parameters.AddWithValue("@P13", this.IsDeparture);
             scmd.Parameters.AddWithNullableValue("@P14", this.CrewMemberIdentityDocumentIssuingState);
             scmd.Parameters.AddWithNullableValue("@P15", this.CrewMemberIdentityDocumentExpiryDate);
+            scmd.Parameters.AddWithNullableValue("@P16", this.NotificationSchengen);
+            scmd.Parameters.AddWithNullableValue("@P17", this.NotificationPAX);
 
             if (this.IsNew)
             {
@@ -165,8 +173,8 @@ namespace bsmd.database
                 scmd.CommandText = string.Format("INSERT INTO {0} (Id, MessageHeaderId, CrewMemberLastName, CrewMemberFirstName, " +
                     "CrewMemberPlaceOfBirth, CrewMemberDateOfBirth, CrewMemberGender, CrewMemberNationality,CrewMemberIdentityDocumentType, " +
                     "CrewMemberIdentityDocumentId, CrewMemberVisaNumber, CrewMemberDuty, Identifier, IsDeparture, " +
-                    "CrewMemberIdentityDocumentIssuingState, CrewMemberIdentityDocumentExpiryDate) " +
-                    "VALUES (@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11, @P12, @P13, @P14, @P15 )", this.Tablename);
+                    "CrewMemberIdentityDocumentIssuingState, CrewMemberIdentityDocumentExpiryDate, NotificationSchengen, NotificationPAX) " +
+                    "VALUES (@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11, @P12, @P13, @P14, @P15, @P16, @P17 )", this.Tablename);
             }
             else
             {
@@ -175,7 +183,7 @@ namespace bsmd.database
                     "CrewMemberPlaceOfBirth = @P4, CrewMemberDateOfBirth = @P5, CrewMemberGender = @P6, CrewMemberNationality = @P7, "+
                     "CrewMemberIdentityDocumentType = @P8, CrewMemberIdentityDocumentId = @P9, CrewMemberVisaNumber = @P10, " +
                     "CrewMemberDuty = @P11, Identifier = @P12, IsDeparture = @P13, CrewMemberIdentityDocumentIssuingState = @P14, " +
-                    "CrewMemberIdentityDocumentExpiryDate = @P15 WHERE Id = @ID", this.Tablename);
+                    "CrewMemberIdentityDocumentExpiryDate = @P15, NotificationSchengen = @P16, NotificationPAX = @P17 WHERE Id = @ID", this.Tablename);
             }
         }
 
@@ -184,7 +192,7 @@ namespace bsmd.database
             string query = string.Format("SELECT Id, CrewMemberLastName, CrewMemberFirstName, CrewMemberPlaceOfBirth, " +
                 "CrewMemberDateOfBirth, CrewMemberGender, CrewMemberNationality, CrewMemberIdentityDocumentType, CrewMemberIdentityDocumentId, " +
                 "CrewMemberVisaNumber, CrewMemberDuty, Identifier, IsDeparture, CrewMemberIdentityDocumentIssuingState, " +
-                "CrewMemberIdentityDocumentExpiryDate FROM {0}", this.Tablename);
+                "CrewMemberIdentityDocumentExpiryDate, NotificationSchengen, NotificationPAX FROM {0}", this.Tablename);
 
             switch (filter)
             {
@@ -226,6 +234,8 @@ namespace bsmd.database
                 if (!reader.IsDBNull(12)) crew.IsDeparture = reader.GetBoolean(12);
                 if (!reader.IsDBNull(13)) crew.CrewMemberIdentityDocumentIssuingState = reader.GetString(13);
                 if (!reader.IsDBNull(14)) crew.CrewMemberIdentityDocumentExpiryDate = reader.GetDateTime(14);
+                if (!reader.IsDBNull(15)) crew.NotificationSchengen = reader.GetBoolean(15);
+                if (!reader.IsDBNull(16)) crew.NotificationPAX = reader.GetBoolean(16);
 
                 result.Add(crew);
             }
@@ -249,7 +259,7 @@ namespace bsmd.database
             string query = string.Format("SELECT Id, CrewMemberLastName, CrewMemberFirstName, CrewMemberPlaceOfBirth, " +
                 "CrewMemberDateOfBirth, CrewMemberGender, CrewMemberNationality, CrewMemberIdentityDocumentType, CrewMemberIdentityDocumentId, " +
                 "CrewMemberVisaNumber, CrewMemberDuty, Identifier, IsDeparture, CrewMemberIdentityDocumentIssuingState, " +
-                "CrewMemberIdentityDocumentExpiryDate FROM {0}", this.Tablename);
+                "CrewMemberIdentityDocumentExpiryDate, NotificationSchengen, NotificationPAX FROM {0}", this.Tablename);
 
             switch (filter)
             {
diff --git a/bsmd.database/Message.cs b/bsmd.database/Message.cs
index 811bd41c..34c73de5 100644
--- a/bsmd.database/Message.cs
+++ b/bsmd.database/Message.cs
@@ -96,8 +96,9 @@ namespace bsmd.database
             HAZD,
             AGNT,
             STO,        // DK - only
-            CREWD,      // DK - only
-            PASD        // DK - only
+            CREWD,
+            PASD,
+            WAS_RCPT
         } 
 
         public enum MessageStatus
diff --git a/bsmd.database/PAS.cs b/bsmd.database/PAS.cs
index 14b4ff69..10d515d2 100644
--- a/bsmd.database/PAS.cs
+++ b/bsmd.database/PAS.cs
@@ -128,6 +128,23 @@ namespace bsmd.database
         [ENI2Validation]
         public DateTime? PassengerIdentityDocumentExpiryDate { get; set; }
 
+        [ENI2Validation]
+        public bool? NotificationSchengen { get; set; }
+
+        [ENI2Validation]
+        public bool? NotificationPAX { get; set; }
+
+        [ENI2Validation]
+        [ReportDisplayName("Emergency care")]
+        [MaxLength(255)]
+        public string EmergencyCare { get; set; }
+
+        [ENI2Validation]
+        [ReportDisplayName("Emergency contact number")]
+        [MaxLength(99)]
+        public string EmergencyContactNumber { get; set; }
+
+
         public string Identifier { get; set; }
 
         public string SublistCollectionKey { get { return "pas"; } }
@@ -170,6 +187,10 @@ namespace bsmd.database
             scmd.Parameters.AddWithValue("@P15", this.IsDeparture);
             scmd.Parameters.AddWithNullableValue("@P16", this.PassengerIdentityDocumentIssuingState);
             scmd.Parameters.AddWithNullableValue("@P17", this.PassengerIdentityDocumentExpiryDate);
+            scmd.Parameters.AddWithNullableValue("@P18", this.NotificationSchengen);
+            scmd.Parameters.AddWithNullableValue("@P19", this.NotificationPAX);
+            scmd.Parameters.AddWithNullableValue("@P20", this.EmergencyCare);
+            scmd.Parameters.AddWithNullableValue("@P21", this.EmergencyContactNumber);
 
             if (this.IsNew)
             {
@@ -178,8 +199,9 @@ namespace bsmd.database
                 scmd.CommandText = string.Format("INSERT INTO {0} (Id, MessageHeaderId, PassengerLastName, PassengerFirstName, " +
                     "PassengerPlaceOfBirth, PassengerDateOfBirth, PassengerGender, PassengerNationality, PassengerIdentityDocumentType, " +
                     "PassengerIdentityDocumentId, PassengerVisaNumber, PassengerPortOfEmbarkation, PassengerPortOfDisembarkation," +
-                    "PassengerInTransit, Identifier, IsDeparture, PassengerIdentityDocumentIssuingState, PassengerIdentityDocumentExpiryDate) " +
-                    "VALUES (@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11, @P12, @P13, @P14, @P15, @P16, @P17 )", 
+                    "PassengerInTransit, Identifier, IsDeparture, PassengerIdentityDocumentIssuingState, PassengerIdentityDocumentExpiryDate, " +
+                    "NotificationSchengen, NotificationSchengen, EmergencyCare, EmergencyContactNumber) " +
+                    "VALUES (@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11, @P12, @P13, @P14, @P15, @P16, @P17, @P18, @P19, @P20, @P21 )", 
                     this.Tablename);
             }
             else
@@ -190,7 +212,8 @@ namespace bsmd.database
                     "PassengerNationality = @P7, PassengerIdentityDocumentType = @P8, PassengerIdentityDocumentId = @P9, " +
                     "PassengerVisaNumber = @P10, PassengerPortOfEmbarkation = @P11, PassengerPortOfDisembarkation = @P12, " +
                     "PassengerInTransit = @P13, IsDeparture = @P15, Identifier = @P14, PassengerIdentityDocumentIssuingState = @P16, " +
-                    "PassengerIdentityDocumentExpiryDate = @P17 WHERE Id = @ID", this.Tablename);
+                    "PassengerIdentityDocumentExpiryDate = @P17, NotificationSchengen = @P18, NotificationPAX = @P19, " +
+                    "EmergencyCare = @P20, EmergencyContactNumber = @P21 WHERE Id = @ID", this.Tablename);
             }
         }
 
@@ -199,7 +222,8 @@ namespace bsmd.database
             string query = string.Format("SELECT Id, PassengerLastName, PassengerFirstName, PassengerPlaceOfBirth, " +
                 "PassengerDateOfBirth, PassengerGender, PassengerNationality, PassengerIdentityDocumentType, PassengerIdentityDocumentId, " +
                 "PassengerVisaNumber, PassengerPortOfEmbarkation, PassengerPortOfDisembarkation, PassengerInTransit, Identifier, " +
-                "IsDeparture, PassengerIdentityDocumentIssuingState, PassengerIdentityDocumentExpiryDate FROM {0}", 
+                "IsDeparture, PassengerIdentityDocumentIssuingState, PassengerIdentityDocumentExpiryDate, NotificationSchengen, " +
+                "NotificationPAX, EmergencyCare, EmergencyContactNumber FROM {0}", 
                 this.Tablename);
 
             switch (filter)
@@ -244,6 +268,10 @@ namespace bsmd.database
                 if (!reader.IsDBNull(14)) pas.IsDeparture = reader.GetBoolean(14);
                 if (!reader.IsDBNull(15)) pas.PassengerIdentityDocumentIssuingState = reader.GetString(15);
                 if (!reader.IsDBNull(16)) pas.PassengerIdentityDocumentExpiryDate = reader.GetDateTime(16);
+                if (!reader.IsDBNull(17)) pas.NotificationSchengen = reader.GetBoolean(17);
+                if (!reader.IsDBNull(18)) pas.NotificationPAX = reader.GetBoolean(18);
+                if (!reader.IsDBNull(19)) pas.EmergencyCare = reader.GetString(19);
+                if (!reader.IsDBNull(20)) pas.EmergencyContactNumber = reader.GetString(20);
                 result.Add(pas);
             }
             reader.Close();
@@ -284,7 +312,8 @@ namespace bsmd.database
             string query = string.Format("SELECT Id, PassengerLastName, PassengerFirstName, PassengerPlaceOfBirth, " +
                 "PassengerDateOfBirth, PassengerGender, PassengerNationality, PassengerIdentityDocumentType, PassengerIdentityDocumentId, " +
                 "PassengerVisaNumber, PassengerPortOfEmbarkation, PassengerPortOfDisembarkation, PassengerInTransit, Identifier, IsDeparture, " +
-                "PassengerIdentityDocumentIssuingState, PassengerIdentityDocumentExpiryDate FROM {0}",
+                "PassengerIdentityDocumentIssuingState, PassengerIdentityDocumentExpiryDate, NotificationSchengen, NotificationPAX, " +
+                "EmergencyCare, EmergencyContactNumber FROM {0}",
                 this.Tablename);
 
             switch (filter)
diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index 89505aa6..6e8330e2 100644
--- a/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("6.9.19")]
+[assembly: AssemblyInformationalVersion("7.0.0")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2022 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs
index a0faa9b5..ee7ffbc1 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("6.9.19.*")]
+[assembly: AssemblyVersion("7.0.0.*")]
 
diff --git a/bsmd.database/WAS_RCPT.cs b/bsmd.database/WAS_RCPT.cs
index 68f97f70..bf6f8ef1 100644
--- a/bsmd.database/WAS_RCPT.cs
+++ b/bsmd.database/WAS_RCPT.cs
@@ -15,7 +15,7 @@ namespace bsmd.database
 
     [TypeConverter(typeof(MessageClassConverter<WAS>))]
     [JsonConverter(typeof(NoTypeConverterJsonConverter<WAS>))]
-    public class WAS_RCPT : DatabaseEntity, ISublistContainer
+    public class WAS_RCPT : DatabaseEntity, ISublistContainer, ISublistElement
     {
         public WAS_RCPT()
         {
@@ -95,6 +95,14 @@ namespace bsmd.database
 
         #endregion
 
+        #region ISublistElement implementation
+
+        public string Identifier { get; set; }
+
+        public string SublistCollectionKey { get { return "was_rcpt"; } }
+
+        #endregion
+
         #region DatabaseEntity implementation
 
         public override void PrepareSave(IDbCommand cmd)