Mitarbeiter, etc,

Plose date, etc.
2025-11-21 17:32:06 +01:00 · 2025-11-20 13:50:00 +01:00
7 changed files with 634 additions and 377 deletions
--- a/MDM_Worker/cPLOSE_Inv_Data.vb
+++ b/MDM_Worker/cPLOSE_Inv_Data.vb
@@ -346,6 +346,24 @@ Public Class cPLOSE_Inv_Data
    End Function
    Public Shared Function setBackToCustomer(SQL As SQL, backToCustomer As Boolean, ab As Date, customerNo As Integer) As Boolean
        Return SQL.doSQL("update tblPLOSE_Inv_Data set plInv_InvToCustomer = " & IIf(backToCustomer, "1", "NULL") & "  where cast(plInv_SupplierRechnungsDatum as Date) >= '" & ab.ToShortDateString & "' AND  plInv_PLOSEKundennummer =  '" & customerNo & "'", "FMZOLL")
    End Function
    Public Shared Function setBackToCustomerCustomerID(SQL As SQL, backToCustomer As Boolean, customerNo As String) As Boolean
        Return SQL.doSQL("update tblPLOSE_Inv_Data set plInv_InvToCustomer = " & IIf(backToCustomer, "1", "NULL") & "  where plInv_InvToCustomer Is null AND  plInv_PLOSEKundennummer =  '" & customerNo & "'", "FMZOLL")
    End Function
    Public Shared Function setBackToCustomerInvoiceID(SQL As SQL, backToCustomer As Boolean, Optional invoiceID As String = "") As Boolean
        Return SQL.doSQL("update tblPLOSE_Inv_Data set plInv_InvToCustomer = " & IIf(backToCustomer, "1", "0") & "  where plInv_InvToCustomer Is null " & IIf(invoiceID <> "", "AND  plInv_Id = '" & invoiceID & "'", " ") & "", "FMZOLL")
    End Function
    Public Shared Function setWahrunginIvoiceFromTransactions(jahr As Integer, Optional message As Boolean = False, Optional kdNr As Integer = -1) As Boolean
--- a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
@@ -36,21 +36,13 @@ Partial Class frmMitarbDetails
        Me.TabPage1 = New System.Windows.Forms.TabPage()
        Me.tbcntr = New System.Windows.Forms.TabControl()
        Me.TabPage2 = New System.Windows.Forms.TabPage()
        Me.cboDPFirma2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboDPFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label50 = New System.Windows.Forms.Label()
        Me.Label38 = New System.Windows.Forms.Label()
        Me.cboPersonal = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label37 = New System.Windows.Forms.Label()
        Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboDP = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboKasse = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label42 = New System.Windows.Forms.Label()
        Me.Label40 = New System.Windows.Forms.Label()
        Me.cbxSpedBuch = New System.Windows.Forms.CheckBox()
        Me.Label41 = New System.Windows.Forms.Label()
        Me.cboSpedbuch = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.MyComboBox3 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.TabPage4 = New System.Windows.Forms.TabPage()
        Me.Label62 = New System.Windows.Forms.Label()
        Me.Label61 = New System.Windows.Forms.Label()
@@ -65,9 +57,6 @@ Partial Class frmMitarbDetails
        Me.Label46 = New System.Windows.Forms.Label()
        Me.Label44 = New System.Windows.Forms.Label()
        Me.Label43 = New System.Windows.Forms.Label()
        Me.cboEZOLL_SB_UNISPED = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboEZOLL_SB = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboATLAS_SB = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.TabPage5 = New System.Windows.Forms.TabPage()
        Me.cbxShowPW = New System.Windows.Forms.CheckBox()
        Me.lblCheckconnection = New System.Windows.Forms.Label()
@@ -77,9 +66,7 @@ Partial Class frmMitarbDetails
        Me.txtCSUser = New System.Windows.Forms.TextBox()
        Me.Label59 = New System.Windows.Forms.Label()
        Me.TabPage7 = New System.Windows.Forms.TabPage()
        Me.lbSprachen = New VERAG_PROG_ALLGEMEIN.MyListBox()
        Me.tabParameter = New System.Windows.Forms.TabPage()
        Me.dgvUserParameter = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Label4 = New System.Windows.Forms.Label()
        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
        Me.txtTelNr = New System.Windows.Forms.TextBox()
@@ -88,21 +75,15 @@ Partial Class frmMitarbDetails
        Me.lblEmailExtension = New System.Windows.Forms.Label()
        Me.txtAbweichenderAnzeigename = New System.Windows.Forms.TextBox()
        Me.Label57 = New System.Windows.Forms.Label()
        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()
        Me.cboFirmaHaupt = New System.Windows.Forms.ComboBox()
        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()
        Me.lkl = New System.Windows.Forms.LinkLabel()
        Me.Label45 = New System.Windows.Forms.Label()
        Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox()
        Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label39 = New System.Windows.Forms.Label()
        Me.cboFirma = New System.Windows.Forms.ComboBox()
        Me.Label36 = New System.Windows.Forms.Label()
@@ -118,13 +99,11 @@ Partial Class frmMitarbDetails
        Me.txtDurchwahl = New System.Windows.Forms.TextBox()
        Me.Label19 = New System.Windows.Forms.Label()
        Me.Label8 = New System.Windows.Forms.Label()
        Me.cboAbteilung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.txtPwd = New System.Windows.Forms.TextBox()
        Me.Label11 = New System.Windows.Forms.Label()
        Me.Label6 = New System.Windows.Forms.Label()
        Me.txtUsername = New System.Windows.Forms.TextBox()
        Me.Label3 = New System.Windows.Forms.Label()
        Me.cboNiederlassung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label9 = New System.Windows.Forms.Label()
        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
        Me.txtprivateEMail = New System.Windows.Forms.TextBox()
@@ -158,7 +137,6 @@ 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()
@@ -236,9 +214,33 @@ Partial Class frmMitarbDetails
        Me.Label65 = New System.Windows.Forms.Label()
        Me.cbUrlaubInStund = New System.Windows.Forms.CheckBox()
        Me.Label66 = New System.Windows.Forms.Label()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.Label63 = New System.Windows.Forms.Label()
        Me.cboDPFirma2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboDPFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboPersonal = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboDP = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboKasse = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboSpedbuch = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.MyComboBox3 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboEZOLL_SB_UNISPED = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboEZOLL_SB = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboATLAS_SB = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.lbSprachen = New VERAG_PROG_ALLGEMEIN.MyListBox()
        Me.dgvUserParameter = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.cboFunktion = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboFaktGrp = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboALIASDomain2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboTeam = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboALIASDomain = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox()
        Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboAbteilung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboNiederlassung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.cboProgSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.dgvUberstundenauszahlungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.TabControl2.SuspendLayout()
@@ -249,7 +251,6 @@ Partial Class frmMitarbDetails
        Me.TabPage5.SuspendLayout()
        Me.TabPage7.SuspendLayout()
        Me.tabParameter.SuspendLayout()
        CType(Me.dgvUserParameter, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.GroupBox2.SuspendLayout()
        Me.GroupBox1.SuspendLayout()
        CType(Me.picFoto, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -262,6 +263,7 @@ Partial Class frmMitarbDetails
        CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.TabPage8.SuspendLayout()
        CType(Me.dgvUserParameter, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvUberstundenauszahlungen, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvData, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
@@ -422,30 +424,6 @@ Partial Class frmMitarbDetails
        Me.TabPage2.Text = "Intern"
        Me.TabPage2.UseVisualStyleBackColor = True
        '
        'cboDPFirma2
        '
        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
        '
        'cboDPFirma
        '
        Me.cboDPFirma._allowedValuesFreiText = Nothing
        Me.cboDPFirma._allowFreiText = False
        Me.cboDPFirma._value = ""
        Me.cboDPFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboDPFirma.FormattingEnabled = True
        Me.cboDPFirma.Location = New System.Drawing.Point(7, 151)
        Me.cboDPFirma.Name = "cboDPFirma"
        Me.cboDPFirma.Size = New System.Drawing.Size(101, 21)
        Me.cboDPFirma.TabIndex = 107
        '
        'Label50
        '
        Me.Label50.AutoSize = True
@@ -466,18 +444,6 @@ Partial Class frmMitarbDetails
        Me.Label38.TabIndex = 96
        Me.Label38.Text = "Standard-Filiale (SpedBuch)"
        '
        'cboPersonal
        '
        Me.cboPersonal._allowedValuesFreiText = Nothing
        Me.cboPersonal._allowFreiText = False
        Me.cboPersonal._value = ""
        Me.cboPersonal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboPersonal.FormattingEnabled = True
        Me.cboPersonal.Location = New System.Drawing.Point(7, 65)
        Me.cboPersonal.Name = "cboPersonal"
        Me.cboPersonal.Size = New System.Drawing.Size(200, 21)
        Me.cboPersonal.TabIndex = 95
        '
        'Label37
        '
        Me.Label37.AutoSize = True
@@ -488,42 +454,6 @@ Partial Class frmMitarbDetails
        Me.Label37.TabIndex = 94
        Me.Label37.Text = "Zuordnung / FM-ZOLL Personal - Tabelle:"
        '
        'MyComboBox2
        '
        Me.MyComboBox2._allowedValuesFreiText = Nothing
        Me.MyComboBox2._allowFreiText = False
        Me.MyComboBox2._value = ""
        Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.MyComboBox2.FormattingEnabled = True
        Me.MyComboBox2.Location = New System.Drawing.Point(9, 24)
        Me.MyComboBox2.Name = "MyComboBox2"
        Me.MyComboBox2.Size = New System.Drawing.Size(198, 21)
        Me.MyComboBox2.TabIndex = 97
        '
        'cboDP
        '
        Me.cboDP._allowedValuesFreiText = Nothing
        Me.cboDP._allowFreiText = False
        Me.cboDP._value = ""
        Me.cboDP.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboDP.FormattingEnabled = True
        Me.cboDP.Location = New System.Drawing.Point(217, 151)
        Me.cboDP.Name = "cboDP"
        Me.cboDP.Size = New System.Drawing.Size(198, 21)
        Me.cboDP.TabIndex = 105
        '
        'cboKasse
        '
        Me.cboKasse._allowedValuesFreiText = Nothing
        Me.cboKasse._allowFreiText = False
        Me.cboKasse._value = ""
        Me.cboKasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboKasse.FormattingEnabled = True
        Me.cboKasse.Location = New System.Drawing.Point(7, 106)
        Me.cboKasse.Name = "cboKasse"
        Me.cboKasse.Size = New System.Drawing.Size(200, 21)
        Me.cboKasse.TabIndex = 99
        '
        'Label42
        '
        Me.Label42.AutoSize = True
@@ -565,31 +495,6 @@ Partial Class frmMitarbDetails
        Me.Label41.TabIndex = 100
        Me.Label41.Text = "Standard-Preisliste:"
        '
        'cboSpedbuch
        '
        Me.cboSpedbuch._allowedValuesFreiText = Nothing
        Me.cboSpedbuch._allowFreiText = False
        Me.cboSpedbuch._value = ""
        Me.cboSpedbuch.Enabled = False
        Me.cboSpedbuch.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboSpedbuch.FormattingEnabled = True
        Me.cboSpedbuch.Location = New System.Drawing.Point(217, 66)
        Me.cboSpedbuch.Name = "cboSpedbuch"
        Me.cboSpedbuch.Size = New System.Drawing.Size(200, 21)
        Me.cboSpedbuch.TabIndex = 103
        '
        'MyComboBox3
        '
        Me.MyComboBox3._allowedValuesFreiText = Nothing
        Me.MyComboBox3._allowFreiText = False
        Me.MyComboBox3._value = ""
        Me.MyComboBox3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.MyComboBox3.FormattingEnabled = True
        Me.MyComboBox3.Location = New System.Drawing.Point(217, 106)
        Me.MyComboBox3.Name = "MyComboBox3"
        Me.MyComboBox3.Size = New System.Drawing.Size(198, 21)
        Me.MyComboBox3.TabIndex = 101
        '
        'TabPage4
        '
        Me.TabPage4.Controls.Add(Me.Label62)
@@ -738,48 +643,6 @@ Partial Class frmMitarbDetails
        Me.Label43.TabIndex = 108
        Me.Label43.Text = "EZOLL Sachbearbeiter:"
        '
        'cboEZOLL_SB_UNISPED
        '
        Me.cboEZOLL_SB_UNISPED._allowedValuesFreiText = Nothing
        Me.cboEZOLL_SB_UNISPED._allowFreiText = False
        Me.cboEZOLL_SB_UNISPED._value = ""
        Me.cboEZOLL_SB_UNISPED.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
        Me.cboEZOLL_SB_UNISPED.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.cboEZOLL_SB_UNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboEZOLL_SB_UNISPED.FormattingEnabled = True
        Me.cboEZOLL_SB_UNISPED.Location = New System.Drawing.Point(332, 29)
        Me.cboEZOLL_SB_UNISPED.Name = "cboEZOLL_SB_UNISPED"
        Me.cboEZOLL_SB_UNISPED.Size = New System.Drawing.Size(104, 21)
        Me.cboEZOLL_SB_UNISPED.TabIndex = 121
        '
        'cboEZOLL_SB
        '
        Me.cboEZOLL_SB._allowedValuesFreiText = Nothing
        Me.cboEZOLL_SB._allowFreiText = False
        Me.cboEZOLL_SB._value = ""
        Me.cboEZOLL_SB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
        Me.cboEZOLL_SB.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.cboEZOLL_SB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        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(116, 21)
        Me.cboEZOLL_SB.TabIndex = 109
        '
        'cboATLAS_SB
        '
        Me.cboATLAS_SB._allowedValuesFreiText = Nothing
        Me.cboATLAS_SB._allowFreiText = False
        Me.cboATLAS_SB._value = ""
        Me.cboATLAS_SB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
        Me.cboATLAS_SB.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.cboATLAS_SB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboATLAS_SB.FormattingEnabled = True
        Me.cboATLAS_SB.Location = New System.Drawing.Point(9, 29)
        Me.cboATLAS_SB.Name = "cboATLAS_SB"
        Me.cboATLAS_SB.Size = New System.Drawing.Size(200, 21)
        Me.cboATLAS_SB.TabIndex = 107
        '
        'TabPage5
        '
        Me.TabPage5.Controls.Add(Me.cbxShowPW)
@@ -875,18 +738,6 @@ Partial Class frmMitarbDetails
        Me.TabPage7.Text = "Sprachen"
        Me.TabPage7.UseVisualStyleBackColor = True
        '
        'lbSprachen
        '
        Me.lbSprachen._value = ""
        Me.lbSprachen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lbSprachen.FormattingEnabled = True
        Me.lbSprachen.Location = New System.Drawing.Point(5, 3)
        Me.lbSprachen.MultiColumn = True
        Me.lbSprachen.Name = "lbSprachen"
        Me.lbSprachen.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple
        Me.lbSprachen.Size = New System.Drawing.Size(152, 134)
        Me.lbSprachen.TabIndex = 97
        '
        'tabParameter
        '
        Me.tabParameter.Controls.Add(Me.dgvUserParameter)
@@ -898,16 +749,6 @@ Partial Class frmMitarbDetails
        Me.tabParameter.Text = "Parameter"
        Me.tabParameter.UseVisualStyleBackColor = True
        '
        'dgvUserParameter
        '
        Me.dgvUserParameter.AKTUALISIERUNGS_INTERVALL = -1
        Me.dgvUserParameter.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvUserParameter.Dock = System.Windows.Forms.DockStyle.Fill
        Me.dgvUserParameter.Location = New System.Drawing.Point(3, 3)
        Me.dgvUserParameter.Name = "dgvUserParameter"
        Me.dgvUserParameter.Size = New System.Drawing.Size(436, 168)
        Me.dgvUserParameter.TabIndex = 0
        '
        'Label4
        '
        Me.Label4.AutoSize = True
@@ -919,6 +760,8 @@ Partial Class frmMitarbDetails
        '
        'GroupBox2
        '
        Me.GroupBox2.Controls.Add(Me.cboFunktion)
        Me.GroupBox2.Controls.Add(Me.Label63)
        Me.GroupBox2.Controls.Add(Me.txtTelNr)
        Me.GroupBox2.Controls.Add(Me.btnUpdateAD)
        Me.GroupBox2.Controls.Add(Me.txtEmailExtension)
@@ -1027,20 +870,6 @@ Partial Class frmMitarbDetails
        Me.Label57.TabIndex = 110
        Me.Label57.Text = "And. Anzeigename (Aviso,TV):"
        '
        '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))
@@ -1050,19 +879,6 @@ Partial Class frmMitarbDetails
        Me.Label56.TabIndex = 108
        Me.Label56.Text = "Fakturierungs-Gruppe:"
        '
        'cboALIASDomain2
        '
        Me.cboALIASDomain2._allowedValuesFreiText = Nothing
        Me.cboALIASDomain2._allowFreiText = False
        Me.cboALIASDomain2._value = ""
        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(402, 60)
        Me.cboALIASDomain2.Name = "cboALIASDomain2"
        Me.cboALIASDomain2.Size = New System.Drawing.Size(116, 21)
        Me.cboALIASDomain2.TabIndex = 106
        '
        'txtALIASUser2
        '
        Me.txtALIASUser2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -1084,6 +900,7 @@ Partial Class frmMitarbDetails
        'cboFirmaHaupt
        '
        Me.cboFirmaHaupt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
        Me.cboFirmaHaupt.DropDownWidth = 75
        Me.cboFirmaHaupt.Enabled = False
        Me.cboFirmaHaupt.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboFirmaHaupt.FormattingEnabled = True
@@ -1092,20 +909,6 @@ Partial Class frmMitarbDetails
        Me.cboFirmaHaupt.Size = New System.Drawing.Size(57, 21)
        Me.cboFirmaHaupt.TabIndex = 103
        '
        '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(399, 116)
        Me.cboTeam.Name = "cboTeam"
        Me.cboTeam.Size = New System.Drawing.Size(148, 21)
        Me.cboTeam.TabIndex = 101
        '
        'Label53
        '
        Me.Label53.AutoSize = True
@@ -1116,19 +919,6 @@ Partial Class frmMitarbDetails
        Me.Label53.TabIndex = 102
        Me.Label53.Text = "Team:"
        '
        'cboALIASDomain
        '
        Me.cboALIASDomain._allowedValuesFreiText = Nothing
        Me.cboALIASDomain._allowFreiText = False
        Me.cboALIASDomain._value = ""
        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(402, 37)
        Me.cboALIASDomain.Name = "cboALIASDomain"
        Me.cboALIASDomain.Size = New System.Drawing.Size(116, 21)
        Me.cboALIASDomain.TabIndex = 100
        '
        'txtALIASUser
        '
        Me.txtALIASUser.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -1168,31 +958,6 @@ Partial Class frmMitarbDetails
        Me.Label45.TabIndex = 97
        Me.Label45.Text = "Einsicht Firmen-Daten:" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Offene Posten, Umsätze, ... )"
        '
        'MyListBox1
        '
        Me.MyListBox1._value = ""
        Me.MyListBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.MyListBox1.FormattingEnabled = True
        Me.MyListBox1.Location = New System.Drawing.Point(551, 133)
        Me.MyListBox1.MultiColumn = True
        Me.MyListBox1.Name = "MyListBox1"
        Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple
        Me.MyListBox1.Size = New System.Drawing.Size(152, 95)
        Me.MyListBox1.TabIndex = 96
        '
        'cboFirmaFMZOLL
        '
        Me.cboFirmaFMZOLL._allowedValuesFreiText = Nothing
        Me.cboFirmaFMZOLL._allowFreiText = False
        Me.cboFirmaFMZOLL._value = ""
        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(210, 76)
        Me.cboFirmaFMZOLL.Name = "cboFirmaFMZOLL"
        Me.cboFirmaFMZOLL.Size = New System.Drawing.Size(178, 21)
        Me.cboFirmaFMZOLL.TabIndex = 95
        '
        'Label39
        '
        Me.Label39.AutoSize = True
@@ -1260,7 +1025,7 @@ Partial Class frmMitarbDetails
        Me.cboPosition.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
        Me.cboPosition.Location = New System.Drawing.Point(18, 155)
        Me.cboPosition.Name = "cboPosition"
-        Me.cboPosition.Size = New System.Drawing.Size(136, 21)
+        Me.cboPosition.Size = New System.Drawing.Size(67, 21)
        Me.cboPosition.TabIndex = 5
        '
        'Label29
@@ -1339,20 +1104,6 @@ Partial Class frmMitarbDetails
        Me.Label8.TabIndex = 1
        Me.Label8.Text = "(erst bei Doppelklick sichtbar)"
        '
        'cboAbteilung
        '
        Me.cboAbteilung._allowedValuesFreiText = Nothing
        Me.cboAbteilung._allowFreiText = False
        Me.cboAbteilung._value = ""
        Me.cboAbteilung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
        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(211, 116)
        Me.cboAbteilung.Name = "cboAbteilung"
        Me.cboAbteilung.Size = New System.Drawing.Size(177, 21)
        Me.cboAbteilung.TabIndex = 4
        '
        'txtPwd
        '
        Me.txtPwd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -1399,20 +1150,6 @@ Partial Class frmMitarbDetails
        Me.Label3.TabIndex = 56
        Me.Label3.Text = "Username:"
        '
        'cboNiederlassung
        '
        Me.cboNiederlassung._allowedValuesFreiText = Nothing
        Me.cboNiederlassung._allowFreiText = False
        Me.cboNiederlassung._value = ""
        Me.cboNiederlassung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
        Me.cboNiederlassung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboNiederlassung.FormattingEnabled = True
        Me.cboNiederlassung.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
        Me.cboNiederlassung.Location = New System.Drawing.Point(18, 116)
        Me.cboNiederlassung.Name = "cboNiederlassung"
        Me.cboNiederlassung.Size = New System.Drawing.Size(177, 21)
        Me.cboNiederlassung.TabIndex = 3
        '
        'Label9
        '
        Me.Label9.AutoSize = True
@@ -1804,19 +1541,6 @@ 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
@@ -2649,6 +2373,317 @@ Partial Class frmMitarbDetails
        Me.Label66.TabIndex = 127
        Me.Label66.Text = "aliqu. Urlaub.:"
        '
        'ContextMenuStrip1
        '
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
        '
        'Label63
        '
        Me.Label63.AutoSize = True
        Me.Label63.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label63.Location = New System.Drawing.Point(91, 140)
        Me.Label63.Name = "Label63"
        Me.Label63.Size = New System.Drawing.Size(51, 13)
        Me.Label63.TabIndex = 114
        Me.Label63.Text = "Funktion:"
        '
        'cboDPFirma2
        '
        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
        '
        'cboDPFirma
        '
        Me.cboDPFirma._allowedValuesFreiText = Nothing
        Me.cboDPFirma._allowFreiText = False
        Me.cboDPFirma._value = ""
        Me.cboDPFirma.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboDPFirma.FormattingEnabled = True
        Me.cboDPFirma.Location = New System.Drawing.Point(7, 151)
        Me.cboDPFirma.Name = "cboDPFirma"
        Me.cboDPFirma.Size = New System.Drawing.Size(101, 21)
        Me.cboDPFirma.TabIndex = 107
        '
        'cboPersonal
        '
        Me.cboPersonal._allowedValuesFreiText = Nothing
        Me.cboPersonal._allowFreiText = False
        Me.cboPersonal._value = ""
        Me.cboPersonal.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboPersonal.FormattingEnabled = True
        Me.cboPersonal.Location = New System.Drawing.Point(7, 65)
        Me.cboPersonal.Name = "cboPersonal"
        Me.cboPersonal.Size = New System.Drawing.Size(200, 21)
        Me.cboPersonal.TabIndex = 95
        '
        'MyComboBox2
        '
        Me.MyComboBox2._allowedValuesFreiText = Nothing
        Me.MyComboBox2._allowFreiText = False
        Me.MyComboBox2._value = ""
        Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.MyComboBox2.FormattingEnabled = True
        Me.MyComboBox2.Location = New System.Drawing.Point(9, 24)
        Me.MyComboBox2.Name = "MyComboBox2"
        Me.MyComboBox2.Size = New System.Drawing.Size(198, 21)
        Me.MyComboBox2.TabIndex = 97
        '
        'cboDP
        '
        Me.cboDP._allowedValuesFreiText = Nothing
        Me.cboDP._allowFreiText = False
        Me.cboDP._value = ""
        Me.cboDP.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboDP.FormattingEnabled = True
        Me.cboDP.Location = New System.Drawing.Point(217, 151)
        Me.cboDP.Name = "cboDP"
        Me.cboDP.Size = New System.Drawing.Size(198, 21)
        Me.cboDP.TabIndex = 105
        '
        'cboKasse
        '
        Me.cboKasse._allowedValuesFreiText = Nothing
        Me.cboKasse._allowFreiText = False
        Me.cboKasse._value = ""
        Me.cboKasse.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboKasse.FormattingEnabled = True
        Me.cboKasse.Location = New System.Drawing.Point(7, 106)
        Me.cboKasse.Name = "cboKasse"
        Me.cboKasse.Size = New System.Drawing.Size(200, 21)
        Me.cboKasse.TabIndex = 99
        '
        'cboSpedbuch
        '
        Me.cboSpedbuch._allowedValuesFreiText = Nothing
        Me.cboSpedbuch._allowFreiText = False
        Me.cboSpedbuch._value = ""
        Me.cboSpedbuch.Enabled = False
        Me.cboSpedbuch.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboSpedbuch.FormattingEnabled = True
        Me.cboSpedbuch.Location = New System.Drawing.Point(217, 66)
        Me.cboSpedbuch.Name = "cboSpedbuch"
        Me.cboSpedbuch.Size = New System.Drawing.Size(200, 21)
        Me.cboSpedbuch.TabIndex = 103
        '
        'MyComboBox3
        '
        Me.MyComboBox3._allowedValuesFreiText = Nothing
        Me.MyComboBox3._allowFreiText = False
        Me.MyComboBox3._value = ""
        Me.MyComboBox3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.MyComboBox3.FormattingEnabled = True
        Me.MyComboBox3.Location = New System.Drawing.Point(217, 106)
        Me.MyComboBox3.Name = "MyComboBox3"
        Me.MyComboBox3.Size = New System.Drawing.Size(198, 21)
        Me.MyComboBox3.TabIndex = 101
        '
        'cboEZOLL_SB_UNISPED
        '
        Me.cboEZOLL_SB_UNISPED._allowedValuesFreiText = Nothing
        Me.cboEZOLL_SB_UNISPED._allowFreiText = False
        Me.cboEZOLL_SB_UNISPED._value = ""
        Me.cboEZOLL_SB_UNISPED.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
        Me.cboEZOLL_SB_UNISPED.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.cboEZOLL_SB_UNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboEZOLL_SB_UNISPED.FormattingEnabled = True
        Me.cboEZOLL_SB_UNISPED.Location = New System.Drawing.Point(332, 29)
        Me.cboEZOLL_SB_UNISPED.Name = "cboEZOLL_SB_UNISPED"
        Me.cboEZOLL_SB_UNISPED.Size = New System.Drawing.Size(104, 21)
        Me.cboEZOLL_SB_UNISPED.TabIndex = 121
        '
        'cboEZOLL_SB
        '
        Me.cboEZOLL_SB._allowedValuesFreiText = Nothing
        Me.cboEZOLL_SB._allowFreiText = False
        Me.cboEZOLL_SB._value = ""
        Me.cboEZOLL_SB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
        Me.cboEZOLL_SB.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.cboEZOLL_SB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        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(116, 21)
        Me.cboEZOLL_SB.TabIndex = 109
        '
        'cboATLAS_SB
        '
        Me.cboATLAS_SB._allowedValuesFreiText = Nothing
        Me.cboATLAS_SB._allowFreiText = False
        Me.cboATLAS_SB._value = ""
        Me.cboATLAS_SB.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
        Me.cboATLAS_SB.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
        Me.cboATLAS_SB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboATLAS_SB.FormattingEnabled = True
        Me.cboATLAS_SB.Location = New System.Drawing.Point(9, 29)
        Me.cboATLAS_SB.Name = "cboATLAS_SB"
        Me.cboATLAS_SB.Size = New System.Drawing.Size(200, 21)
        Me.cboATLAS_SB.TabIndex = 107
        '
        'lbSprachen
        '
        Me.lbSprachen._value = ""
        Me.lbSprachen.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lbSprachen.FormattingEnabled = True
        Me.lbSprachen.Location = New System.Drawing.Point(5, 3)
        Me.lbSprachen.MultiColumn = True
        Me.lbSprachen.Name = "lbSprachen"
        Me.lbSprachen.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple
        Me.lbSprachen.Size = New System.Drawing.Size(152, 134)
        Me.lbSprachen.TabIndex = 97
        '
        'dgvUserParameter
        '
        Me.dgvUserParameter.AKTUALISIERUNGS_INTERVALL = -1
        Me.dgvUserParameter.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvUserParameter.Dock = System.Windows.Forms.DockStyle.Fill
        Me.dgvUserParameter.Location = New System.Drawing.Point(3, 3)
        Me.dgvUserParameter.Name = "dgvUserParameter"
        Me.dgvUserParameter.Size = New System.Drawing.Size(436, 168)
        Me.dgvUserParameter.TabIndex = 0
        '
        'cboFunktion
        '
        Me.cboFunktion._allowedValuesFreiText = Nothing
        Me.cboFunktion._allowFreiText = False
        Me.cboFunktion._value = ""
        Me.cboFunktion.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
        Me.cboFunktion.DropDownWidth = 120
        Me.cboFunktion.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboFunktion.FormattingEnabled = True
        Me.cboFunktion.Items.AddRange(New Object() {"Buchhaltung", "EDV", "Fiskal", "Geschäftsführung", "Lager", "MDM", "quick-stop", "Verrechnung", "Zollabteilung"})
        Me.cboFunktion.Location = New System.Drawing.Point(91, 156)
        Me.cboFunktion.Name = "cboFunktion"
        Me.cboFunktion.Size = New System.Drawing.Size(101, 21)
        Me.cboFunktion.TabIndex = 115
        '
        '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
        '
        'cboALIASDomain2
        '
        Me.cboALIASDomain2._allowedValuesFreiText = Nothing
        Me.cboALIASDomain2._allowFreiText = False
        Me.cboALIASDomain2._value = ""
        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(402, 60)
        Me.cboALIASDomain2.Name = "cboALIASDomain2"
        Me.cboALIASDomain2.Size = New System.Drawing.Size(116, 21)
        Me.cboALIASDomain2.TabIndex = 106
        '
        '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(399, 116)
        Me.cboTeam.Name = "cboTeam"
        Me.cboTeam.Size = New System.Drawing.Size(148, 21)
        Me.cboTeam.TabIndex = 101
        '
        'cboALIASDomain
        '
        Me.cboALIASDomain._allowedValuesFreiText = Nothing
        Me.cboALIASDomain._allowFreiText = False
        Me.cboALIASDomain._value = ""
        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(402, 37)
        Me.cboALIASDomain.Name = "cboALIASDomain"
        Me.cboALIASDomain.Size = New System.Drawing.Size(116, 21)
        Me.cboALIASDomain.TabIndex = 100
        '
        'MyListBox1
        '
        Me.MyListBox1._value = ""
        Me.MyListBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.MyListBox1.FormattingEnabled = True
        Me.MyListBox1.Location = New System.Drawing.Point(551, 133)
        Me.MyListBox1.MultiColumn = True
        Me.MyListBox1.Name = "MyListBox1"
        Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple
        Me.MyListBox1.Size = New System.Drawing.Size(152, 95)
        Me.MyListBox1.TabIndex = 96
        '
        'cboFirmaFMZOLL
        '
        Me.cboFirmaFMZOLL._allowedValuesFreiText = Nothing
        Me.cboFirmaFMZOLL._allowFreiText = False
        Me.cboFirmaFMZOLL._value = ""
        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(210, 76)
        Me.cboFirmaFMZOLL.Name = "cboFirmaFMZOLL"
        Me.cboFirmaFMZOLL.Size = New System.Drawing.Size(178, 21)
        Me.cboFirmaFMZOLL.TabIndex = 95
        '
        'cboAbteilung
        '
        Me.cboAbteilung._allowedValuesFreiText = Nothing
        Me.cboAbteilung._allowFreiText = False
        Me.cboAbteilung._value = ""
        Me.cboAbteilung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
        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(211, 116)
        Me.cboAbteilung.Name = "cboAbteilung"
        Me.cboAbteilung.Size = New System.Drawing.Size(177, 21)
        Me.cboAbteilung.TabIndex = 4
        '
        'cboNiederlassung
        '
        Me.cboNiederlassung._allowedValuesFreiText = Nothing
        Me.cboNiederlassung._allowFreiText = False
        Me.cboNiederlassung._value = ""
        Me.cboNiederlassung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
        Me.cboNiederlassung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cboNiederlassung.FormattingEnabled = True
        Me.cboNiederlassung.Items.AddRange(New Object() {"Suben", "Salzburg", "Waidhaus", "Nickelsdorf"})
        Me.cboNiederlassung.Location = New System.Drawing.Point(18, 116)
        Me.cboNiederlassung.Name = "cboNiederlassung"
        Me.cboNiederlassung.Size = New System.Drawing.Size(177, 21)
        Me.cboNiederlassung.TabIndex = 3
        '
        '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
        '
        'dgvUberstundenauszahlungen
        '
        Me.dgvUberstundenauszahlungen.AKTUALISIERUNGS_INTERVALL = -1
@@ -2670,11 +2705,6 @@ Partial Class frmMitarbDetails
        Me.dgvData.Size = New System.Drawing.Size(390, 192)
        Me.dgvData.TabIndex = 149
        '
        'ContextMenuStrip1
        '
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
        '
        'frmMitarbDetails
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2704,7 +2734,6 @@ Partial Class frmMitarbDetails
        Me.TabPage5.PerformLayout()
        Me.TabPage7.ResumeLayout(False)
        Me.tabParameter.ResumeLayout(False)
        CType(Me.dgvUserParameter, System.ComponentModel.ISupportInitialize).EndInit()
        Me.GroupBox2.ResumeLayout(False)
        Me.GroupBox2.PerformLayout()
        Me.GroupBox1.ResumeLayout(False)
@@ -2721,6 +2750,7 @@ Partial Class frmMitarbDetails
        CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit()
        Me.TabPage8.ResumeLayout(False)
        Me.TabPage8.PerformLayout()
        CType(Me.dgvUserParameter, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.dgvUberstundenauszahlungen, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.dgvData, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
@@ -2941,4 +2971,6 @@ Partial Class frmMitarbDetails
    Friend WithEvents cbxClientTimas As ComboBox
    Friend WithEvents tabParameter As TabPage
    Friend WithEvents dgvUserParameter As VERAG_PROG_ALLGEMEIN.MyDatagridview
    Friend WithEvents Label63 As Label
    Friend WithEvents cboFunktion As VERAG_PROG_ALLGEMEIN.MyComboBox
 End Class
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -215,6 +215,10 @@ Public Class frmMitarbDetails
        cboAbteilung.Items.Clear()
        cboAbteilung.fillWithSQL("SELECT [abt_kuerzel],[abt_bezeichnung] FROM tblAbteilungen", False, "ADMIN", True)
        cboFunktion.Items.Clear()
        cboFunktion.fillWithSQL("SELECT [fun_kuerzel],[fun_bezeichnung] FROM tblMitarbeiter_Funktionen", False, "ADMIN", True)
        cboNiederlassung.Items.Clear()
        cboNiederlassung.fillWithSQL("SELECT [nl_kuerzel],[nl_bezeichnung] FROM tblNiederlassungen", False, "ADMIN", True)
@@ -318,6 +322,7 @@ Public Class frmMitarbDetails
        cboNiederlassung.changeItem(mitarbeiter.mit_niederlassung)
        cboFaktGrp.changeItem(mitarbeiter.mit_fakturierungsgruppe)
        cboAbteilung.changeItem(mitarbeiter.mit_abteilung)
        cboFunktion.changeItem(mitarbeiter.mit_Funktion)
        cboPosition.Text = mitarbeiter.mit_position
        txtDurchwahl.Text = mitarbeiter.mit_durchwahl
        txtTelNr.Text = mitarbeiter.mit_telefonnr
@@ -631,6 +636,7 @@ Public Class frmMitarbDetails
        mitarbeiter.mit_niederlassung = cboNiederlassung._value
        mitarbeiter.mit_fakturierungsgruppe = cboFaktGrp._value
        mitarbeiter.mit_abteilung = cboAbteilung._value
        mitarbeiter.mit_Funktion = cboFunktion._value
        mitarbeiter.mit_position = cboPosition.Text
        mitarbeiter.mit_durchwahl = txtDurchwahl.Text
        mitarbeiter.mit_email = txtEmail.Text
@@ -657,6 +663,7 @@ Public Class frmMitarbDetails
        mitarbeiter.mit_emailprivat = txtprivateEMail.Text
        If IsNumeric(cboPersonal._value) AndAlso cboPersonal._value > 0 Then
            mitarbeiter.mit_FMZollPersID = cboPersonal._value
        Else
--- a/UID/cSqlDb.vb
+++ b/UID/cSqlDb.vb
@@ -1558,8 +1558,8 @@ Public Class cMitarbeiter
        'Änderung
        Dim sql = "INSERT INTO tblMitarbeiter " &
-                       "(mit_username,mit_abweichenderAnzeigename, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_AliasAD_Domain2,mit_AliasAD_Username2,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt,mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname,mit_foto_DocId,mit_MAVerzeichnis_Motto,mit_sprache,mit_fakturierungsgruppe, mit_CSuser, mit_CSpwd, mit_PersonalNr, mit_telefonnr,mit_ATGRNAccessCode_AT51FP7,mit_ATGRNAccessCode_AT52VA6 , mit_Sprachkentnisse,mit_EZOLL_SB_UNISPED, mit_homeoffice,mit_timasNichtStempeln,mit_emailprivat, mit_timasMehrereFirmen, mit_timasFirmen) OUTPUT INSERTED.mit_id VALUES " &
+                       "(mit_username,mit_abweichenderAnzeigename, mit_pwd, mit_geschlecht, mit_affix, mit_vname, mit_nname, mit_gebdat, mit_strasse,mit_hausnr,mit_land,mit_plz,mit_ort,mit_niederlassung, mit_abteilung, mit_position, mit_durchwahl, mit_email, mit_mobiltel, mit_allowAnruf,mit_info, mit_einstiegsdatum, mit_gekuendigt, mit_kuendigungsdatum, mit_foto,mit_firma,mit_firmaFMZoll,mit_FMZollPersID,mit_FMZollPersIDKasseIsnotSpedBuch,mit_FMZollPersIDSpedBuch,mit_standartFiliale,mit_DpUserStandardDP,mit_EZOLL_SB,mit_ATLAS_SB,mit_FirmenDatenAnzeige,mit_DAKOSY_SB,mit_DAKOSY_SBFull,mit_DpUserStandardFirma,mit_DpUserStandardFirma2,mit_TESTonly,mit_PasswortChanged,mit_TELOTEC_SB,mit_AliasAD_Domain,mit_AliasAD_Username,mit_AliasAD_Domain2,mit_AliasAD_Username2,mit_teamId,mit_ChatBenutzer,mit_FirmaHaupt,mit_ChatEasteregg,mit_MAVerzeichnis_SettingsTstmp,mit_MAVerzeichnis_allowGebDat,mit_MAVerzeichnis_allowWohnadresse,mit_MAVerzeichnis_allowGebDatOhneJahr,mit_MAVerzeichnis_Spitzname,mit_foto_DocId,mit_MAVerzeichnis_Motto,mit_sprache,mit_fakturierungsgruppe, mit_CSuser, mit_CSpwd, mit_PersonalNr, mit_telefonnr,mit_ATGRNAccessCode_AT51FP7,mit_ATGRNAccessCode_AT52VA6 , mit_Sprachkentnisse,mit_EZOLL_SB_UNISPED, mit_homeoffice,mit_timasNichtStempeln,mit_emailprivat, mit_timasMehrereFirmen, mit_timasFirmen, mit_Funktion) OUTPUT INSERTED.mit_id VALUES " &
-                       "(@mit_username,@mit_abweichenderAnzeigename,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_AliasAD_Domain2,@mit_AliasAD_Username2,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt,@mit_ChatEasteregg,@mit_MAVerzeichnis_SettingsTstmp,@mit_MAVerzeichnis_allowGebDat,@mit_MAVerzeichnis_allowWohnadresse,@mit_MAVerzeichnis_allowGebDatOhneJahr,@mit_MAVerzeichnis_Spitzname,@mit_foto_DocId,@mit_MAVerzeichnis_Motto ,@mit_sprache,@mit_fakturierungsgruppe, @mit_CSuser, @mit_CSpwd, @mit_PersonalNr, @mit_telefonnr,@mit_ATGRNAccessCode_AT51FP7 ,@mit_ATGRNAccessCode_AT52VA6, @mit_Sprachkentnisse,@mit_EZOLL_SB_UNISPED, @mit_homeoffice,@mit_timasNichtStempeln, @mit_emailprivat, @mit_timasMehrereFirmen, @mit_timasFirmen)"
+                       "(@mit_username,@mit_abweichenderAnzeigename,@mit_pwd,@mit_geschlecht,@mit_affix,@mit_vname,@mit_nname,@mit_gebdat,@mit_strasse,@mit_hausnr,@mit_land,@mit_plz,@mit_ort,@mit_niederlassung,@mit_abteilung,@mit_position,@mit_durchwahl,@mit_email,@mit_mobiltel,@mit_allowAnruf,@mit_info,@mit_einstiegsdatum,@mit_gekuendigt,@mit_kuendigungsdatum,@mit_foto,@mit_firma,@mit_firmaFMZoll,@mit_FMZollPersID,@mit_FMZollPersIDKasseIsnotSpedBuch,@mit_FMZollPersIDSpedBuch,@mit_standartFiliale,@mit_DpUserStandardDP,@mit_EZOLL_SB,@mit_ATLAS_SB,@mit_FirmenDatenAnzeige,@mit_DAKOSY_SB,@mit_DAKOSY_SBFull,@mit_DpUserStandardFirma,@mit_DpUserStandardFirma2,@mit_TESTonly,@mit_PasswortChanged,@mit_TELOTEC_SB,@mit_AliasAD_Domain,@mit_AliasAD_Username,@mit_AliasAD_Domain2,@mit_AliasAD_Username2,@mit_teamId,@mit_ChatBenutzer,@mit_FirmaHaupt,@mit_ChatEasteregg,@mit_MAVerzeichnis_SettingsTstmp,@mit_MAVerzeichnis_allowGebDat,@mit_MAVerzeichnis_allowWohnadresse,@mit_MAVerzeichnis_allowGebDatOhneJahr,@mit_MAVerzeichnis_Spitzname,@mit_foto_DocId,@mit_MAVerzeichnis_Motto ,@mit_sprache,@mit_fakturierungsgruppe, @mit_CSuser, @mit_CSpwd, @mit_PersonalNr, @mit_telefonnr,@mit_ATGRNAccessCode_AT51FP7 ,@mit_ATGRNAccessCode_AT52VA6, @mit_Sprachkentnisse,@mit_EZOLL_SB_UNISPED, @mit_homeoffice,@mit_timasNichtStempeln, @mit_emailprivat, @mit_timasMehrereFirmen, @mit_timasFirmen,@mit_Funktion )"
@@ -1644,6 +1644,7 @@ Public Class cMitarbeiter
                cmd.Parameters.AddWithValue("@mit_emailprivat", m.mit_emailprivat)
                cmd.Parameters.AddWithValue("@mit_timasMehrereFirmen", m.mit_timasMehrereFirmen)
                cmd.Parameters.AddWithValue("@mit_timasFirmen", If(m.mit_timasFirmen, DBNull.Value))
                cmd.Parameters.AddWithValue("@mit_Funktion", If(m.mit_Funktion, DBNull.Value))
                Try
                    mid = cmd.ExecuteScalar()
@@ -1662,7 +1663,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_EZOLL_SB_UNISPED=@mit_EZOLL_SB_UNISPED " &
-                     " ,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, mit_homeoffice=@mit_homeoffice, mit_timasNichtStempeln=@mit_timasNichtStempeln, mit_emailprivat=@mit_emailprivat, mit_timasMehrereFirmen=@mit_timasMehrereFirmen, mit_timasFirmen=@mit_timasFirmen" &
+                     " ,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, mit_homeoffice=@mit_homeoffice, mit_timasNichtStempeln=@mit_timasNichtStempeln, mit_emailprivat=@mit_emailprivat, mit_timasMehrereFirmen=@mit_timasMehrereFirmen, mit_timasFirmen=@mit_timasFirmen, mit_Funktion=@mit_Funktion" &
                     " WHERE mit_id=@mit_id "
@@ -1749,6 +1750,7 @@ Public Class cMitarbeiter
                cmd.Parameters.AddWithValue("@mit_emailprivat", m.mit_emailprivat)
                cmd.Parameters.AddWithValue("@mit_timasMehrereFirmen", m.mit_timasMehrereFirmen)
                cmd.Parameters.AddWithValue("@mit_timasFirmen", If(m.mit_timasFirmen, DBNull.Value))
                cmd.Parameters.AddWithValue("@mit_Funktion", If(m.mit_Funktion, DBNull.Value))
                Try
--- a/UID/usrctlProcedures.Designer.vb
+++ b/UID/usrctlProcedures.Designer.vb
@@ -59,8 +59,6 @@ Partial Class usrctlProcedures
        Me.Button11 = New System.Windows.Forms.Button()
        Me.Button10 = New System.Windows.Forms.Button()
        Me.DataGridView1 = New System.Windows.Forms.DataGridView()
        Me.Column1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.Column2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.Button9 = New System.Windows.Forms.Button()
        Me.Button8 = New System.Windows.Forms.Button()
        Me.Button7 = New System.Windows.Forms.Button()
@@ -157,6 +155,10 @@ Partial Class usrctlProcedures
        Me.Button99 = New System.Windows.Forms.Button()
        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.Column1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.Column2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.Button54 = New System.Windows.Forms.Button()
        Me.Label23 = New System.Windows.Forms.Label()
        Me.TabControl1.SuspendLayout()
        Me.TabPage3.SuspendLayout()
        Me.TabPage1.SuspendLayout()
@@ -539,16 +541,6 @@ Partial Class usrctlProcedures
        Me.DataGridView1.Size = New System.Drawing.Size(240, 431)
        Me.DataGridView1.TabIndex = 5
        '
        'Column1
        '
        Me.Column1.HeaderText = "dat"
        Me.Column1.Name = "Column1"
        '
        'Column2
        '
        Me.Column2.HeaderText = "anz"
        Me.Column2.Name = "Column2"
        '
        'Button9
        '
        Me.Button9.Location = New System.Drawing.Point(131, 131)
@@ -793,6 +785,8 @@ Partial Class usrctlProcedures
        '
        'TabPage6
        '
        Me.TabPage6.Controls.Add(Me.Label23)
        Me.TabPage6.Controls.Add(Me.Button54)
        Me.TabPage6.Controls.Add(Me.Label19)
        Me.TabPage6.Controls.Add(Me.Label18)
        Me.TabPage6.Controls.Add(Me.Label17)
@@ -1449,6 +1443,34 @@ Partial Class usrctlProcedures
        Me.DataGridViewTextBoxColumn2.HeaderText = "anz"
        Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
        '
        'Column1
        '
        Me.Column1.HeaderText = "dat"
        Me.Column1.Name = "Column1"
        '
        'Column2
        '
        Me.Column2.HeaderText = "anz"
        Me.Column2.Name = "Column2"
        '
        'Button54
        '
        Me.Button54.Location = New System.Drawing.Point(33, 133)
        Me.Button54.Name = "Button54"
        Me.Button54.Size = New System.Drawing.Size(106, 28)
        Me.Button54.TabIndex = 72
        Me.Button54.Text = "ZNB Zinssätze"
        Me.Button54.UseVisualStyleBackColor = True
        '
        'Label23
        '
        Me.Label23.AutoSize = True
        Me.Label23.Location = New System.Drawing.Point(11, 141)
        Me.Label23.Name = "Label23"
        Me.Label23.Size = New System.Drawing.Size(16, 13)
        Me.Label23.TabIndex = 73
        Me.Label23.Text = "3."
        '
        'usrctlProcedures
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1664,4 +1686,6 @@ Partial Class usrctlProcedures
    Friend WithEvents Label22 As Label
    Friend WithEvents dtpbis As DateTimePicker
    Friend WithEvents Button53 As Button
    Friend WithEvents Label23 As Label
    Friend WithEvents Button54 As Button
 End Class
--- a/UID/usrctlProcedures.vb
+++ b/UID/usrctlProcedures.vb
@@ -4098,7 +4098,7 @@ Public Class usrctlProcedures
        Dim kdnr_tmp = ""
        Try
-            VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
+            VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxMDM_Testsystem.Checked
            Dim fd As New OpenFileDialog
            If fd.ShowDialog = DialogResult.OK Then
@@ -4181,7 +4181,7 @@ Public Class usrctlProcedures
        Try
-            VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
+            VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxMDM_Testsystem.Checked
            Dim fd As New OpenFileDialog
            If fd.ShowDialog = DialogResult.OK Then
@@ -4341,6 +4341,7 @@ OPTION (MAXRECURSION 1000);", "AVISO") '
                        Case "Vereinigte Arabische Emirate" : ISO2SetCountry = "AE"
                        Case "Vereinigte Staaten" : ISO2SetCountry = "US"
                        Case "Vereinigtes Königreich" : ISO2SetCountry = "GB"
                        Case "Bosnien und Herzegowina" : ISO2SetCountry = "BA"
                    End Select
@@ -4359,6 +4360,61 @@ OPTION (MAXRECURSION 1000);", "AVISO") '
    End Sub
    Private Sub Button54_Click(sender As Object, e As EventArgs) Handles Button54.Click
        Dim cnt = 0
        Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
        Try
            VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxMDM_Testsystem.Checked
            Dim fd As New OpenFileDialog
            If fd.ShowDialog = DialogResult.OK Then
                If fd.FileName.ToLower.EndsWith(".csv") Then
                    ' fd.FileName.EndsWith(".csv") 
                    Using MyReader As New Microsoft.VisualBasic.FileIO.TextFieldParser(fd.FileName, Encoding.Default)
                        MyReader.TextFieldType = FileIO.FieldType.Delimited
                        MyReader.SetDelimiters(";")
                        Dim currentRow As String()
                        While Not MyReader.EndOfData
                            Try
                                currentRow = MyReader.ReadFields()
                                If currentRow.Length > 1 AndAlso isleernothing(currentRow(0)) IsNot Nothing AndAlso IsNumeric(currentRow(0)) Then
                                    Dim KUNDE_ERW As New cKundenErweitert(currentRow(0))
                                    If isleernothing(currentRow(1)) IsNot Nothing AndAlso IsNumeric(currentRow(1)) Then
                                        KUNDE_ERW.kde_zinssatz = CDbl(currentRow(1))
                                        KUNDE_ERW.SAVE()
                                    End If
                                End If
                                cnt += 1
                            Catch ex As Exception
                                MsgBox(ex.Message & ex.StackTrace)
                            End Try
                        End While
                    End Using
                End If
            End If
        Catch ex As Exception
            MessageBox.Show("Datei nicht vorhanden.")
        Finally
        End Try
    End Sub
    'Private Sub Button26_Click(sender As Object, e As EventArgs)
--- a/initATLASAufschubkonten/frmStartOptions.vb
+++ b/initATLASAufschubkonten/frmStartOptions.vb
@@ -8,7 +8,9 @@ Imports System.Threading
 Imports System.Xml
 Imports com.sun.crypto.provider
 Imports com.sun.org.apache.bcel.internal.generic
 Imports com.sun.org.apache.xpath.internal.operations
 Imports com.sun.xml.internal.rngom
 Imports io.konik.zugferd
 Imports MDM_Worker
 Imports Renci.SshNet
 Imports VERAG_PROG_ALLGEMEIN
@@ -6918,7 +6920,11 @@ repeatRequest:
        Dim sql_query = ""
        Dim sql_query_keineMWST = ""
        'alle ab 2025!
        Dim test As String = " AND Adressen.AdressenNr = 139999"
        Select Case Lieferant
            Case "IDS"
@@ -6926,53 +6932,126 @@ repeatRequest:
                            inner join [VERAG].[dbo].[tbl_IDS_Kunden] on tblIDSInvoicesNewSplittedByCountry.CustomerCode = tbl_IDS_Kunden.CustomerCode 
                            inner join Adressen on Adressen.AdressenNr = KdNrVERAG 
                             WHERE tblIDSInvoicesNewSplittedByCountry.[CustomerCode] in (SELECT distinct([CustomerCode]) FROM [VERAG].[dbo].[tbl_IDS_Kunden]  
-                             WHERE 1 = 1 AND isnull([tbl_IDS_Kunden].KdNrAlt, 0) = 0) AND tblIDSInvoicesNewSplittedByCountry.InvToCustomer is null"
+                             WHERE 1 = 1 AND isnull([tbl_IDS_Kunden].KdNrAlt, 0) = 0) AND tblIDSInvoicesNewSplittedByCountry.InvToCustomer is null and Year(YearMonthDay) > 2024" '& test
                sql_query_keineMWST = "select distinct(tblKundenErweitert.kde_KundenNr) as KundenNr  FROM tblIDSInvoicesNewSplittedByCountry 
                            inner join [VERAG].[dbo].[tbl_IDS_Kunden] on tblIDSInvoicesNewSplittedByCountry.CustomerCode = tbl_IDS_Kunden.CustomerCode 
                            inner join tblKundenErweitert on tblKundenErweitert.kde_KundenNr = KdNrVERAG 
                             WHERE tblIDSInvoicesNewSplittedByCountry.[CustomerCode] in (SELECT distinct([CustomerCode]) FROM [VERAG].[dbo].[tbl_IDS_Kunden]  
                             WHERE 1 = 1 AND isnull([tbl_IDS_Kunden].KdNrAlt, 0) = 0) AND tblIDSInvoicesNewSplittedByCountry.InvToCustomer is null and Year(YearMonthDay) > 2024 and kde_keineMWSt = 1"
            Case "MSE"
-                sql_query = " select partner_customer_number as KundenNr,invoice_id,LandKz as KundenLandKz, total_vat_amount_euro as MWST,  country as RELandKz FROM tblMSEInvoices 
+                sql_query = " select customer_number as KundenNr,invoice_id,LandKz as KundenLandKz, total_vat_amount_euro as MWST,  country as RELandKz FROM tblMSEInvoices 
                              inner join tblMSECustomers on customer_id = [customer_number] 
                              inner join Adressen on Adressen.AdressenNr = partner_customer_number 
-                              where tblMSEInvoices.InvToCustomer is null and Year()"
+                              where tblMSEInvoices.InvToCustomer is null and Year(invoice_date) > 2024"
                sql_query_keineMWST = "select distinct(customer_number) as KundenNr FROM tblMSEInvoices 
                            inner join tblMSECustomers on customer_id = [customer_number] 
                            inner join tblKundenErweitert on tblKundenErweitert.kde_KundenNr = partner_customer_number 
                            where tblMSEInvoices.InvToCustomer is null and Year(invoice_date) > 2024 and kde_keineMWSt = 1"
            Case "PLOSE"
-                sql_query = "  select Adressen.AdressenNr as KundenNr, [plInv_Id] as invoice_id,LandKz as KundenLandKz ,[plInv_MWSTBetrag] as MWST, [plInv_SupplierCountry] as RELandKz FROM tblPLOSE_Inv_Data  
+
                Dim kdNrPlose As String = ""
                If txtPLoseKdNr.Text <> "" AndAlso IsNumeric(txtPLoseKdNr.Text) Then
                    kdNrPlose = " AND plInv_PLOSEKundennummer = " & txtPLoseKdNr.Text
                End If
                sql_query = "  select plInv_PLOSEKundennummer as KundenNr, [plInv_Id] as invoice_id,LandKz as KundenLandKz ,[plInv_MWSTBetrag] as MWST, [plInv_SupplierCountry] as RELandKz FROM tblPLOSE_Inv_Data  
                                inner join Adressen on Adressen.PLOSEKundenNr = plInv_PLOSEKundennummer 
-                                where plInv_InvToCustomer is null"
+                                where plInv_InvToCustomer is null and YEAR(plInv_SupplierRechnungsDatum) > 2024" & kdNrPlose
                sql_query_keineMWST = "select distinct(plInv_PLOSEKundennummer) as KundenNr FROM tblPLOSE_Inv_Data  
                                        inner join Adressen on Adressen.PLOSEKundenNr = plInv_PLOSEKundennummer  
                                       inner join tblKundenErweitert on tblKundenErweitert.kde_KundenNr = Adressen.AdressenNr 
                                        where plInv_InvToCustomer is null and YEAR(plInv_SupplierRechnungsDatum) > 2024 and kde_keineMWSt = 1 "
            Case "UTA"
-                sql_query = "  select Adressen.AdressenNr as KundenNr,[Rechnungsnummer_pro_Lieferland] as invoice_id,LandKz as KundenLandKz, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[Lieferland_ISO2] as RELandKz  FROM [VERAG].[dbo].[tblUTAImportNew] 
+                sql_query = "  select Adressen.UTAKundenNr as KundenNr,[Rechnungsnummer_pro_Lieferland] as invoice_id,LandKz as KundenLandKz, SUM(Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) as MWSt,[Lieferland_ISO2] as RELandKz  FROM [VERAG].[dbo].[tblUTAImportNew] 
-                                inner join adressen on Kundennummer = UTAKundenNr  
+                                inner join Adressen on Adressen.UTAKundenNr= [tblUTAImportNew].Kundennummer  
-                                where InvToCustomer is null
+                                inner join tblKundenErweitert on tblKundenErweitert.kde_KundenNr = Adressen.AdressenNr   
-                                group by Adressen.AdressenNr,[Rechnungsnummer_pro_Lieferland],LandKz,[Lieferland_ISO2]"
+                                where InvToCustomer is null and Year(Rechnungsdatum) > 2024
                                group by Adressen.UTAKundenNr ,[Rechnungsnummer_pro_Lieferland],LandKz,[Lieferland_ISO2]"
                sql_query_keineMWST = "select distinct(Adressen.UTAKundenNr) as KundenNr  FROM [VERAG].[dbo].[tblUTAImportNew] 
                                        inner join Adressen on Adressen.UTAKundenNr= [tblUTAImportNew].Kundennummer  
                                        inner join tblKundenErweitert on tblKundenErweitert.kde_KundenNr = Adressen.AdressenNr   
                                        where InvToCustomer is null and Year(Rechnungsdatum) > 2024 and kde_keineMWSt = 1
                                        group by Adressen.UTAKundenNr  "
            Case "RMC"
-                sql_query = " select Adressen.AdressenNr as KundenNr,rmc_id as invoice_id,LandKz as KundenLandKz,[rmc_betragMWST] as MWST,rmc_landKZ as RELandKz
+                sql_query = " select Adressen.WölflKundenNr as KundenNr,rmc_id as invoice_id,LandKz as KundenLandKz,[rmc_betragMWST] as MWST,rmc_landKZ as RELandKz
                            FROM [VERAG].[dbo].[tblRMCImport] 
-                            inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr 
+                            inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr
-                            where InvToCustomer is null"
+                            where InvToCustomer is null and Year(rmc_reDatum) > 2024"
                sql_query_keineMWST = "select distinct(Adressen.WölflKundenNr) as KundenNr FROM [VERAG].[dbo].[tblRMCImport] 
                                        inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr
                                        inner join tblKundenErweitert on tblKundenErweitert.kde_KundenNr = Adressen.AdressenNr
                                        where InvToCustomer is null and Year(rmc_reDatum) > 2024 and kde_keineMWSt = 1"
        End Select
        Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
        Dim dt_keineMWST As DataTable = SQL.loadDgvBySql(sql_query_keineMWST, "FMZOLL")
        'zuerst alle setzen, MWST nicht MDM uns machen!
        For Each r In dt_keineMWST.Rows
            If Not IsDBNull(r.Item("KundenNr")) AndAlso IsNumeric(r.Item("KundenNr")) Then
                Select Case Lieferant
                    Case "IDS" 'OK
                        Dim IDS As cIDS
                        IDS.setBackToCustomerCustomerID(SQL, True, r.Item("KundenNr"))
                    Case "MSE" 'OK
                        Dim MSE As cMSEAPI
                        MSE.setBackToCustomerCustomerID(SQL, True, r.Item("KundenNr"))
                    Case "PLOSE"
                        Dim ploseRE As cPLOSE_Inv_Data
                        ploseRE.setBackToCustomerCustomerID(SQL, True, r.Item("KundenNr"))
                    Case "UTA"
                        Dim uta As cUTA
                        uta.setBackToCustomerCustomerID(SQL, True, r.Item("KundenNr"))
                    Case "RMC"
                        Dim rmc As cRMC
                        rmc.setBackToCustomerCustomerID(SQL, True, r.Item("KundenNr"))
                End Select
            End If
        Next
        Dim dtnichtGesetzteInvToCustomer As DataTable = SQL.loadDgvBySql(sql_query, "FMZOLL")
        Dim rows_fehlendesErstattungsland() As DataRow = dtnichtGesetzteInvToCustomer.Select("RELandKz is null")
        If rows_fehlendesErstattungsland.Length > 0 Then
            MsgBox("Rechnungsland fehlt noch bei " & rows_fehlendesErstattungsland.Length & " Einträgen von " & Lieferant & vbNewLine & "Bitte Ländercode ISO2 einfügen!")
            Exit Sub
        End If
        For Each r In dtnichtGesetzteInvToCustomer.Rows
            'checks!
            'ORIGINAL-RECHNUNG setzen:
            If Not IsDBNull(r.Item("MWST")) AndAlso IsNumeric(r.Item("MWST")) AndAlso CDbl(r.Item("MWST")) = 0 Then
                'wenn die Rechnung die MWST-SUMME 0 aufweist!!!
-                UpdateLieferantInvToCustomer(Lieferant, r.Item("invoice_id"))
+                UpdateLieferantInvToCustomer(Lieferant, r.Item("invoice_id"), r.Item("KundenNr"))
                Continue For
            Else
@@ -6990,63 +7069,102 @@ repeatRequest:
                        landKZiso2 = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromISO1Land(LandKz)
                    End If
                    If IsDBNull(r.Item("RELandKz")) Then Continue For
                    Dim Erstattungsland As String = r.Item("RELandKz")
-                    If landKZiso2 = r.Item("RELandKz") Then
+                    If landKZiso2 = Erstattungsland Then
                        'wenn die Rechnung in dem Land in dem er ansässig ist ausgestellt wurde (rumän. Kunde – Rechnung ausgestellt in Rumänien = z.B. IDS in RO getankt…)
-                        UpdateLieferantInvToCustomer(Lieferant, r.Item("invoice_id"))
+                        UpdateLieferantInvToCustomer(Lieferant, r.Item("invoice_id"), r.Item("KundenNr"))
                        Continue For
                    End If
                    If landKZiso2 <> "" AndAlso dtkeineMWST.Rows.Count > 0 Then
                        'Rechnungen der Länder in denen der Kunde keine MWST erstattet bekommt
                        Dim rows_keineMWST() As DataRow = dtkeineMWST.Select("Land = '" & landKZiso2 & "' AND Erstattungsland= '" & r.Item("RELandKz") & "'" & IIf(Lieferant <> "IDS", " AND Lieferant <> 'IDS'", ""))
                        If rows_keineMWST.Length > 0 Then
                            UpdateLieferantInvToCustomer(Lieferant, r.Item("invoice_id"))
                            Continue For
                        End If
                    End If
-                    'Rechnungen der Länder, in denen der Kunde selber MWST beantragt
+                        If landKZiso2 <> "" AndAlso dtkeineMWST.Rows.Count > 0 Then
-                    If landKZiso2 <> "" AndAlso dtKundeMWST.Rows.Count > 0 Then
+                            'Rechnungen der Länder in denen der Kunde keine MWST erstattet bekommt
-                        Dim rows_KundeMWST() As DataRow = dtKundeMWST.Select("LandKz = '" & r.Item("RELandKz") & "' AND KdNr =" & kdnr)
+                            Dim rows_keineMWST() As DataRow = dtkeineMWST.Select("Land = '" & landKZiso2 & "' AND Erstattungsland= '" & Erstattungsland & "'" & IIf(Lieferant <> "IDS", " AND Lieferant <> 'IDS'", ""))
-                        If rows_KundeMWST.Length > 0 Then
+                            If rows_keineMWST.Length > 0 Then
-                            UpdateLieferantInvToCustomer(Lieferant, r.Item("invoice_id"))
+                            UpdateLieferantInvToCustomer(Lieferant, r.Item("invoice_id"), r.Item("KundenNr"))
                            Continue For
                            End If
                        End If
                        'Rechnungen der Länder, in denen der Kunde selber MWST beantragt
                        If landKZiso2 <> "" AndAlso dtKundeMWST.Rows.Count > 0 Then
                            Dim rows_KundeMWST() As DataRow = dtKundeMWST.Select("LandKz = '" & Erstattungsland & "' AND KdNr =" & kdnr)
                            If rows_KundeMWST.Length > 0 Then
                            UpdateLieferantInvToCustomer(Lieferant, r.Item("invoice_id"), r.Item("KundenNr"))
                            Continue For
                            End If
                        End If
                    End If
                End If
            End If
        Next
        Select Case Lieferant
-            Case "IDS" : SQL.doSQL("update tblIDSInvoicesNewSplittedByCountry set InvToCustomer = 0 where InvToCustomer is null", "FMZOLL")
+            Case "IDS"
-            Case "MSE" : SQL.doSQL("update tblMSEInvoices set InvToCustomer = 0 where InvToCustomer is null", "FMZOLL")
+
-            Case "PLOSE" : SQL.doSQL("update tblPLOSE_Inv_Data set plInv_InvToCustomer = 0  where plInv_InvToCustomer is null", "FMZOLL")
+                Dim IDS As cIDS
-            Case "UTA" : SQL.doSQL("update tblUTAImportNew set InvToCustomer = 0 where InvToCustomer is null", "FMZOLL")
+                IDS.setBackToCustomerInvoiceID(SQL, False)
-            Case "RMC" : SQL.doSQL("update tblRMCImport set InvToCustomer = 0  where InvToCustomer is null", "FMZOLL")
+
            Case "MSE"
                Dim MSE As cMSEAPI
                MSE.setBackToCustomerInvoiceID(SQL, False)
            Case "PLOSE"
                Dim ploseRE As cPLOSE_Inv_Data
                ploseRE.setBackToCustomerInvoiceID(SQL, False)
            Case "UTA"
                Dim uta As cUTA
                uta.setBackToCustomerInvoiceID(SQL, False)
            Case "RMC"
                Dim rmc As cRMC
                rmc.setBackToCustomerInvoiceID(SQL, False)
        End Select
    End Sub
-    Private Sub UpdateLieferantInvToCustomer(Lieferant As String, InvoiceID As String)
+    Private Sub UpdateLieferantInvToCustomer(Lieferant As String, InvoiceID As String, Optional CustomerNr As String = "")
        Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
        Select Case Lieferant
-            Case "IDS" : SQL.doSQL("update tblIDSInvoicesNewSplittedByCountry set InvToCustomer = 1 where invoice_id = '" & InvoiceID & "'", "FMZOLL")
+            Case "IDS"
-            Case "MSE" : SQL.doSQL("update tblMSEInvoices set InvToCustomer = 1 where invoice_id = '" & InvoiceID & "'", "FMZOLL")
+
-            Case "PLOSE" : SQL.doSQL("update tblPLOSE_Inv_Data set plInv_InvToCustomer = 1 where plInv_Id = '" & InvoiceID & "'", "FMZOLL")
+                Dim IDS As cIDS
-            Case "UTA" : SQL.doSQL("update tblUTAImportNew set InvToCustomer = 1 where [Rechnungsnummer_pro_Lieferland] = '" & InvoiceID & "'", "FMZOLL")
+                IDS.setBackToCustomerInvoiceID(SQL, True, InvoiceID)
-            Case "RMC" : SQL.doSQL("update tblRMCImport set InvToCustomer = 1 where rmc_id = '" & InvoiceID & "'", "FMZOLL")
+
            Case "MSE"
                Dim MSE As cMSEAPI
                MSE.setBackToCustomerInvoiceID(SQL, True, InvoiceID, CustomerNr) 'bei MSE ist die InvoiceID nur in Verbindung mit dem CustomerCode eindeutig!
            Case "PLOSE"
                Dim ploseRE As cPLOSE_Inv_Data
                ploseRE.setBackToCustomerInvoiceID(SQL, True, InvoiceID)
            Case "UTA"
                Dim uta As cUTA
                uta.setBackToCustomerInvoiceID(SQL, True, InvoiceID)
            Case "RMC"
                Dim rmc As cRMC
                rmc.setBackToCustomerInvoiceID(SQL, True, InvoiceID)
        End Select
Author	SHA1	Message	Date
d.breimaier	3b1c9c383e	Mitarbeiter, etc,	2025-11-21 17:32:06 +01:00
d.breimaier	e13dcd095e	Plose date, etc.	2025-11-20 13:50:00 +01:00