Merge branch 'ADMIN' of https://verag.visualstudio.com/ADMIN/_git/ADMIN into ADMIN

UID/Mitarbeiter/frmMitarbDetails.Designer.vb

@@ -52,6 +52,10 @@ Partial Class frmMitarbDetails
         Me.cboSpedbuch = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.MyComboBox3 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.TabPage4 = New System.Windows.Forms.TabPage()
+        Me.Label61 = New System.Windows.Forms.Label()
+        Me.txtATGRNAccessCode_AT51FP7 = New System.Windows.Forms.TextBox()
+        Me.txtATGRNAccessCode_AT52VA6 = New System.Windows.Forms.TextBox()
+        Me.Label60 = New System.Windows.Forms.Label()
         Me.txtTelotecSB = New System.Windows.Forms.TextBox()
         Me.Label51 = New System.Windows.Forms.Label()
         Me.txtDyFullName = New System.Windows.Forms.TextBox()
@@ -547,6 +551,10 @@ Partial Class frmMitarbDetails
         '
         'TabPage4
         '
+        Me.TabPage4.Controls.Add(Me.Label61)
+        Me.TabPage4.Controls.Add(Me.txtATGRNAccessCode_AT51FP7)
+        Me.TabPage4.Controls.Add(Me.txtATGRNAccessCode_AT52VA6)
+        Me.TabPage4.Controls.Add(Me.Label60)
         Me.TabPage4.Controls.Add(Me.txtTelotecSB)
         Me.TabPage4.Controls.Add(Me.Label51)
         Me.TabPage4.Controls.Add(Me.txtDyFullName)
@@ -565,6 +573,44 @@ Partial Class frmMitarbDetails
         Me.TabPage4.Text = "Zollprogramme"
         Me.TabPage4.UseVisualStyleBackColor = True
         '
+        'Label61
+        '
+        Me.Label61.AutoSize = True
+        Me.Label61.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label61.Location = New System.Drawing.Point(216, 136)
+        Me.Label61.Name = "Label61"
+        Me.Label61.Size = New System.Drawing.Size(164, 13)
+        Me.Label61.TabIndex = 120
+        Me.Label61.Text = "VERAG AccessCode (AT51FP7):"
+        '
+        'txtATGRNAccessCode_AT51FP7
+        '
+        Me.txtATGRNAccessCode_AT51FP7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtATGRNAccessCode_AT51FP7.Location = New System.Drawing.Point(386, 133)
+        Me.txtATGRNAccessCode_AT51FP7.MaxLength = 4
+        Me.txtATGRNAccessCode_AT51FP7.Name = "txtATGRNAccessCode_AT51FP7"
+        Me.txtATGRNAccessCode_AT51FP7.Size = New System.Drawing.Size(47, 20)
+        Me.txtATGRNAccessCode_AT51FP7.TabIndex = 119
+        '
+        'txtATGRNAccessCode_AT52VA6
+        '
+        Me.txtATGRNAccessCode_AT52VA6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtATGRNAccessCode_AT52VA6.Location = New System.Drawing.Point(386, 114)
+        Me.txtATGRNAccessCode_AT52VA6.MaxLength = 4
+        Me.txtATGRNAccessCode_AT52VA6.Name = "txtATGRNAccessCode_AT52VA6"
+        Me.txtATGRNAccessCode_AT52VA6.Size = New System.Drawing.Size(47, 20)
+        Me.txtATGRNAccessCode_AT52VA6.TabIndex = 118
+        '
+        'Label60
+        '
+        Me.Label60.AutoSize = True
+        Me.Label60.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label60.Location = New System.Drawing.Point(216, 117)
+        Me.Label60.Name = "Label60"
+        Me.Label60.Size = New System.Drawing.Size(154, 13)
+        Me.Label60.TabIndex = 117
+        Me.Label60.Text = "IMEX AccessCode (AT52VA6):"
+        '
         'txtTelotecSB
         '
         Me.txtTelotecSB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -588,7 +634,7 @@ Partial Class frmMitarbDetails
         Me.txtDyFullName.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.txtDyFullName.Location = New System.Drawing.Point(217, 81)
         Me.txtDyFullName.Name = "txtDyFullName"
-        Me.txtDyFullName.Size = New System.Drawing.Size(200, 20)
+        Me.txtDyFullName.Size = New System.Drawing.Size(216, 20)
         Me.txtDyFullName.TabIndex = 114
         '
         'Label49
@@ -650,7 +696,7 @@ Partial Class frmMitarbDetails
         Me.cboEZOLL_SB.FormattingEnabled = True
         Me.cboEZOLL_SB.Location = New System.Drawing.Point(217, 29)
         Me.cboEZOLL_SB.Name = "cboEZOLL_SB"
-        Me.cboEZOLL_SB.Size = New System.Drawing.Size(198, 21)
+        Me.cboEZOLL_SB.Size = New System.Drawing.Size(214, 21)
         Me.cboEZOLL_SB.TabIndex = 109
         '
         'cboATLAS_SB
@@ -2406,4 +2452,8 @@ Partial Class frmMitarbDetails
     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
+    Friend WithEvents Label61 As Label
+    Friend WithEvents txtATGRNAccessCode_AT51FP7 As TextBox
 End Class

UID/Mitarbeiter/frmMitarbDetails.vb

@@ -281,6 +281,8 @@ Public Class frmMitarbDetails
         txtMobiltel.Text = mitarbeiter.mit_mobiltel
         cbxAnrufen.Checked = mitarbeiter.mit_allowAnruf
         txtInfo.Text = mitarbeiter.mit_info
+        txtATGRNAccessCode_AT51FP7.Text = mitarbeiter.mit_ATGRNAccessCode_AT51FP7
+        txtATGRNAccessCode_AT52VA6.Text = mitarbeiter.mit_ATGRNAccessCode_AT52VA6
         txtDakosySB.Text = mitarbeiter.mit_DAKOSY_SB
         txtDyFullName.Text = If(mitarbeiter.mit_DAKOSY_SBFull, "")
         txtTelotecSB.Text = mitarbeiter.mit_TELOTEC_SB
@@ -557,6 +559,8 @@ Public Class frmMitarbDetails
         mitarbeiter.mit_mobiltel = txtMobiltel.Text
         mitarbeiter.mit_allowAnruf = cbxAnrufen.Checked
         mitarbeiter.mit_info = txtInfo.Text
+        mitarbeiter.mit_ATGRNAccessCode_AT51FP7 = txtATGRNAccessCode_AT51FP7.Text
+        mitarbeiter.mit_ATGRNAccessCode_AT52VA6 = txtATGRNAccessCode_AT52VA6.Text
         mitarbeiter.mit_DAKOSY_SB = txtDakosySB.Text
         mitarbeiter.mit_DAKOSY_SBFull = txtDyFullName.Text
         mitarbeiter.mit_TELOTEC_SB = txtTelotecSB.Text
@@ -571,7 +575,6 @@ Public Class frmMitarbDetails
         mitarbeiter.mit_telefonnr = txtTelNr.Text
 
 
-
         If IsNumeric(cboPersonal._value) AndAlso cboPersonal._value > 0 Then
             mitarbeiter.mit_FMZollPersID = cboPersonal._value
         Else
@@ -1273,5 +1276,6 @@ Public Class frmMitarbDetails
 
     Private isDataLoaded As Boolean = True
 
+
 End Class