TIMAS API, API, etc

2023-10-31 17:08:04 +01:00
parent 0e6f88e932
commit 7b5c593bd8
13 changed files with 1766 additions and 96 deletions
--- a/UID/ADMIN.vbproj
+++ b/UID/ADMIN.vbproj
@@ -437,6 +437,12 @@
    <Compile Include="Dienstplan\frmDienstplan.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmAPI.Designer.vb">
+      <DependentUpon>frmAPI.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmAPI.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmERS.Designer.vb">
      <DependentUpon>frmERS.vb</DependentUpon>
    </Compile>
@@ -718,6 +724,9 @@
    <EmbeddedResource Include="Dienstplan\frmDienstplan.resx">
      <DependentUpon>frmDienstplan.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmAPI.resx">
+      <DependentUpon>frmAPI.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmERS.resx">
      <DependentUpon>frmERS.vb</DependentUpon>
    </EmbeddedResource>
--- a/UID/Dienstplan/frmSchichtenZeiten.vb
+++ b/UID/Dienstplan/frmSchichtenZeiten.vb
@@ -204,7 +204,7 @@ Public Class frmSchichtenZeiten
        Dim input = InputBox("Bitte geben Sie die Bezeichnung der neuen Schicht ein:", "Schicht anlegen")
        If input <> "" Then
            If checkNameIsValid(input) Then
-                DP.insertEintraegeDetails(input, niederlassung, True)
+                DP.insertEintraegeDetails(input, niederlassung, True, input)
                initSchichten()
            Else
                MsgBox("Für die Niederlassung" & niederlassung.ToString & " existiert bereits eine Schicht " & input)
--- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
@@ -76,7 +76,6 @@ Partial Class frmMitarbDetails
        Me.Label59 = New System.Windows.Forms.Label()
        Me.TabPage6 = New System.Windows.Forms.TabPage()
        Me.TabControl1 = New System.Windows.Forms.TabControl()
-        Me.PictureBox9 = New System.Windows.Forms.PictureBox()
        Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.rtfInfoTimas = New System.Windows.Forms.RichTextBox()
        Me.btngetInfo = New System.Windows.Forms.Button()
@@ -205,6 +204,7 @@ Partial Class frmMitarbDetails
        Me.cboAdminBer = New System.Windows.Forms.ComboBox()
        Me.Label7 = New System.Windows.Forms.Label()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.btnDelete = New System.Windows.Forms.Button()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.TabControl2.SuspendLayout()
@@ -214,7 +214,6 @@ Partial Class frmMitarbDetails
        Me.TabPage4.SuspendLayout()
        Me.TabPage5.SuspendLayout()
        Me.TabPage6.SuspendLayout()
-        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvData, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.TabPage7.SuspendLayout()
        Me.GroupBox2.SuspendLayout()
@@ -804,8 +803,8 @@ Partial Class frmMitarbDetails
        '
        'TabPage6
        '
+        Me.TabPage6.Controls.Add(Me.btnDelete)
        Me.TabPage6.Controls.Add(Me.TabControl1)
-        Me.TabPage6.Controls.Add(Me.PictureBox9)
        Me.TabPage6.Controls.Add(Me.dgvData)
        Me.TabPage6.Controls.Add(Me.rtfInfoTimas)
        Me.TabPage6.Controls.Add(Me.btngetInfo)
@@ -827,15 +826,6 @@ Partial Class frmMitarbDetails
        Me.TabControl1.Size = New System.Drawing.Size(287, 145)
        Me.TabControl1.TabIndex = 122
        '
-        'PictureBox9
-        '
-        Me.PictureBox9.Location = New System.Drawing.Point(405, 3)
-        Me.PictureBox9.Name = "PictureBox9"
-        Me.PictureBox9.Size = New System.Drawing.Size(34, 27)
-        Me.PictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
-        Me.PictureBox9.TabIndex = 121
-        Me.PictureBox9.TabStop = False
-        '
        'dgvData
        '
        Me.dgvData.AKTUALISIERUNGS_INTERVALL = -1
@@ -2255,6 +2245,19 @@ Partial Class frmMitarbDetails
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
        '
+        'btnDelete
+        '
+        Me.btnDelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.btnDelete.BackColor = System.Drawing.Color.White
+        Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnDelete.Location = New System.Drawing.Point(384, 3)
+        Me.btnDelete.Name = "btnDelete"
+        Me.btnDelete.Size = New System.Drawing.Size(55, 26)
+        Me.btnDelete.TabIndex = 123
+        Me.btnDelete.Text = "löschen"
+        Me.btnDelete.UseVisualStyleBackColor = False
+        Me.btnDelete.Visible = False
+        '
        'frmMitarbDetails
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2284,7 +2287,6 @@ Partial Class frmMitarbDetails
        Me.TabPage5.PerformLayout()
        Me.TabPage6.ResumeLayout(False)
        Me.TabPage6.PerformLayout()
-        CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.dgvData, System.ComponentModel.ISupportInitialize).EndInit()
        Me.TabPage7.ResumeLayout(False)
        Me.GroupBox2.ResumeLayout(False)
@@ -2477,7 +2479,6 @@ Partial Class frmMitarbDetails
    Friend WithEvents btngetInfo As Button
    Friend WithEvents rtfInfoTimas As RichTextBox
    Friend WithEvents dgvData As VERAG_PROG_ALLGEMEIN.MyDatagridview
-    Friend WithEvents PictureBox9 As PictureBox
    Friend WithEvents TabControl1 As TabControl
    Friend WithEvents txtATGRNAccessCode_AT52VA6 As TextBox
    Friend WithEvents Label60 As Label
@@ -2485,4 +2486,5 @@ Partial Class frmMitarbDetails
    Friend WithEvents txtATGRNAccessCode_AT51FP7 As TextBox
    Friend WithEvents TabPage7 As TabPage
    Friend WithEvents lbSprachen As VERAG_PROG_ALLGEMEIN.MyListBox
+    Friend WithEvents btnDelete As Button
 End Class
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -1172,6 +1172,7 @@ Public Class frmMitarbDetails

        If checkMandatoryFields() Then
            timas.createEmployee(mitarbeiter, rtfInfoTimas.Text, dtTimas)
+            If rtfInfoTimas.Visible = False AndAlso rtfInfoTimas.Text <> "" Then MsgBox(rtfInfoTimas.Text)
            tbcntr_TabIndexChanged(sender, e)
        End If

@@ -1194,6 +1195,7 @@ Public Class frmMitarbDetails
        dgvData.Visible = Not cbxTimasAngelegt.Checked
        rtfInfoTimas.Visible = cbxTimasAngelegt.Checked
        btngetInfo.Visible = cbxTimasAngelegt.Checked
+        btnDelete.Visible = cbxTimasAngelegt.Checked

    End Sub

@@ -1283,7 +1285,7 @@ Public Class frmMitarbDetails

    End Sub

-    Private Sub PictureBox9_Click_1(sender As Object, e As EventArgs) Handles PictureBox9.Click
+    Private Sub PictureBox9_Click_1(sender As Object, e As EventArgs)
        Dim webAddress As String = "https://zeit.verag.ag/"
        Process.Start(webAddress)
    End Sub
@@ -1306,6 +1308,22 @@ Public Class frmMitarbDetails

    Private isDataLoaded As Boolean = True

+    Private Sub btnDelete_Click(sender As Object, e As EventArgs) Handles btnDelete.Click
+        If Not cbxTimasAngelegt.Checked Then
+            rtfInfoTimas.Text = "Mitarbeiter nicht im Timas angelegt!"
+            Exit Sub
+        End If

+        If vbYes = MsgBox("Soll die Verknüpfung zu Timas gelöscht werden?", vbYesNoCancel) Then
+            getMitarbeiter()
+            mitarbeiter.mit_PersonalNr = DBNull.Value
+            mitarbeiter.mit_timasId = DBNull.Value
+            If UID.updateMitarbeiter(mitarbeiter) Then
+                MsgBox("Mitarbeitverknüpfung gelöscht!")
+            End If
+
+        End If
+
+    End Sub
 End Class

--- a/UID/Mitarbeiter/frmMitarbTimas.vb
+++ b/UID/Mitarbeiter/frmMitarbTimas.vb
@@ -290,7 +290,9 @@ Public Class frmMitarbTimas

                                For Each r As DataGridViewRow In dgvData.Rows
                                    For Each i As cTimasGruppe In emp.Gruppen
-                                        If r.Cells("id").Value = i.Id Then r.Cells("set").Value = True
+                                        If r.Cells("id").Value = i.Id Then
+                                            r.Cells("set").Value = True
+                                        End If
                                    Next
                                Next
                            End With
@@ -318,6 +320,24 @@ Public Class frmMitarbTimas
            dv.RowFilter = "groupType = '" & tab.Text & "'"
            dgvData.DataSource = dv
            If dgvData.Columns.Count > 0 Then
+                With dgvData
+                    .RowHeadersWidth = 10
+                    .Columns("id").Visible = True
+                    .Columns("name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+                    .Columns("groupType").Visible = False
+                    .Columns("info").Width = 200
+                    .Columns("set").Width = 20
+                    .Columns("set").HeaderText = "X"
+                    .Dock = DockStyle.Fill
+
+                    For Each r As DataGridViewRow In dgvData.Rows
+                        For Each i As cTimasGruppe In emp.Gruppen
+                            If r.Cells("id").Value = i.Id Then
+                                r.Cells("set").Value = True
+                            End If
+                        Next
+                    Next
+                End With
                tab.Controls.Add(Me.dgvData)
            End If

@@ -327,7 +347,7 @@ Public Class frmMitarbTimas

    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click

-        If vbYes = MsgBox("Möchten Sie Daten aus AVISO/SQL übernehmen?", vbYesNo) Then
+        If vbYes = MsgBox("Möchten Sie Daten aus AVISO/SDL übernehmen?", vbYesNo) Then
            If avisoEmp IsNot Nothing AndAlso avisoEmp.mit_username <> "" Then
                txtUsername.Text = avisoEmp.mit_username
                If txtInfo.Text = "" Then
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("1.2.2.2")>
-<Assembly: AssemblyFileVersion("1.2.2.2")>
+<Assembly: AssemblyVersion("1.2.2.4")>
+<Assembly: AssemblyFileVersion("1.2.2.4")>
--- a/UID/cSqlDb.vb
+++ b/UID/cSqlDb.vb
@@ -1647,7 +1647,7 @@ Public Class cMitarbeiter

        Dim sql = "UPDATE tblMitarbeiter " &
                     "SET mit_username=@mit_username, mit_abweichenderAnzeigename=@mit_abweichenderAnzeigename,mit_pwd=@mit_pwd, mit_geschlecht=@mit_geschlecht, mit_affix=@mit_affix, mit_vname=@mit_vname, mit_nname=@mit_nname, mit_gebdat=@mit_gebdat, mit_strasse=@mit_strasse, mit_hausnr=@mit_hausnr, mit_land=@mit_land, mit_plz=@mit_plz, mit_ort=@mit_ort, mit_niederlassung=@mit_niederlassung, mit_abteilung=@mit_abteilung, mit_position=@mit_position, mit_durchwahl=@mit_durchwahl, mit_email=@mit_email, mit_mobiltel=@mit_mobiltel, mit_allowAnruf=@mit_allowAnruf, mit_info=@mit_info, mit_einstiegsdatum=@mit_einstiegsdatum, mit_gekuendigt=@mit_gekuendigt, mit_kuendigungsdatum=@mit_kuendigungsdatum, mit_foto=@mit_foto, mit_firma=@mit_firma,mit_firmaFMZoll=@mit_firmaFMZoll,mit_FMZollPersID=@mit_FMZollPersID, mit_FMZollPersIDKasseIsnotSpedBuch=@mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch=@mit_FMZollPersIDSpedBuch,mit_standartFiliale=@mit_standartFiliale,mit_standardPreisliste=@mit_standardPreisliste,mit_DpUserStandardDP=@mit_DpUserStandardDP, mit_EZOLL_SB=@mit_EZOLL_SB, mit_ATLAS_SB=@mit_ATLAS_SB,mit_FirmenDatenAnzeige=@mit_FirmenDatenAnzeige,mit_DAKOSY_SB=@mit_DAKOSY_SB, mit_DAKOSY_SBFull=@mit_DAKOSY_SBFull ,mit_DpUserStandardFirma=@mit_DpUserStandardFirma,mit_DpUserStandardFirma2=@mit_DpUserStandardFirma2, mit_TESTonly=@mit_TESTonly,mit_PasswortChanged=@mit_PasswortChanged,mit_TELOTEC_SB=@mit_TELOTEC_SB,mit_AliasAD_Domain=@mit_AliasAD_Domain,mit_AliasAD_Username=@mit_AliasAD_Username,mit_AliasAD_Domain2=@mit_AliasAD_Domain2,mit_AliasAD_Username2=@mit_AliasAD_Username2,mit_teamId=@mit_teamId,mit_ChatBenutzer=@mit_ChatBenutzer,mit_FirmaHaupt=@mit_FirmaHaupt " &
-                     " ,mit_ChatEasteregg=@mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp=@mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat=@mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse=@mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr=@mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname=@mit_MAVerzeichnis_Spitzname,mit_foto_DocId=@mit_foto_DocId,mit_MAVerzeichnis_Motto=@mit_MAVerzeichnis_Motto,mit_sprache=@mit_sprache,mit_fakturierungsgruppe=@mit_fakturierungsgruppe, mit_CSuser=@mit_CSuser, mit_CSpwd=@mit_CSpwd, mit_PersonalNr = @mit_PersonalNr, mit_telefonnr = @mit_telefonnr, mit_ATGRNAccessCode_AT51FP7 =@mit_ATGRNAccessCode_AT51FP7 ,mit_ATGRNAccessCode_AT52VA6=@mit_ATGRNAccessCode_AT52VA6, mit_Sprachkentnisse=@mit_Sprachkentnisse" &
+                     " ,mit_ChatEasteregg=@mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp=@mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat=@mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse=@mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr=@mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname=@mit_MAVerzeichnis_Spitzname,mit_foto_DocId=@mit_foto_DocId,mit_MAVerzeichnis_Motto=@mit_MAVerzeichnis_Motto,mit_sprache=@mit_sprache,mit_fakturierungsgruppe=@mit_fakturierungsgruppe, mit_CSuser=@mit_CSuser, mit_CSpwd=@mit_CSpwd, mit_PersonalNr = @mit_PersonalNr, mit_timasId = @mit_timasId, mit_telefonnr = @mit_telefonnr, mit_ATGRNAccessCode_AT51FP7 =@mit_ATGRNAccessCode_AT51FP7 ,mit_ATGRNAccessCode_AT52VA6=@mit_ATGRNAccessCode_AT52VA6, mit_Sprachkentnisse=@mit_Sprachkentnisse" &
                     " WHERE mit_id=@mit_id "


@@ -1722,6 +1722,7 @@ Public Class cMitarbeiter
                cmd.Parameters.AddWithValue("@mit_CSuser", If(m.mit_CSuser, DBNull.Value))
                cmd.Parameters.AddWithValue("@mit_CSpwd", If(m.mit_CSpwd, DBNull.Value))
                cmd.Parameters.AddWithValue("@mit_PersonalNr", If(m.mit_PersonalNr, DBNull.Value))
+                cmd.Parameters.AddWithValue("@mit_timasId", If(m.mit_timasId, DBNull.Value))
                cmd.Parameters.AddWithValue("@mit_telefonnr", If(m.mit_telefonnr, DBNull.Value))
                cmd.Parameters.AddWithValue("@mit_ATGRNAccessCode_AT51FP7 ", If(m.mit_ATGRNAccessCode_AT51FP7, DBNull.Value))
                cmd.Parameters.AddWithValue("@mit_ATGRNAccessCode_AT52VA6 ", If(m.mit_ATGRNAccessCode_AT52VA6, DBNull.Value))
@@ -3020,11 +3021,11 @@ Public Class cDienstplan
        Return False
    End Function

-    Public Function insertEintraegeDetails(dedet_info, dedet_niederlassung, dedet_aktiv) As Boolean
+    Public Function insertEintraegeDetails(dedet_info, dedet_niederlassung, dedet_aktiv, dedet_abt) As Boolean

        Dim sql As String = "INSERT INTO [tblDienstplanEintraegeDetails] " &
-                               "(dedet_info, dedet_niederlassung, dedet_aktiv ) VALUES " &
-                               "(@dedet_info, @dedet_niederlassung, @dedet_aktiv) "
+                               "(dedet_info, dedet_niederlassung, dedet_aktiv, dedet_abt ) VALUES " &
+                               "(@dedet_info, @dedet_niederlassung, @dedet_aktiv, @dedet_abt) "


        Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
@@ -3033,6 +3034,7 @@ Public Class cDienstplan
                cmd.Parameters.AddWithValue("@dedet_info", dedet_info)
                cmd.Parameters.AddWithValue("@dedet_niederlassung", dedet_niederlassung)
                cmd.Parameters.AddWithValue("@dedet_aktiv", dedet_aktiv)
+                cmd.Parameters.AddWithValue("@dedet_abt", dedet_abt)

                Try
                    cmd.ExecuteNonQuery()
--- a/UID/frmAPI.Designer.vb
+++ b/UID/frmAPI.Designer.vb
@@ -0,0 +1,248 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class frmAPI
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmERS))
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.rtferrStack = New System.Windows.Forms.RichTextBox()
+        Me.txtDatetime = New System.Windows.Forms.TextBox()
+        Me.lblDat = New System.Windows.Forms.Label()
+        Me.txtMethode = New System.Windows.Forms.TextBox()
+        Me.lblProgramm = New System.Windows.Forms.Label()
+        Me.lblErrMsg = New System.Windows.Forms.Label()
+        Me.rtferrMsg = New System.Windows.Forms.RichTextBox()
+        Me.txtUser = New System.Windows.Forms.TextBox()
+        Me.lblUser = New System.Windows.Forms.Label()
+        Me.lblMethode = New System.Windows.Forms.Label()
+        Me.txtType = New System.Windows.Forms.TextBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.cbxTestsysten = New System.Windows.Forms.CheckBox()
+        Me.lblFirma = New System.Windows.Forms.Label()
+        Me.txtMail = New System.Windows.Forms.TextBox()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.SuspendLayout()
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(9, 462)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(63, 13)
+        Me.Label4.TabIndex = 114
+        Me.Label4.Text = "Error Stack:"
+        '
+        'rtferrStack
+        '
+        Me.rtferrStack.Location = New System.Drawing.Point(12, 478)
+        Me.rtferrStack.Name = "rtferrStack"
+        Me.rtferrStack.Size = New System.Drawing.Size(358, 305)
+        Me.rtferrStack.TabIndex = 113
+        Me.rtferrStack.Text = ""
+        '
+        'txtDatetime
+        '
+        Me.txtDatetime.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtDatetime.Location = New System.Drawing.Point(12, 82)
+        Me.txtDatetime.Name = "txtDatetime"
+        Me.txtDatetime.Size = New System.Drawing.Size(143, 20)
+        Me.txtDatetime.TabIndex = 117
+        '
+        'lblDat
+        '
+        Me.lblDat.AutoSize = True
+        Me.lblDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblDat.Location = New System.Drawing.Point(9, 66)
+        Me.lblDat.Name = "lblDat"
+        Me.lblDat.Size = New System.Drawing.Size(79, 13)
+        Me.lblDat.TabIndex = 118
+        Me.lblDat.Text = "Datum/Uhrzeit:"
+        '
+        'txtMethode
+        '
+        Me.txtMethode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtMethode.Location = New System.Drawing.Point(12, 169)
+        Me.txtMethode.Multiline = True
+        Me.txtMethode.Name = "txtMethode"
+        Me.txtMethode.Size = New System.Drawing.Size(361, 38)
+        Me.txtMethode.TabIndex = 115
+        '
+        'lblProgramm
+        '
+        Me.lblProgramm.AutoSize = True
+        Me.lblProgramm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblProgramm.Location = New System.Drawing.Point(9, 17)
+        Me.lblProgramm.Name = "lblProgramm"
+        Me.lblProgramm.Size = New System.Drawing.Size(62, 13)
+        Me.lblProgramm.TabIndex = 116
+        Me.lblProgramm.Text = "Programm"
+        '
+        'lblErrMsg
+        '
+        Me.lblErrMsg.AutoSize = True
+        Me.lblErrMsg.Location = New System.Drawing.Point(12, 210)
+        Me.lblErrMsg.Name = "lblErrMsg"
+        Me.lblErrMsg.Size = New System.Drawing.Size(78, 13)
+        Me.lblErrMsg.TabIndex = 120
+        Me.lblErrMsg.Text = "Error Message:"
+        '
+        'rtferrMsg
+        '
+        Me.rtferrMsg.Location = New System.Drawing.Point(12, 226)
+        Me.rtferrMsg.Name = "rtferrMsg"
+        Me.rtferrMsg.Size = New System.Drawing.Size(361, 209)
+        Me.rtferrMsg.TabIndex = 119
+        Me.rtferrMsg.Text = ""
+        '
+        'txtUser
+        '
+        Me.txtUser.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtUser.Location = New System.Drawing.Point(12, 121)
+        Me.txtUser.Name = "txtUser"
+        Me.txtUser.Size = New System.Drawing.Size(143, 20)
+        Me.txtUser.TabIndex = 123
+        '
+        'lblUser
+        '
+        Me.lblUser.AutoSize = True
+        Me.lblUser.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblUser.Location = New System.Drawing.Point(9, 105)
+        Me.lblUser.Name = "lblUser"
+        Me.lblUser.Size = New System.Drawing.Size(32, 13)
+        Me.lblUser.TabIndex = 124
+        Me.lblUser.Text = "User:"
+        '
+        'lblMethode
+        '
+        Me.lblMethode.AutoSize = True
+        Me.lblMethode.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblMethode.Location = New System.Drawing.Point(12, 153)
+        Me.lblMethode.Name = "lblMethode"
+        Me.lblMethode.Size = New System.Drawing.Size(49, 13)
+        Me.lblMethode.TabIndex = 125
+        Me.lblMethode.Text = "Methode"
+        '
+        'txtType
+        '
+        Me.txtType.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtType.Location = New System.Drawing.Point(188, 82)
+        Me.txtType.Name = "txtType"
+        Me.txtType.Size = New System.Drawing.Size(108, 20)
+        Me.txtType.TabIndex = 126
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label2.Location = New System.Drawing.Point(185, 66)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(28, 13)
+        Me.Label2.TabIndex = 127
+        Me.Label2.Text = "Typ:"
+        '
+        'cbxTestsysten
+        '
+        Me.cbxTestsysten.AutoSize = True
+        Me.cbxTestsysten.Location = New System.Drawing.Point(309, 12)
+        Me.cbxTestsysten.Name = "cbxTestsysten"
+        Me.cbxTestsysten.Size = New System.Drawing.Size(79, 17)
+        Me.cbxTestsysten.TabIndex = 128
+        Me.cbxTestsysten.Text = "Testsystem"
+        Me.cbxTestsysten.UseVisualStyleBackColor = True
+        '
+        'lblFirma
+        '
+        Me.lblFirma.AutoSize = True
+        Me.lblFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblFirma.Location = New System.Drawing.Point(9, 41)
+        Me.lblFirma.Name = "lblFirma"
+        Me.lblFirma.Size = New System.Drawing.Size(37, 13)
+        Me.lblFirma.TabIndex = 129
+        Me.lblFirma.Text = "Firma"
+        '
+        'txtMail
+        '
+        Me.txtMail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtMail.Location = New System.Drawing.Point(188, 121)
+        Me.txtMail.Name = "txtMail"
+        Me.txtMail.Size = New System.Drawing.Size(185, 20)
+        Me.txtMail.TabIndex = 130
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label1.Location = New System.Drawing.Point(185, 105)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(36, 13)
+        Me.Label1.TabIndex = 131
+        Me.Label1.Text = "EMail:"
+        '
+        'frmERS
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(391, 841)
+        Me.Controls.Add(Me.txtMail)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.lblFirma)
+        Me.Controls.Add(Me.cbxTestsysten)
+        Me.Controls.Add(Me.txtType)
+        Me.Controls.Add(Me.Label2)
+        Me.Controls.Add(Me.lblMethode)
+        Me.Controls.Add(Me.txtUser)
+        Me.Controls.Add(Me.lblUser)
+        Me.Controls.Add(Me.lblErrMsg)
+        Me.Controls.Add(Me.rtferrMsg)
+        Me.Controls.Add(Me.Label4)
+        Me.Controls.Add(Me.rtferrStack)
+        Me.Controls.Add(Me.txtDatetime)
+        Me.Controls.Add(Me.lblDat)
+        Me.Controls.Add(Me.txtMethode)
+        Me.Controls.Add(Me.lblProgramm)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "frmERS"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Error"
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents Label4 As Label
+    Friend WithEvents rtferrStack As RichTextBox
+    Friend WithEvents txtDatetime As TextBox
+    Friend WithEvents lblDat As Label
+    Friend WithEvents txtMethode As TextBox
+    Friend WithEvents lblProgramm As Label
+    Friend WithEvents lblErrMsg As Label
+    Friend WithEvents rtferrMsg As RichTextBox
+    Friend WithEvents txtUser As TextBox
+    Friend WithEvents lblUser As Label
+    Friend WithEvents lblMethode As Label
+    Friend WithEvents txtType As TextBox
+    Friend WithEvents Label2 As Label
+    Friend WithEvents cbxTestsysten As CheckBox
+    Friend WithEvents lblFirma As Label
+    Friend WithEvents txtMail As TextBox
+    Friend WithEvents Label1 As Label
+End Class
--- a/UID/frmAPI.resx
+++ b/UID/frmAPI.resx
--- a/UID/frmAPI.vb
+++ b/UID/frmAPI.vb
@@ -0,0 +1,41 @@
+Public Class frmAPI
+
+    Public id, progId, progName, maid, datetime, testsystem, type, mail, userName, firma, errorCode, errStack, errMessage, errMethodName, progVersion
+
+
+
+    Sub New()
+
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+
+        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+    End Sub
+
+
+    Private Sub frmAPI_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+        lblProgramm.Text = progId & " - " & progName & IIf(progVersion <> "", " (" & progVersion & ")", "")
+        lblFirma.Text = IIf(firma IsNot DBNull.Value, firma, "")
+        txtUser.Text = IIf(maid IsNot DBNull.Value, maid & ": ", "") & IIf(userName IsNot DBNull.Value, userName, "")
+        txtType.Text = IIf(type IsNot DBNull.Value, type, "")
+        txtMethode.Text = IIf(errMethodName IsNot DBNull.Value, errMethodName, "")
+        txtDatetime.Text = IIf(datetime IsNot DBNull.Value, datetime, "")
+        txtMail.Text = IIf(mail IsNot DBNull.Value, mail, "")
+
+        rtferrMsg.Text = IIf(errMessage IsNot DBNull.Value, errMessage, "")
+        rtferrStack.Text = IIf(errStack IsNot DBNull.Value, errStack, "")
+
+        If errorCode > 0 Then
+            lblErrMsg.Text &= " (Error Code: " & errorCode & ")"
+        End If
+
+        If testsystem IsNot Nothing Then
+            cbxTestsysten.Checked = testsystem
+        End If
+
+
+    End Sub
+
+
+End Class
--- a/UID/usrCntlAPI.Designer.vb
+++ b/UID/usrCntlAPI.Designer.vb
@@ -26,6 +26,7 @@ Partial Class usrCntlAPI
        Me.SplitContainer = New System.Windows.Forms.SplitContainer()
        Me.pnlSearch = New System.Windows.Forms.Panel()
        Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
+        Me.cboPartnersystem = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.Label11 = New System.Windows.Forms.Label()
        Me.txtZollBelegNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -33,7 +34,6 @@ Partial Class usrCntlAPI
        Me.txtBezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label9 = New System.Windows.Forms.Label()
        Me.kdtxtKunde = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
-        Me.txtAPIUArt = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label8 = New System.Windows.Forms.Label()
        Me.cboAPIArt = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label7 = New System.Windows.Forms.Label()
@@ -63,7 +63,9 @@ Partial Class usrCntlAPI
        Me.DateTimePicker2 = New System.Windows.Forms.DateTimePicker()
        Me.Label27 = New System.Windows.Forms.Label()
        Me.Label13 = New System.Windows.Forms.Label()
+        Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label12 = New System.Windows.Forms.Label()
        Me.Label1 = New System.Windows.Forms.Label()
        Me.Label2 = New System.Windows.Forms.Label()
        Me.txtAbfertigungsnummerBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -80,6 +82,8 @@ Partial Class usrCntlAPI
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.Button10 = New System.Windows.Forms.Button()
        Me.Button11 = New System.Windows.Forms.Button()
+        Me.cboProgram = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label14 = New System.Windows.Forms.Label()
        CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainer.Panel1.SuspendLayout()
        Me.SplitContainer.Panel2.SuspendLayout()
@@ -135,6 +139,9 @@ Partial Class usrCntlAPI
        '
        'SplitContainer1.Panel1
        '
+        Me.SplitContainer1.Panel1.Controls.Add(Me.cboProgram)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.Label14)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.cboPartnersystem)
        Me.SplitContainer1.Panel1.Controls.Add(Me.Button1)
        Me.SplitContainer1.Panel1.Controls.Add(Me.Label11)
        Me.SplitContainer1.Panel1.Controls.Add(Me.txtZollBelegNr)
@@ -142,7 +149,6 @@ Partial Class usrCntlAPI
        Me.SplitContainer1.Panel1.Controls.Add(Me.txtBezugsNr)
        Me.SplitContainer1.Panel1.Controls.Add(Me.Label9)
        Me.SplitContainer1.Panel1.Controls.Add(Me.kdtxtKunde)
-        Me.SplitContainer1.Panel1.Controls.Add(Me.txtAPIUArt)
        Me.SplitContainer1.Panel1.Controls.Add(Me.Label8)
        Me.SplitContainer1.Panel1.Controls.Add(Me.cboAPIArt)
        Me.SplitContainer1.Panel1.Controls.Add(Me.Label7)
@@ -172,7 +178,9 @@ Partial Class usrCntlAPI
        Me.SplitContainer1.Panel1.Controls.Add(Me.DateTimePicker2)
        Me.SplitContainer1.Panel1.Controls.Add(Me.Label27)
        Me.SplitContainer1.Panel1.Controls.Add(Me.Label13)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.cboFirma)
        Me.SplitContainer1.Panel1.Controls.Add(Me.cboFiliale)
+        Me.SplitContainer1.Panel1.Controls.Add(Me.Label12)
        Me.SplitContainer1.Panel1.Controls.Add(Me.Label1)
        Me.SplitContainer1.Panel1.Controls.Add(Me.Label2)
        Me.SplitContainer1.Panel1.Controls.Add(Me.txtAbfertigungsnummerBis)
@@ -184,6 +192,19 @@ Partial Class usrCntlAPI
        Me.SplitContainer1.SplitterDistance = 125
        Me.SplitContainer1.TabIndex = 0
        '
+        'cboPartnersystem
+        '
+        Me.cboPartnersystem._allowedValuesFreiText = Nothing
+        Me.cboPartnersystem._allowFreiText = False
+        Me.cboPartnersystem._value = ""
+        Me.cboPartnersystem.DropDownWidth = 250
+        Me.cboPartnersystem.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboPartnersystem.FormattingEnabled = True
+        Me.cboPartnersystem.Location = New System.Drawing.Point(324, 31)
+        Me.cboPartnersystem.Name = "cboPartnersystem"
+        Me.cboPartnersystem.Size = New System.Drawing.Size(73, 22)
+        Me.cboPartnersystem.TabIndex = 54
+        '
        'Button1
        '
        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -299,39 +320,15 @@ Partial Class usrCntlAPI
        Me.kdtxtKunde.TIMER_SEARCH = True
        Me.kdtxtKunde.usrcntl = Nothing
        '
-        'txtAPIUArt
-        '
-        Me.txtAPIUArt._DateTimeOnly = False
-        Me.txtAPIUArt._numbersOnly = False
-        Me.txtAPIUArt._numbersOnlyKommastellen = ""
-        Me.txtAPIUArt._numbersOnlyTrennzeichen = True
-        Me.txtAPIUArt._Prozent = False
-        Me.txtAPIUArt._ShortDateNew = False
-        Me.txtAPIUArt._ShortDateOnly = False
-        Me.txtAPIUArt._TimeOnly = False
-        Me.txtAPIUArt._TimeOnly_Seconds = False
-        Me.txtAPIUArt._value = Nothing
-        Me.txtAPIUArt._Waehrung = False
-        Me.txtAPIUArt._WaehrungZeichen = True
-        Me.txtAPIUArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtAPIUArt.ForeColor = System.Drawing.Color.Black
-        Me.txtAPIUArt.Location = New System.Drawing.Point(720, 30)
-        Me.txtAPIUArt.MaxLineLength = -1
-        Me.txtAPIUArt.MaxLines_Warning = ""
-        Me.txtAPIUArt.MaxLines_Warning_Label = Nothing
-        Me.txtAPIUArt.Name = "txtAPIUArt"
-        Me.txtAPIUArt.Size = New System.Drawing.Size(99, 20)
-        Me.txtAPIUArt.TabIndex = 46
-        '
        'Label8
        '
        Me.Label8.AutoSize = True
        Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label8.Location = New System.Drawing.Point(717, 14)
+        Me.Label8.Location = New System.Drawing.Point(321, 16)
        Me.Label8.Name = "Label8"
-        Me.Label8.Size = New System.Drawing.Size(62, 13)
+        Me.Label8.Size = New System.Drawing.Size(90, 13)
        Me.Label8.TabIndex = 45
-        Me.Label8.Text = "Unter-Art:"
+        Me.Label8.Text = "Partnersystem:"
        '
        'cboAPIArt
        '
@@ -341,16 +338,16 @@ Partial Class usrCntlAPI
        Me.cboAPIArt.DropDownWidth = 250
        Me.cboAPIArt.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboAPIArt.FormattingEnabled = True
-        Me.cboAPIArt.Location = New System.Drawing.Point(542, 30)
+        Me.cboAPIArt.Location = New System.Drawing.Point(714, 34)
        Me.cboAPIArt.Name = "cboAPIArt"
-        Me.cboAPIArt.Size = New System.Drawing.Size(172, 22)
+        Me.cboAPIArt.Size = New System.Drawing.Size(78, 22)
        Me.cboAPIArt.TabIndex = 44
        '
        'Label7
        '
        Me.Label7.AutoSize = True
        Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label7.Location = New System.Drawing.Point(539, 12)
+        Me.Label7.Location = New System.Drawing.Point(711, 16)
        Me.Label7.Name = "Label7"
        Me.Label7.Size = New System.Drawing.Size(47, 13)
        Me.Label7.TabIndex = 43
@@ -364,16 +361,16 @@ Partial Class usrCntlAPI
        Me.cboType.DropDownWidth = 250
        Me.cboType.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboType.FormattingEnabled = True
-        Me.cboType.Location = New System.Drawing.Point(419, 30)
+        Me.cboType.Location = New System.Drawing.Point(639, 34)
        Me.cboType.Name = "cboType"
-        Me.cboType.Size = New System.Drawing.Size(105, 22)
+        Me.cboType.Size = New System.Drawing.Size(69, 22)
        Me.cboType.TabIndex = 42
        '
        'Label6
        '
        Me.Label6.AutoSize = True
        Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label6.Location = New System.Drawing.Point(416, 12)
+        Me.Label6.Location = New System.Drawing.Point(636, 16)
        Me.Label6.Name = "Label6"
        Me.Label6.Size = New System.Drawing.Size(35, 13)
        Me.Label6.TabIndex = 41
@@ -387,16 +384,16 @@ Partial Class usrCntlAPI
        Me.cboInOut.DropDownWidth = 250
        Me.cboInOut.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboInOut.FormattingEnabled = True
-        Me.cboInOut.Location = New System.Drawing.Point(333, 30)
+        Me.cboInOut.Location = New System.Drawing.Point(557, 34)
        Me.cboInOut.Name = "cboInOut"
-        Me.cboInOut.Size = New System.Drawing.Size(80, 22)
+        Me.cboInOut.Size = New System.Drawing.Size(74, 22)
        Me.cboInOut.TabIndex = 40
        '
        'Label5
        '
        Me.Label5.AutoSize = True
        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label5.Location = New System.Drawing.Point(330, 12)
+        Me.Label5.Location = New System.Drawing.Point(554, 16)
        Me.Label5.Name = "Label5"
        Me.Label5.Size = New System.Drawing.Size(52, 13)
        Me.Label5.TabIndex = 39
@@ -406,7 +403,7 @@ Partial Class usrCntlAPI
        '
        Me.Label3.AutoSize = True
        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label3.Location = New System.Drawing.Point(330, 73)
+        Me.Label3.Location = New System.Drawing.Point(334, 100)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(80, 13)
        Me.Label3.TabIndex = 38
@@ -415,7 +412,7 @@ Partial Class usrCntlAPI
        'Label34
        '
        Me.Label34.AutoSize = True
-        Me.Label34.Location = New System.Drawing.Point(330, 122)
+        Me.Label34.Location = New System.Drawing.Point(334, 149)
        Me.Label34.Name = "Label34"
        Me.Label34.Size = New System.Drawing.Size(67, 13)
        Me.Label34.TabIndex = 37
@@ -424,7 +421,7 @@ Partial Class usrCntlAPI
        'Label35
        '
        Me.Label35.AutoSize = True
-        Me.Label35.Location = New System.Drawing.Point(330, 96)
+        Me.Label35.Location = New System.Drawing.Point(334, 123)
        Me.Label35.Name = "Label35"
        Me.Label35.Size = New System.Drawing.Size(45, 13)
        Me.Label35.TabIndex = 34
@@ -446,7 +443,7 @@ Partial Class usrCntlAPI
        Me.txtSendungsId._WaehrungZeichen = True
        Me.txtSendungsId.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtSendungsId.ForeColor = System.Drawing.Color.Black
-        Me.txtSendungsId.Location = New System.Drawing.Point(399, 119)
+        Me.txtSendungsId.Location = New System.Drawing.Point(403, 146)
        Me.txtSendungsId.MaxLineLength = -1
        Me.txtSendungsId.MaxLines_Warning = ""
        Me.txtSendungsId.MaxLines_Warning_Label = Nothing
@@ -470,7 +467,7 @@ Partial Class usrCntlAPI
        Me.txtAvisoId._WaehrungZeichen = True
        Me.txtAvisoId.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtAvisoId.ForeColor = System.Drawing.Color.Black
-        Me.txtAvisoId.Location = New System.Drawing.Point(399, 93)
+        Me.txtAvisoId.Location = New System.Drawing.Point(403, 120)
        Me.txtAvisoId.MaxLineLength = -1
        Me.txtAvisoId.MaxLines_Warning = ""
        Me.txtAvisoId.MaxLines_Warning_Label = Nothing
@@ -684,7 +681,7 @@ Partial Class usrCntlAPI
        'Label26
        '
        Me.Label26.AutoSize = True
-        Me.Label26.Location = New System.Drawing.Point(649, 122)
+        Me.Label26.Location = New System.Drawing.Point(554, 149)
        Me.Label26.Name = "Label26"
        Me.Label26.Size = New System.Drawing.Size(23, 13)
        Me.Label26.TabIndex = 30
@@ -704,7 +701,7 @@ Partial Class usrCntlAPI
        'Label27
        '
        Me.Label27.AutoSize = True
-        Me.Label27.Location = New System.Drawing.Point(649, 96)
+        Me.Label27.Location = New System.Drawing.Point(554, 123)
        Me.Label27.Name = "Label27"
        Me.Label27.Size = New System.Drawing.Size(28, 13)
        Me.Label27.TabIndex = 21
@@ -719,6 +716,19 @@ Partial Class usrCntlAPI
        Me.Label13.TabIndex = 13
        Me.Label13.Text = "von:"
        '
+        'cboFirma
+        '
+        Me.cboFirma._allowedValuesFreiText = Nothing
+        Me.cboFirma._allowFreiText = False
+        Me.cboFirma._value = ""
+        Me.cboFirma.DropDownWidth = 250
+        Me.cboFirma.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboFirma.FormattingEnabled = True
+        Me.cboFirma.Location = New System.Drawing.Point(414, 74)
+        Me.cboFirma.Name = "cboFirma"
+        Me.cboFirma.Size = New System.Drawing.Size(104, 22)
+        Me.cboFirma.TabIndex = 20
+        '
        'cboFiliale
        '
        Me.cboFiliale._allowedValuesFreiText = Nothing
@@ -727,16 +737,26 @@ Partial Class usrCntlAPI
        Me.cboFiliale.DropDownWidth = 250
        Me.cboFiliale.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboFiliale.FormattingEnabled = True
-        Me.cboFiliale.Location = New System.Drawing.Point(542, 91)
+        Me.cboFiliale.Location = New System.Drawing.Point(414, 34)
        Me.cboFiliale.Name = "cboFiliale"
        Me.cboFiliale.Size = New System.Drawing.Size(104, 22)
        Me.cboFiliale.TabIndex = 20
        '
+        'Label12
+        '
+        Me.Label12.AutoSize = True
+        Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label12.Location = New System.Drawing.Point(411, 56)
+        Me.Label12.Name = "Label12"
+        Me.Label12.Size = New System.Drawing.Size(37, 13)
+        Me.Label12.TabIndex = 6
+        Me.Label12.Text = "Firma"
+        '
        'Label1
        '
        Me.Label1.AutoSize = True
        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label1.Location = New System.Drawing.Point(539, 73)
+        Me.Label1.Location = New System.Drawing.Point(411, 16)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(40, 13)
        Me.Label1.TabIndex = 6
@@ -746,7 +766,7 @@ Partial Class usrCntlAPI
        '
        Me.Label2.AutoSize = True
        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label2.Location = New System.Drawing.Point(649, 73)
+        Me.Label2.Location = New System.Drawing.Point(554, 100)
        Me.Label2.Name = "Label2"
        Me.Label2.Size = New System.Drawing.Size(121, 13)
        Me.Label2.TabIndex = 7
@@ -769,7 +789,7 @@ Partial Class usrCntlAPI
        Me.txtAbfertigungsnummerBis.Enabled = False
        Me.txtAbfertigungsnummerBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtAbfertigungsnummerBis.ForeColor = System.Drawing.Color.Black
-        Me.txtAbfertigungsnummerBis.Location = New System.Drawing.Point(683, 119)
+        Me.txtAbfertigungsnummerBis.Location = New System.Drawing.Point(588, 146)
        Me.txtAbfertigungsnummerBis.MaxLineLength = -1
        Me.txtAbfertigungsnummerBis.MaxLines_Warning = ""
        Me.txtAbfertigungsnummerBis.MaxLines_Warning_Label = Nothing
@@ -793,7 +813,7 @@ Partial Class usrCntlAPI
        Me.txtAbfertigungsnummer._WaehrungZeichen = True
        Me.txtAbfertigungsnummer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtAbfertigungsnummer.ForeColor = System.Drawing.Color.Black
-        Me.txtAbfertigungsnummer.Location = New System.Drawing.Point(683, 93)
+        Me.txtAbfertigungsnummer.Location = New System.Drawing.Point(588, 120)
        Me.txtAbfertigungsnummer.MaxLineLength = -1
        Me.txtAbfertigungsnummer.MaxLines_Warning = ""
        Me.txtAbfertigungsnummer.MaxLines_Warning_Label = Nothing
@@ -822,6 +842,7 @@ Partial Class usrCntlAPI
        Me.cboDatum.DropDownWidth = 250
        Me.cboDatum.FlatStyle = System.Windows.Forms.FlatStyle.Popup
        Me.cboDatum.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboDatum.ForeColor = System.Drawing.Color.Red
        Me.cboDatum.FormattingEnabled = True
        Me.cboDatum.Items.AddRange(New Object() {"Rechnungsdatum", "Abfertigungsdatum"})
        Me.cboDatum.Location = New System.Drawing.Point(17, 9)
@@ -957,6 +978,29 @@ Partial Class usrCntlAPI
        Me.Button11.TabIndex = 4
        Me.Button11.UseVisualStyleBackColor = True
        '
+        'cboProgram
+        '
+        Me.cboProgram._allowedValuesFreiText = Nothing
+        Me.cboProgram._allowFreiText = False
+        Me.cboProgram._value = ""
+        Me.cboProgram.DropDownWidth = 250
+        Me.cboProgram.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboProgram.FormattingEnabled = True
+        Me.cboProgram.Location = New System.Drawing.Point(324, 72)
+        Me.cboProgram.Name = "cboProgram"
+        Me.cboProgram.Size = New System.Drawing.Size(73, 22)
+        Me.cboProgram.TabIndex = 56
+        '
+        'Label14
+        '
+        Me.Label14.AutoSize = True
+        Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label14.Location = New System.Drawing.Point(321, 54)
+        Me.Label14.Name = "Label14"
+        Me.Label14.Size = New System.Drawing.Size(62, 13)
+        Me.Label14.TabIndex = 55
+        Me.Label14.Text = "Programm"
+        '
        'usrCntlAPI
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1023,7 +1067,6 @@ Partial Class usrCntlAPI
    Friend WithEvents Button10 As Button
    Friend WithEvents Button11 As Button
    Friend WithEvents Label3 As Label
-    Friend WithEvents txtAPIUArt As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents Label8 As Label
    Friend WithEvents cboAPIArt As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Label7 As Label
@@ -1039,4 +1082,9 @@ Partial Class usrCntlAPI
    Friend WithEvents Label10 As Label
    Friend WithEvents txtBezugsNr As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents Button1 As Button
+    Friend WithEvents cboPartnersystem As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents cboFirma As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label12 As Label
+    Friend WithEvents cboProgram As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label14 As Label
 End Class
--- a/UID/usrCntlAPI.vb
+++ b/UID/usrCntlAPI.vb
@@ -1,4 +1,5 @@
 Imports System.ComponentModel
+Imports System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel
 Imports GrapeCity
 Imports VERAG_PROG_ALLGEMEIN

@@ -27,24 +28,13 @@ Public Class usrCntlAPI
        cboDatum.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("API-Datum", "ADat"))
        cboDatum.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Durchführungsdatum", "DDat"))
        cboDatum.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Error-Datum", "EDat"))
-        cboDatum.changeItem("EDat")
+        cboDatum.changeItem("ADat")

        cboInOut.Items.Clear()
        cboInOut.fillWithSQL("SELECT distinct([api_InOut]) FROM [tblAPI] ", False, "ADMIN", True)
-        'cboInOut.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
-        'cboInOut.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IN", VERAG_PROG_ALLGEMEIN.cAPI_INOUT.IN))
-        'cboInOut.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("OUT", VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT))
-        'cboInOut.changeItem("")
-

        cboType.Items.Clear()
        cboType.fillWithSQL("SELECT distinct(api_Type) FROM [tblAPI] ", False, "ADMIN", True)
-        'cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
-        'cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FTP", VERAG_PROG_ALLGEMEIN.cAPI_Type.FTP))
-        'cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MAIL", VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL))
-        'cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("REST", VERAG_PROG_ALLGEMEIN.cAPI_Type.REST))
-        'cboType.changeItem("")
-

        cboAPIArt.Items.Clear()
        cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
@@ -55,6 +45,16 @@ Public Class usrCntlAPI
        cboAPIArt.changeItem("")


+        cboPartnersystem.Items.Clear()
+        cboPartnersystem.fillWithSQL("SELECT distinct(api_Partnersystem) from [tblAPI]   where api_Partnersystem is not null ", False, "ADMIN", True)
+
+        cboFirma.Items.Clear()
+        cboFirma.fillWithSQL("SELECT distinct([api_Firma]) FROM [tblAPI] where api_Firma is not null ", False, "ADMIN", True)
+
+        cboProgram.Items.Clear()
+        cboProgram.fillWithSQL("SELECT distinct([api_progName]) FROM [tblAPI] where api_progName is not null ", False, "ADMIN", True)
+
+

    End Sub

@@ -132,8 +132,8 @@ Public Class usrCntlAPI

        Dim sqlstr As String = ""
        Dim TopMax = If(IsNumeric(txtMaxSrch.Text), " TOP " & txtMaxSrch.Text, "")
-        sqlstr &= "SELECT " & TopMax & " api_id,[api_datetime],[api_progName],[api_Type],[api_Partnersystem], api_apiArt,api_apiUArt,[api_apiZollStatus],[api_InOut],[api_status],[api_fehlversuch],[api_progVersion],[api_EMail],[api_filepathSource],[api_filepathDestination],[api_Firma],[api_Username],[api_Vorsystem],[api_KundenNr],[api_AvisoId],[api_SendungsId],[api_FilialenNr],[api_AbfertigungsNr],[api_BezugsNr],[api_Zollbelegnummer],[api_finTstmp] 
-                  FROM [tblAPI] WHERE 1=1 "
+        sqlstr &= "SELECT " & TopMax & "*  FROM [tblAPI] WHERE 1=1 "
+        '" api_id,[api_datetime],[api_progName],[api_Type],[api_Partnersystem],[api_Testsystem], api_apiArt,api_apiUArt,[api_apiZollStatus],[api_InOut],[api_status],[api_fehlversuch],[api_progVersion],[api_EMail],[api_filepathSource],[api_filepathDestination],[api_Firma],[api_Username],[api_Vorsystem],[api_KundenNr],[api_AvisoId],[api_SendungsId],[api_FilialenNr],[api_AbfertigungsNr],[api_BezugsNr],[api_Zollbelegnummer],[api_finTstmp] 

        With DataGridView
            '  .DataSource = myTable
@@ -216,11 +216,14 @@ Public Class usrCntlAPI

        If cboFiliale._value <> "" Then sqlstr &= " AND [api_FilialenNr] LIKE @FilialenNr "

-        If txtAPIUArt.Text <> "" Then sqlstr &= " AND [api_apiUArt] LIKE @UArt "
+        If cboPartnersystem._value <> "" Then sqlstr &= " AND [api_Partnersystem] = @Partnersystem "

-        If cboAPIArt._value <> "" Then sqlstr &= " AND [api_apiArt] LIKE @APIArt "
-        If cboType._value <> "" Then sqlstr &= " AND [api_Type] LIKE @APIType "
-        If cboInOut._value <> "" Then sqlstr &= " AND [api_InOut] LIKE @APIInOut "
+        If cboFirma._value <> "" Then sqlstr &= " AND [api_Firma] = @Firma "
+
+        If cboAPIArt._value <> "" Then sqlstr &= " AND [api_apiArt] = @APIArt "
+        If cboType._value <> "" Then sqlstr &= " AND [api_Type] = @APIType "
+        If cboProgram._value <> "" Then sqlstr &= " AND [api_progName] = @Program "
+        If cboInOut._value <> "" Then sqlstr &= " AND [api_InOut] =  @APIInOut "

        If txtAvisoId.Text <> "" Then sqlstr &= " AND [api_AvisoId] LIKE @AvisoId "
        If txtSendungsId.Text <> "" Then sqlstr &= " AND [api_SendungsId] LIKE @SendungsId "
@@ -247,7 +250,9 @@ Public Class usrCntlAPI


        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("FilialenNr", cboFiliale._value))
-        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UArt", txtAPIUArt.Text.Replace("*", "%").ToUpper))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Partnersystem", cboFiliale._value))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Program", cboProgram._value))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma", cboFirma._value))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("APIArt", cboAPIArt._value))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("APIType", cboType._value))
        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("APIInOut", cboInOut._value))
@@ -281,4 +286,28 @@ Public Class usrCntlAPI
    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
        initBtns("Tag")
    End Sub
+
+    Private Sub DataGridView_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles DataGridView.CellDoubleClick
+        Me.Cursor = Cursors.WaitCursor
+        Dim err As New frmAPI With {
+            .id = sender.CurrentRow.Cells("api_id").Value,
+            .progName = sender.CurrentRow.Cells("api_progName").Value,
+            .progVersion = sender.CurrentRow.Cells("api_progVersion").Value,
+            .datetime = sender.CurrentRow.Cells("api_datetime").Value,
+            .testsystem = sender.CurrentRow.Cells("api_Testsystem").Value,
+            .type = sender.CurrentRow.Cells("api_Type").Value,
+            .mail = sender.CurrentRow.Cells("api_EMail").Value,
+            .maid = sender.CurrentRow.Cells("api_MaId").Value,
+            .userName = sender.CurrentRow.Cells("api_Username").Value,
+            .firma = sender.CurrentRow.Cells("api_Firma").Value,
+            .errorCode = sender.CurrentRow.Cells("api_status").Value,
+            .errStack = IIf(sender.CurrentRow.Cells("api_errTstmp").Value IsNot DBNull.Value, "Datum: " & sender.CurrentRow.Cells("api_errTstmp").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_errMethodName").Value IsNot DBNull.Value, "Methode: " & sender.CurrentRow.Cells("api_errMethodName").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_errMessage").Value IsNot DBNull.Value, "Message: " & sender.CurrentRow.Cells("api_errMessage").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_errStack").Value IsNot DBNull.Value, "Stack: " & sender.CurrentRow.Cells("api_errStack").Value & vbNewLine, ""),
+            .errMessage = IIf(sender.CurrentRow.Cells("api_EMailFrom").Value IsNot DBNull.Value, "Mail von : " & sender.CurrentRow.Cells("api_EMailFrom").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_EMail").Value IsNot DBNull.Value, "E-Mail: " & sender.CurrentRow.Cells("api_EMail").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_KundenNr").Value IsNot DBNull.Value, "Kunde: " & sender.CurrentRow.Cells("api_KundenNr").Value & vbNewLine, ""),
+            .errMethodName = IIf(sender.CurrentRow.Cells("api_BezugsNr").Value IsNot DBNull.Value, "BezugsNr: " & sender.CurrentRow.Cells("api_BezugsNr").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_BezugsNr").Value IsNot DBNull.Value, "AVISO-ID: " & sender.CurrentRow.Cells("api_AvisoId").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_KundenNr").Value IsNot DBNull.Value, "Kunde: " & sender.CurrentRow.Cells("api_KundenNr").Value & vbNewLine, "")
+            }
+        err.Show(Me)
+        sender.RELOAD()
+        Me.Cursor = Cursors.Default
+    End Sub
+
 End Class
--- a/initATLASAufschubkonten/frmStartOptions.vb
+++ b/initATLASAufschubkonten/frmStartOptions.vb
@@ -486,7 +486,7 @@ Public Class frmStartOptions
                                                where MsgTyp IN ('EZ922','EZ923','TR109', 'EX431') and ErstelltAm>='" & datum.ToShortDateString & " 00:00:00'  and pfad is not null", "EZOLL", 200)
            If dt IsNot Nothing Then
                For Each row In dt.Rows
-                    Dim cDHF_Anhaenge As New VERAG_PROG_ALLGEMEIN.cDHF_Anhaenge(row("AnmID"), row("MsgTyp"))
+                    Dim cDHF_Anhaenge As New VERAG_PROG_ALLGEMEIN.cDHF_Anhaenge(row("AnmID"), row("MsgTyp"), row("LizenzNr"))

                    If Not cDHF_Anhaenge.hasEntry Then 'WENN NEU::