NEU

2020-01-08 13:18:12 +01:00
parent de1d935624
commit a6964d7082
28 changed files with 3853 additions and 1086 deletions
--- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
@@ -61,6 +61,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.cboTeam = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label53 = New System.Windows.Forms.Label()
        Me.cboALIASDomain = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.txtALIASUser = New System.Windows.Forms.TextBox()
        Me.Label52 = New System.Windows.Forms.Label()
@@ -161,8 +163,7 @@ 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.cboTeam = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.Label53 = New System.Windows.Forms.Label()
+        Me.cboDPFirma2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.TabControl2.SuspendLayout()
@@ -296,6 +297,7 @@ Partial Class frmMitarbDetails
        '
        'TabPage2
        '
+        Me.TabPage2.Controls.Add(Me.cboDPFirma2)
        Me.TabPage2.Controls.Add(Me.cboDPFirma)
        Me.TabPage2.Controls.Add(Me.Label50)
        Me.TabPage2.Controls.Add(Me.Label38)
@@ -327,7 +329,7 @@ Partial Class frmMitarbDetails
        Me.cboDPFirma.FormattingEnabled = True
        Me.cboDPFirma.Location = New System.Drawing.Point(7, 151)
        Me.cboDPFirma.Name = "cboDPFirma"
-        Me.cboDPFirma.Size = New System.Drawing.Size(198, 21)
+        Me.cboDPFirma.Size = New System.Drawing.Size(101, 21)
        Me.cboDPFirma.TabIndex = 107
        '
        'Label50
@@ -647,6 +649,30 @@ Partial Class frmMitarbDetails
        Me.GroupBox2.TabStop = False
        Me.GroupBox2.Text = "Firmendaten"
        '
+        'cboTeam
+        '
+        Me.cboTeam._allowedValuesFreiText = Nothing
+        Me.cboTeam._allowFreiText = False
+        Me.cboTeam._value = ""
+        Me.cboTeam.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        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.Name = "cboTeam"
+        Me.cboTeam.Size = New System.Drawing.Size(136, 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.Name = "Label53"
+        Me.Label53.Size = New System.Drawing.Size(37, 13)
+        Me.Label53.TabIndex = 102
+        Me.Label53.Text = "Team:"
+        '
        'cboALIASDomain
        '
        Me.cboALIASDomain._allowedValuesFreiText = Nothing
@@ -1728,29 +1754,17 @@ Partial Class frmMitarbDetails
        Me.Label7.TabIndex = 78
        Me.Label7.Text = "Berechtigung:"
        '
-        'cboTeam
+        'cboDPFirma2
        '
-        Me.cboTeam._allowedValuesFreiText = Nothing
-        Me.cboTeam._allowFreiText = False
-        Me.cboTeam._value = ""
-        Me.cboTeam.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        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.Name = "cboTeam"
-        Me.cboTeam.Size = New System.Drawing.Size(136, 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.Name = "Label53"
-        Me.Label53.Size = New System.Drawing.Size(37, 13)
-        Me.Label53.TabIndex = 102
-        Me.Label53.Text = "Team:"
+        Me.cboDPFirma2._allowedValuesFreiText = Nothing
+        Me.cboDPFirma2._allowFreiText = False
+        Me.cboDPFirma2._value = ""
+        Me.cboDPFirma2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cboDPFirma2.FormattingEnabled = True
+        Me.cboDPFirma2.Location = New System.Drawing.Point(106, 151)
+        Me.cboDPFirma2.Name = "cboDPFirma2"
+        Me.cboDPFirma2.Size = New System.Drawing.Size(101, 21)
+        Me.cboDPFirma2.TabIndex = 108
        '
        'frmMitarbDetails
        '
@@ -1934,4 +1948,5 @@ Partial Class frmMitarbDetails
    Friend WithEvents Label52 As Label
    Friend WithEvents cboTeam As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Label53 As Label
+    Friend WithEvents cboDPFirma2 As VERAG_PROG_ALLGEMEIN.MyComboBox
 End Class
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -50,12 +50,23 @@

        cboDPFirma.Items.Clear()
        cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "ALLE"))
        cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
        cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA"))
        cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
        cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
        cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
        cboDPFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE"))
+        cboDPFirma2.Items.Clear()
+        cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "ALLE"))
+        cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
+        cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA"))
+        cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
+        cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
+        cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
+        cboDPFirma2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE"))
+

        cboALIASDomain.Items.Clear()
        cboALIASDomain.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
@@ -260,6 +271,7 @@

        If mitarbeiter.mit_DpUserStandardDP IsNot Nothing Then cboDP.changeItem(mitarbeiter.mit_DpUserStandardDP)
        If mitarbeiter.mit_DpUserStandardFirma IsNot Nothing Then cboDPFirma.changeItem(mitarbeiter.mit_DpUserStandardFirma)
+        If mitarbeiter.mit_DpUserStandardFirma2 IsNot Nothing Then cboDPFirma2.changeItem(mitarbeiter.mit_DpUserStandardFirma2)

        cbxSpedBuch.Checked = mitarbeiter.mit_FMZollPersIDKasseIsnotSpedBuch

@@ -484,6 +496,7 @@

        mitarbeiter.mit_DpUserStandardDP = cboDP._value
        mitarbeiter.mit_DpUserStandardFirma = cboDPFirma._value
+        mitarbeiter.mit_DpUserStandardFirma2 = cboDPFirma2._value

        If IsNumeric(MyComboBox2._value) AndAlso MyComboBox2._value > 0 Then
            mitarbeiter.mit_standartFiliale = MyComboBox2._value