div. Änderungen, Verson

Aviso/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("4.2.5.8")>
+<Assembly: AssemblyVersion("4.2.5.9")>
-<Assembly: AssemblyFileVersion("4.2.5.8")>
+<Assembly: AssemblyFileVersion("4.2.5.9")>

Aviso/frmGesamtsicherheitenNEU.vb

@@ -1698,20 +1698,14 @@ Public Class frmGesamtsicherheitenNEU
 
 
             txtAnzalPosGes.Text = DirectCast(dgvGesamtsicherheit.Rows.Count().ToString(), String)
-
             txtPosAnzalPosGes.Text = DirectCast(dgvSicherheitsPos.Rows.Count().ToString(), String)
 
             Dim countSicherheitsbetrag As Double = 0
             Dim countWarenwert As Double = 0
 
             For i As Integer = 0 To dgvGesamtsicherheit.Rows.Count - 1
-
-
-
                 countSicherheitsbetrag += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_sicherheitsbetrag").Value)
                 countWarenwert += CDbl(dgvGesamtsicherheit.Rows(i).Cells("gs_warenwert").Value)
-
-
             Next
 
             txtSicherheitsbGes._value = countSicherheitsbetrag.ToString

Aviso/frmHauptfenster.Designer.vb

@@ -22,7 +22,6 @@ Partial Class frmHauptfenster
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster))
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -35,7 +34,7 @@ Partial Class frmHauptfenster
         Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem()
         Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem()
-        Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip()
         Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator()
         Me.conFertig = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
@@ -282,7 +281,7 @@ Partial Class frmHauptfenster
         Me.Label2 = New System.Windows.Forms.Label()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Label3 = New System.Windows.Forms.Label()
-        Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
+        Me.Timer1 = New System.Windows.Forms.Timer()
         Me.btnWichtige = New System.Windows.Forms.Button()
         Me.btnWichtigeStandort = New System.Windows.Forms.Button()
         Me.btnMinimieren = New System.Windows.Forms.Button()
@@ -297,7 +296,7 @@ Partial Class frmHauptfenster
         Me.Label20 = New System.Windows.Forms.Label()
         Me.pnlLinksOben = New System.Windows.Forms.Panel()
         Me.Button9 = New System.Windows.Forms.Button()
-        Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip()
         Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem()
         Me.Label22 = New System.Windows.Forms.Label()
         Me.btnE_Aviso = New System.Windows.Forms.Button()
@@ -306,9 +305,10 @@ Partial Class frmHauptfenster
         Me.picAVISOMessenger = New System.Windows.Forms.PictureBox()
         Me.pic = New System.Windows.Forms.PictureBox()
         Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
+        Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
         Me.pnl = New System.Windows.Forms.Panel()
         Me.Button10 = New System.Windows.Forms.Button()
-        Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
         Me.Panel6 = New System.Windows.Forms.Panel()
         Me.cbx_My_Brexit = New System.Windows.Forms.CheckBox()
         Me.cbx_My_CBAM = New System.Windows.Forms.CheckBox()
@@ -323,7 +323,7 @@ Partial Class frmHauptfenster
         Me.lblMySND_Anzeige = New System.Windows.Forms.Label()
         Me.lblAkte = New System.Windows.Forms.Label()
         Me.btnClose = New System.Windows.Forms.Button()
-        Me.TimerAkte = New System.Windows.Forms.Timer(Me.components)
+        Me.TimerAkte = New System.Windows.Forms.Timer()
         Me.tabVorgeschrieben = New System.Windows.Forms.TabPage()
         Me.tabFreigegeben = New System.Windows.Forms.TabPage()
         Me.tabNichtEingetroffen = New System.Windows.Forms.TabPage()
@@ -340,7 +340,7 @@ Partial Class frmHauptfenster
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         Me.pnlDetailsLinks = New System.Windows.Forms.Panel()
         Me.splitMain = New System.Windows.Forms.SplitContainer()
-        Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.CheckBox1 = New System.Windows.Forms.CheckBox()
         Me.tbcntrAvisoSND = New System.Windows.Forms.TabControl()
@@ -387,16 +387,16 @@ Partial Class frmHauptfenster
         Me.lblErwAuftraggeber = New System.Windows.Forms.Label()
         Me.cbxAlle = New System.Windows.Forms.CheckBox()
         Me.btnSmall = New System.Windows.Forms.Button()
-        Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+        Me.ToolTip1 = New System.Windows.Forms.ToolTip()
         Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
-        Me.timerStandzeit = New System.Windows.Forms.Timer(Me.components)
+        Me.timerStandzeit = New System.Windows.Forms.Timer()
-        Me.TimerUPDATE = New System.Windows.Forms.Timer(Me.components)
+        Me.TimerUPDATE = New System.Windows.Forms.Timer()
         Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlOptionen = New System.Windows.Forms.Panel()
         Me.btnKasse_User = New System.Windows.Forms.Button()
         Me.btnKasse_LG = New System.Windows.Forms.Button()
         Me.btnTV = New System.Windows.Forms.Button()
-        Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.cntxt = New System.Windows.Forms.ContextMenuStrip()
         Me.BundesanzeigerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.EUTaricToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ZugelassenerAusführerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -405,23 +405,23 @@ Partial Class frmHauptfenster
         Me.BrexitToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.EmbargosLänderToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GüterlisteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
+        Me.Timer_REFRESH = New System.Windows.Forms.Timer()
         Me.ColorDialog = New System.Windows.Forms.ColorDialog()
-        Me.ctxtFarben = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ctxtFarben = New System.Windows.Forms.ContextMenuStrip()
         Me.ALLEToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem21 = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel3 = New System.Windows.Forms.Panel()
         Me.Panel4 = New System.Windows.Forms.Panel()
-        Me.cntVerag = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.cntVerag = New System.Windows.Forms.ContextMenuStrip()
         Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlLeft = New System.Windows.Forms.Panel()
+        Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
         Me.Panel5 = New System.Windows.Forms.Panel()
         Me.Panel7 = New System.Windows.Forms.Panel()
-        Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen()
+        Me.PrüfeBilderAufBase64ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen()
         Me.conMenuAviso.SuspendLayout()
         Me.MenuStrip1.SuspendLayout()
         Me.pnlDetailsRechts.SuspendLayout()
@@ -655,7 +655,7 @@ Partial Class frmHauptfenster
         '
         'AdministrationToolStripMenuItem
         '
-        Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem, Me.AnhangsartenToolStripMenuItem, Me.SpireLizenzPrüfenToolStripMenuItem, Me.UNBescheinigungAusTFEinlesenToolStripMenuItem, Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem})
+        Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem, Me.AnhangsartenToolStripMenuItem, Me.SpireLizenzPrüfenToolStripMenuItem, Me.UNBescheinigungAusTFEinlesenToolStripMenuItem, Me.FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem, Me.PrüfeBilderAufBase64ToolStripMenuItem})
         Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem"
         Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(213, 22)
         Me.AdministrationToolStripMenuItem.Text = "Administration"
@@ -2658,6 +2658,15 @@ Partial Class frmHauptfenster
         Me.SplitContainer3.SplitterDistance = 99
         Me.SplitContainer3.TabIndex = 3
         '
+        'UsrCntlBenachrichtigungen1
+        '
+        Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
+        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(99, 300)
+        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
+        '
         'pnl
         '
         Me.pnl.Controls.Add(Me.Button10)
@@ -4013,6 +4022,15 @@ Partial Class frmHauptfenster
         Me.pnlLeft.TabIndex = 88
         Me.pnlLeft.Visible = False
         '
+        'UsrCntlBenachrichtigungen2
+        '
+        Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51)
+        Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2"
+        Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243)
+        Me.UsrCntlBenachrichtigungen2.TabIndex = 1
+        '
         'Panel5
         '
         Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
@@ -4030,23 +4048,11 @@ Partial Class frmHauptfenster
         Me.Panel7.Size = New System.Drawing.Size(252, 51)
         Me.Panel7.TabIndex = 4
         '
-        'UsrCntlBenachrichtigungen1
+        'PrüfeBilderAufBase64ToolStripMenuItem
         '
-        Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.PrüfeBilderAufBase64ToolStripMenuItem.Name = "PrüfeBilderAufBase64ToolStripMenuItem"
-        Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0)
+        Me.PrüfeBilderAufBase64ToolStripMenuItem.Size = New System.Drawing.Size(257, 22)
-        Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.PrüfeBilderAufBase64ToolStripMenuItem.Text = "Prüfe Bilder auf Base64"
-        Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1"
-        Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(99, 300)
-        Me.UsrCntlBenachrichtigungen1.TabIndex = 0
-        '
-        'UsrCntlBenachrichtigungen2
-        '
-        Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51)
-        Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2"
-        Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243)
-        Me.UsrCntlBenachrichtigungen2.TabIndex = 1
         '
         'frmHauptfenster
         '
@@ -4510,4 +4516,5 @@ Partial Class frmHauptfenster
     Friend WithEvents FIXSQLTIGGERSQLGUIDE01ToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ServicesToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents cbx_My_CBAM As CheckBox
+    Friend WithEvents PrüfeBilderAufBase64ToolStripMenuItem As ToolStripMenuItem
 End Class

Aviso/frmSendungsdetailsNEU.vb

@@ -1677,6 +1677,9 @@ Public Class frmSendungsdetailsNEU
             '                                      End Sub
 
             '   txtT1Verzollungsadresse.Text = ""
+
+            btnWWberechnen.Visible = False
+
             Select Case SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID
                 Case 5, 6, 18, 32, 24, 33, 34, 37, 40, 42
                     If (SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId IsNot Nothing) Then
@@ -7944,7 +7947,7 @@ Public Class frmSendungsdetailsNEU
         Dim vorpT1 = usrcntl_ATB.txtATBT1.Text
         Try
 
-            If SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung = "" Then
+            If SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung = "" Then 'GESTELLUNG
                 txtWarenwertWaehrung.SET_VALUE("EUR")
                 SAVE_ME()
             End If
@@ -7956,23 +7959,25 @@ Public Class frmSendungsdetailsNEU
             End If
 
             If SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung <> "EUR" Then
-                MsgBox("Warenwert darf nur in EUR angegeben werden")
+                MsgBox("Warenwert der Gestellung darf nur in EUR angegeben werden")
                 Exit Sub
             End If
 
-
-
             For Each s As cSendungen In SENDUNG_LIST
-                'nur Betrag EUR
+                If s.tblSnd_Vorpapier = vorpT1 AndAlso Not s.tblSnd_Abfertigungsart_ID = 44 Then
-                If s.tblSnd_Vorpapier = vorpT1 Then
+
-                    If s.tblSnd_WarenwertWaehrung = "EUR" AndAlso s.FilialenNr = SENDUNG_LIST(CURRENT_INDEX).FilialenNr Then
+                    If s.tblSnd_WarenwertWaehrung = "EUR" Then
-                        If Not s.tblSnd_Abfertigungsart_ID = 44 Then calcWarenwerte += s.tblSnd_Warenwert
+                        calcWarenwerte += s.tblSnd_Warenwert
+                    ElseIf s.tblSnd_WarenwertWaehrung <> "" Then
+                        Dim kurs As New cFremdwaehrungskurse(s.tblSnd_WarenwertWaehrung)
+                        If kurs.hasEntry Then
+                            calcWarenwerte += Math.Round(kurs.EXCHANGE_CURTOEUR(s.tblSnd_Warenwert, s.tblSnd_WarenwertWaehrung, CDate(Today)), 2)
                         Else
-                        MsgBox("Bei Sendung " & s.AbfertigungsNr & " ist der Warenwert nicht in EUR angegeben!")
+                            MsgBox("Es kann keine Umrechnungskurs zum heutigen Datum für " & s.tblSnd_WarenwertWaehrung & " ermittelt werden!")
-                        Exit Sub
+                        End If
+                    End If
                 End If
 
-                End If
 
             Next
 
@@ -7984,7 +7989,7 @@ Public Class frmSendungsdetailsNEU
 
 
             If IsNumeric(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert) AndAlso SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert <> 0 AndAlso Math.Round(calcWarenwerte, 2) <> Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2) Then
-                MsgBox("Warenwert für Gestellung stimmt nicht überein!" & vbNewLine & "Berechnerter Warenwert: " & Math.Round(calcWarenwerte, 2) & vbNewLine & "Eingetragener Warenwert: " & Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2), MsgBoxStyle.Critical)
+                MsgBox("Warenwert für Gestellung stimmt nicht überein!" & vbNewLine & "Berechneter Warenwert: " & Math.Round(calcWarenwerte, 2) & vbNewLine & "Eingetragener Warenwert: " & Math.Round(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, 2), MsgBoxStyle.Critical)
 
             Else