neu

2021-11-18 14:59:04 +01:00
parent 05280436a4
commit 98378dd496
51 changed files with 4647 additions and 763 deletions
--- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
@@ -128,6 +128,8 @@ Partial Class frmMitarbDetails
        Me.Label2 = New System.Windows.Forms.Label()
        Me.txtInfo = New System.Windows.Forms.RichTextBox()
        Me.TabPage3 = New System.Windows.Forms.TabPage()
+        Me.cboProgSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label55 = New System.Windows.Forms.Label()
        Me.Button5 = New System.Windows.Forms.Button()
        Me.Button4 = New System.Windows.Forms.Button()
        Me.Button3 = New System.Windows.Forms.Button()
@@ -169,8 +171,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.Label55 = New System.Windows.Forms.Label()
-        Me.cboProgSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.cboFaktGrp = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label56 = New System.Windows.Forms.Label()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.TabControl2.SuspendLayout()
@@ -208,7 +210,7 @@ Partial Class frmMitarbDetails
        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label1.Location = New System.Drawing.Point(216, 19)
        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(82, 16)
+        Me.Label1.Size = New System.Drawing.Size(81, 16)
        Me.Label1.TabIndex = 18
        Me.Label1.Text = "Mitarbeiter"
        '
@@ -630,6 +632,8 @@ Partial Class frmMitarbDetails
        '
        'GroupBox2
        '
+        Me.GroupBox2.Controls.Add(Me.cboFaktGrp)
+        Me.GroupBox2.Controls.Add(Me.Label56)
        Me.GroupBox2.Controls.Add(Me.cboALIASDomain2)
        Me.GroupBox2.Controls.Add(Me.txtALIASUser2)
        Me.GroupBox2.Controls.Add(Me.Label54)
@@ -1408,6 +1412,30 @@ Partial Class frmMitarbDetails
        Me.TabPage3.Text = "Programme"
        Me.TabPage3.UseVisualStyleBackColor = True
        '
+        'cboProgSprache
+        '
+        Me.cboProgSprache._allowedValuesFreiText = Nothing
+        Me.cboProgSprache._allowFreiText = False
+        Me.cboProgSprache._value = ""
+        Me.cboProgSprache.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboProgSprache.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboProgSprache.FormattingEnabled = True
+        Me.cboProgSprache.Location = New System.Drawing.Point(16, 526)
+        Me.cboProgSprache.Name = "cboProgSprache"
+        Me.cboProgSprache.Size = New System.Drawing.Size(178, 21)
+        Me.cboProgSprache.TabIndex = 120
+        '
+        'Label55
+        '
+        Me.Label55.AutoSize = True
+        Me.Label55.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label55.Location = New System.Drawing.Point(13, 510)
+        Me.Label55.Name = "Label55"
+        Me.Label55.Size = New System.Drawing.Size(50, 13)
+        Me.Label55.TabIndex = 119
+        Me.Label55.Text = "Sprache:"
+        Me.Label55.Visible = False
+        '
        'Button5
        '
        Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -1838,29 +1866,28 @@ Partial Class frmMitarbDetails
        Me.Label7.TabIndex = 78
        Me.Label7.Text = "Berechtigung:"
        '
-        'Label55
+        'cboFaktGrp
        '
-        Me.Label55.AutoSize = True
-        Me.Label55.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label55.Location = New System.Drawing.Point(13, 510)
-        Me.Label55.Name = "Label55"
-        Me.Label55.Size = New System.Drawing.Size(50, 13)
-        Me.Label55.TabIndex = 119
-        Me.Label55.Text = "Sprache:"
-        Me.Label55.Visible = False
+        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
        '
-        'cboProgSprache
+        'Label56
        '
-        Me.cboProgSprache._allowedValuesFreiText = Nothing
-        Me.cboProgSprache._allowFreiText = False
-        Me.cboProgSprache._value = ""
-        Me.cboProgSprache.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboProgSprache.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cboProgSprache.FormattingEnabled = True
-        Me.cboProgSprache.Location = New System.Drawing.Point(16, 526)
-        Me.cboProgSprache.Name = "cboProgSprache"
-        Me.cboProgSprache.Size = New System.Drawing.Size(178, 21)
-        Me.cboProgSprache.TabIndex = 120
+        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:"
        '
        'frmMitarbDetails
        '
@@ -2052,4 +2079,6 @@ Partial Class frmMitarbDetails
    Friend WithEvents txtALIASUser2 As TextBox
    Friend WithEvents cboProgSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Label55 As Label
+    Friend WithEvents cboFaktGrp As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label56 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
-        wwAADsMBx2+oZAAAAhBJREFUWEftlbFKA1EQRQP5FyG1fyBp/ANT2KYxWNkm+AExtYipLASDlYVpRBSC
+        wgAADsIBFShKgAAAAhBJREFUWEftlbFKA1EQRQP5FyG1fyBp/ANT2KYxWNkm+AExtYipLASDlYVpRBSC
        RRoDQbBYEItAFLQwksJi9Qy5j8ljG5vdZgdmd959M3fuzEaspAVbKaAUUApYE/CzWJjH9h/cn+M46y4I
        eBuN0ptq1XzcaKzQ1GLhD/V6OhsODectnFoI72u1UM85jpWrWvAgYNrphCSIMBXS+LnXMxwHT/r9kP86
        GKyd4dJAPtaZXA1pApbzuV1Crolp8pUkFj+2WpaMCM4QkocwzhKnM4LwOOZePRCCmQCp50ICPieTsCru
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -116,6 +116,11 @@
        cboFirmaHaupt.Items.Add("VERIMEX")


+        cboFaktGrp.Items.Clear()
+        cboFaktGrp.fillWithSQL("SELECT [Code],[Bezeichnung] FROM tblFakturierungsgruppe", False, "ADMIN", False)
+        cboFaktGrp.changeItem("")
+
+
        ZOLLDATENBEARB = False

        txtPwd.Visible = False
@@ -234,6 +239,7 @@
        txtPlz.Text = mitarbeiter.mit_plz
        txtOrt.Text = mitarbeiter.mit_ort
        cboNiederlassung.changeItem(mitarbeiter.mit_niederlassung)
+        cboFaktGrp.changeItem(mitarbeiter.mit_fakturierungsgruppe)
        cboAbteilung.changeItem(mitarbeiter.mit_abteilung)
        cboPosition.Text = mitarbeiter.mit_position
        txtDurchwahl.Text = mitarbeiter.mit_durchwahl
@@ -499,6 +505,7 @@
        mitarbeiter.mit_plz = txtPlz.Text
        mitarbeiter.mit_ort = txtOrt.Text
        mitarbeiter.mit_niederlassung = cboNiederlassung._value
+        mitarbeiter.mit_fakturierungsgruppe = cboFaktGrp._value
        mitarbeiter.mit_abteilung = cboAbteilung._value
        mitarbeiter.mit_position = cboPosition.Text
        mitarbeiter.mit_durchwahl = txtDurchwahl.Text
@@ -786,7 +793,7 @@
            End Try

            Try
-                cboEZOLL_SB.fillWithSQL("SELECT [PersonalID],[UserID]  FROM [zzPersonal] ORDER BY UserID ", False, "EZOLL", True)
+                cboEZOLL_SB.fillWithSQL("SELECT [PersonalID],[UserID]  FROM [zzPersonal] where lizenznr='S01122' ORDER BY UserID ", False, "EZOLL", True)
            Catch ex As Exception
                MsgBox("EZOLL Problem")
                tbcntr.SelectedIndex = 0