Fiskal-Checkliste / AT ZOLL eingereicht

2023-03-15 22:29:37 +01:00
parent e0c0d74b9a
commit a27e324a71
7 changed files with 127 additions and 101 deletions
--- a/Aviso/frmATZollEingereichtSetzen.Designer.vb
+++ b/Aviso/frmATZollEingereichtSetzen.Designer.vb
@@ -48,7 +48,6 @@ Partial Class frmATZollEingereichtSetzen
        Me.cbxS2 = New System.Windows.Forms.CheckBox()
        Me.cbxS1 = New System.Windows.Forms.CheckBox()
        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
-        Me.cbxCMR3 = New System.Windows.Forms.CheckBox()
        Me.cbxCMR1 = New System.Windows.Forms.CheckBox()
        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
        Me.cbxVS3 = New System.Windows.Forms.CheckBox()
@@ -120,7 +119,7 @@ Partial Class frmATZollEingereichtSetzen
        Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnl.Location = New System.Drawing.Point(0, 0)
        Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(621, 659)
+        Me.pnl.Size = New System.Drawing.Size(621, 594)
        Me.pnl.TabIndex = 0
        '
        'lblEORIPruefdatum
@@ -241,13 +240,14 @@ Partial Class frmATZollEingereichtSetzen
        Me.GroupBox5.Controls.Add(Me.cbxUEST3)
        Me.GroupBox5.Controls.Add(Me.cbxUEST2)
        Me.GroupBox5.Controls.Add(Me.cbxUEST1)
+        Me.GroupBox5.Enabled = False
        Me.GroupBox5.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.GroupBox5.Location = New System.Drawing.Point(13, 513)
+        Me.GroupBox5.Location = New System.Drawing.Point(355, 301)
        Me.GroupBox5.Name = "GroupBox5"
        Me.GroupBox5.Size = New System.Drawing.Size(250, 119)
        Me.GroupBox5.TabIndex = 59
        Me.GroupBox5.TabStop = False
-        Me.GroupBox5.Text = "Übereinstimmuing notwendig"
+        Me.GroupBox5.Text = "Übereinstimmung notwendig"
        '
        'cbxUEST4
        '
@@ -305,6 +305,7 @@ Partial Class frmATZollEingereichtSetzen
        '
        Me.GroupBox3.Controls.Add(Me.cbxRG2)
        Me.GroupBox3.Controls.Add(Me.cbxRG1)
+        Me.GroupBox3.Enabled = False
        Me.GroupBox3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.GroupBox3.Location = New System.Drawing.Point(13, 426)
        Me.GroupBox3.Name = "GroupBox3"
@@ -343,8 +344,9 @@ Partial Class frmATZollEingereichtSetzen
        '
        Me.GroupBox4.Controls.Add(Me.cbxS2)
        Me.GroupBox4.Controls.Add(Me.cbxS1)
+        Me.GroupBox4.Enabled = False
        Me.GroupBox4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.GroupBox4.Location = New System.Drawing.Point(355, 426)
+        Me.GroupBox4.Location = New System.Drawing.Point(14, 502)
        Me.GroupBox4.Name = "GroupBox4"
        Me.GroupBox4.Size = New System.Drawing.Size(250, 68)
        Me.GroupBox4.TabIndex = 60
@@ -379,29 +381,16 @@ Partial Class frmATZollEingereichtSetzen
        '
        'GroupBox2
        '
-        Me.GroupBox2.Controls.Add(Me.cbxCMR3)
        Me.GroupBox2.Controls.Add(Me.cbxCMR1)
+        Me.GroupBox2.Enabled = False
        Me.GroupBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.GroupBox2.Location = New System.Drawing.Point(355, 301)
+        Me.GroupBox2.Location = New System.Drawing.Point(355, 426)
        Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(250, 119)
+        Me.GroupBox2.Size = New System.Drawing.Size(250, 70)
        Me.GroupBox2.TabIndex = 57
        Me.GroupBox2.TabStop = False
        Me.GroupBox2.Text = "Auf CMR"
        '
-        'cbxCMR3
-        '
-        Me.cbxCMR3.AutoSize = True
-        Me.cbxCMR3.Checked = True
-        Me.cbxCMR3.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbxCMR3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxCMR3.Location = New System.Drawing.Point(6, 45)
-        Me.cbxCMR3.Name = "cbxCMR3"
-        Me.cbxCMR3.Size = New System.Drawing.Size(206, 17)
-        Me.cbxCMR3.TabIndex = 2
-        Me.cbxCMR3.Text = "Versendung als ig-Lieferung / Stempel"
-        Me.cbxCMR3.UseVisualStyleBackColor = True
-        '
        'cbxCMR1
        '
        Me.cbxCMR1.AutoSize = True
@@ -422,6 +411,7 @@ Partial Class frmATZollEingereichtSetzen
        Me.GroupBox1.Controls.Add(Me.cbxVS4)
        Me.GroupBox1.Controls.Add(Me.cbxVS2)
        Me.GroupBox1.Controls.Add(Me.cbxVS1)
+        Me.GroupBox1.Enabled = False
        Me.GroupBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.GroupBox1.Location = New System.Drawing.Point(12, 301)
        Me.GroupBox1.Name = "GroupBox1"
@@ -580,7 +570,7 @@ Partial Class frmATZollEingereichtSetzen
        Me.Label6.Name = "Label6"
        Me.Label6.Size = New System.Drawing.Size(467, 26)
        Me.Label6.TabIndex = 51
-        Me.Label6.Text = "AT Zoll Einreichen Fiskal - Checkliste"
+        Me.Label6.Text = "AT/DE Zoll Einreichen Fiskal - Checkliste"
        Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        '
        'lblWare
@@ -626,7 +616,7 @@ Partial Class frmATZollEingereichtSetzen
        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
        Me.btn.ForeColor = System.Drawing.Color.White
-        Me.btn.Location = New System.Drawing.Point(402, 570)
+        Me.btn.Location = New System.Drawing.Point(399, 508)
        Me.btn.Name = "btn"
        Me.btn.Size = New System.Drawing.Size(206, 62)
        Me.btn.TabIndex = 0
@@ -676,7 +666,7 @@ Partial Class frmATZollEingereichtSetzen
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(621, 659)
+        Me.ClientSize = New System.Drawing.Size(621, 594)
        Me.Controls.Add(Me.pnl)
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
@@ -722,7 +712,6 @@ Partial Class frmATZollEingereichtSetzen
    Friend WithEvents cbxS2 As CheckBox
    Friend WithEvents cbxS1 As CheckBox
    Friend WithEvents GroupBox2 As GroupBox
-    Friend WithEvents cbxCMR3 As CheckBox
    Friend WithEvents cbxCMR1 As CheckBox
    Friend WithEvents GroupBox1 As GroupBox
    Friend WithEvents cbxVS3 As CheckBox
--- a/Aviso/frmATZollEingereichtSetzen.vb
+++ b/Aviso/frmATZollEingereichtSetzen.vb
@@ -49,9 +49,11 @@ Public Class frmATZollEingereichtSetzen
                            cbxUID.Checked = True
                            picUIDAbfrage.Image = My.Resources.ok
                        Else
-                            check_UID(ADRESSEN)
+                            check_UID_AD(ADRESSEN)
                        End If
                    End If
+                Else
+                    check_UID(txtUid.Text)
                End If
                If KUNDEN IsNot Nothing Then
                    txtEori.Text = If(KUNDEN.EORITIN, "")
@@ -62,6 +64,10 @@ Public Class frmATZollEingereichtSetzen
    End Sub

    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
+        If Not cbxUID.Checked Then Me.DialogResult = DialogResult.None : Exit Sub
+        If Not cbxEORI.Checked Then Me.DialogResult = DialogResult.None : Exit Sub
+
+

        Me.DialogResult = DialogResult.OK

@@ -93,7 +99,7 @@ Public Class frmATZollEingereichtSetzen
            If EORI_ERG.Result(0).Status = 0 Or EORI_ERG.Result(0).Status = 1 Then

                Select Case EORI_ERG.Result(0).Status
-                    Case 0 : cbxEORI.Checked = True : picEORIAbfrage.BackgroundImage = My.Resources.ok
+                    Case 0 : cbxEORI.Checked = True : picEORIAbfrage.BackgroundImage = My.Resources.ok : lblEORIPruefdatum.Text = Now.ToShortDateString
                    Case 1 : cbxEORI.Checked = False : picEORIAbfrage.BackgroundImage = My.Resources.del
                End Select

@@ -103,7 +109,7 @@ Public Class frmATZollEingereichtSetzen
        End If

    End Sub
-    Sub check_UID(ADRESSE)
+    Sub check_UID_AD(ADRESSE)
        If ADRESSE.UstIdNr Is Nothing Then Exit Sub
        If ADRESSE.UstIdKz Is Nothing Then Exit Sub
        If ADRESSE.UstIdKz = "" Then Exit Sub
@@ -117,12 +123,47 @@ Public Class frmATZollEingereichtSetzen
        FO.initValues()

        If FO.Call_Web_Service_MethodUID_Login_NEU2020() = 0 Then
+
            Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(ADRESSE.AdressenNr,, , , 2)
+            If UID_TMP IsNot Nothing Then
+
+                If UID_TMP.uid_valid Then
+                    'setKD(kdNr)
+                    cbxUID.Checked = True
+                    picUIDAbfrage.BackgroundImage = My.Resources.ok
+                    lblUIDPruefdatum.Text = Now.ToShortDateString
+                Else
+                    cbxUID.Checked = False
+                    picUIDAbfrage.BackgroundImage = My.Resources.del
+                End If
+            Else
+                picUIDAbfrage.BackgroundImage = Nothing
+            End If
+
+            FO.Call_Web_Service_MethodUID_Logout_NEU2020()
+
+        End If
+    End Sub
+
+    Sub check_UID(UID_NR)
+
+        picUIDAbfrage.BackgroundImage = Nothing
+        ' Button5.Visible = False
+
+
+        Dim FO As New VERAG_PROG_ALLGEMEIN.cFinanzOnlineWebService
+        FO.initValues()
+
+        If FO.Call_Web_Service_MethodUID_Login_NEU2020() = 0 Then
+            Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_WO_KDNR(UID_NR,, 2)
            If UID_TMP IsNot Nothing Then
                If UID_TMP.uid_valid Then
                    'setKD(kdNr)
+                    cbxUID.Checked = True
                    picUIDAbfrage.BackgroundImage = My.Resources.ok
+                    lblUIDPruefdatum.Text = Now.ToShortDateString
                Else
+                    cbxUID.Checked = False
                    picUIDAbfrage.BackgroundImage = My.Resources.del
                End If
            Else
@@ -149,14 +190,17 @@ Public Class frmATZollEingereichtSetzen

    Private Sub btnCheckUID_Click(sender As Object, e As EventArgs) Handles btnCheckUID.Click
        If SND IsNot Nothing Then
-            If SND.tblSnd_EmpfaengerKdNr > 0 Then

-            End If
+            If SND.tblSnd_EmpfaengerKdNr > 0 Then
                Dim ADRESSEN As New VERAG_PROG_ALLGEMEIN.cAdressen(SND.tblSnd_EmpfaengerKdNr)
                If ADRESSEN IsNot Nothing Then
-                check_UID(ADRESSEN)
+                    check_UID_AD(ADRESSEN)
+                    Exit Sub
                End If
            End If
+        End If
+        'Wenn oben nciht zutrifft..
+        check_UID(txtUid.Text)
    End Sub

 End Class
--- a/Aviso/frmAddAktenvermerkShort.vb
+++ b/Aviso/frmAddAktenvermerkShort.vb
@@ -198,8 +198,7 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli
                insertVermerk("AT Zoll fertig", 20)
                If myAviso.LKW_fertig Then VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.LKWFertig(myAviso.AvisoID) : frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
            Else
-                If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AT_FISKAL_CHECKLISTE") Then
-
+                If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AT_FISKAL_CHECKLISTE") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", "AVISO") Then


                    'Sendungen durchlaufen und die Fiskal - Checkliste bei AT Fiskal anzeigen (je SND)
@@ -209,15 +208,18 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli
                    If SENDUNG_LIST IsNot Nothing Then

                        For Each SND In SENDUNG_LIST
+                            Select Case SND.tblSnd_Abfertigungsart_ID
+                                Case 26, 28

-                            If SND.tblSnd_Abfertigungsart_ID = 26 Then
                                    Dim f As New frmATZollEingereichtSetzen(myAviso, SND)
                                    If f.ShowDialog() = DialogResult.OK Then
                                        'Passt scho..
+                                        AvisoStatusFunctions.insertSendungsVermerk(SND.tblSnd_SendungID, myAviso.AvisoID, "Fiskal-Checkliste - OK", 100)
                                    Else
                                        Exit Sub ' --> YOU'RE OUT!
                                    End If
-                            End If
+
+                            End Select
                        Next

                    End If
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -739,20 +739,25 @@ Public Class frmSendungsdetailsNEU
                                InfoText &= "ABFERTIGUNGSVERBOT!" & vbNewLine
                        End Select

-                        If If(kdSearch.KdData_KUNDE.Abfertigungsverbot_Grund, "") <> "" Then InfoText &= kdSearch.KdData_KUNDE.Abfertigungsverbot_Grund & vbNewLine
+                        If If(kdSearch.KdData_KUNDE.Abfertigungsverbot_Grund, "") <> "" Then
+                            InfoText &= kdSearch.KdData_KUNDE.Abfertigungsverbot_Grund & vbNewLine
+                        End If
+                    End If


-                        If If(kdSearch.KdData_KUNDE.Besonderheiten, "") <> "" Then
+                    'BESONDERHEITEN HERVORGEHOBEN 
+                    Dim BH_LIST As New VERAG_PROG_ALLGEMEIN.cKundenBesonderheiten_LIST(kdSearch.KdData_KUNDE.KundenNr, Nothing, "'ZOLL','VERIMEX'")
+
+                    If BH_LIST.LIST IsNot Nothing AndAlso BH_LIST.LIST.Count > 0 Then
                        pic.Visible = True
                        InfoText &= "BESONDERHEITEN:" & vbNewLine
-                            InfoText &= kdSearch.KdData_KUNDE.Besonderheiten
+                        For Each BH In BH_LIST.LIST
+                            InfoText &= "(" & BH.kdb_kategorie & ") " & BH.kdb_text & vbNewLine
+                        Next
                    End If

                End If

-
-                End If
-
                ToolTip.SetToolTip(pic, InfoText.Trim)

            End If
--- a/Aviso/usrcntlAktDetails.Designer.vb
+++ b/Aviso/usrcntlAktDetails.Designer.vb
@@ -1450,13 +1450,13 @@ Partial Class usrcntlAktDetails
        Me.btnFertig.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.btnFertig.FlatStyle = System.Windows.Forms.FlatStyle.Flat
        Me.btnFertig.ForeColor = System.Drawing.Color.Black
-        Me.btnFertig.Image = CType(resources.GetObject("btnFertig.Image"), System.Drawing.Image)
+        Me.btnFertig.Image = Global.AVISO.My.Resources.Resources.vermerk
        Me.btnFertig.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
        Me.btnFertig.Location = New System.Drawing.Point(436, 35)
        Me.btnFertig.Name = "btnFertig"
        Me.btnFertig.Size = New System.Drawing.Size(134, 40)
        Me.btnFertig.TabIndex = 99
-        Me.btnFertig.Text = "LKW fertig"
+        Me.btnFertig.Text = "LKW Vermerk"
        Me.btnFertig.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btnFertig.UseVisualStyleBackColor = True
        '
--- a/Aviso/usrcntlAktDetails.resx
+++ b/Aviso/usrcntlAktDetails.resx
@@ -188,33 +188,6 @@
        ZQTVQGm2pq0ZI+Pya7NfZATl4b/NGPTQ+wN40OPzwhtXNyvULCOkHoJevGwMJ/7TjGHA4dTX684Yzhd7
        sDlu/WDNDmx5yff8UC4MTZYW3IgD2HW0wm0X4LLXJ/Q0Y1AhQRyySLwFbcDwDUJWbE0CgQrjAAAAAElF
        TkSuQmCC
-</value>
-  </data>
-  <data name="btnFertig.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAATKSURBVFhHxZZ/UNN1GMd3XXXXlZl5LO/kD39gWhd2
-        aUaddV3nP5RHWVpGpIX4i040EYb4A2Vk8puNzY1AlK5MMz1IjWWG+ePEgYOmE4bmjy1gMGTgGM6B4Lvn
-        +W6nbLc7R9zN5+7Fnr2f5/k+7332/e4QAXio+BWDiV8xmPgVg4lfMZhwPHpqU9iRM5sn4szmCf+LakK7
-        KfQwX0u44jBj1Nktk9CtyYCtUgobvw4HmrmpSYchbSx/nFHuSw4vQmrSJ8BpOARz5gyYs2fBnBMRGNxL
-        My5DOYxbnsbU7IYfZimbEKFoIC76QFqOdhnte8S99n6IddKJ6K3fB3Pe6zAXzCbeDBDqpRln3R5c3joa
-        05St2Hbcim1VFnzzpwUZxwh6lR5rFXhVftFF+55wr70f4vptk9CrLQMuKYAmJbEjQKiXZpzaUlzJeAZT
-        CltQYXTgNaURSw+aEPuLCXEHTJitbsIg3XFpZCh8s2YF7fQ6BbF++2Q4qosBY6GbxgDx9Dur1bj27RiE
-        yVuw12DHG7SwdwCwuQB7PxB7wIzGjju4ZBvAywXnb9NOr1MQX8iegltni9BRNg8d339IfBQg1EszrrMq
-        mDLHCgZ26+14u/QKLD3AVdtdNN8E4sqbUW7shcUBrNdYMN3nFMQNeVPpGHeg6+cYdO1fRCwOEOqlmT6t
-        Ai25IYKBkr/teO/HazB1A5c7gWtdwKojFhRqu3Gd8vNtg3il4EIf7b13CmJjwQu4rVXCXrEU9l+XDw+a
-        6dfK0Zb/HKaQAWVdDxbs/xdRe82Y+5MJ8/aZhfdJR62CgVY6mRkyAz+yz7rXk4FL8hfRVyuHo3IVHJqE
-        4UEzA7UFsMrHCQZk5+yIqWhBP911VjrytL868eWhVnxBxFS0YvGRdsxUGNmA2L2ekn+UL6G/Nh/OqkRi
-        3TBJxMC5HNxQjkeYrBm5uh4sq7RiCS2K+60NyyvbEa+xYuXvHVh2tBtLTvRj2s52bwNXVeEY0OXDdWrD
-        PfpPezO05stdXS5sqlDBQJbOgTVVN7C6qhNrjtvwtUAnVh/vwoqTd4ADItifEnkbMBdNB/R5GKyV4m5t
-        OnBOCtQT+gw3nJPGtcEaH7hfnw17USgmy1qwvd4FyRkHJNrbSKntc0N5cvUtJGjpx0AqQpevgbZdZKBJ
-        Rs92Fj3XmXSrbsfW1NWY//kKAc5ZE2oNPjQSTTlw7RqPOSojMgzAxhon4lPSEbcoWoBz1lL1QFIjEFra
-        42VgDBGRpdyDXOVu5O8ow5L4tciTqVBTpxfgnDWu5Sp2E7u8yKO5QnUZsjJzsLNIjYSvVkIhl0FXVyfA
-        eUL8SpSoVShWq1H8XTGKSkrZxONsgP9MWpu8EYmSVCSlbMCChZ/hxOlqfBodI8A5a1xbRz2Jyev9Qtd5
-        X5KyHp8sjMbJIfOcsyZJSUWyJEUgSSL084cXgpMZxBwicv78j6H5owqLFscKcM4a1zw9/oggwom3Apzn
-        ffcM8CnwG/5eno+K+uB62pZ0HKw4LMA5a1zz9PiD558kJgQ4z/3CV+Abo4mZkZHvmufOjQLDOWue2oNi
-        pPOix4hxBA+844Fz1rj2oBjpvBDcyG5DPHAe8DDFSOeDGEP/RX4Y+BWDiV8xmPgVg4lfMXhA9B+exBGw
-        pOTzPwAAAABJRU5ErkJggg==
 </value>
  </data>
  <metadata name="conMenuVermerke.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/Aviso/usrcntlAktDetails.vb
+++ b/Aviso/usrcntlAktDetails.vb
@@ -6,6 +6,7 @@ Imports System.IO
 Imports System.Drawing
 Imports Microsoft.Office.Interop

+
 Public Class usrcntlAktDetails

    Dim VermerkeDAL As New cVermerkeDAL
@@ -2558,8 +2559,20 @@ Public Class usrcntlAktDetails
    End Sub

    Private Sub btnFertig_Click_1(sender As Object, e As EventArgs) Handles btnFertig.Click
-        VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.LKWFertig(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
-        frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+        'VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.LKWFertig(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+        'frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID)
+
+        'Select Case AVISO.Status
+        '   ' Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_Vorgeschrieben
+        '    Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben
+
+        'End Select
+
+        Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+        Dim sv As New frmAddAktenvermerkShort(AVISO.AvisoID)
+        sv.Location = Me.PointToClient(Cursor.Position)
+        sv.ShowDialog(frmGrayOut)
+        frmGrayOut.Close()
    End Sub