From 0b677f36cc79955c04e6c5ca34937fcb46a31746 Mon Sep 17 00:00:00 2001
From: puls200 <schick@textbausteine.net>
Date: Mon, 6 Nov 2023 08:39:52 +0100
Subject: [PATCH] Bumped version and added some small fixes for first 7.2.0.0
 test version

---
 ENI2/DetailRootControl.xaml.cs                |  8 ++--
 .../BorderPoliceDetailControl.xaml            | 10 ++---
 .../BorderPoliceDetailControl.xaml.cs         | 40 +++++++++----------
 .../OverViewDetailControl.xaml                |  2 +-
 ENI2/ENI2.csproj                              |  6 +--
 ENI2/Excel/DakosyUtil.cs                      |  4 +-
 ENI2/Excel/ExcelUtil.cs                       |  4 +-
 ENI2/Excel/ExcelWriter.cs                     |  4 +-
 ENI2/MainWindow.xaml                          |  2 +-
 ENI2/Report/ReportDocument.cs                 |  8 ++--
 ENI2/Util/UIHelper.cs                         |  4 +-
 bsmd.dakosy/Request.cs                        |  4 +-
 bsmd.database/DBManager.cs                    |  4 +-
 bsmd.database/Message.cs                      | 24 +++++------
 .../Properties/AssemblyProductInfo.cs         |  2 +-
 .../Properties/AssemblyProjectInfo.cs         |  2 +-
 bsmd.database/ValidationRule.cs               |  4 +-
 bsmd.dbh/RequestUtil.cs                       |  6 +--
 bsmd.hisnord/NSWResponse.cs                   | 10 ++---
 bsmd.hisnord/Request.cs                       |  4 +-
 misc/info_deployment.txt                      |  4 +-
 21 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/ENI2/DetailRootControl.xaml.cs b/ENI2/DetailRootControl.xaml.cs
index a44ec20a..233d85b3 100644
--- a/ENI2/DetailRootControl.xaml.cs
+++ b/ENI2/DetailRootControl.xaml.cs
@@ -734,9 +734,9 @@ namespace ENI2
             }
 
             #region 12.11.18 / 6.3.21 / 23.5.22: globale Plausi-Prüfungen
-            Message crewaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.CREW);
+            Message crewaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.CREWA);
             Message crewdMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.CREWD);
-            Message pasaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.PAS);
+            Message pasaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.PASA);
             Message pasdMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.PASD);
             Message pobaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.POBA);
             Message secMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.SEC);
@@ -1233,9 +1233,9 @@ namespace ENI2
                 case Message.NotificationClass.BKRA:
                     return Properties.Resources.textArrivalNotification;
                 case Message.NotificationClass.BPOL:
-                case Message.NotificationClass.CREW:
+                case Message.NotificationClass.CREWA:
                 case Message.NotificationClass.CREWD:
-                case Message.NotificationClass.PAS:
+                case Message.NotificationClass.PASA:
                 case Message.NotificationClass.PASD:
                     return Properties.Resources.textBorderPolice;
                 case Message.NotificationClass.HAZA:
diff --git a/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml b/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
index ea0ca7e8..6871be9d 100644
--- a/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
+++ b/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml
@@ -131,8 +131,8 @@
                 </Grid>
             </GroupBox>
         </TabItem>
-        
-        <TabItem Header="{x:Static p:Resources.textPas}" Name="tabPassengerList">
+
+        <TabItem Header="{x:Static p:Resources.textPasArrival}" Name="tabPassengerList">
             <GroupBox Name="groupBoxPassengerList" Header="{x:Static p:Resources.textTabPassengerList}">
                 <Grid>
                     <Grid.RowDefinitions>
@@ -161,15 +161,15 @@
                             <DataGridCheckBoxColumn Header="{x:Static p:Resources.textTransitPassenger}" Binding="{Binding PassengerInTransit}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textNationality}" Binding="{Binding PassengerNationality}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textPlaceOfBirth}" Binding="{Binding PassengerPlaceOfBirth}" IsReadOnly="True" Width="0.1*" />
-                            <!--<DataGridTextColumn Header="{x:Static p:Resources.textCountryOfBirth}" Binding="{Binding PassengerCountryOfBirth, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />-->
+                            <DataGridTextColumn Header="{x:Static p:Resources.textCountryOfBirth}" Binding="{Binding PassengerCountryOfBirth, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textDateOfBirth}" Binding="{Binding PassengerDateOfBirth, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textIdDocType}" Binding="{Binding PassengerIdentityDocumentTypeDisplay}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textIdDocNumber}" Binding="{Binding PassengerIdentityDocumentId}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textDocumentIssuingState}" Binding="{Binding PassengerIdentityDocumentIssuingState}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textDocumentExpiryDate}" Binding="{Binding PassengerIdentityDocumentExpiryDate, StringFormat=\{0:dd.MM.yyyy\}}" IsReadOnly="True" Width="0.1*" />
                             <DataGridTextColumn Header="{x:Static p:Resources.textVisaNumber}" Binding="{Binding PassengerVisaNumber}" IsReadOnly="True" Width="0.1*" />
-                            <!--<DataGridTextColumn Header="{x:Static p:Resources.textEmergencyCare}" Binding="{Binding EmergencyCare, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />--> <!-- XXX : TODO -->
-                            <!-- <DataGridTextColumn Header="{x:Static p:Resources.textEmergencyContactNumber}" Binding="{Binding EmergencyContactNumber, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" /> -->
+                            <DataGridTextColumn Header="{x:Static p:Resources.textEmergencyCare}" Binding="{Binding EmergencyCare, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                            <DataGridTextColumn Header="{x:Static p:Resources.textEmergencyContactNumber}" Binding="{Binding EmergencyContactNumber, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
                             
                         </DataGrid.Columns>
                     </enictrl:ENIDataGrid>
diff --git a/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs b/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
index d6d1e34c..d57466b4 100644
--- a/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs
@@ -50,8 +50,8 @@ namespace ENI2.DetailViewControls
             foreach (Message aMessage in this.Messages)
             {
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.BPOL) { this._bpolMessage = aMessage; this.ControlMessages.Add(aMessage); }
-                if (aMessage.MessageNotificationClass == Message.NotificationClass.CREW) { this._crewMessage = aMessage; this.ControlMessages.Add(aMessage); }
-                if (aMessage.MessageNotificationClass == Message.NotificationClass.PAS) { this._pasMessage = aMessage; this.ControlMessages.Add(aMessage); }
+                if (aMessage.MessageNotificationClass == Message.NotificationClass.CREWA) { this._crewMessage = aMessage; this.ControlMessages.Add(aMessage); }
+                if (aMessage.MessageNotificationClass == Message.NotificationClass.PASA) { this._pasMessage = aMessage; this.ControlMessages.Add(aMessage); }
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.CREWD) { this._crewdMessage = aMessage; this.ControlMessages.Add(aMessage); }
                 if (aMessage.MessageNotificationClass == Message.NotificationClass.PASD) { this._pasdMessage = aMessage; this.ControlMessages.Add(aMessage); }
 
@@ -99,7 +99,7 @@ namespace ENI2.DetailViewControls
 
             if (this._crewMessage == null)
             {
-                this._crewMessage = this.Core.CreateMessage(Message.NotificationClass.CREW);
+                this._crewMessage = this.Core.CreateMessage(Message.NotificationClass.CREWA);
                 this.Messages.Add(this._crewMessage);
             }
 
@@ -151,7 +151,7 @@ namespace ENI2.DetailViewControls
 
             if (this._pasMessage == null)
             {
-                this._pasMessage = this.Core.CreateMessage(Message.NotificationClass.PAS);
+                this._pasMessage = this.Core.CreateMessage(Message.NotificationClass.PASA);
                 this.Messages.Add(this._pasMessage);
             }
 
@@ -359,7 +359,7 @@ namespace ENI2.DetailViewControls
                     MessageHeader = this._pasMessage,
                     Identifier = PAS.GetNewIdentifier(_pasMessage.Elements)
                 };
-                this.SublistElementChanged(Message.NotificationClass.PAS);
+                this.SublistElementChanged(Message.NotificationClass.PASA);
             };
 
             if (epd.ShowDialog() ?? false)
@@ -367,7 +367,7 @@ namespace ENI2.DetailViewControls
                 if(!this._pasMessage.Elements.Contains(epd.PAS))
                     _pasMessage.Elements.Add(epd.PAS);
                 this.dataGridPassengerList.Items.Refresh();
-                this.SublistElementChanged(Message.NotificationClass.PAS);
+                this.SublistElementChanged(Message.NotificationClass.PASA);
             }
         }
 
@@ -384,7 +384,7 @@ namespace ENI2.DetailViewControls
         private void DataGridPassengerList_RefreshGrid()
         {
             DatabaseEntity.ResetIdentifiers(_pasMessage.Elements);
-            this.SublistElementChanged(Message.NotificationClass.PAS);
+            this.SublistElementChanged(Message.NotificationClass.PASA);
             this.dataGridPassengerList.Items.Refresh();
         }
 
@@ -406,7 +406,7 @@ namespace ENI2.DetailViewControls
                     Identifier = PAS.GetNewIdentifier(_pasMessage.Elements),
                     MessageHeader = _pasMessage
                 };
-                this.SublistElementChanged(Message.NotificationClass.PAS);
+                this.SublistElementChanged(Message.NotificationClass.PASA);
             };
 
             if (epd.ShowDialog() ?? false)
@@ -415,7 +415,7 @@ namespace ENI2.DetailViewControls
                     _pasMessage.Elements.Add(epd.PAS);
                 epd.PAS.IsDirty = true;
                 this.dataGridPassengerList.Items.Refresh();
-                this.SublistElementChanged(Message.NotificationClass.PAS);
+                this.SublistElementChanged(Message.NotificationClass.PASA);
             }
         }
 
@@ -541,7 +541,7 @@ namespace ENI2.DetailViewControls
                     MessageHeader = this._crewMessage,
                     Identifier = CREW.GetNewIdentifier(_crewMessage.Elements)
                 };
-                this.SublistElementChanged(Message.NotificationClass.CREW);
+                this.SublistElementChanged(Message.NotificationClass.CREWA);
             };
 
             if (ecd.ShowDialog() ?? false)
@@ -549,7 +549,7 @@ namespace ENI2.DetailViewControls
                 if(!this._crewMessage.Elements.Contains(ecd.CREW))
                     _crewMessage.Elements.Add(ecd.CREW);                
                 this.dataGridCrewList.Items.Refresh();
-                this.SublistElementChanged(Message.NotificationClass.CREW);
+                this.SublistElementChanged(Message.NotificationClass.CREWA);
             }
         }
 
@@ -566,7 +566,7 @@ namespace ENI2.DetailViewControls
         private void DataGridCrewList_RefreshGrid()
         {
             DatabaseEntity.ResetIdentifiers(_crewMessage.Elements);
-            this.SublistElementChanged(Message.NotificationClass.CREW);
+            this.SublistElementChanged(Message.NotificationClass.CREWA);
             this.dataGridCrewList.Items.Refresh();
         }
 
@@ -588,7 +588,7 @@ namespace ENI2.DetailViewControls
                     Identifier = CREW.GetNewIdentifier(_crewMessage.Elements),
                     MessageHeader = _crewMessage
                 };
-                this.SublistElementChanged(Message.NotificationClass.CREW);
+                this.SublistElementChanged(Message.NotificationClass.CREWA);
             };
 
             if (ecd.ShowDialog() ?? false)
@@ -597,7 +597,7 @@ namespace ENI2.DetailViewControls
                     _crewMessage.Elements.Add(ecd.CREW);
                 ecd.CREW.IsDirty = true;
                 this.dataGridCrewList.Items.Refresh();
-                this.SublistElementChanged(Message.NotificationClass.CREW);
+                this.SublistElementChanged(Message.NotificationClass.CREWA);
             }
         }
 
@@ -779,7 +779,7 @@ namespace ENI2.DetailViewControls
                     if (importCrew.Count > 0)
                     {                        
                         this.dataGridCrewList.Items.Refresh();                        
-                        this.SublistElementChanged(Message.NotificationClass.CREW);
+                        this.SublistElementChanged(Message.NotificationClass.CREWA);
                         MessageBox.Show(String.Format(Properties.Resources.textCrewImported, importCrew.Count), Properties.Resources.textCaptionInformation, MessageBoxButton.OK, MessageBoxImage.Information);
                     }                                                                
                }
@@ -940,7 +940,7 @@ namespace ENI2.DetailViewControls
                     if (importPassenger.Count > 0)
                     {
                         this.dataGridPassengerList.Items.Refresh();
-                        this.SublistElementChanged(Message.NotificationClass.PAS);
+                        this.SublistElementChanged(Message.NotificationClass.PASA);
                         MessageBox.Show(String.Format(Properties.Resources.textPassengerImported, importPassenger.Count), Properties.Resources.textCaptionInformation, MessageBoxButton.OK, MessageBoxImage.Information);
                     }
                 }
@@ -1078,7 +1078,7 @@ namespace ENI2.DetailViewControls
             {
                 crew.NotificationSchengen = checkBoxCrewNotificationSchengen.IsChecked;
             }
-            this.SublistElementChanged(Message.NotificationClass.CREW);
+            this.SublistElementChanged(Message.NotificationClass.CREWA);
         }
 
         private void checkBoxCrewNotificationPAX_Click(object sender, RoutedEventArgs e)
@@ -1088,7 +1088,7 @@ namespace ENI2.DetailViewControls
             {
                 crew.NotificationPAX = checkBoxCrewNotificationPAX.IsChecked;
             }
-            this.SublistElementChanged(Message.NotificationClass.CREW);
+            this.SublistElementChanged(Message.NotificationClass.CREWA);
         }
 
         private void checkBoxCrewNotificationSchengenDeparture_Click(object sender, RoutedEventArgs e)
@@ -1115,7 +1115,7 @@ namespace ENI2.DetailViewControls
             {
                 pas.NotificationSchengen = checkBoxPasNotificationSchengen.IsChecked;
             }
-            this.SublistElementChanged(Message.NotificationClass.PAS);
+            this.SublistElementChanged(Message.NotificationClass.PASA);
         }
 
         private void checkBoxPasNotificationPAX_Click(object sender, RoutedEventArgs e)
@@ -1124,7 +1124,7 @@ namespace ENI2.DetailViewControls
             {
                 pas.NotificationPAX = checkBoxPasNotificationPAX.IsChecked;
             }
-            this.SublistElementChanged(Message.NotificationClass.PAS);
+            this.SublistElementChanged(Message.NotificationClass.PASA);
         }
 
         private void checkBoxPasNotificationSchengenDeparture_Click(object sender, RoutedEventArgs e)
diff --git a/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI2/DetailViewControls/OverViewDetailControl.xaml
index 8a06b9d0..7218b25c 100644
--- a/ENI2/DetailViewControls/OverViewDetailControl.xaml
+++ b/ENI2/DetailViewControls/OverViewDetailControl.xaml
@@ -151,7 +151,7 @@
                                     <MultiDataTrigger>
                                         <MultiDataTrigger.Conditions>
                                             <Condition Binding="{Binding Path=Elements, Converter={util:CutoffConverter}, ConverterParameter=0}" Value="True" />
-                                            <Condition Binding="{Binding Path=MessageNotificationClass}" Value="{x:Static data:Message+NotificationClass.PAS}" />
+                                            <Condition Binding="{Binding Path=MessageNotificationClass}" Value="{x:Static data:Message+NotificationClass.PASA}" />
                                         </MultiDataTrigger.Conditions>
                                         <Setter Property="Background" Value="Yellow" />
                                     </MultiDataTrigger>
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 304dfe13..53293536 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ENI2</RootNamespace>
-    <AssemblyName>ENI2</AssemblyName>
+    <AssemblyName>ENI2Test</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>3</ApplicationRevision>
-    <ApplicationVersion>7.14.0.%2a</ApplicationVersion>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>7.2.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI2/Excel/DakosyUtil.cs b/ENI2/Excel/DakosyUtil.cs
index f430205a..df31cffb 100644
--- a/ENI2/Excel/DakosyUtil.cs
+++ b/ENI2/Excel/DakosyUtil.cs
@@ -74,7 +74,7 @@ namespace ENI2.Excel
                     { if (ScanBKRD(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.BPOL) && notificationClasses.Contains(Message.NotificationClass.BPOL))
                     { if (ScanBPOL(message, reader)) ExcelReader.SaveMessage(message); }
-                    if ((message.MessageNotificationClass == Message.NotificationClass.CREW) && notificationClasses.Contains(Message.NotificationClass.CREW))
+                    if ((message.MessageNotificationClass == Message.NotificationClass.CREWA) && notificationClasses.Contains(Message.NotificationClass.CREWA))
                     { if (ScanCREW(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.CREWD) && notificationClasses.Contains(Message.NotificationClass.CREWD))
                     { if (ScanCREWD(message, reader)) ExcelReader.SaveMessage(message); continue; }
@@ -92,7 +92,7 @@ namespace ENI2.Excel
                     { if (ScanNAME(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.NOA_NOD) && notificationClasses.Contains(Message.NotificationClass.NOA_NOD))
                     { if (ScanNOA_NOD(message, reader)) ExcelReader.SaveMessage(message); continue; }
-                    if ((message.MessageNotificationClass == Message.NotificationClass.PAS) && notificationClasses.Contains(Message.NotificationClass.PAS))
+                    if ((message.MessageNotificationClass == Message.NotificationClass.PASA) && notificationClasses.Contains(Message.NotificationClass.PASA))
                     { if (ScanPAS(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.PASD) && notificationClasses.Contains(Message.NotificationClass.PASD))
                     { if (ScanPASD(message, reader)) ExcelReader.SaveMessage(message); continue; }
diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index f8de70eb..cf93c357 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -84,7 +84,7 @@ namespace ENI2.Excel
                     { if (ScanBKRD(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.BPOL) && notificationClasses.Contains(Message.NotificationClass.BPOL))
                     { if (ScanBPOL(message, messages, messageCore, reader)) ExcelReader.SaveMessage(message); }
-                    if ((message.MessageNotificationClass == Message.NotificationClass.CREW) && notificationClasses.Contains(Message.NotificationClass.CREW))
+                    if ((message.MessageNotificationClass == Message.NotificationClass.CREWA) && notificationClasses.Contains(Message.NotificationClass.CREWA))
                     { if (ScanCREW(message, reader, isOldVersion)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.CREWD) && notificationClasses.Contains(Message.NotificationClass.CREWD))
                     { if (ScanCREWD(message, reader)) ExcelReader.SaveMessage(message); continue; }
@@ -102,7 +102,7 @@ namespace ENI2.Excel
                     { if (ScanNAME(message, reader)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.NOA_NOD) && notificationClasses.Contains(Message.NotificationClass.NOA_NOD))
                     { if (ScanNOA_NOD(message, messageCore, reader)) ExcelReader.SaveMessage(message); continue; }
-                    if ((message.MessageNotificationClass == Message.NotificationClass.PAS) && notificationClasses.Contains(Message.NotificationClass.PAS))
+                    if ((message.MessageNotificationClass == Message.NotificationClass.PASA) && notificationClasses.Contains(Message.NotificationClass.PASA))
                     { if (ScanPAS(message, reader, isOldVersion)) ExcelReader.SaveMessage(message); continue; }
                     if ((message.MessageNotificationClass == Message.NotificationClass.PASD) && notificationClasses.Contains(Message.NotificationClass.PASD))
                     { if (ScanPASD(message, reader)) ExcelReader.SaveMessage(message); continue; }
diff --git a/ENI2/Excel/ExcelWriter.cs b/ENI2/Excel/ExcelWriter.cs
index 12b197b5..cf3055fb 100644
--- a/ENI2/Excel/ExcelWriter.cs
+++ b/ENI2/Excel/ExcelWriter.cs
@@ -76,7 +76,7 @@ namespace ENI2.Excel
                                 this.WriteItineraries(bpol);
                             }
                             break;
-                        case Message.NotificationClass.CREW:
+                        case Message.NotificationClass.CREWA:
                             this.WriteCREW(message, true, isRefSheet);
                             break;
                         case Message.NotificationClass.CREWD:
@@ -111,7 +111,7 @@ namespace ENI2.Excel
                         case Message.NotificationClass.NOA_NOD:
                             if (message.Elements[0] is NOA_NOD noa_nod) this.WriteNOA_NOD(noa_nod, core.IsTransit, isRefSheet);
                             break;
-                        case Message.NotificationClass.PAS:
+                        case Message.NotificationClass.PASA:
                             this.WritePAS(message, true, isRefSheet);
                             break;
                         case Message.NotificationClass.PASD:
diff --git a/ENI2/MainWindow.xaml b/ENI2/MainWindow.xaml
index a09b88e3..46cf0c6a 100644
--- a/ENI2/MainWindow.xaml
+++ b/ENI2/MainWindow.xaml
@@ -10,7 +10,7 @@
         xmlns:util="clr-namespace:ENI2.Util"
         xmlns:local="clr-namespace:ENI2"        
         mc:Ignorable="d"
-        Title="ENI 2" Height="450" Width="825" Icon="Resources/logo_schwarz.ico" Loaded="Window_Loaded" Closing="Window_Closing" 
+        Title="ENI 2 Testversion" Height="450" Width="825" Icon="Resources/logo_schwarz.ico" Loaded="Window_Loaded" Closing="Window_Closing" 
         SourceInitialized="Window_SourceInitialized">
 
     <Window.CommandBindings>
diff --git a/ENI2/Report/ReportDocument.cs b/ENI2/Report/ReportDocument.cs
index 9a284392..a754b4d5 100644
--- a/ENI2/Report/ReportDocument.cs
+++ b/ENI2/Report/ReportDocument.cs
@@ -373,9 +373,9 @@ namespace ENI2.Report
 
             switch (message.MessageNotificationClass)
             {
-                case Message.NotificationClass.CREW:
+                case Message.NotificationClass.CREWA:
                 case Message.NotificationClass.CREWD:
-                case Message.NotificationClass.PAS:
+                case Message.NotificationClass.PASA:
                 case Message.NotificationClass.PASD:
                 case Message.NotificationClass.TOWA:
                 case Message.NotificationClass.TOWD:
@@ -418,11 +418,11 @@ namespace ENI2.Report
 
             switch(message.MessageNotificationClass)
             {
-                case Message.NotificationClass.CREW:
+                case Message.NotificationClass.CREWA:
                 case Message.NotificationClass.CREWD:
                     CreateCrewTable(document, message);
                     return;
-                case Message.NotificationClass.PAS:
+                case Message.NotificationClass.PASA:
                 case Message.NotificationClass.PASD:
                     CreatePassengerTable(document, message);
                     return;
diff --git a/ENI2/Util/UIHelper.cs b/ENI2/Util/UIHelper.cs
index 48fc1b0a..754c6bc4 100644
--- a/ENI2/Util/UIHelper.cs
+++ b/ENI2/Util/UIHelper.cs
@@ -172,8 +172,8 @@ namespace ENI2.Util
                         aMessage.ENINotificationDetailIndex = 9;
                         break;
                     case Message.NotificationClass.BPOL:
-                    case Message.NotificationClass.CREW:
-                    case Message.NotificationClass.PAS:
+                    case Message.NotificationClass.CREWA:
+                    case Message.NotificationClass.PASA:
                     case Message.NotificationClass.CREWD:
                     case Message.NotificationClass.PASD:
                         aMessage.ENINotificationIconString = "../Resources/policeman_german.png";
diff --git a/bsmd.dakosy/Request.cs b/bsmd.dakosy/Request.cs
index 5b941c73..0dede8a3 100644
--- a/bsmd.dakosy/Request.cs
+++ b/bsmd.dakosy/Request.cs
@@ -270,7 +270,7 @@ namespace bsmd.dakosy
                                     }
                                 }
                                 break;
-                            case Message.NotificationClass.CREW:
+                            case Message.NotificationClass.CREWA:
                                 {
                                     if (aMessage.Elements.Count > 0)
                                     {
@@ -425,7 +425,7 @@ namespace bsmd.dakosy
                                 vList.Visit[0].NAME = new NAME();
                                 vList.Visit[0].NAME.NameOfMaster = name.NameOfMaster;
                                 break;
-                            case Message.NotificationClass.PAS:
+                            case Message.NotificationClass.PASA:
                                 {
                                     if (aMessage.Elements.Count > 0)
                                     {
diff --git a/bsmd.database/DBManager.cs b/bsmd.database/DBManager.cs
index 578aa46a..8d5d90dd 100644
--- a/bsmd.database/DBManager.cs
+++ b/bsmd.database/DBManager.cs
@@ -1002,8 +1002,8 @@ namespace bsmd.database
                 case Message.NotificationClass.PRE72H: result = new PRE72H(); break;
                 case Message.NotificationClass.MDH: result = new MDH(); break;
                 case Message.NotificationClass.WAS: result = new WAS(); break;
-                case Message.NotificationClass.CREW: result = new CREW(); break;
-                case Message.NotificationClass.PAS: result = new PAS(); break;
+                case Message.NotificationClass.CREWA: result = new CREW(); break;
+                case Message.NotificationClass.PASA: result = new PAS(); break;
                 case Message.NotificationClass.BPOL: result = new BPOL(); break;
                 case Message.NotificationClass.TOWA: result = new TOWA(); break;
                 case Message.NotificationClass.TOWD: result = new TOWD(); break;
diff --git a/bsmd.database/Message.cs b/bsmd.database/Message.cs
index b10c5b8f..c23c7740 100644
--- a/bsmd.database/Message.cs
+++ b/bsmd.database/Message.cs
@@ -44,8 +44,8 @@ namespace bsmd.database
             NotificationClass.SEC,
             NotificationClass.PRE72H,
             NotificationClass.BPOL,
-            NotificationClass.CREW,
-            NotificationClass.PAS,
+            NotificationClass.CREWA,
+            NotificationClass.PASA,
             NotificationClass.MDH,
             NotificationClass.HAZA,
             NotificationClass.HAZD,
@@ -87,8 +87,8 @@ namespace bsmd.database
             PRE72H, 
             MDH, 
             WAS, 
-            CREW,       // 20
-            PAS, 
+            CREWA,       // 20
+            PASA, 
             BPOL, 
             TOWA, 
             TOWD, 
@@ -610,10 +610,10 @@ namespace bsmd.database
             {
                 case NotificationClass.BKRA:
                 case NotificationClass.BKRD:
-                case NotificationClass.CREW:
+                case NotificationClass.CREWA:
                 case NotificationClass.CREWD:
                 case NotificationClass.LADG:
-                case NotificationClass.PAS:
+                case NotificationClass.PASA:
                 case NotificationClass.PASD:
                 case NotificationClass.SERV:
                 case NotificationClass.STO:
@@ -693,9 +693,9 @@ namespace bsmd.database
                     case NotificationClass.BKRA: return 5;
                     case NotificationClass.BKRD: return 5;
                     case NotificationClass.LADG: return 36;
-                    case NotificationClass.CREW: return 40;
+                    case NotificationClass.CREWA: return 40;
                     case NotificationClass.CREWD: return 40;
-                    case NotificationClass.PAS: return 40;
+                    case NotificationClass.PASA: return 40;
                     case NotificationClass.PASD: return 40;
                     case NotificationClass.TOWA: return 5;
                     case NotificationClass.TOWD: return 5;
@@ -826,8 +826,8 @@ namespace bsmd.database
             {
                 switch (this.MessageNotificationClass)
                 {
-                    case NotificationClass.CREW:
-                    case NotificationClass.PAS:
+                    case NotificationClass.CREWA:
+                    case NotificationClass.PASA:
                         return true;
                     default:
                         return false;
@@ -934,9 +934,9 @@ namespace bsmd.database
         /// </summary>        
         private bool CanDoBulkSave()
         {
-            if(this.MessageNotificationClass == NotificationClass.CREW ||
+            if(this.MessageNotificationClass == NotificationClass.CREWA ||
                 this.MessageNotificationClass == NotificationClass.CREWD ||
-                this.MessageNotificationClass == NotificationClass.PAS ||
+                this.MessageNotificationClass == NotificationClass.PASA ||
                 this.MessageNotificationClass == NotificationClass.PASD)
             {
                 foreach (DatabaseEntity subEntity in this.Elements)
diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index 09d61c04..ff9453c8 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("7.14.0")]
+[assembly: AssemblyInformationalVersion("7.2.0")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2023 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 79272584..8111450c 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("7.14.0.*")]
+[assembly: AssemblyVersion("7.2.0.*")]
 
diff --git a/bsmd.database/ValidationRule.cs b/bsmd.database/ValidationRule.cs
index 624805a6..fba6ce01 100644
--- a/bsmd.database/ValidationRule.cs
+++ b/bsmd.database/ValidationRule.cs
@@ -65,7 +65,7 @@ namespace bsmd.database
                     _validationFields.AddRange(GetFieldsForClass(typeof(BRKD), true, Message.NotificationClass.BKRD));
                     _validationFields.AddRange(GetFieldsForClass(typeof(BPOL), false, Message.NotificationClass.BPOL));
                     _validationFields.AddRange(GetFieldsForClass(typeof(CallPurpose), true, null));
-                    _validationFields.AddRange(GetFieldsForClass(typeof(CREW), true, Message.NotificationClass.CREW));
+                    _validationFields.AddRange(GetFieldsForClass(typeof(CREW), true, Message.NotificationClass.CREWA));
                     _validationFields.AddRange(GetFieldsForClass(typeof(Customer), false, null));
 
                     _validationFields.AddRange(GetFieldsForClass(typeof(HAZ), false, Message.NotificationClass.HAZA));
@@ -89,7 +89,7 @@ namespace bsmd.database
                     _validationFields.AddRange(GetFieldsForClass(typeof(MDH), false, Message.NotificationClass.MDH));
                     _validationFields.AddRange(GetFieldsForClass(typeof(NAME), false, Message.NotificationClass.NAME));
                     _validationFields.AddRange(GetFieldsForClass(typeof(NOA_NOD), false, Message.NotificationClass.NOA_NOD));
-                    _validationFields.AddRange(GetFieldsForClass(typeof(PAS), true, Message.NotificationClass.PAS));
+                    _validationFields.AddRange(GetFieldsForClass(typeof(PAS), true, Message.NotificationClass.PASA));
                     _validationFields.AddRange(GetFieldsForClass(typeof(POBA), false, Message.NotificationClass.POBA));
                     _validationFields.AddRange(GetFieldsForClass(typeof(POBD), false, Message.NotificationClass.POBD));
                     _validationFields.AddRange(GetFieldsForClass(typeof(PortArea), true, null));
diff --git a/bsmd.dbh/RequestUtil.cs b/bsmd.dbh/RequestUtil.cs
index 1fccd406..f33d3ace 100644
--- a/bsmd.dbh/RequestUtil.cs
+++ b/bsmd.dbh/RequestUtil.cs
@@ -26,7 +26,7 @@ namespace bsmd.dbh
             {
                 Root root = new Root();
                 root.Version = RootVersion.Item72;
-                root.SourceDocumentVersion = "7.1";
+                root.SourceDocumentVersion = "7.2";
                 root.Timestamp = DateTime.Now;
                 string filenameComponent;
 
@@ -463,7 +463,7 @@ namespace bsmd.dbh
 
                         #region CREWA
 
-                        case Message.NotificationClass.CREW: // this is CREWA
+                        case Message.NotificationClass.CREWA:
                             {
 
                                 RootCREWA rootCREW = new RootCREWA();
@@ -549,7 +549,7 @@ namespace bsmd.dbh
 
                         #region PASA
 
-                        case Message.NotificationClass.PAS: // this is PASA
+                        case Message.NotificationClass.PASA:
                             {
                                 RootPASA rootPAS = new RootPASA();
                                 rootPAS.Passenger = new RootPASAPassenger[message.Elements.Count];
diff --git a/bsmd.hisnord/NSWResponse.cs b/bsmd.hisnord/NSWResponse.cs
index fe35f5f8..1456ee2f 100644
--- a/bsmd.hisnord/NSWResponse.cs
+++ b/bsmd.hisnord/NSWResponse.cs
@@ -206,10 +206,10 @@ namespace bsmd.hisnord
                     case Message.NotificationClass.WAS:
                         lookupName = wasNS + "WASResponse";                        
                         break;
-                    case Message.NotificationClass.CREW:
+                    case Message.NotificationClass.CREWA:
                         lookupName = crewNS + "CREWResponse";                        
                         break;
-                    case Message.NotificationClass.PAS:
+                    case Message.NotificationClass.PASA:
                         lookupName = pasNS + "PASResponse";                        
                         break;
                     case Message.NotificationClass.BPOL:
@@ -294,8 +294,7 @@ namespace bsmd.hisnord
                     foreach(XElement anElem in elem)
                     {
                         MessageViolation mv = new MessageViolation();
-                        int vCode = -1;
-                        if (!Int32.TryParse(anElem.Element(vCodeName).Value, out vCode))
+                        if (!Int32.TryParse(anElem.Element(vCodeName).Value, out int vCode))
                             _log.WarnFormat("cannot convert violation code to int: {0}", anElem.Element(vCodeName).Value);
                         else
                             mv.ViolationCode = vCode;
@@ -311,8 +310,7 @@ namespace bsmd.hisnord
                     foreach (XElement anElem in elem)
                     {
                         MessageError me = new MessageError();
-                        int eCode = -1;
-                        if (!Int32.TryParse(anElem.Element(eCodeName).Value, out eCode))
+                        if (!Int32.TryParse(anElem.Element(eCodeName).Value, out int eCode))
                             _log.WarnFormat("cannot convert error code to int: {0}", anElem.Element(eCodeName).Value);
                         else
                             me.ErrorCode = eCode;
diff --git a/bsmd.hisnord/Request.cs b/bsmd.hisnord/Request.cs
index 2030fdcd..ecd622e2 100644
--- a/bsmd.hisnord/Request.cs
+++ b/bsmd.hisnord/Request.cs
@@ -1375,7 +1375,7 @@ namespace bsmd.hisnord
 
                     #region PASA
                                         
-                    if (message.MessageNotificationClass == Message.NotificationClass.PAS)
+                    if (message.MessageNotificationClass == Message.NotificationClass.PASA)
                     {
                         if (message.Reset)
                         {
@@ -1513,7 +1513,7 @@ namespace bsmd.hisnord
 
                     #region CREWA                                    
 
-                    if (message.MessageNotificationClass == Message.NotificationClass.CREW)
+                    if (message.MessageNotificationClass == Message.NotificationClass.CREWA)
                     {                    
                         if (message.Reset)
                         {
diff --git a/misc/info_deployment.txt b/misc/info_deployment.txt
index 37c08100..a11b6943 100644
--- a/misc/info_deployment.txt
+++ b/misc/info_deployment.txt
@@ -1,9 +1,11 @@
 1) copyprod.cmd ausführen (damit app.config richtig überschrieben wird)
 2) Prüfen ob das ENI App logo richtig ist
 3) VS: Publish: Folder Location und Url richtig auswählen
-4) Signing: "Sign the ClickOnce manifests": Hier für Prod das Zertifikat 
+4) Signing: "Sign the ClickOnce manifests": Hier für Prod das Zertifikat
 Schiffsmelder CA auswählen, das am 02/24 abläuft.
 Auswahl über "Select from Store.."
 5) Release Build einstellen
 6) komplett neu bauen (clean!)
 7) In Description bei Product name "ENI" statt "ENI Testversion"
+8) MainWindow.xaml: "ENI 2 Testversion" -> "ENI 2"
+9) ENI2 Project Properties -> Application -> Assembly Name: "ENI2Test" -> "ENI2"