diff --git a/MDM_Worker/cPLOSE_Inv_Data.vb b/MDM_Worker/cPLOSE_Inv_Data.vb
index 8ce6a28..a4297a8 100644
--- 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
diff --git a/UID/Mitarbeiter/frmMitarbDetails.Designer.vb b/UID/Mitarbeiter/frmMitarbDetails.Designer.vb
index 8d2d1bb..9338599 100644
--- 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
diff --git a/UID/Mitarbeiter/frmMitarbDetails.vb b/UID/Mitarbeiter/frmMitarbDetails.vb
index 5e35943..83da639 100644
--- a/UID/Mitarbeiter/frmMitarbDetails.vb
+++ b/UID/Mitarbeiter/frmMitarbDetails.vb
@@ -155,6 +155,7 @@ Public Class frmMitarbDetails
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FO"))
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG AG", "VERAG AG"))
+ cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG CS", "VERAG CS"))
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG GMBH", "VERAG GMBH"))
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG UNISPED Ltd", "VERAG UNISPED LIMITED"))
cbxClientTimas.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG CUSTOMS LOGISTICS Ltd", "VERAG CL LIMITED"))
@@ -214,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)
@@ -317,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
@@ -630,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
@@ -656,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
@@ -1452,70 +1460,152 @@ Public Class frmMitarbDetails
Private Sub datEinstiegsdatum_ValueChanged(sender As Object, e As EventArgs) Handles datEinstiegsdatum.ValueChanged, cbUrlaubInStund.CheckedChanged, txtUrlaubsabsp.TextChanged, cboDaysPerWeek.SelectedIndexChanged
- If cbxEinsteigsDat.Checked And mitarbeiter.mit_einstiegsdatum <> "" Then
+ If cbxEinsteigsDat.Checked AndAlso Not String.IsNullOrWhiteSpace(mitarbeiter.mit_einstiegsdatum) Then
- If CDate(mitarbeiter.mit_einstiegsdatum).ToShortDateString >= DateTime.Parse("01/01/2000") Then
+ Dim einstiegsdat As Date
+ If Date.TryParse(mitarbeiter.mit_einstiegsdatum, einstiegsdat) AndAlso einstiegsdat >= #01/01/2000# Then
+ ' Prüfen, ob Arbeitszeit und Arbeitstage korrekt eingegeben wurden
+ If Not String.IsNullOrWhiteSpace(txtWoStd.Text) AndAlso IsNumeric(txtWoStd.Text) AndAlso Not String.IsNullOrWhiteSpace(cboDaysPerWeek.Text) AndAlso IsNumeric(cboDaysPerWeek.Text) Then
- If txtWoStd.Text <> "" AndAlso IsNumeric(txtWoStd.Text) AndAlso cboDaysPerWeek.Text <> "" AndAlso IsNumeric(cboDaysPerWeek.Text) Then
- Dim einstiegsdat As Date = CDate(mitarbeiter.mit_einstiegsdatum)
+ ' Ende des Jahres oder ggf. Kündigungsdatum
+ Dim endOfCurrentYear As Date = New DateTime(einstiegsdat.Year, 12, 31)
+ Dim span As TimeSpan = endOfCurrentYear - einstiegsdat
- Dim endOfCurrentYear = New DateTime(einstiegsdat.Year, 12, 31)
+ If cbxGekuendigt.Checked AndAlso Not String.IsNullOrWhiteSpace(mitarbeiter.mit_kuendigungsdatum) Then
- Dim span = endOfCurrentYear - einstiegsdat
-
- If cbxGekuendigt.Checked AndAlso mitarbeiter.mit_kuendigungsdatum <> "" AndAlso CDate(mitarbeiter.mit_kuendigungsdatum).ToShortDateString >= DateTime.Parse("01/01/2000") Then
- Dim kuendigungsdatum As Date = CDate(mitarbeiter.mit_kuendigungsdatum)
- span = kuendigungsdatum - einstiegsdat
+ Dim kuendigungsdatum As Date
+ If Date.TryParse(mitarbeiter.mit_kuendigungsdatum, kuendigungsdatum) AndAlso kuendigungsdatum >= #01/01/2000# Then
+ span = kuendigungsdatum - einstiegsdat
+ End If
End If
Dim days As Double = span.TotalDays
Dim uansp As Double = 0
Dim aliquU As Double = 0
- calcUrlaubsabspruch(cbUrlaubInStund.Checked, uansp)
+ ' Urlaubsanspruch berechnen
+ calcUrlaubsabspruchNew(cbUrlaubInStund.Checked, uansp)
If days > 0 AndAlso uansp > 0 Then
- If IsNumeric(txtUrlaubsabsp.Text) Then uansp = txtUrlaubsabsp.Text
- If Not cbUrlaubInStund.Checked Then
- aliquU = Math.Round((uansp / 365) * span.TotalDays, 2, MidpointRounding.AwayFromZero)
- txtaliquUA.Text = aliquU
- lblHoursOrDays2.Text = "D"
- Else
- aliquU = Math.Round((uansp / 365) * span.TotalDays, 2, MidpointRounding.AwayFromZero)
- txtaliquUA.Text = aliquU
- lblHoursOrDays2.Text = "H"
+ If IsNumeric(txtUrlaubsabsp.Text) Then
+ uansp = CDbl(txtUrlaubsabsp.Text)
End If
+ ' aliquoter Urlaubsanspruch
+ aliquU = Math.Round((uansp / 365) * days, 2, MidpointRounding.AwayFromZero)
+ txtaliquUA.Text = aliquU.ToString("0.00")
+ lblHoursOrDays2.Text = If(cbUrlaubInStund.Checked, "H", "D")
End If
-
-
End If
End If
-
End If
End Sub
Private Sub calcUrlaubsabspruch(UrlaubInStunden As Boolean, ByRef urlaubsabspruch As Double)
- If Not UrlaubInStunden Then
- If cboDaysPerWeek.SelectedItem <> "" Then
- If Not cbabwJahresurlaub.Checked Then
- urlaubsabspruch = 5 * cboDaysPerWeek.SelectedItem
- End If
+
+ urlaubsabspruch = 0 ' sicherstellen, dass immer ein Wert zurückgegeben wird
+
+ Dim daysPerWeek As Double = 0
+ Dim wochenstunden As Double = 0
+
+ ' Tage pro Woche validieren
+ If cboDaysPerWeek.SelectedItem IsNot Nothing AndAlso IsNumeric(cboDaysPerWeek.SelectedItem) Then
+ daysPerWeek = CDbl(cboDaysPerWeek.SelectedItem)
+ End If
+
+ ' Wochenstunden validieren
+ If IsNumeric(txtWoStd.Text) Then
+ wochenstunden = CDbl(txtWoStd.Text)
+ End If
+
+ ' Wenn keine gültigen Werte, abbrechen
+ If daysPerWeek <= 0 Then Exit Sub
+
+ ' Jahresurlaub nur berechnen, wenn nicht "abgewählter Jahresurlaub"
+ If Not cbabwJahresurlaub.Checked Then
+ If Not UrlaubInStunden Then
+ ' Urlaub in Tagen
+ urlaubsabspruch = 5 * daysPerWeek
lblHoursOrDays1.Text = "D"
- End If
- Else
- If cboDaysPerWeek.SelectedItem <> "" AndAlso IsNumeric(txtWoStd.Text) AndAlso txtWoStd.Text > 0 Then
- If Not cbabwJahresurlaub.Checked Then
- urlaubsabspruch = (txtWoStd.Text / cboDaysPerWeek.SelectedItem) * cboDaysPerWeek.SelectedItem * 5
+ Else
+ ' Urlaub in Stunden
+ If wochenstunden > 0 Then
+ urlaubsabspruch = (wochenstunden / daysPerWeek) * 5
+ lblHoursOrDays1.Text = "H"
End If
- lblHoursOrDays1.Text = "H"
End If
End If
- txtUrlaubsabsp.Text = urlaubsabspruch
+
+ ' Ergebnis anzeigen
+ txtUrlaubsabsp.Text = urlaubsabspruch.ToString("0.00")
+
+ 'If Not UrlaubInStunden Then
+ ' If cboDaysPerWeek.SelectedItem <> "" Then
+ ' If Not cbabwJahresurlaub.Checked Then
+ ' urlaubsabspruch = 5 * cboDaysPerWeek.SelectedItem
+ ' End If
+ ' lblHoursOrDays1.Text = "D"
+ ' End If
+ 'Else
+ ' If cboDaysPerWeek.SelectedItem <> "" AndAlso IsNumeric(txtWoStd.Text) AndAlso txtWoStd.Text > 0 Then
+ ' If Not cbabwJahresurlaub.Checked Then
+ ' urlaubsabspruch = (txtWoStd.Text / cboDaysPerWeek.SelectedItem) * cboDaysPerWeek.SelectedItem * 5
+ ' End If
+ ' lblHoursOrDays1.Text = "H"
+ ' End If
+ 'End If
+ 'txtUrlaubsabsp.Text = urlaubsabspruch
End Sub
+
+ Private Sub calcUrlaubsabspruchNew(UrlaubInStunden As Boolean, ByRef urlaubsabspruch As Double)
+
+ Dim tageProWoche As Double = 0
+ Dim wochenstunden As Double = 0
+
+ ' Eingaben validieren
+ If cboDaysPerWeek.SelectedItem IsNot Nothing AndAlso IsNumeric(cboDaysPerWeek.SelectedItem) Then
+ tageProWoche = CDbl(cboDaysPerWeek.SelectedItem)
+ End If
+
+ If IsNumeric(txtWoStd.Text) Then
+ wochenstunden = CDbl(txtWoStd.Text)
+ End If
+
+ ' Nur berechnen, wenn Jahresurlaub nicht manuell abgewählt wurde
+ If Not cbabwJahresurlaub.Checked Then
+ urlaubsabspruch = BerechneUrlaubsanspruch(tageProWoche, wochenstunden, UrlaubInStunden)
+ Else
+ urlaubsabspruch = 0
+ End If
+
+ ' UI aktualisieren
+ txtUrlaubsabsp.Text = urlaubsabspruch.ToString("0.00")
+ lblHoursOrDays1.Text = If(UrlaubInStunden, "H", "D")
+
+ End Sub
+
+ Public Function BerechneUrlaubsanspruch(tageProWoche As Double, wochenstunden As Double, urlaubInStunden As Boolean) As Double
+
+ ' Sicherheitsprüfungen
+ If tageProWoche <= 0 Then Return 0
+ If urlaubInStunden AndAlso wochenstunden <= 0 Then Return 0
+
+ Dim anspruch As Double = 0
+
+ If Not urlaubInStunden Then
+ ' Urlaub in Tagen
+ anspruch = 5 * tageProWoche
+ Else
+ ' Urlaub in Stunden: durchschnittliche Tagesarbeitszeit * 5
+ anspruch = (wochenstunden / tageProWoche) * 5
+ End If
+
+ Return Math.Round(anspruch, 2, MidpointRounding.AwayFromZero)
+ End Function
+
Private Sub TabControl2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl2.SelectedIndexChanged
If TabControl2.SelectedIndex = 2 Then
Try
diff --git a/UID/Mitarbeiter/usrCntlMitarbeiter.vb b/UID/Mitarbeiter/usrCntlMitarbeiter.vb
index 35678ff..df369f1 100644
--- a/UID/Mitarbeiter/usrCntlMitarbeiter.vb
+++ b/UID/Mitarbeiter/usrCntlMitarbeiter.vb
@@ -39,152 +39,168 @@ Public Class usrCntlMitarbeiter
End Sub
Public Sub Tabelle_anzeigen()
- Dim startIndex As Integer = TabControl1.SelectedIndex
- Dim firmaGefunden As Boolean = False
- Dim tabCount As Integer = TabControl1.TabCount
- If TabControl1.SelectedIndex <> 7 Then
- For offset As Integer = 0 To tabCount - 1
- Dim i As Integer = (startIndex + offset) Mod tabCount
- Dim firma As String = ""
-
- Select Case i
- Case 0
- firma = "VERAG"
- Case 1
- firma = "ATILLA"
- Case 2
- firma = "IMEX"
- Case 3
- firma = "UNISPED"
- Case 4
- firma = "AMBAR"
- Case 5
- firma = "FRONTOFFICE"
- Case 6
- firma = "VERIMEX"
- End Select
-
-
- If firma <> "" Then
- If showVERAGATILLA(firma) Then
- ' Wechsel zum Tab der gefundenen Firma
- TabControl1.SelectedIndex = i
- firmaGefunden = True
- Exit For
- End If
- End If
-
- Next
- End If
-
- If TabControl1.SelectedIndex = 7 Then
+ If TabControl1.SelectedIndex = 0 Then
+ showVERAGATILLA("VERAG")
+ ElseIf TabControl1.SelectedIndex = 1 Then
+ showVERAGATILLA("ATILLA")
+ ElseIf TabControl1.SelectedIndex = 2 Then
+ showVERAGATILLA("IMEX")
+ ElseIf TabControl1.SelectedIndex = 3 Then
+ showVERAGATILLA("UNISPED")
+ ElseIf TabControl1.SelectedIndex = 4 Then
+ showVERAGATILLA("AMBAR")
+ ElseIf TabControl1.SelectedIndex = 5 Then
+ showVERAGATILLA("FRONTOFFICE")
+ ElseIf TabControl1.SelectedIndex = 6 Then
+ showVERAGATILLA("VERIMEX")
+ ElseIf TabControl1.SelectedIndex = 7 Then
If dgvTimasNew IsNot Nothing Then
showTIMAS(False)
End If
End If
- If txtSuche.Text <> "" AndAlso TabControl1.SelectedIndex <> 7 Then
- If Not firmaGefunden Then
- MsgBox("Keine Daten für die ausgewählten Kriterien gefunden.", MsgBoxStyle.Information)
+ End Sub
+
+ Public Sub showVERAGATILLA(firma)
+ 'Paint wieder reaktivieren
+ locZeilen = -1
+ If Not Grid_aktiv Then Exit Sub
+
+
+
+ Dim sql As String = "SELECT mit_id,mit_username,mit_vname, mit_nname ,mit_niederlassung,mit_abteilung,mit_email,cast (case when mit_timasId is null then 0 else 1 end as bit) mit_ze, cast (case when isnull([mit_DAKOSY_SB],'')<> '' and isnull([mit_DAKOSY_SBFull],'')<>'' then 1 else 0 end as bit) mit_DAKOSY, mit_durchwahl,mit_gekuendigt, isnull(mit_foto_DocId,'') as mit_foto_DocId FROM tblMitarbeiter WHERE (mit_firma='" & firma & "' OR (mit_firma='ALL' AND mit_FirmaHaupt='" & firma & "' )) "
+
+ If txtSuche.Text <> "" Then
+ sql &= " AND (mit_username LIKE '%" & txtSuche.Text & "%' OR mit_nname LIKE '%" & txtSuche.Text & "%' OR mit_vname LIKE '%" & txtSuche.Text & "%') "
+ End If
+
+ If cbx.CheckState <> CheckState.Indeterminate Then
+ sql &= " AND mit_gekuendigt=" & IIf(cbx.Checked, 1, 0)
+ End If
+
+ If cbxZE.CheckState <> CheckState.Indeterminate Then
+ sql &= IIf(cbxZE.Checked, " AND mit_timasId is not null", " AND mit_timasId is null")
+ End If
+
+ If cbxDakosy.CheckState <> CheckState.Indeterminate Then
+ sql &= IIf(cbxDakosy.Checked, " AND (isnull([mit_DAKOSY_SB],'')<> '' AND isnull([mit_DAKOSY_SBFull],'')<>'')", " AND ((isnull([mit_DAKOSY_SB],'')= '' OR isnull([mit_DAKOSY_SBFull],'')=''))")
+ End If
+
+ If firma = "VERAG" Then
+
+ ' dgvVERAG.DataSource = UID.AnzeigeTabelleFirma(sql)
+
+ c.SET_SQL(sql, "ADMIN")
+ c.LOAD()
+ 'Tabelle Kommt/Geht bereinigen
+ If c.RowCount = 0 Then
+ c.DataSource = Nothing
+ Else
+ sortDGV(c)
+ 'Eintraege_festlegen()
+ 'AL: Sortierung nach Ausfahrt (Zeit)
+ c.Sort(c.Columns(3), ListSortDirection.Ascending)
+ End If
+ ElseIf firma = "ATILLA" Then
+ ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
+
+ dgvATILLA.SET_SQL(sql, "ADMIN")
+ dgvATILLA.LOAD()
+
+ 'Tabelle Kommt/Geht bereinigen
+ If dgvATILLA.RowCount = 0 Then
+ dgvATILLA.DataSource = Nothing
+ Else
+ sortDGV(dgvATILLA)
+ 'Eintraege_festlegen()
+ 'AL: Sortierung nach Ausfahrt (Zeit)
+ dgvATILLA.Sort(dgvATILLA.Columns(3), ListSortDirection.Ascending)
+ End If
+ ElseIf firma = "IMEX" Then
+ ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
+
+ dgvIMEX.SET_SQL(sql, "ADMIN")
+ dgvIMEX.LOAD()
+
+ 'Tabelle Kommt/Geht bereinigen
+ If dgvIMEX.RowCount = 0 Then
+ dgvIMEX.DataSource = Nothing
+ Else
+ sortDGV(dgvIMEX)
+ 'Eintraege_festlegen()
+ 'AL: Sortierung nach Ausfahrt (Zeit)
+ dgvIMEX.Sort(dgvIMEX.Columns(3), ListSortDirection.Ascending)
+ End If
+ ElseIf firma = "UNISPED" Then
+ ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
+
+ dgvUNISPED.SET_SQL(sql, "ADMIN")
+ dgvUNISPED.LOAD()
+
+ 'Tabelle Kommt/Geht bereinigen
+ If dgvUNISPED.RowCount = 0 Then
+ dgvUNISPED.DataSource = Nothing
+ Else
+ sortDGV(dgvUNISPED)
+ 'Eintraege_festlegen()
+ 'AL: Sortierung nach Ausfahrt (Zeit)
+ dgvUNISPED.Sort(dgvUNISPED.Columns(3), ListSortDirection.Ascending)
+ End If
+ ElseIf firma = "AMBAR" Then
+ ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
+
+ dgvAMBAR.SET_SQL(sql, "ADMIN")
+ dgvAMBAR.LOAD()
+
+ 'Tabelle Kommt/Geht bereinigen
+ If dgvAMBAR.RowCount = 0 Then
+ dgvAMBAR.DataSource = Nothing
+ Else
+ sortDGV(dgvAMBAR)
+ 'Eintraege_festlegen()
+ 'AL: Sortierung nach Ausfahrt (Zeit)
+ dgvAMBAR.Sort(dgvAMBAR.Columns(3), ListSortDirection.Ascending)
+ End If
+
+ ElseIf firma = "FRONTOFFICE" Then
+ ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
+
+ dgvFRONTOFFICE.SET_SQL(sql, "ADMIN")
+ dgvFRONTOFFICE.LOAD()
+
+ 'Tabelle Kommt/Geht bereinigen
+ If dgvFRONTOFFICE.RowCount = 0 Then
+ dgvFRONTOFFICE.DataSource = Nothing
+ Else
+ sortDGV(dgvFRONTOFFICE)
+ 'Eintraege_festlegen()
+ 'AL: Sortierung nach Ausfahrt (Zeit)
+ dgvFRONTOFFICE.Sort(dgvFRONTOFFICE.Columns(3), ListSortDirection.Ascending)
+
+ End If
+
+
+ ElseIf firma = "VERIMEX" Then
+ ' dgvATILLA.DataSource = UID.AnzeigeTabelleFirma(sql)
+
+ dgvVERIMEX.SET_SQL(sql, "ADMIN")
+ dgvVERIMEX.LOAD()
+
+ 'Tabelle Kommt/Geht bereinigen
+ If dgvVERIMEX.RowCount = 0 Then
+ dgvVERIMEX.DataSource = Nothing
+ Else
+ sortDGV(dgvVERIMEX)
+ 'Eintraege_festlegen()
+ 'AL: Sortierung nach Ausfahrt (Zeit)
+ dgvVERIMEX.Sort(dgvVERIMEX.Columns(3), ListSortDirection.Ascending)
+
End If
End If
End Sub
- Public Function showVERAGATILLA(firma As String) As Boolean
- ' Paint wieder reaktivieren
- locZeilen = -1
- If Not Grid_aktiv Then Return False
-
- ' SQL-Abfrage erstellen
- Dim sql As String = "SELECT mit_id, mit_username, mit_vname, mit_nname, mit_niederlassung, mit_abteilung, mit_email, " &
- "CAST(CASE WHEN mit_timasId IS NULL THEN 0 ELSE 1 END AS BIT) mit_ze, " &
- "CAST(CASE WHEN ISNULL([mit_DAKOSY_SB],'')<> '' AND ISNULL([mit_DAKOSY_SBFull],'')<>'' THEN 1 ELSE 0 END AS BIT) mit_DAKOSY, " &
- "mit_durchwahl, mit_gekuendigt, ISNULL(mit_foto_DocId,'') AS mit_foto_DocId " &
- "FROM tblMitarbeiter WHERE (mit_firma='" & firma & "' OR (mit_firma='ALL' AND mit_FirmaHaupt='" & firma & "'))"
-
- ' Filter hinzufügen
- If txtSuche.Text <> "" Then
- sql &= " AND (mit_username LIKE '%" & txtSuche.Text & "%' OR mit_nname LIKE '%" & txtSuche.Text & "%' OR mit_vname LIKE '%" & txtSuche.Text & "%')"
- End If
-
- If cbx.CheckState <> CheckState.Indeterminate Then
- sql &= " AND mit_gekuendigt=" & If(cbx.Checked, 1, 0)
- End If
-
- If cbxZE.CheckState <> CheckState.Indeterminate Then
- sql &= If(cbxZE.Checked, " AND mit_timasId IS NOT NULL", " AND mit_timasId IS NULL")
- End If
-
- If cbxDakosy.CheckState <> CheckState.Indeterminate Then
- sql &= If(cbxDakosy.Checked, " AND (ISNULL([mit_DAKOSY_SB],'')<> '' AND ISNULL([mit_DAKOSY_SBFull],'')<>'')", " AND (ISNULL([mit_DAKOSY_SB],'')= '' OR ISNULL([mit_DAKOSY_SBFull],'')='')")
- End If
-
- ' Daten laden und prüfen
- Select Case firma
- Case "VERAG"
- c.SET_SQL(sql, "ADMIN")
- c.LOAD()
- If c.RowCount > 0 Then
- sortDGV(c)
- c.Sort(c.Columns(3), ListSortDirection.Ascending)
- Return True
- End If
- Case "ATILLA"
- dgvATILLA.SET_SQL(sql, "ADMIN")
- dgvATILLA.LOAD()
- If dgvATILLA.RowCount > 0 Then
- sortDGV(dgvATILLA)
- dgvATILLA.Sort(dgvATILLA.Columns(3), ListSortDirection.Ascending)
- Return True
- End If
- Case "IMEX"
- dgvIMEX.SET_SQL(sql, "ADMIN")
- dgvIMEX.LOAD()
- If dgvIMEX.RowCount > 0 Then
- sortDGV(dgvIMEX)
- dgvIMEX.Sort(dgvIMEX.Columns(3), ListSortDirection.Ascending)
- Return True
- End If
- Case "UNISPED"
- dgvUNISPED.SET_SQL(sql, "ADMIN")
- dgvUNISPED.LOAD()
- If dgvUNISPED.RowCount > 0 Then
- sortDGV(dgvUNISPED)
- dgvUNISPED.Sort(dgvUNISPED.Columns(3), ListSortDirection.Ascending)
- Return True
- End If
- Case "AMBAR"
- dgvAMBAR.SET_SQL(sql, "ADMIN")
- dgvAMBAR.LOAD()
- If dgvAMBAR.RowCount > 0 Then
- sortDGV(dgvAMBAR)
- dgvAMBAR.Sort(dgvAMBAR.Columns(3), ListSortDirection.Ascending)
- Return True
- End If
- Case "FRONTOFFICE"
- dgvFRONTOFFICE.SET_SQL(sql, "ADMIN")
- dgvFRONTOFFICE.LOAD()
- If dgvFRONTOFFICE.RowCount > 0 Then
- sortDGV(dgvFRONTOFFICE)
- dgvFRONTOFFICE.Sort(dgvFRONTOFFICE.Columns(3), ListSortDirection.Ascending)
- Return True
- End If
- Case "VERIMEX"
- dgvVERIMEX.SET_SQL(sql, "ADMIN")
- dgvVERIMEX.LOAD()
- If dgvVERIMEX.RowCount > 0 Then
- sortDGV(dgvVERIMEX)
- dgvVERIMEX.Sort(dgvVERIMEX.Columns(3), ListSortDirection.Ascending)
- Return True
- End If
- End Select
-
- Return False
- End Function
-
-
Public Sub showTIMAS(refresh As Boolean)
locZeilen = -1
@@ -836,6 +852,7 @@ Public Class usrCntlMitarbeiter
Return rest.ResponseStatusCode & " " & rest.ResponseStatusText
Else
Debug.WriteLine("File uploaded")
+ MsgBox("Bilder wurden hochgeladen")
End If
rest.ClearAllHeaders()
diff --git a/UID/cSqlDb.vb b/UID/cSqlDb.vb
index 90289ce..57c2d6c 100644
--- 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_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_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
diff --git a/UID/usrctlProcedures.Designer.vb b/UID/usrctlProcedures.Designer.vb
index d8458b9..6c2b762 100644
--- 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()
@@ -95,6 +93,7 @@ Partial Class usrctlProcedures
Me.Button50 = New System.Windows.Forms.Button()
Me.Button49 = New System.Windows.Forms.Button()
Me.TabPage7 = New System.Windows.Forms.TabPage()
+ Me.Button53 = New System.Windows.Forms.Button()
Me.Label22 = New System.Windows.Forms.Label()
Me.dtpbis = New System.Windows.Forms.DateTimePicker()
Me.lblDakosyImport = New System.Windows.Forms.Label()
@@ -161,6 +160,11 @@ Partial Class usrctlProcedures
Me.TabPage9 = New System.Windows.Forms.TabPage()
Me.Button53 = New System.Windows.Forms.Button()
Me.tbTRStat.SuspendLayout()
+ 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()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -546,16 +550,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)
@@ -800,6 +794,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)
@@ -882,6 +878,7 @@ Partial Class usrctlProcedures
'
'TabPage7
'
+ Me.TabPage7.Controls.Add(Me.Button53)
Me.TabPage7.Controls.Add(Me.Label22)
Me.TabPage7.Controls.Add(Me.dtpbis)
Me.TabPage7.Controls.Add(Me.lblDakosyImport)
@@ -897,6 +894,15 @@ Partial Class usrctlProcedures
Me.TabPage7.Text = "Dakosy Import"
Me.TabPage7.UseVisualStyleBackColor = True
'
+ 'Button53
+ '
+ Me.Button53.Location = New System.Drawing.Point(18, 115)
+ Me.Button53.Name = "Button53"
+ Me.Button53.Size = New System.Drawing.Size(145, 41)
+ Me.Button53.TabIndex = 73
+ Me.Button53.Text = "Ursprungsland ISO2 einfügen"
+ Me.Button53.UseVisualStyleBackColor = True
+ '
'Label22
'
Me.Label22.Location = New System.Drawing.Point(279, 19)
@@ -1466,6 +1472,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."
+ '
'TabPage9
'
Me.TabPage9.Controls.Add(Me.Button53)
@@ -1702,6 +1736,9 @@ Partial Class usrctlProcedures
Friend WithEvents Button52 As Button
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
Friend WithEvents TabPage8 As TabPage
Friend WithEvents btnImportTrStat As Button
Friend WithEvents TabPage9 As TabPage
diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb
index 012f464..bb107a2 100644
--- a/UID/usrctlProcedures.vb
+++ b/UID/usrctlProcedures.vb
@@ -3596,6 +3596,12 @@ Public Class usrctlProcedures
DYIMPORT.Ursprung = isleernothing((currentRow(89)))
+
+ If DYIMPORT.Ursprung IsNot Nothing AndAlso DYIMPORT.Ursprung <> "" Then
+ Dim ISO2 As String = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromLandbezeichnung(DYIMPORT.Ursprung)
+ If ISO2 <> "" Then DYIMPORT.Ursprungsland_ISO2 = ISO2
+ End If
+
DYIMPORT.Präferenzursprungsland = isleernothing((currentRow(90)))
DYIMPORT.Beguenstigung = isleernothing((currentRow(91)))
@@ -3712,25 +3718,8 @@ Public Class usrctlProcedures
If savedDY Then
'zuerst alle doppelten löschen und die fehlerhaften zuerst
- Dim sql_deleleMultEntries As String = "
- WITH Doppelte AS (
- SELECT
- *,
- ROW_NUMBER() OVER (
- PARTITION BY Registriernummer_MRN, PositionNo, Positionsunterlagenzeile
- ORDER BY (SELECT NULL)
- ) AS rn
- FROM [tbl_DY_Zollmeldungen_Import]
-
- )
-
- DELETE FROM Doppelte
- WHERE rn > 1 and importfile is null;"
-
- sql.doSQL(sql_deleleMultEntries, "AVISO")
-
+ sql.doSQL("EXECUTE dbo.sp_DeleteDuplicateZollmeldungen_ohne_Importfile", "AVISO")
'dann generell alle doppelten löschen
-
sql.doSQL("EXECUTE dbo.sp_DeleteDuplicateZollmeldungen", "AVISO")
End If
@@ -4109,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
@@ -4192,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
@@ -4301,6 +4290,128 @@ OPTION (MAXRECURSION 1000);", "AVISO") '
cProgramFunctions.genExcelFromDT_NEW(dt)
+ Dim dt_fehlendeLaender As DataTable = SQL.loadDgvBySql("select distinct (Ursprung) FROM [AVISO].[dbo].[tbl_DY_Zollmeldungen_Import] where Ursprungsland_ISO2 is null and Ursprung is not null", "AVISO")
+ If dt_fehlendeLaender.Rows.Count > 0 Then
+ MsgBox("ACHTUNG!, es befinden sich noch " & dt_fehlendeLaender.Rows.Count & " Länder, zu denen kein Ursprungsland zugewiesen wurde!" & vbNewLine & "Bitte zuweisen/bei Administration nachfragen!")
+ cProgramFunctions.genExcelFromDT_NEW(dt_fehlendeLaender)
+ End If
+
+
+ End Sub
+
+ Private Sub Button53_Click(sender As Object, e As EventArgs) Handles Button53.Click
+
+
+ Dim Laneder = "select distinct (Ursprung) FROM [AVISO].[dbo].[tbl_DY_Zollmeldungen_Import] where Ursprungsland_ISO2 is null and Ursprung is not null"
+
+
+ Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+ Dim dtiso2Laneder As DataTable = SQL.loadDgvBySql(Laneder, "AVISO")
+
+ If dtiso2Laneder.Rows.Count > 0 Then
+ For Each r As DataRow In dtiso2Laneder.Rows
+
+
+ Dim landISO2 As String = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromLandbezeichnung(r.Item("Ursprung"))
+
+ If landISO2 <> "" Then
+ SQL.doSQL("Update [AVISO].[dbo].[tbl_DY_Zollmeldungen_Import] set Ursprungsland_ISO2 = '" & landISO2 & "' where Ursprung = '" & r.Item("Ursprung") & "'", "AVISO")
+ Else
+ Dim ISO2SetCountry As String = ""
+ Select Case r.Item("Ursprung")
+ Case "El Salvador" : ISO2SetCountry = "SV"
+ Case "Europäische Union" : ISO2SetCountry = "EU"
+ Case "Guatemala" : ISO2SetCountry = "GT"
+ Case "Iran (Islamische Republik)" : ISO2SetCountry = "IR"
+ Case "Kambodscha" : ISO2SetCountry = "KH"
+ Case "Katar" : ISO2SetCountry = "QA"
+ Case "Macau" : ISO2SetCountry = "MO"
+ Case "Mali" : ISO2SetCountry = "ML"
+ Case "Moldau, Republik" : ISO2SetCountry = "MD"
+ Case "Myanmar" : ISO2SetCountry = "MM"
+ Case "Nordmazedonien" : ISO2SetCountry = "MK"
+ Case "Paraguay" : ISO2SetCountry = "PY"
+ Case "Russische Föderation" : ISO2SetCountry = "RU"
+ Case "Saudi-Arabien" : ISO2SetCountry = "SA"
+ Case "Sierra Leone" : ISO2SetCountry = "SL"
+ Case "Slowakische Republik" : ISO2SetCountry = "SK"
+ Case "Spanien (ohne XC, XL)" : ISO2SetCountry = "ES"
+ Case "Südkorea (Republik Korea)" : ISO2SetCountry = "KR"
+ Case "Tschechien" : ISO2SetCountry = "CZ"
+ 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
+
+
+ If ISO2SetCountry <> "" Then
+ SQL.doSQL("Update [AVISO].[dbo].[tbl_DY_Zollmeldungen_Import] set Ursprungsland_ISO2 = '" & ISO2SetCountry & "' where Ursprung = '" & r.Item("Ursprung") & "'", "AVISO")
+
+ End If
+
+ End If
+
+ Next
+ MsgBox("alle Länder gesetzt!")
+ Else
+ MsgBox("keine fehlenden Länder vorhanden!")
+ End If
+
+ 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
diff --git a/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb b/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb
index d505ee4..5830801 100644
--- a/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb
+++ b/initATLASAufschubkonten/frmNachrichtenVerarbeitung_MDM_divers.vb
@@ -623,6 +623,10 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
SQL.doSQL("Update [tblRMCImport] SET [rmc_daId]='" & DS.da_id & "' where [rmc_pdfFileName] = '" & DS.da_name & "' and [rmc_importDatum] > DATEADD(DAY,-4,getdate()) ", "FMZOLL")
+ frmStartOptions.moveFile_DateBack(fileNamePath, zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
+ If fi.Name.ToLower.Contains("pdf") Then addDGVEinarbeitung("PDF", fi.Name)
+ dgvEinarbeitung.Refresh()
+
ElseIf (fi.Name.ToString.StartsWith("maut_") AndAlso fi.Name.ToString.Contains("EGR") AndAlso Not fi.Name.ToString.Contains("ALL")) Then 'EasyTrip IT Rechnungen
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(fileNamePath))
@@ -693,8 +697,11 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
End If
- End If
+ frmStartOptions.moveFile_DateBack(fileNamePath, zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
+ If fi.Name.ToLower.Contains("pdf") Then addDGVEinarbeitung("PDF", fi.Name)
+ dgvEinarbeitung.Refresh()
+ End If
End If
diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb
index ffa3194..74631e2 100644
--- a/initATLASAufschubkonten/frmStartOptions.Designer.vb
+++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb
@@ -25,6 +25,7 @@ Partial Class frmStartOptions
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStartOptions))
Me.pnl = New System.Windows.Forms.Panel()
+ Me.cbxUpdateFIBU = New System.Windows.Forms.CheckBox()
Me.cbxUseUIDFinanzOnline = New System.Windows.Forms.CheckBox()
Me.txtMRNPrefix = New System.Windows.Forms.TextBox()
Me.ATCNRinRE = New System.Windows.Forms.LinkLabel()
@@ -216,6 +217,7 @@ Partial Class frmStartOptions
Me.Label25 = New System.Windows.Forms.Label()
Me.LinkLabel49 = New System.Windows.Forms.LinkLabel()
Me.IDS = New System.Windows.Forms.TabPage()
+ Me.lbl_setBackToCustomerIDS = New System.Windows.Forms.LinkLabel()
Me.IDS_PDFmitREverkn = New System.Windows.Forms.LinkLabel()
Me.IDSUpdateDAID = New System.Windows.Forms.LinkLabel()
Me.Label32 = New System.Windows.Forms.Label()
@@ -228,6 +230,7 @@ Partial Class frmStartOptions
Me.TextBox3 = New System.Windows.Forms.TextBox()
Me.txtIDSYear = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.MSE = New System.Windows.Forms.TabPage()
+ Me.lblBackToCustomer_MSE = New System.Windows.Forms.LinkLabel()
Me.Label33 = New System.Windows.Forms.Label()
Me.Label36 = New System.Windows.Forms.Label()
Me.MSE_Transaktions = New System.Windows.Forms.LinkLabel()
@@ -254,6 +257,7 @@ Partial Class frmStartOptions
Me.txtBatchNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtBatchNrofTransaction = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.RMC = New System.Windows.Forms.TabPage()
+ Me.lblBackToCustomer_RMC = New System.Windows.Forms.LinkLabel()
Me.LinkLabel53 = New System.Windows.Forms.LinkLabel()
Me.Label29 = New System.Windows.Forms.Label()
Me.Label30 = New System.Windows.Forms.Label()
@@ -262,6 +266,7 @@ Partial Class frmStartOptions
Me.TextBox2 = New System.Windows.Forms.TextBox()
Me.cbxRMC = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.UTA = New System.Windows.Forms.TabPage()
+ Me.lblBackToCustomer_UTA = New System.Windows.Forms.LinkLabel()
Me.Label31 = New System.Windows.Forms.Label()
Me.Label34 = New System.Windows.Forms.Label()
Me.lblJahrUTA = New System.Windows.Forms.Label()
@@ -274,13 +279,14 @@ Partial Class frmStartOptions
Me.txtUTAYear = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtUTADate = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.PLOSE = New System.Windows.Forms.TabPage()
+ Me.lblBackToCustomer_PLOSE = New System.Windows.Forms.LinkLabel()
+ Me.lblPlosefoppelteIMporte = New System.Windows.Forms.LinkLabel()
Me.LinkLabel52 = New System.Windows.Forms.LinkLabel()
Me.Label5 = New System.Windows.Forms.Label()
Me.Label52 = New System.Windows.Forms.Label()
Me.Label51 = New System.Windows.Forms.Label()
Me.LinkLabel24 = New System.Windows.Forms.LinkLabel()
Me.LinkLabel23 = New System.Windows.Forms.LinkLabel()
- Me.Laender_Steuercode = New System.Windows.Forms.LinkLabel()
Me.PlosePdfRE = New System.Windows.Forms.LinkLabel()
Me.txtPloseJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtPLoseKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -307,6 +313,7 @@ Partial Class frmStartOptions
Me.Button24 = New System.Windows.Forms.Button()
Me.cbxTestFTP = New System.Windows.Forms.CheckBox()
Me.cbxTestsystem = New System.Windows.Forms.CheckBox()
+ Me.Laender_Steuercode = New System.Windows.Forms.LinkLabel()
Me.TabPage6 = New System.Windows.Forms.TabPage()
Me.lblAbDat = New System.Windows.Forms.Label()
Me.Button27 = New System.Windows.Forms.Button()
@@ -356,7 +363,6 @@ Partial Class frmStartOptions
Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Button21 = New System.Windows.Forms.Button()
Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
- Me.lblPlosefoppelteIMporte = New System.Windows.Forms.LinkLabel()
Me.pnl.SuspendLayout()
CType(Me.PictureBox24, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -410,6 +416,7 @@ Partial Class frmStartOptions
'
Me.pnl.BackColor = System.Drawing.Color.White
Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.pnl.Controls.Add(Me.cbxUpdateFIBU)
Me.pnl.Controls.Add(Me.cbxUseUIDFinanzOnline)
Me.pnl.Controls.Add(Me.txtMRNPrefix)
Me.pnl.Controls.Add(Me.ATCNRinRE)
@@ -493,10 +500,22 @@ Partial Class frmStartOptions
Me.pnl.Size = New System.Drawing.Size(1229, 946)
Me.pnl.TabIndex = 0
'
+ 'cbxUpdateFIBU
+ '
+ Me.cbxUpdateFIBU.AutoSize = True
+ Me.cbxUpdateFIBU.Location = New System.Drawing.Point(18, 139)
+ Me.cbxUpdateFIBU.Name = "cbxUpdateFIBU"
+ Me.cbxUpdateFIBU.Size = New System.Drawing.Size(121, 17)
+ Me.cbxUpdateFIBU.TabIndex = 140
+ Me.cbxUpdateFIBU.Text = "UID-Update in FIBU"
+ Me.cbxUpdateFIBU.UseVisualStyleBackColor = True
+ '
'cbxUseUIDFinanzOnline
'
Me.cbxUseUIDFinanzOnline.AutoSize = True
- Me.cbxUseUIDFinanzOnline.Location = New System.Drawing.Point(18, 142)
+ Me.cbxUseUIDFinanzOnline.Checked = True
+ Me.cbxUseUIDFinanzOnline.CheckState = System.Windows.Forms.CheckState.Checked
+ Me.cbxUseUIDFinanzOnline.Location = New System.Drawing.Point(18, 118)
Me.cbxUseUIDFinanzOnline.Name = "cbxUseUIDFinanzOnline"
Me.cbxUseUIDFinanzOnline.Size = New System.Drawing.Size(131, 17)
Me.cbxUseUIDFinanzOnline.TabIndex = 139
@@ -2932,6 +2951,7 @@ Partial Class frmStartOptions
'
'IDS
'
+ Me.IDS.Controls.Add(Me.lbl_setBackToCustomerIDS)
Me.IDS.Controls.Add(Me.IDS_PDFmitREverkn)
Me.IDS.Controls.Add(Me.IDSUpdateDAID)
Me.IDS.Controls.Add(Me.Label32)
@@ -2951,11 +2971,22 @@ Partial Class frmStartOptions
Me.IDS.Text = "IDS"
Me.IDS.UseVisualStyleBackColor = True
'
+ 'lbl_setBackToCustomerIDS
+ '
+ Me.lbl_setBackToCustomerIDS.AutoSize = True
+ Me.lbl_setBackToCustomerIDS.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.lbl_setBackToCustomerIDS.Location = New System.Drawing.Point(6, 225)
+ Me.lbl_setBackToCustomerIDS.Name = "lbl_setBackToCustomerIDS"
+ Me.lbl_setBackToCustomerIDS.Size = New System.Drawing.Size(123, 13)
+ Me.lbl_setBackToCustomerIDS.TabIndex = 171
+ Me.lbl_setBackToCustomerIDS.TabStop = True
+ Me.lbl_setBackToCustomerIDS.Text = "BackToCustomer-setzen"
+ '
'IDS_PDFmitREverkn
'
Me.IDS_PDFmitREverkn.AutoSize = True
Me.IDS_PDFmitREverkn.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.IDS_PDFmitREverkn.Location = New System.Drawing.Point(9, 203)
+ Me.IDS_PDFmitREverkn.Location = New System.Drawing.Point(6, 197)
Me.IDS_PDFmitREverkn.Name = "IDS_PDFmitREverkn"
Me.IDS_PDFmitREverkn.Size = New System.Drawing.Size(154, 13)
Me.IDS_PDFmitREverkn.TabIndex = 170
@@ -3088,6 +3119,7 @@ Partial Class frmStartOptions
'
'MSE
'
+ Me.MSE.Controls.Add(Me.lblBackToCustomer_MSE)
Me.MSE.Controls.Add(Me.Label33)
Me.MSE.Controls.Add(Me.Label36)
Me.MSE.Controls.Add(Me.MSE_Transaktions)
@@ -3120,6 +3152,17 @@ Partial Class frmStartOptions
Me.MSE.Text = "MSE"
Me.MSE.UseVisualStyleBackColor = True
'
+ 'lblBackToCustomer_MSE
+ '
+ Me.lblBackToCustomer_MSE.AutoSize = True
+ Me.lblBackToCustomer_MSE.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.lblBackToCustomer_MSE.Location = New System.Drawing.Point(82, 17)
+ Me.lblBackToCustomer_MSE.Name = "lblBackToCustomer_MSE"
+ Me.lblBackToCustomer_MSE.Size = New System.Drawing.Size(123, 13)
+ Me.lblBackToCustomer_MSE.TabIndex = 172
+ Me.lblBackToCustomer_MSE.TabStop = True
+ Me.lblBackToCustomer_MSE.Text = "BackToCustomer-setzen"
+ '
'Label33
'
Me.Label33.AutoSize = True
@@ -3432,6 +3475,7 @@ Partial Class frmStartOptions
'
'RMC
'
+ Me.RMC.Controls.Add(Me.lblBackToCustomer_RMC)
Me.RMC.Controls.Add(Me.LinkLabel53)
Me.RMC.Controls.Add(Me.Label29)
Me.RMC.Controls.Add(Me.Label30)
@@ -3446,6 +3490,17 @@ Partial Class frmStartOptions
Me.RMC.Text = "RMC"
Me.RMC.UseVisualStyleBackColor = True
'
+ 'lblBackToCustomer_RMC
+ '
+ Me.lblBackToCustomer_RMC.AutoSize = True
+ Me.lblBackToCustomer_RMC.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.lblBackToCustomer_RMC.Location = New System.Drawing.Point(60, 17)
+ Me.lblBackToCustomer_RMC.Name = "lblBackToCustomer_RMC"
+ Me.lblBackToCustomer_RMC.Size = New System.Drawing.Size(123, 13)
+ Me.lblBackToCustomer_RMC.TabIndex = 172
+ Me.lblBackToCustomer_RMC.TabStop = True
+ Me.lblBackToCustomer_RMC.Text = "BackToCustomer-setzen"
+ '
'LinkLabel53
'
Me.LinkLabel53.AutoSize = True
@@ -3522,6 +3577,7 @@ Partial Class frmStartOptions
'
'UTA
'
+ Me.UTA.Controls.Add(Me.lblBackToCustomer_UTA)
Me.UTA.Controls.Add(Me.Label31)
Me.UTA.Controls.Add(Me.Label34)
Me.UTA.Controls.Add(Me.lblJahrUTA)
@@ -3540,6 +3596,17 @@ Partial Class frmStartOptions
Me.UTA.Text = "UTA"
Me.UTA.UseVisualStyleBackColor = True
'
+ 'lblBackToCustomer_UTA
+ '
+ Me.lblBackToCustomer_UTA.AutoSize = True
+ Me.lblBackToCustomer_UTA.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.lblBackToCustomer_UTA.Location = New System.Drawing.Point(60, 14)
+ Me.lblBackToCustomer_UTA.Name = "lblBackToCustomer_UTA"
+ Me.lblBackToCustomer_UTA.Size = New System.Drawing.Size(123, 13)
+ Me.lblBackToCustomer_UTA.TabIndex = 172
+ Me.lblBackToCustomer_UTA.TabStop = True
+ Me.lblBackToCustomer_UTA.Text = "BackToCustomer-setzen"
+ '
'Label31
'
Me.Label31.AutoSize = True
@@ -3690,6 +3757,7 @@ Partial Class frmStartOptions
'
'PLOSE
'
+ Me.PLOSE.Controls.Add(Me.lblBackToCustomer_PLOSE)
Me.PLOSE.Controls.Add(Me.lblPlosefoppelteIMporte)
Me.PLOSE.Controls.Add(Me.LinkLabel52)
Me.PLOSE.Controls.Add(Me.Label5)
@@ -3707,6 +3775,27 @@ Partial Class frmStartOptions
Me.PLOSE.Text = "PLOSE"
Me.PLOSE.UseVisualStyleBackColor = True
'
+ 'lblBackToCustomer_PLOSE
+ '
+ Me.lblBackToCustomer_PLOSE.AutoSize = True
+ Me.lblBackToCustomer_PLOSE.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.lblBackToCustomer_PLOSE.Location = New System.Drawing.Point(85, 21)
+ Me.lblBackToCustomer_PLOSE.Name = "lblBackToCustomer_PLOSE"
+ Me.lblBackToCustomer_PLOSE.Size = New System.Drawing.Size(123, 13)
+ Me.lblBackToCustomer_PLOSE.TabIndex = 172
+ Me.lblBackToCustomer_PLOSE.TabStop = True
+ Me.lblBackToCustomer_PLOSE.Text = "BackToCustomer-setzen"
+ '
+ 'lblPlosefoppelteIMporte
+ '
+ Me.lblPlosefoppelteIMporte.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.lblPlosefoppelteIMporte.Location = New System.Drawing.Point(24, 203)
+ Me.lblPlosefoppelteIMporte.Name = "lblPlosefoppelteIMporte"
+ Me.lblPlosefoppelteIMporte.Size = New System.Drawing.Size(132, 23)
+ Me.lblPlosefoppelteIMporte.TabIndex = 169
+ Me.lblPlosefoppelteIMporte.TabStop = True
+ Me.lblPlosefoppelteIMporte.Text = "Doppelte Importe prüfen"
+ '
'LinkLabel52
'
Me.LinkLabel52.AutoSize = True
@@ -3771,16 +3860,6 @@ Partial Class frmStartOptions
Me.LinkLabel23.TabStop = True
Me.LinkLabel23.Text = "Eingangsnachrichten abrufen PROD"
'
- 'Laender_Steuercode
- '
- Me.Laender_Steuercode.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.Laender_Steuercode.Location = New System.Drawing.Point(275, 11)
- Me.Laender_Steuercode.Name = "Laender_Steuercode"
- Me.Laender_Steuercode.Size = New System.Drawing.Size(132, 17)
- Me.Laender_Steuercode.TabIndex = 0
- Me.Laender_Steuercode.TabStop = True
- Me.Laender_Steuercode.Text = "Land in Steuernr setzen"
- '
'PlosePdfRE
'
Me.PlosePdfRE.AutoSize = True
@@ -4150,6 +4229,16 @@ Partial Class frmStartOptions
Me.cbxTestsystem.Text = "Import in Testsystem"
Me.cbxTestsystem.UseVisualStyleBackColor = True
'
+ 'Laender_Steuercode
+ '
+ Me.Laender_Steuercode.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.Laender_Steuercode.Location = New System.Drawing.Point(275, 11)
+ Me.Laender_Steuercode.Name = "Laender_Steuercode"
+ Me.Laender_Steuercode.Size = New System.Drawing.Size(132, 17)
+ Me.Laender_Steuercode.TabIndex = 0
+ Me.Laender_Steuercode.TabStop = True
+ Me.Laender_Steuercode.Text = "Land in Steuernr setzen"
+ '
'TabPage6
'
Me.TabPage6.Controls.Add(Me.lblAbDat)
@@ -4767,16 +4856,6 @@ Partial Class frmStartOptions
Me.DataGridViewTextBoxColumn1.MinimumWidth = 8
Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
'
- 'lblPlosefoppelteIMporte
- '
- Me.lblPlosefoppelteIMporte.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.lblPlosefoppelteIMporte.Location = New System.Drawing.Point(24, 203)
- Me.lblPlosefoppelteIMporte.Name = "lblPlosefoppelteIMporte"
- Me.lblPlosefoppelteIMporte.Size = New System.Drawing.Size(132, 23)
- Me.lblPlosefoppelteIMporte.TabIndex = 169
- Me.lblPlosefoppelteIMporte.TabStop = True
- Me.lblPlosefoppelteIMporte.Text = "Doppelte Importe prüfen"
- '
'frmStartOptions
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -5188,4 +5267,10 @@ Partial Class frmStartOptions
Friend WithEvents cbxEventtriggered As CheckBox
Friend WithEvents LinkLabel53 As LinkLabel
Friend WithEvents lblPlosefoppelteIMporte As LinkLabel
+ Friend WithEvents cbxUpdateFIBU As CheckBox
+ Friend WithEvents lbl_setBackToCustomerIDS As LinkLabel
+ Friend WithEvents lblBackToCustomer_MSE As LinkLabel
+ Friend WithEvents lblBackToCustomer_RMC As LinkLabel
+ Friend WithEvents lblBackToCustomer_UTA As LinkLabel
+ Friend WithEvents lblBackToCustomer_PLOSE As LinkLabel
End Class
diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb
index 4712e37..6b443b3 100644
--- a/initATLASAufschubkonten/frmStartOptions.vb
+++ b/initATLASAufschubkonten/frmStartOptions.vb
@@ -6,6 +6,11 @@ Imports System.Security.Cryptography.X509Certificates
Imports System.Text
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
@@ -661,6 +666,7 @@ Public Class frmStartOptions
Dim totalPages = 0
Dim batchrequestNr = 0
Dim counTrans As Integer = 0
+ Dim pages As String = ""
Dim savedTrans As Integer = 0
Dim MDMEinarb As New cMDMEinarbeitung("MSE", Now())
MDMEinarb.setInvoicingDate(Now(), MDMEinarb)
@@ -672,6 +678,7 @@ Public Class frmStartOptions
closeMe()
Exit Sub
Else
+ pages = "1"
counTrans += dt.Rows.Count
End If
If totalPages > 1 Then
@@ -686,9 +693,10 @@ Public Class frmStartOptions
counTrans += dt.Rows.Count
End If
i = i + 1
+ pages &= " " & i
Next
End If
- API.UPDTAE_OK(,, PARAM & " Batch-Nr: " & batchrequestNr & "-" & totalPages)
+ API.UPDTAE_OK(,, PARAM & " Batch-Nr: " & batchrequestNr & "-" & totalPages & " Transactions: " & counTrans & " Pages: " & pages)
MDMEinarb.ds_count += savedTrans
MDMEinarb.ds_total += counTrans
@@ -3183,10 +3191,11 @@ Public Class frmStartOptions
Function getUID_Pruefung(maxAnz As Integer, Optional finanzOnline As Boolean = True, Optional veroegerungMs As Integer = 1000) As Boolean
- getUID_Pruefung(maxAnz, "VERAG", "UID Prüfung VERAG", "as@verag.ag;ih@verag.ag;kb@verag.ag", "al@verag.ag",,, True, finanzOnline, veroegerungMs)
- getUID_Pruefung(maxAnz, "IMEX", "UID Prüfung IMEX", "Viktoria.Leirich@imex-group.at;as@verag.ag;kb@verag.ag", "al@verag.ag",,, True, finanzOnline, veroegerungMs)
- getUID_Pruefung(maxAnz, "AMBAR", "UID Prüfung AMBAR", "as@verag.ag", "al@verag.ag",,, True, finanzOnline, veroegerungMs)
- getUID_Pruefung(maxAnz, "UNISPED", "UID Prüfung UNISPED", "al@verag.ag", "al@verag.ag",,, True, finanzOnline, veroegerungMs)
+
+ getUID_Pruefung(maxAnz, "VERAG", "UID Prüfung VERAG", "as@verag.ag;kb@verag.ag", "al@verag.ag", "d.breimaier@verag.ag",, True, finanzOnline, veroegerungMs, True)
+ getUID_Pruefung(maxAnz, "IMEX", "UID Prüfung IMEX", "Viktoria.Leirich@imex-group.at;as@verag.ag;kb@verag.ag", "al@verag.ag", "d.breimaier@verag.ag",, True, finanzOnline, veroegerungMs)
+ getUID_Pruefung(maxAnz, "AMBAR", "UID Prüfung AMBAR", "as@verag.ag", "al@verag.ag", "d.breimaier@verag.ag",, True, finanzOnline, veroegerungMs)
+ getUID_Pruefung(maxAnz, "UNISPED", "UID Prüfung UNISPED", "al@verag.ag", "al@verag.ag", "d.breimaier@verag.ag",, True, finanzOnline, veroegerungMs)
'getUID_Pruefung(maxAnz, "VERAG", "UID Prüfung VERAG", "mm@verag.ag;la@verag.ag", "al@verag.ag")
End Function
@@ -3325,7 +3334,7 @@ Public Class frmStartOptions
Private Function ValidateServerCertificate(sender As Object, certificate As X509Certificate, chain As X509Chain, sslPolicyErrors As SslPolicyErrors) As Boolean
Return True
End Function
- Function getUID_Pruefung(maxAnz As Integer, Mail_FIMRA As String, Mail_betreff As String, Mail_To As String, Optional Mail_CC As String = "", Optional Mail_BCC As String = "", Optional TageZurueck As String = "", Optional setKundenvermerk As Boolean = False, Optional finanzOnline As Boolean = True, Optional veroegerungMs As Integer = 1500) As Boolean
+ Function getUID_Pruefung(maxAnz As Integer, Mail_FIMRA As String, Mail_betreff As String, Mail_To As String, Optional Mail_CC As String = "", Optional Mail_BCC As String = "", Optional TageZurueck As String = "", Optional setKundenvermerk As Boolean = False, Optional finanzOnline As Boolean = True, Optional veroegerungMs As Integer = 1500, Optional updateFIBU As Boolean = False) As Boolean
Dim firmatmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Try
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = Mail_FIMRA
@@ -3337,19 +3346,23 @@ Public Class frmStartOptions
Dim list As New List(Of String)
list.Add(PDF)
Dim Body = "Anbei befinden sich die Auflistung der geprüfen UID-Nummern. Bei UID-Nummer mit dem Prüfungserbnis 'OK' wurde das Prüfdatum in den Kundenstamm eingetragen. "
- Body &= " Ungültige UID-Nummern werden automatisch im Aviso vermerkt!"
+
+ Body &= createUIDPruefungUebersicht(dt)
+
+ Body &= " Ungültige UID-Nummern werden automatisch im Aviso" & IIf(updateFIBU, " und in der Buchhaltung", "") & " vermerkt!"
Body &= "
Erstellt am: " & Now.ToShortDateString & ", um " & Now.ToShortTimeString
Body &= "
Automatisch generiertes E-Mail."
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mail_To, Mail_betreff, Body,,, False, Mail_CC, Mail_BCC, list)
+ 'VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("d.breimaier@verag.ag", "UID-Prüfung", Body,,, False, , , list)
' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "UID Prüfung", Body,,, False, ,, list)
End If
+
If setKundenvermerk Then
For Each r As DataRow In dt.Rows
- If r("Ergebnis") = "UNGÜLTIG" Then
-
+ If Not IsDBNull(r("Ergebnis")) AndAlso r("Ergebnis") = "UNGÜLTIG" Then
Dim kunde As cKunde = New cKunde(r("kdNr"))
Dim KdFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(kunde.FilialenNr)
If KdFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then
@@ -3369,14 +3382,26 @@ Public Class frmStartOptions
If kunde.Besonderheiten <> "" Then kunde.Besonderheiten &= vbNewLine
kunde.Besonderheiten &= textUIDVermerk
- Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
- Case "IMEX" : kunde.FiBuSchnittstelle = True 'IMEX-Kunden sollen neu in DVO exportiert werden!
- End Select
-
kunde.SAVE()
setUIDToNull(kunde)
End If
+
+ If updateFIBU Then
+ Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+ Dim firma_id As String = ""
+ Dim vermerkNew As String = "UID Nr. " & r("UstIdKz") & r("UstIdnr") & " ungültig (" & Now().ToShortDateString & ")"
+ Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+ Case "VERAG" : firma_id = "'1', '11', '7'"
+ 'Case "ATILLA" : firma_id = "'7'" 'ATILLA UND VERAG haben selben Kundenstamm!!!
+ End Select
+ If firma_id <> "" Then SQL.doSQL("UPDATE [FIBU2].dbo.fibu_konto SET [c_homepage]='" & vermerkNew & "',[c_text2] = isnull([c_ustidnr],''), [c_ustidnr] = '', c_manipulator = 'AUTO', dt_manipulation = Getdate() where i_konto='" & kunde.KundenNr & "' AND i_firm_refid in (" & firma_id & ")", "FIBU")
+ End If
+
+ Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+ Case "IMEX" : kunde.FiBuSchnittstelle = True : kunde.SAVE() 'IMEX-Kunden sollen neu in DVO exportiert werden!
+ End Select
+
changeSteuerschlüssel(kunde)
End If
@@ -3399,6 +3424,46 @@ Public Class frmStartOptions
End Function
+ Function createUIDPruefungUebersicht(dt As DataTable) As String
+
+
+ Dim gruppiert = From row In dt.AsEnumerable()
+ Group row By kat = row.Field(Of String)("Ergebnis") Into grp = Group
+ Select New With {
+ .Ergebnis = kat,
+ .Anzahl = grp.Count()
+ }
+
+ ' Ergebnis in neue DataTable umwandeln
+ Dim result As New DataTable()
+ result.Columns.Add("Ergebnis", GetType(String))
+ result.Columns.Add("Anzahl", GetType(Integer))
+
+ For Each item In gruppiert
+ result.Rows.Add(item.Ergebnis, item.Anzahl)
+ Next
+
+
+
+ Dim TextHTMLtable = ""
+
+ TextHTMLtable &= "
"
+ TextHTMLtable &= "
Anzahl
Ergebnis
"
+
+ For Each row As DataRow In result.Rows
+
+ TextHTMLtable &= "
"
+ TextHTMLtable &= "
" & row.Item("Anzahl") & "
"
+ TextHTMLtable &= "
" & row.Item("Ergebnis") & "
"
+ TextHTMLtable &= "
"
+
+ Next
+
+ Return TextHTMLtable & "
"
+
+
+ End Function
+
Sub setUIDToNull(kunde)
Dim addressen As cAdressen = New cAdressen(kunde.KundenNr)
@@ -3787,7 +3852,8 @@ Public Class frmStartOptions
Private Sub LinkLabel20_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel20.LinkClicked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
- Dim bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "as@verag.ag;kb@verag.ag", "al@verag.ag;d.breimaier@verag.ag",, MyTextBox2._value, cbxVermerk.Checked, cbxUseUIDFinanzOnline.Checked)
+
+ Dim bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "as@verag.ag;kb@verag.ag", "al@verag.ag;d.breimaier@verag.ag",, MyTextBox2._value, cbxVermerk.Checked, cbxUseUIDFinanzOnline.Checked, , cbxUpdateFIBU.Checked)
'bool = getUID_Pruefung(MyTextBox1.Text, "VERAG", "UID Prüfung VERAG", "d.breimaier@verag.ag",,, MyTextBox2._value, cbxVermerk.Checked)
'Dim bool = getUID_PruefungVERAG(MyTextBox1.Text)
showPic(bool, PictureBox12)
@@ -4270,12 +4336,13 @@ Public Class frmStartOptions
Private Sub LinkLabel32_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel32.LinkClicked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
- ' Dim bool = getUID_PruefungIMEX(MyTextBox1.Text)
+
Dim bool = getUID_Pruefung(MyTextBox1.Text, "IMEX", "UID Prüfung IMEX", "Viktoria.Leirich@imex-group.at;as@verag.ag;kb@verag.ag", "al@verag.ag;d.breimaier@verag.ag",, MyTextBox2._value, cbxVermerk.Checked, cbxUseUIDFinanzOnline.Checked)
showPic(bool, PictureBox12)
End Sub
Private Sub LinkLabel33_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel33.LinkClicked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
+
Dim bool = getUID_Pruefung(MyTextBox1.Text, "AMBAR", "UID Prüfung AMBAR", "io@ambarlog.de", , "al@verag.ag;as@verag.ag", MyTextBox2._value, cbxVermerk.Checked, cbxUseUIDFinanzOnline.Checked)
showPic(bool, PictureBox12)
End Sub
@@ -4427,6 +4494,7 @@ Public Class frmStartOptions
Private Sub LinkLabel36_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel36.LinkClicked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
+
Dim bool = getUID_Pruefung(MyTextBox1.Text, "UNISPED", "UID Prüfung UNISPED", "al@verag.ag", "al@verag.ag",, MyTextBox2._value, cbxVermerk.Checked, cbxUseUIDFinanzOnline.Checked)
showPic(bool, PictureBox12)
End Sub
@@ -5108,14 +5176,14 @@ Public Class frmStartOptions
Else
Dim totalPages = 0
Dim batchrequestNr = 0
-
+ Dim pages As String = ""
Dim counTrans As Integer = 0
Dim savedTrans As Integer = 0
Dim MDMEinarb As New cMDMEinarbeitung("MSE", Now())
MDMEinarb.setInvoicingDate(Now(), MDMEinarb)
fehler = mse.getNewestTransactions(token, dt, batchrequestNr, totalPages, 0, cbxOnlyBilledTransactions.Checked, savedTrans)
-
+ pages = "0"
If fehler <> "" Then
MsgBox(fehler)
Me.Visible = True
@@ -5135,6 +5203,7 @@ Public Class frmStartOptions
End If
i = i + 1
+ pages &= " " & i
Next
@@ -5279,7 +5348,7 @@ Public Class frmStartOptions
Dim token = mse.createJWT(fehler)
Dim transactions As New DataTable
Dim invoice As New DataTable
-
+ Dim pages As String = ""
Dim counTrans As Integer = 0
Dim savedTrans As Integer = 0
Dim MDMEinarb As New cMDMEinarbeitung("MSE", Now())
@@ -5301,6 +5370,7 @@ Public Class frmStartOptions
fehler = mse.getTransactionsFromBatchNrAndPage(token, transactions, batchrequestNr, totalPages, 1, savedTrans)
+ pages = "1"
If fehler <> "" Then
MsgBox(fehler)
Me.Visible = True
@@ -5324,13 +5394,13 @@ Public Class frmStartOptions
Else
counTrans += transactions.Rows.Count
-
+ pages &= " " & i
End If
Next
End If
- MsgBox("DONE")
+ MsgBox("DONE" & " Transactions: " & counTrans & " Pages: " & pages)
MDMEinarb.ds_count += savedTrans
MDMEinarb.ds_total += counTrans
@@ -5846,12 +5916,14 @@ weiter:
Dim fehlendeRechungsdatenOhneDVR As String = "select upper([Invoicenumber]) as Invoicenumber, CustomerCode, cast(YearMonthDay as Date) as YearMonthDay FROM [VERAG].[dbo].tblIDSInvoicesNewSplittedByCountry where TransactionVolume is null and AmminclVAT is null and TotalNetAmount is null and VATAmount is null and [Invoicenumber] not like 'DEVR%' and Year(YearMonthDay) >= " & txtIDSYear.Text
-
Dim fehlendeRechungsdatenMitDVR As String = "select upper([Invoicenumber]) as Invoicenumber, CustomerCode, cast(YearMonthDay as Date) as YearMonthDay FROM [VERAG].[dbo].tblIDSInvoicesNewSplittedByCountry where TransactionVolume is null and AmminclVAT is null and TotalNetAmount is null and VATAmount is null and [Invoicenumber] like 'DEVR%' and Year(YearMonthDay) >= " & txtIDSYear.Text
-
Dim fehlendeRechungsdatenTotalInvoiceID As String = "select CustomerCode, cast(YearMonthDay as Date) as YearMonthDay FROM [VERAG].[dbo].tblIDSInvoicesNewSplittedByCountry where TotalInvoiceId is null"
+ Dim ok_OhneDVR As Boolean = False
+ Dim ok_mitDVR As Boolean = False
+ Dim ok_setInvoiceID As Boolean = False
+ Dim rechnugdatum As String = ""
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim dtRechnnungsdatenOhneDVR As DataTable = SQL.loadDgvBySql(fehlendeRechungsdatenOhneDVR, "FMZOLL")
@@ -5895,6 +5967,7 @@ weiter:
Next
MsgBox("alle Daten der tblIDSInvoicesNewSplittedByCountry Ohne DVR gesetzt!")
+ ok_OhneDVR = True
Else
MsgBox("keine fehlenden Daten der tblIDSInvoicesNewSplittedByCountry Ohne DVR vorhanden!")
End If
@@ -5934,6 +6007,7 @@ weiter:
Next
+ ok_mitDVR = True
MsgBox("alle Daten der tblIDSInvoicesNewSplittedByCountry mit DVR gesetzt!")
Else
MsgBox("keine fehlenden Daten der tblIDSInvoicesNewSplittedByCountry mit DVR vorhanden!")
@@ -5943,6 +6017,7 @@ weiter:
If dtRechnnungsdatenTotalInvoiceID.Rows.Count > 0 Then
For Each r As DataRow In dtRechnnungsdatenTotalInvoiceID.Rows
+ rechnugdatum = r.Item("YearMonthDay")
SQL.doSQL("
UPDATE
@@ -5972,11 +6047,15 @@ weiter:
Next
+ ok_setInvoiceID = True
MsgBox("alle TotalInvoiceIDs gesetzt!")
Else
MsgBox("keine fehlenden TotalInvoiceIDs vorhanden!")
End If
+ If ok_mitDVR AndAlso ok_OhneDVR AndAlso ok_setInvoiceID AndAlso rechnugdatum <> "" Then
+ SQL.doSQL("Update tblMDMEinarbeitung set nacharbeitung_completed = 1 where invoicedate = '" & rechnugdatum & "' and completed = 1", "FMZOLL")
+ End If
End Sub
@@ -6822,4 +6901,273 @@ repeatRequest:
Private Sub LinkLabel54_LinkClicked_1(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lblPlosefoppelteIMporte.LinkClicked
cPLOSE_Inv_Data.checkImport()
End Sub
+
+ Private Sub lbl_setBackToCustomerIDS_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lbl_setBackToCustomerIDS.LinkClicked, lblBackToCustomer_MSE.LinkClicked, lblBackToCustomer_PLOSE.LinkClicked, lblBackToCustomer_UTA.LinkClicked, lblBackToCustomer_RMC.LinkClicked
+
+
+ Dim dtkeineMWST As DataTable = (New SQL).loadDgvBySql("select Land, Erstattungsland, Lieferant from tblKeineMWSTErstattung", "FMZOLL")
+ Dim dtKundeMWST As DataTable = (New SQL).loadDgvBySql("select * from tblKundenMWST", "FMZOLL")
+
+ Dim Lieferant As String = ""
+
+ Select Case sender.Name
+ Case "lbl_setBackToCustomerIDS" : Lieferant = "IDS"
+ Case "lblBackToCustomer_MSE" : Lieferant = "MSE"
+ Case "lblBackToCustomer_PLOSE" : Lieferant = "PLOSE"
+ Case "lblBackToCustomer_UTA" : Lieferant = "UTA"
+ Case "lblBackToCustomer_RMC" : Lieferant = "RMC"
+ End Select
+
+
+ Dim sql_query = ""
+ Dim sql_query_keineMWST = ""
+
+ 'alle ab 2025!
+
+ Dim test As String = " AND Adressen.AdressenNr = 139999"
+
+ Select Case Lieferant
+ Case "IDS"
+ sql_query = " select Adressen.AdressenNr as KundenNr, invoice_id, LandKz as KundenLandKz, VATAmount as MWST, Country as RELandKz FROM tblIDSInvoicesNewSplittedByCountry
+ 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 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 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(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"
+
+ 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 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.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 Adressen.UTAKundenNr= [tblUTAImportNew].Kundennummer
+ inner join tblKundenErweitert on tblKundenErweitert.kde_KundenNr = Adressen.AdressenNr
+ 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.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
+ 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"), r.Item("KundenNr"))
+ Continue For
+ Else
+
+ If Not IsDBNull(r.Item("KundenNr")) AndAlso Not IsDBNull(r.Item("KundenLandKz")) Then
+
+ Dim kdnr As Integer = r.Item("KundenNr")
+ Dim LandKz = r.Item("KundenLandKz")
+ Dim landKZiso2 = ""
+
+ If LandKz.Length = 2 Then
+ landKZiso2 = LandKz
+ ElseIf LandKz.Length = 3 Then
+ landKZiso2 = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO2LandFromISO3Land(LandKz)
+ ElseIf LandKz.Length = 1 Then
+ 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 = 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"), 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= '" & Erstattungsland & "'" & IIf(Lieferant <> "IDS", " AND Lieferant <> 'IDS'", ""))
+ If rows_keineMWST.Length > 0 Then
+ 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
+
+
+ Next
+
+ Select Case Lieferant
+ Case "IDS"
+
+ Dim IDS As cIDS
+ IDS.setBackToCustomerInvoiceID(SQL, False)
+
+ 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, Optional CustomerNr As String = "")
+
+ Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
+
+ Select Case Lieferant
+ Case "IDS"
+
+ Dim IDS As cIDS
+ IDS.setBackToCustomerInvoiceID(SQL, True, InvoiceID)
+
+
+ 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
+
+ End Sub
+
End Class
\ No newline at end of file