neu

2022-09-01 10:37:14 +02:00
parent 46c14b6500
commit 5809e9c89c
13 changed files with 291 additions and 217 deletions
--- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
@@ -62,6 +62,8 @@ Partial Class frmMitarbDetails
        Me.cboATLAS_SB = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.cboFaktGrp = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label56 = New System.Windows.Forms.Label()
        Me.cboALIASDomain2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.txtALIASUser2 = New System.Windows.Forms.TextBox()
        Me.Label54 = New System.Windows.Forms.Label()
@@ -171,8 +173,8 @@ Partial Class frmMitarbDetails
        Me.PictureBox6 = New System.Windows.Forms.PictureBox()
        Me.cboAdminBer = New System.Windows.Forms.ComboBox()
        Me.Label7 = New System.Windows.Forms.Label()
-        Me.cboFaktGrp = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.Label56 = New System.Windows.Forms.Label()
+        Me.txtAbweichenderAnzeigename = New System.Windows.Forms.TextBox()
+        Me.Label57 = New System.Windows.Forms.Label()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.TabControl2.SuspendLayout()
@@ -632,6 +634,8 @@ Partial Class frmMitarbDetails
        '
        'GroupBox2
        '
+        Me.GroupBox2.Controls.Add(Me.txtAbweichenderAnzeigename)
+        Me.GroupBox2.Controls.Add(Me.Label57)
        Me.GroupBox2.Controls.Add(Me.cboFaktGrp)
        Me.GroupBox2.Controls.Add(Me.Label56)
        Me.GroupBox2.Controls.Add(Me.cboALIASDomain2)
@@ -678,6 +682,29 @@ Partial Class frmMitarbDetails
        Me.GroupBox2.TabStop = False
        Me.GroupBox2.Text = "Firmendaten"
        '
+        'cboFaktGrp
+        '
+        Me.cboFaktGrp._allowedValuesFreiText = Nothing
+        Me.cboFaktGrp._allowFreiText = False
+        Me.cboFaktGrp._value = ""
+        Me.cboFaktGrp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboFaktGrp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboFaktGrp.FormattingEnabled = True
+        Me.cboFaktGrp.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
+        Me.cboFaktGrp.Location = New System.Drawing.Point(211, 155)
+        Me.cboFaktGrp.Name = "cboFaktGrp"
+        Me.cboFaktGrp.Size = New System.Drawing.Size(177, 21)
+        Me.cboFaktGrp.TabIndex = 107
+        '
+        'Label56
+        '
+        Me.Label56.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label56.Location = New System.Drawing.Point(208, 139)
+        Me.Label56.Name = "Label56"
+        Me.Label56.Size = New System.Drawing.Size(128, 13)
+        Me.Label56.TabIndex = 108
+        Me.Label56.Text = "Fakturierungs-Gruppe:"
+        '
        'cboALIASDomain2
        '
        Me.cboALIASDomain2._allowedValuesFreiText = Nothing
@@ -686,7 +713,7 @@ Partial Class frmMitarbDetails
        Me.cboALIASDomain2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboALIASDomain2.FormattingEnabled = True
        Me.cboALIASDomain2.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
-        Me.cboALIASDomain2.Location = New System.Drawing.Point(409, 60)
+        Me.cboALIASDomain2.Location = New System.Drawing.Point(402, 60)
        Me.cboALIASDomain2.Name = "cboALIASDomain2"
        Me.cboALIASDomain2.Size = New System.Drawing.Size(116, 21)
        Me.cboALIASDomain2.TabIndex = 106
@@ -694,7 +721,7 @@ Partial Class frmMitarbDetails
        'txtALIASUser2
        '
        Me.txtALIASUser2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtALIASUser2.Location = New System.Drawing.Point(524, 60)
+        Me.txtALIASUser2.Location = New System.Drawing.Point(517, 60)
        Me.txtALIASUser2.Name = "txtALIASUser2"
        Me.txtALIASUser2.Size = New System.Drawing.Size(179, 20)
        Me.txtALIASUser2.TabIndex = 105
@@ -729,16 +756,16 @@ Partial Class frmMitarbDetails
        Me.cboTeam.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboTeam.FormattingEnabled = True
        Me.cboTeam.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
-        Me.cboTeam.Location = New System.Drawing.Point(406, 116)
+        Me.cboTeam.Location = New System.Drawing.Point(399, 116)
        Me.cboTeam.Name = "cboTeam"
-        Me.cboTeam.Size = New System.Drawing.Size(136, 21)
+        Me.cboTeam.Size = New System.Drawing.Size(148, 21)
        Me.cboTeam.TabIndex = 101
        '
        'Label53
        '
        Me.Label53.AutoSize = True
        Me.Label53.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label53.Location = New System.Drawing.Point(403, 100)
+        Me.Label53.Location = New System.Drawing.Point(396, 100)
        Me.Label53.Name = "Label53"
        Me.Label53.Size = New System.Drawing.Size(37, 13)
        Me.Label53.TabIndex = 102
@@ -752,7 +779,7 @@ Partial Class frmMitarbDetails
        Me.cboALIASDomain.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboALIASDomain.FormattingEnabled = True
        Me.cboALIASDomain.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
-        Me.cboALIASDomain.Location = New System.Drawing.Point(409, 37)
+        Me.cboALIASDomain.Location = New System.Drawing.Point(402, 37)
        Me.cboALIASDomain.Name = "cboALIASDomain"
        Me.cboALIASDomain.Size = New System.Drawing.Size(116, 21)
        Me.cboALIASDomain.TabIndex = 100
@@ -760,7 +787,7 @@ Partial Class frmMitarbDetails
        'txtALIASUser
        '
        Me.txtALIASUser.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtALIASUser.Location = New System.Drawing.Point(524, 37)
+        Me.txtALIASUser.Location = New System.Drawing.Point(517, 37)
        Me.txtALIASUser.Name = "txtALIASUser"
        Me.txtALIASUser.Size = New System.Drawing.Size(179, 20)
        Me.txtALIASUser.TabIndex = 99
@@ -769,7 +796,7 @@ Partial Class frmMitarbDetails
        '
        Me.Label52.AutoSize = True
        Me.Label52.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label52.Location = New System.Drawing.Point(406, 21)
+        Me.Label52.Location = New System.Drawing.Point(399, 21)
        Me.Label52.Name = "Label52"
        Me.Label52.Size = New System.Drawing.Size(167, 13)
        Me.Label52.TabIndex = 98
@@ -779,7 +806,7 @@ Partial Class frmMitarbDetails
        '
        Me.lkl.AutoSize = True
        Me.lkl.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lkl.Location = New System.Drawing.Point(357, 21)
+        Me.lkl.Location = New System.Drawing.Point(353, 21)
        Me.lkl.Name = "lkl"
        Me.lkl.Size = New System.Drawing.Size(35, 13)
        Me.lkl.TabIndex = 97
@@ -816,7 +843,7 @@ Partial Class frmMitarbDetails
        Me.cboFirmaFMZOLL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
        Me.cboFirmaFMZOLL.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboFirmaFMZOLL.FormattingEnabled = True
-        Me.cboFirmaFMZOLL.Location = New System.Drawing.Point(214, 76)
+        Me.cboFirmaFMZOLL.Location = New System.Drawing.Point(210, 76)
        Me.cboFirmaFMZOLL.Name = "cboFirmaFMZOLL"
        Me.cboFirmaFMZOLL.Size = New System.Drawing.Size(178, 21)
        Me.cboFirmaFMZOLL.TabIndex = 95
@@ -825,7 +852,7 @@ Partial Class frmMitarbDetails
        '
        Me.Label39.AutoSize = True
        Me.Label39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label39.Location = New System.Drawing.Point(212, 60)
+        Me.Label39.Location = New System.Drawing.Point(208, 60)
        Me.Label39.Name = "Label39"
        Me.Label39.Size = New System.Drawing.Size(88, 13)
        Me.Label39.TabIndex = 93
@@ -926,7 +953,7 @@ Partial Class frmMitarbDetails
        Me.txtEmail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtEmail.Location = New System.Drawing.Point(304, 204)
        Me.txtEmail.Name = "txtEmail"
-        Me.txtEmail.Size = New System.Drawing.Size(241, 20)
+        Me.txtEmail.Size = New System.Drawing.Size(243, 20)
        Me.txtEmail.TabIndex = 7
        '
        'Label20
@@ -961,7 +988,7 @@ Partial Class frmMitarbDetails
        '
        Me.Label8.AutoSize = True
        Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label8.Location = New System.Drawing.Point(216, 40)
+        Me.Label8.Location = New System.Drawing.Point(212, 40)
        Me.Label8.Name = "Label8"
        Me.Label8.Size = New System.Drawing.Size(146, 13)
        Me.Label8.TabIndex = 1
@@ -976,7 +1003,7 @@ Partial Class frmMitarbDetails
        Me.cboAbteilung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboAbteilung.FormattingEnabled = True
        Me.cboAbteilung.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
-        Me.cboAbteilung.Location = New System.Drawing.Point(215, 116)
+        Me.cboAbteilung.Location = New System.Drawing.Point(211, 116)
        Me.cboAbteilung.Name = "cboAbteilung"
        Me.cboAbteilung.Size = New System.Drawing.Size(177, 21)
        Me.cboAbteilung.TabIndex = 4
@@ -984,7 +1011,7 @@ Partial Class frmMitarbDetails
        'txtPwd
        '
        Me.txtPwd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtPwd.Location = New System.Drawing.Point(214, 37)
+        Me.txtPwd.Location = New System.Drawing.Point(210, 37)
        Me.txtPwd.Name = "txtPwd"
        Me.txtPwd.Size = New System.Drawing.Size(178, 20)
        Me.txtPwd.TabIndex = 55
@@ -993,7 +1020,7 @@ Partial Class frmMitarbDetails
        '
        Me.Label11.AutoSize = True
        Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label11.Location = New System.Drawing.Point(212, 100)
+        Me.Label11.Location = New System.Drawing.Point(208, 100)
        Me.Label11.Name = "Label11"
        Me.Label11.Size = New System.Drawing.Size(54, 13)
        Me.Label11.TabIndex = 55
@@ -1003,7 +1030,7 @@ Partial Class frmMitarbDetails
        '
        Me.Label6.AutoSize = True
        Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label6.Location = New System.Drawing.Point(212, 21)
+        Me.Label6.Location = New System.Drawing.Point(208, 21)
        Me.Label6.Name = "Label6"
        Me.Label6.Size = New System.Drawing.Size(53, 13)
        Me.Label6.TabIndex = 57
@@ -1866,28 +1893,23 @@ Partial Class frmMitarbDetails
        Me.Label7.TabIndex = 78
        Me.Label7.Text = "Berechtigung:"
        '
-        'cboFaktGrp
+        'txtAbweichenderAnzeigename
        '
-        Me.cboFaktGrp._allowedValuesFreiText = Nothing
-        Me.cboFaktGrp._allowFreiText = False
-        Me.cboFaktGrp._value = ""
-        Me.cboFaktGrp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboFaktGrp.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboFaktGrp.FormattingEnabled = True
-        Me.cboFaktGrp.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
-        Me.cboFaktGrp.Location = New System.Drawing.Point(215, 155)
-        Me.cboFaktGrp.Name = "cboFaktGrp"
-        Me.cboFaktGrp.Size = New System.Drawing.Size(177, 21)
-        Me.cboFaktGrp.TabIndex = 107
+        Me.txtAbweichenderAnzeigename.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtAbweichenderAnzeigename.Location = New System.Drawing.Point(399, 156)
+        Me.txtAbweichenderAnzeigename.Name = "txtAbweichenderAnzeigename"
+        Me.txtAbweichenderAnzeigename.Size = New System.Drawing.Size(148, 20)
+        Me.txtAbweichenderAnzeigename.TabIndex = 109
        '
-        'Label56
+        'Label57
        '
-        Me.Label56.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label56.Location = New System.Drawing.Point(212, 139)
-        Me.Label56.Name = "Label56"
-        Me.Label56.Size = New System.Drawing.Size(128, 13)
-        Me.Label56.TabIndex = 108
-        Me.Label56.Text = "Fakturierungs-Gruppe:"
+        Me.Label57.AutoSize = True
+        Me.Label57.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label57.Location = New System.Drawing.Point(396, 140)
+        Me.Label57.Name = "Label57"
+        Me.Label57.Size = New System.Drawing.Size(151, 13)
+        Me.Label57.TabIndex = 110
+        Me.Label57.Text = "And. Anzeigename (Aviso,TV):"
        '
        'frmMitarbDetails
        '
@@ -2081,4 +2103,6 @@ Partial Class frmMitarbDetails
    Friend WithEvents Label55 As Label
    Friend WithEvents cboFaktGrp As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Label56 As Label
+    Friend WithEvents txtAbweichenderAnzeigename As TextBox
+    Friend WithEvents Label57 As Label
 End Class
--- a/UID/Mitarbeiter/frmMitarbDetails.resx
+++ b/UID/Mitarbeiter/frmMitarbDetails.resx
@@ -121,7 +121,7 @@
  <data name="PictureBox6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wgAADsIBFShKgAAAAhBJREFUWEftlbFKA1EQRQP5FyG1fyBp/ANT2KYxWNkm+AExtYipLASDlYVpRBSC
+        wQAADsEBuJFr7QAAAhBJREFUWEftlbFKA1EQRQP5FyG1fyBp/ANT2KYxWNkm+AExtYipLASDlYVpRBSC
        RRoDQbBYEItAFLQwksJi9Qy5j8ljG5vdZgdmd959M3fuzEaspAVbKaAUUApYE/CzWJjH9h/cn+M46y4I
        eBuN0ptq1XzcaKzQ1GLhD/V6OhsODectnFoI72u1UM85jpWrWvAgYNrphCSIMBXS+LnXMxwHT/r9kP86
        GKyd4dJAPtaZXA1pApbzuV1Crolp8pUkFj+2WpaMCM4QkocwzhKnM4LwOOZePRCCmQCp50ICPieTsCru
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -222,6 +222,7 @@
        ' mit_id.Text = mitarbeiter.mit_id
        Label48.Text = mitarbeiter.mit_id
        txtUsername.Text = mitarbeiter.mit_username
+        txtAbweichenderAnzeigename.Text = mitarbeiter.mit_abweichenderAnzeigename
        txtPwd.Text = mitarbeiter.mit_pwd
        If mitarbeiter.mit_geschlecht = "m" Then rbtnGeschlechtM.Checked = True
        If mitarbeiter.mit_geschlecht = "w" Then rbtnGeschlechtW.Checked = True
@@ -492,6 +493,7 @@

    Private Sub getMitarbeiter()
        mitarbeiter.mit_username = txtUsername.Text
+        mitarbeiter.mit_abweichenderAnzeigename = txtAbweichenderAnzeigename.Text
        mitarbeiter.mit_pwd = txtPwd.Text
        mitarbeiter.mit_affix = txtTitel.Text
        If rbtnGeschlechtM.Checked Then mitarbeiter.mit_geschlecht = "m"