Merge branch 'release/eni_7.0.1'

This commit is contained in:
Daniel Schick 2022-03-30 16:29:55 +02:00
commit dbff2774c1
7 changed files with 9 additions and 7 deletions

View File

@ -36,8 +36,8 @@
<MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage>
<ApplicationRevision>17</ApplicationRevision>
<ApplicationVersion>7.0.0.17</ApplicationVersion>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>7.0.1.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>

View File

@ -402,7 +402,7 @@ namespace ENI2.Excel
if (date != null)
{
if ((date.Value < new DateTime(1899, 1, 1)) || (date.Value > new DateTime(2030, 1, 1)))
if ((date.Value < new DateTime(1899, 1, 1)) || (date.Value > new DateTime(2130, 1, 1)))
{
date = null; // this can't be right
}

View File

@ -114,13 +114,14 @@ namespace bsmd.database
[ShowReport]
[ReportDisplayName("Issuing state")]
[Validation(ValidationCode.OPTIONAL_FLAG_CODE)]
[Validation(ValidationCode.FLAG_CODE)]
[MaxLength(2)]
[ENI2Validation]
public string CrewMemberIdentityDocumentIssuingState { get; set; }
[ShowReport]
[ReportDisplayName("Expiry date")]
[Validation(ValidationCode.NOT_NULL)]
[ENI2Validation]
public DateTime? CrewMemberIdentityDocumentExpiryDate { get; set; }

View File

@ -118,13 +118,14 @@ namespace bsmd.database
[ShowReport]
[ReportDisplayName("Issuing state")]
[Validation(ValidationCode.OPTIONAL_FLAG_CODE)]
[Validation(ValidationCode.FLAG_CODE)]
[ENI2Validation]
public string PassengerIdentityDocumentIssuingState { get; set; }
[ShowReport]
[ReportDisplayName("Expiry date")]
[Validation(ValidationCode.NOT_NULL)]
[ENI2Validation]
public DateTime? PassengerIdentityDocumentExpiryDate { get; set; }

View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("7.0.0")]
[assembly: AssemblyInformationalVersion("7.0.1")]
[assembly: AssemblyCopyright("Copyright © 2014-2022 schick Informatik")]
[assembly: AssemblyTrademark("")]

View File

@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("7.0.0.*")]
[assembly: AssemblyVersion("7.0.1.*")]