diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 269e5dcc..4d12a981 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb index e09a8494..2695bd36 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb @@ -76,13 +76,18 @@ If (VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") And FilialenNr = 5501 Then FIRMA_DY = "IMEX" ElseIf FilialenNr = 5701 Then - FIRMA_DY = "AMBAR" + If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_firma = "AMBAR" Then + FIRMA_DY = "AMBAR" + Else + FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.getFirma ' Akt von AMBAR aber kein AMBAR-MA -> Dakosy unter VERAG! + End If + ElseIf FilialenNr = 5601 Then - FIRMA_DY = "UNISPED" - ElseIf FilialenNr = 4801 Or FilialenNr = 4802 Then - FIRMA_DY = "ATILLA" - Else - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then + FIRMA_DY = "UNISPED" + ElseIf FilialenNr = 4801 Or FilialenNr = 4802 Then + FIRMA_DY = "ATILLA" + Else + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then 'If DY Is Nothing Then Dim f As New frmDakosy_SelFirma diff --git a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb index 2aa1630a..b347afb1 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.Designer.vb @@ -39,6 +39,7 @@ Partial Class usrcntlFiskaluebersicht Me.btnPDFReport = New System.Windows.Forms.Button() Me.dgvFiskaluebersicht = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.MyPanel2 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components) + Me.lblUmsatz = New System.Windows.Forms.Label() Me.Label14 = New System.Windows.Forms.Label() Me.txtUmsatz = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cbxUntervm = New System.Windows.Forms.CheckBox() @@ -93,7 +94,6 @@ Partial Class usrcntlFiskaluebersicht Me.dgvUnterlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.cbxUID = New System.Windows.Forms.CheckBox() Me.txtUID = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.lblUmsatz = New System.Windows.Forms.Label() CType(Me.picLocked, System.ComponentModel.ISupportInitialize).BeginInit() Me.MyPanel1.SuspendLayout() CType(Me.dgvFiskaluebersicht, System.ComponentModel.ISupportInitialize).BeginInit() @@ -351,6 +351,15 @@ Partial Class usrcntlFiskaluebersicht Me.MyPanel2.Size = New System.Drawing.Size(721, 657) Me.MyPanel2.TabIndex = 110 ' + 'lblUmsatz + ' + Me.lblUmsatz.AutoSize = True + Me.lblUmsatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblUmsatz.Location = New System.Drawing.Point(248, 190) + Me.lblUmsatz.Name = "lblUmsatz" + Me.lblUmsatz.Size = New System.Drawing.Size(0, 13) + Me.lblUmsatz.TabIndex = 186 + ' 'Label14 ' Me.Label14.AutoSize = True @@ -617,7 +626,7 @@ Partial Class usrcntlFiskaluebersicht ' Me.lblAnmerkungen.AutoSize = True Me.lblAnmerkungen.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAnmerkungen.Location = New System.Drawing.Point(283, 464) + Me.lblAnmerkungen.Location = New System.Drawing.Point(355, 464) Me.lblAnmerkungen.Name = "lblAnmerkungen" Me.lblAnmerkungen.Size = New System.Drawing.Size(120, 20) Me.lblAnmerkungen.TabIndex = 166 @@ -861,7 +870,7 @@ Partial Class usrcntlFiskaluebersicht Me.btnAddAttachments.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnAddAttachments.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAddAttachments.ForeColor = System.Drawing.Color.Black - Me.btnAddAttachments.Location = New System.Drawing.Point(171, 600) + Me.btnAddAttachments.Location = New System.Drawing.Point(282, 598) Me.btnAddAttachments.Name = "btnAddAttachments" Me.btnAddAttachments.Size = New System.Drawing.Size(42, 19) Me.btnAddAttachments.TabIndex = 142 @@ -874,9 +883,9 @@ Partial Class usrcntlFiskaluebersicht Me.cbxAttachmentArt._allowFreiText = False Me.cbxAttachmentArt._value = "" Me.cbxAttachmentArt.FormattingEnabled = True - Me.cbxAttachmentArt.Location = New System.Drawing.Point(13, 598) + Me.cbxAttachmentArt.Location = New System.Drawing.Point(8, 598) Me.cbxAttachmentArt.Name = "cbxAttachmentArt" - Me.cbxAttachmentArt.Size = New System.Drawing.Size(145, 21) + Me.cbxAttachmentArt.Size = New System.Drawing.Size(150, 21) Me.cbxAttachmentArt.TabIndex = 131 ' 'Label4 @@ -890,9 +899,9 @@ Partial Class usrcntlFiskaluebersicht ' 'rtbAnmerkung ' - Me.rtbAnmerkung.Location = New System.Drawing.Point(287, 487) + Me.rtbAnmerkung.Location = New System.Drawing.Point(359, 487) Me.rtbAnmerkung.Name = "rtbAnmerkung" - Me.rtbAnmerkung.Size = New System.Drawing.Size(414, 107) + Me.rtbAnmerkung.Size = New System.Drawing.Size(342, 145) Me.rtbAnmerkung.TabIndex = 130 Me.rtbAnmerkung.Text = "" ' @@ -1113,7 +1122,7 @@ Partial Class usrcntlFiskaluebersicht Me.dgvUnterlagen.ReadOnly = True Me.dgvUnterlagen.RowHeadersVisible = False Me.dgvUnterlagen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUnterlagen.Size = New System.Drawing.Size(268, 107) + Me.dgvUnterlagen.Size = New System.Drawing.Size(321, 107) Me.dgvUnterlagen.TabIndex = 115 ' 'cbxUID @@ -1152,15 +1161,6 @@ Partial Class usrcntlFiskaluebersicht Me.txtUID.Size = New System.Drawing.Size(86, 20) Me.txtUID.TabIndex = 106 ' - 'lblUmsatz - ' - Me.lblUmsatz.AutoSize = True - Me.lblUmsatz.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblUmsatz.Location = New System.Drawing.Point(248, 190) - Me.lblUmsatz.Name = "lblUmsatz" - Me.lblUmsatz.Size = New System.Drawing.Size(0, 13) - Me.lblUmsatz.TabIndex = 186 - ' 'usrcntlFiskaluebersicht ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/kunden/usrcntlFiskaluebersicht.vb b/SDL/kunden/usrcntlFiskaluebersicht.vb index 9babe308..4ec86086 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.vb @@ -282,7 +282,8 @@ Public Class usrcntlFiskaluebersicht For Each row As DataGridViewRow In dgvUnterlagen.Rows - listeUnterlagen.Add(row.Cells("fka_Art").Value.ToString) + If row.Cells("fka_Art").Value IsNot Nothing AndAlso Not IsDBNull(row.Cells("fka_Art").Value) Then listeUnterlagen.Add(row.Cells("fka_Art").Value.ToString) + If row.Cells("fka_Name").Value IsNot Nothing AndAlso Not IsDBNull(row.Cells("fka_Name").Value) Then listeUnterlagen.Add(row.Cells("fka_Name").Value.ToString) Next End If diff --git a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb index 0c3addfa..b9a80fa5 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb @@ -25,6 +25,7 @@ Partial Class frmMDMDatenverarbetiung Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDMDatenverarbetiung)) Me.pnl = New System.Windows.Forms.Panel() + Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.cbxBelegeerstellt = New System.Windows.Forms.CheckBox() Me.cbxASFINAGAbgerechnet = New System.Windows.Forms.CheckBox() Me.cbxTestdaten = New System.Windows.Forms.CheckBox() @@ -67,13 +68,15 @@ Partial Class frmMDMDatenverarbetiung Me.Label2 = New System.Windows.Forms.Label() Me.Button3 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() + Me.Button4 = New System.Windows.Forms.Button() Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.txtTTRSum = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtPruefsummeNetto = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.PictureBox5 = New System.Windows.Forms.PictureBox() + Me.Button9 = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel4.SuspendLayout() Me.FlowLayoutPanel.SuspendLayout() Me.Panel1.SuspendLayout() @@ -83,7 +86,6 @@ Partial Class frmMDMDatenverarbetiung Me.Panel3.SuspendLayout() Me.Panel2.SuspendLayout() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnl @@ -104,6 +106,16 @@ Partial Class frmMDMDatenverarbetiung Me.pnl.Size = New System.Drawing.Size(1163, 100) Me.pnl.TabIndex = 1 ' + 'PictureBox5 + ' + Me.PictureBox5.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen + Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox5.Location = New System.Drawing.Point(202, 11) + Me.PictureBox5.Name = "PictureBox5" + Me.PictureBox5.Size = New System.Drawing.Size(18, 19) + Me.PictureBox5.TabIndex = 130 + Me.PictureBox5.TabStop = False + ' 'cbxBelegeerstellt ' Me.cbxBelegeerstellt.AutoSize = True @@ -195,6 +207,8 @@ Partial Class frmMDMDatenverarbetiung Me.FlowLayoutPanel.Controls.Add(Me.btn) Me.FlowLayoutPanel.Controls.Add(Me.Button7) Me.FlowLayoutPanel.Controls.Add(Me.Button8) + Me.FlowLayoutPanel.Controls.Add(Me.Button4) + Me.FlowLayoutPanel.Controls.Add(Me.Button9) Me.FlowLayoutPanel.Location = New System.Drawing.Point(139, 37) Me.FlowLayoutPanel.Name = "FlowLayoutPanel" Me.FlowLayoutPanel.Size = New System.Drawing.Size(840, 31) @@ -553,6 +567,17 @@ Partial Class frmMDMDatenverarbetiung Me.Button2.Text = "Summenbericht" Me.Button2.UseVisualStyleBackColor = True ' + 'Button4 + ' + Me.Button4.BackColor = System.Drawing.Color.FloralWhite + Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button4.Location = New System.Drawing.Point(381, 3) + Me.Button4.Name = "Button4" + Me.Button4.Size = New System.Drawing.Size(120, 23) + Me.Button4.TabIndex = 3 + Me.Button4.Text = "IDS" + Me.Button4.UseVisualStyleBackColor = False + ' 'MyDatagridview1 ' Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1 @@ -671,15 +696,16 @@ Partial Class frmMDMDatenverarbetiung Me.txtAnzahl.TabIndex = 35 Me.txtAnzahl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' - 'PictureBox5 + 'Button9 ' - Me.PictureBox5.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen - Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.PictureBox5.Location = New System.Drawing.Point(202, 11) - Me.PictureBox5.Name = "PictureBox5" - Me.PictureBox5.Size = New System.Drawing.Size(18, 19) - Me.PictureBox5.TabIndex = 130 - Me.PictureBox5.TabStop = False + Me.Button9.BackColor = System.Drawing.Color.FloralWhite + Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button9.Location = New System.Drawing.Point(507, 3) + Me.Button9.Name = "Button9" + Me.Button9.Size = New System.Drawing.Size(120, 23) + Me.Button9.TabIndex = 4 + Me.Button9.Text = "MSE" + Me.Button9.UseVisualStyleBackColor = False ' 'frmMDMDatenverarbetiung ' @@ -696,6 +722,7 @@ Partial Class frmMDMDatenverarbetiung Me.Text = "Datenverarbeitung" Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel4.ResumeLayout(False) Me.Panel4.PerformLayout() Me.FlowLayoutPanel.ResumeLayout(False) @@ -708,7 +735,6 @@ Partial Class frmMDMDatenverarbetiung Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -762,4 +788,6 @@ Partial Class frmMDMDatenverarbetiung Friend WithEvents lblTTRSum As Label Friend WithEvents txtTTRSum As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents PictureBox5 As PictureBox + Friend WithEvents Button4 As Button + Friend WithEvents Button9 As Button End Class diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 17c66c0d..3bbccba4 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -33,6 +33,9 @@ Public Class frmMDMDatenverarbetiung Select Case LIEFERANT Case "PLOSE" : genSummenbericht_PLOSE() Case "ASFINAG" : genSummenbericht_ASFINAG() + Case "UTA" : MsgBox("Nicht verfügbar!") : Exit Sub + Case "IDS" : MsgBox("Nicht verfügbar!") : Exit Sub + Case "MSE" : MsgBox("Nicht verfügbar!") : Exit Sub Case Else : MsgBox("Nicht verfügbar!") End Select End Sub @@ -48,6 +51,9 @@ Public Class frmMDMDatenverarbetiung Select Case LIEFERANT Case "PLOSE" : pruef = pruefData_PLOSE() Case "ASFINAG" : pruef = pruefData_ASFINAG() + Case "UTA" : MsgBox("Nicht verfügbar!") : Exit Sub + Case "IDS" : MsgBox("Nicht verfügbar!") : Exit Sub + Case "MSE" : MsgBox("Nicht verfügbar!") : Exit Sub Case Else : MsgBox("Nicht verfügbar!") : Exit Sub End Select @@ -78,6 +84,10 @@ Public Class frmMDMDatenverarbetiung btnDatenLaden.Text = "Daten laden" Case "ASFINAG" : initDgv_ASFINAG(cbxASFINAGAbgerechnet.Checked, cbxBelegeerstellt.Checked) btnDatenLaden.Text = "Daten laden" + Case "IDS" : MsgBox("Nicht verfügbar!") + btnDatenLaden.Text = "Daten laden" + Case "MSE" : MsgBox("Nicht verfügbar!") + btnDatenLaden.Text = "Daten laden" End Select End Sub @@ -96,6 +106,12 @@ Public Class frmMDMDatenverarbetiung ' setFakturiertUTA() 'End If End If + + Case "IDS" + MsgBox("Nicht verfügbar!") + Case "MSE" + MsgBox("Nicht verfügbar!") + Case "ASFINAG" Dim abrechnungsDatum As DateTime = Now() If datum = Nothing Then @@ -600,6 +616,14 @@ Public Class frmMDMDatenverarbetiung Panel4.Visible = False pnlAsfinag.Visible = True Exit Sub + + Case "IDS" + Panel4.Visible = False + MsgBox("Noch nicht verfürbar!") + + Case "MSE" + Panel4.Visible = False + MsgBox("Noch nicht verfürbar!") End Select init() @@ -2480,96 +2504,13 @@ Public Class frmMDMDatenverarbetiung Dim found = False Dim results As DataRow() - Dim cnt = 0 - - For Each r As DataGridViewRow In MyDatagridview1.Rows - 'KUNDEN-NR / PLOSE KD-NR - 'results = dtAsfinagKartenpruef.Select("PLOSEKundenNr = '" & r.Cells("plose_POLSEKundennummer").Value & "'") - 'If results.Length > 0 Then - ' 'Gefunden! - ' 'r.Cells("VERAGKdNr").Value = results(0)("PLOSEKundenNr") - ' 'r.Cells("VERAGKdNr").Style.BackColor = Color.MintCream - ' VERAGKdNr = results(0)("AdressenNr") - ' found = True - 'Else - ' r.Cells("VERAGKdNr").Style.BackColor = Color.PapayaWhip - ' pruefData_ASFINAG = False - 'End If - - 'KUNDEN-NR / PLOSE KD-NR - 'Default -> Nicht gefunden - 'r.Cells("VERAGKdNr").Style.BackColor = Color.PapayaWhip - 'found = False - 'For Each k In VERAGKdNr_DT.Rows - ' If r.Cells("plose_POLSEKundennummer").Value = k("PLOSEKundenNr") Then - ' 'Gefunden! - ' r.Cells("VERAGKdNr").Value = k("PLOSEKundenNr") - ' r.Cells("VERAGKdNr").Style.BackColor = Color.MintCream - ' VERAGKdNr = k("AdressenNr") - ' found = True - ' Exit For - ' End If - 'Next - 'If Not found Then pruefData_PLOSE = False - - 'VERAG/PLOSE LEISTUNG - 'results = VERAGLeistungsNr_DT.Select("plp_ProductCode = '" & r.Cells("plose_ProduktCode").Value & "' AND plp_LeistungsNr is not null") - 'If results.Length > 0 Then - ' 'Gefunden! - ' VERAGLeistungsNr = results(0)("plp_LeistungsNr") - ' r.Cells("VERAGLeistungsNr").Value = results(0)("plp_LeistungsNr") - ' r.Cells("VERAGLeistungsNr").Style.BackColor = Color.MintCream - ' found = True - 'Else - ' r.Cells("VERAGLeistungsNr").Style.BackColor = Color.PapayaWhip - ' pruefData_ASFINAG = False - 'End If - - - ''VERAG OFFERT 80 - ''Default -> Nicht gefunden - 'Dim OffertenNr_DT = SQL.loadDgvBySql("SELECT KundenNr,OffertenNr FROM [Offerten] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "'", "FMZOLL") - 'results = OffertenNr_DT.Select("KundenNr = '" & VERAGKdNr & "'") - 'If results.Length > 0 Then - ' 'Gefunden! - ' r.Cells("KundeOffertenNr").Value = results(0)("OffertenNr") - ' r.Cells("KundeOffertenNr").Style.BackColor = Color.MintCream - 'Else - ' pruefData_ASFINAG = False - ' r.Cells("KundeOffertenNr").Style.BackColor = Color.PapayaWhip - 'End If - - - - ''VERAG LEISTUNGS-NR - ''Default -> Nicht gefunden - 'Dim KundeLeistungsNr_DT = SQL.loadDgvBySql("SELECT [LeistungsNr],KundenNr FROM [Offertenpositionen] where OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'", "FMZOLL") - 'results = KundeLeistungsNr_DT.Select("KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'") - 'If results.Length > 0 Then - ' 'Gefunden! - ' r.Cells("KundeLeistungsNr").Value = VERAGLeistungsNr - ' r.Cells("KundeLeistungsNr").Style.BackColor = Color.MintCream - 'Else - ' r.Cells("KundeLeistungsNr").Style.BackColor = Color.PapayaWhip - ' pruefData_ASFINAG = False - 'End If - - - 'If cnt Mod 5 = 0 Then - ' lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %" - ' lblProzPruef.Refresh() - ' Me.Refresh() - 'End If - - cnt += 1 - - Next + Dim cnt = MyDatagridview1.Rows.Count MyDatagridview1.ClearSelection() MyDatagridview1.DataSource = dtAsfinagKartenpruef Dim count = MyDatagridview1.Rows.Count() If count > 0 Then - lblProzPruef.Text = CInt(cnt / count * 100) & " %" '100 + lblProzPruef.Text = CInt(cnt / count * 100) & " %" Else cbxASFINAGAbgerechnet.Checked = True End If @@ -2760,6 +2701,14 @@ Public Class frmMDMDatenverarbetiung initLieferant("ASFINAG", sender) End Sub + Private Sub Button4_Click_1(sender As Object, e As EventArgs) Handles Button4.Click + initLieferant("IDS", sender) + End Sub + + Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click + initLieferant("MSE", sender) + End Sub + Private Function setFakturiert_ASFINAG() As Boolean 'Abrechnungsdatum setzen @@ -2901,4 +2850,5 @@ Public Class frmMDMDatenverarbetiung Process.Start(webAddress) End Sub + End Class diff --git a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb index 717e0ac6..d423eeac 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb @@ -45,8 +45,6 @@ Partial Class usrCntlMDMAuswertungen Me.Label8 = New System.Windows.Forms.Label() Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.Label12 = New System.Windows.Forms.Label() - Me.cboUeberfaelligeBestLeistung = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.kdUeberfaelligeBest = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.rbtUeberfaelligeBestKd = New System.Windows.Forms.RadioButton() Me.rbtUeberfaelligeBestAlleKd = New System.Windows.Forms.RadioButton() Me.PictureBox1 = New System.Windows.Forms.PictureBox() @@ -60,16 +58,13 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.cbxArchiv = New System.Windows.Forms.CheckBox() Me.Label14 = New System.Windows.Forms.Label() - Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.PictureBox2 = New System.Windows.Forms.PictureBox() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label15 = New System.Windows.Forms.Label() Me.Label17 = New System.Windows.Forms.Label() Me.Button3 = New System.Windows.Forms.Button() Me.Label16 = New System.Windows.Forms.Label() Me.GroupBox5 = New System.Windows.Forms.GroupBox() Me.Label22 = New System.Windows.Forms.Label() - Me.KdSearchBox2 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.PictureBox3 = New System.Windows.Forms.PictureBox() Me.Label19 = New System.Windows.Forms.Label() Me.datBenachrichtigungBis = New System.Windows.Forms.DateTimePicker() @@ -102,7 +97,6 @@ Partial Class usrCntlMDMAuswertungen Me.Label29 = New System.Windows.Forms.Label() Me.datIDSVon = New System.Windows.Forms.DateTimePicker() Me.GroupBox8 = New System.Windows.Forms.GroupBox() - Me.cboIDSDateType = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtOrt = New System.Windows.Forms.TextBox() Me.lbl = New System.Windows.Forms.Label() Me.cbxLand = New System.Windows.Forms.CheckBox() @@ -117,10 +111,8 @@ Partial Class usrCntlMDMAuswertungen Me.Button11 = New System.Windows.Forms.Button() Me.Label34 = New System.Windows.Forms.Label() Me.PictureBox5 = New System.Windows.Forms.PictureBox() - Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label36 = New System.Windows.Forms.Label() Me.TabPage3 = New System.Windows.Forms.TabPage() - Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg() Me.tbIDS = New System.Windows.Forms.TabPage() Me.TabPage2 = New System.Windows.Forms.TabPage() Me.Label44 = New System.Windows.Forms.Label() @@ -149,8 +141,11 @@ Partial Class usrCntlMDMAuswertungen Me.Label41 = New System.Windows.Forms.Label() Me.Button12 = New System.Windows.Forms.Button() Me.TabPage4 = New System.Windows.Forms.TabPage() - Me.UsrCntlMSE_KonvertCSV1 = New SDL.usrCntlMSE_KonvertCSV() Me.TabPage5 = New System.Windows.Forms.TabPage() + Me.Label56 = New System.Windows.Forms.Label() + Me.GroupBox17 = New System.Windows.Forms.GroupBox() + Me.Label55 = New System.Windows.Forms.Label() + Me.Button16 = New System.Windows.Forms.Button() Me.Label53 = New System.Windows.Forms.Label() Me.GroupBox16 = New System.Windows.Forms.GroupBox() Me.Label54 = New System.Windows.Forms.Label() @@ -170,10 +165,23 @@ Partial Class usrCntlMDMAuswertungen Me.btnContractdaten = New System.Windows.Forms.Button() Me.Button15 = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() - Me.GroupBox17 = New System.Windows.Forms.GroupBox() - Me.Label55 = New System.Windows.Forms.Label() - Me.Button16 = New System.Windows.Forms.Button() - Me.Label56 = New System.Windows.Forms.Label() + Me.UsrCntlWoelfl_IM_CSVRg1 = New SDL.usrCntlWoelfl_IM_CSVRg() + Me.UsrCntlMSE_KonvertCSV1 = New SDL.usrCntlMSE_KonvertCSV() + Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboUeberfaelligeBestLeistung = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.kdUeberfaelligeBest = New VERAG_PROG_ALLGEMEIN.KdSearchBox() + Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.KdSearchBox2 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() + Me.cboIDSDateType = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.GroupBox18 = New System.Windows.Forms.GroupBox() + Me.Label57 = New System.Windows.Forms.Label() + Me.Label58 = New System.Windows.Forms.Label() + Me.ProgressBar2 = New System.Windows.Forms.ProgressBar() + Me.TextBox2 = New System.Windows.Forms.TextBox() + Me.Label59 = New System.Windows.Forms.Label() + Me.Button17 = New System.Windows.Forms.Button() + Me.Label60 = New System.Windows.Forms.Label() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() @@ -201,11 +209,12 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox11.SuspendLayout() Me.TabPage4.SuspendLayout() Me.TabPage5.SuspendLayout() + Me.GroupBox17.SuspendLayout() Me.GroupBox16.SuspendLayout() Me.GroupBox15.SuspendLayout() Me.GroupBox14.SuspendLayout() Me.pnl.SuspendLayout() - Me.GroupBox17.SuspendLayout() + Me.GroupBox18.SuspendLayout() Me.SuspendLayout() ' 'GroupBox1 @@ -448,50 +457,6 @@ Partial Class usrCntlMDMAuswertungen Me.Label12.TabIndex = 16 Me.Label12.Text = "SDL-Leistung:" ' - 'cboUeberfaelligeBestLeistung - ' - Me.cboUeberfaelligeBestLeistung._allowedValuesFreiText = Nothing - Me.cboUeberfaelligeBestLeistung._allowFreiText = False - Me.cboUeberfaelligeBestLeistung._value = "" - Me.cboUeberfaelligeBestLeistung.DropDownHeight = 350 - Me.cboUeberfaelligeBestLeistung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboUeberfaelligeBestLeistung.DropDownWidth = 250 - Me.cboUeberfaelligeBestLeistung.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboUeberfaelligeBestLeistung.FormattingEnabled = True - Me.cboUeberfaelligeBestLeistung.IntegralHeight = False - Me.cboUeberfaelligeBestLeistung.Location = New System.Drawing.Point(223, 58) - Me.cboUeberfaelligeBestLeistung.Name = "cboUeberfaelligeBestLeistung" - Me.cboUeberfaelligeBestLeistung.Size = New System.Drawing.Size(221, 24) - Me.cboUeberfaelligeBestLeistung.TabIndex = 15 - ' - 'kdUeberfaelligeBest - ' - Me.kdUeberfaelligeBest._AlleFirmenCLUSTER = False - Me.kdUeberfaelligeBest._AllowSetValue = True - Me.kdUeberfaelligeBest._autoSizeGross = False - Me.kdUeberfaelligeBest._display_Name1 = False - Me.kdUeberfaelligeBest._displayAVISO_Email = False - Me.kdUeberfaelligeBest._displayFullName = False - Me.kdUeberfaelligeBest._displayWoelflKd = False - Me.kdUeberfaelligeBest._hideIfListEmpty = True - Me.kdUeberfaelligeBest._loadKdData = False - Me.kdUeberfaelligeBest._searchName1 = True - Me.kdUeberfaelligeBest._UseFIRMA = "" - Me.kdUeberfaelligeBest._ValueKdAndName = True - Me.kdUeberfaelligeBest.dgvpos = "LEFT" - Me.kdUeberfaelligeBest.KdName = "" - Me.kdUeberfaelligeBest.KdNr = "-1" - Me.kdUeberfaelligeBest.kdNrField = Nothing - Me.kdUeberfaelligeBest.KdNrNullInt = Nothing - Me.kdUeberfaelligeBest.Location = New System.Drawing.Point(223, 109) - Me.kdUeberfaelligeBest.Name = "kdUeberfaelligeBest" - Me.kdUeberfaelligeBest.nurAktive = True - Me.kdUeberfaelligeBest.searchActive = True - Me.kdUeberfaelligeBest.Size = New System.Drawing.Size(350, 20) - Me.kdUeberfaelligeBest.TabIndex = 14 - Me.kdUeberfaelligeBest.TIMER_SEARCH = True - Me.kdUeberfaelligeBest.usrcntl = Nothing - ' 'rbtUeberfaelligeBestKd ' Me.rbtUeberfaelligeBestKd.AutoSize = True @@ -625,34 +590,6 @@ Partial Class usrCntlMDMAuswertungen Me.Label14.TabIndex = 16 Me.Label14.Text = "SDL-Leistung:" ' - 'KdSearchBox1 - ' - Me.KdSearchBox1._AlleFirmenCLUSTER = False - Me.KdSearchBox1._AllowSetValue = True - Me.KdSearchBox1._autoSizeGross = False - Me.KdSearchBox1._display_Name1 = False - Me.KdSearchBox1._displayAVISO_Email = False - Me.KdSearchBox1._displayFullName = False - Me.KdSearchBox1._displayWoelflKd = False - Me.KdSearchBox1._hideIfListEmpty = True - Me.KdSearchBox1._loadKdData = False - Me.KdSearchBox1._searchName1 = True - Me.KdSearchBox1._UseFIRMA = "" - Me.KdSearchBox1._ValueKdAndName = True - Me.KdSearchBox1.dgvpos = "LEFT" - Me.KdSearchBox1.KdName = "" - Me.KdSearchBox1.KdNr = "-1" - Me.KdSearchBox1.kdNrField = Nothing - Me.KdSearchBox1.KdNrNullInt = Nothing - Me.KdSearchBox1.Location = New System.Drawing.Point(223, 48) - Me.KdSearchBox1.Name = "KdSearchBox1" - Me.KdSearchBox1.nurAktive = True - Me.KdSearchBox1.searchActive = True - Me.KdSearchBox1.Size = New System.Drawing.Size(350, 20) - Me.KdSearchBox1.TabIndex = 14 - Me.KdSearchBox1.TIMER_SEARCH = True - Me.KdSearchBox1.usrcntl = Nothing - ' 'PictureBox2 ' Me.PictureBox2.Image = CType(resources.GetObject("PictureBox2.Image"), System.Drawing.Image) @@ -663,22 +600,6 @@ Partial Class usrCntlMDMAuswertungen Me.PictureBox2.TabIndex = 11 Me.PictureBox2.TabStop = False ' - 'MyComboBox1 - ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.DropDownHeight = 350 - Me.MyComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.MyComboBox1.DropDownWidth = 250 - Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.IntegralHeight = False - Me.MyComboBox1.Location = New System.Drawing.Point(223, 72) - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(221, 24) - Me.MyComboBox1.TabIndex = 15 - ' 'Label15 ' Me.Label15.AutoSize = True @@ -745,34 +666,6 @@ Partial Class usrCntlMDMAuswertungen Me.Label22.TabIndex = 17 Me.Label22.Text = "Kunde:" ' - 'KdSearchBox2 - ' - Me.KdSearchBox2._AlleFirmenCLUSTER = False - Me.KdSearchBox2._AllowSetValue = True - Me.KdSearchBox2._autoSizeGross = False - Me.KdSearchBox2._display_Name1 = False - Me.KdSearchBox2._displayAVISO_Email = False - Me.KdSearchBox2._displayFullName = False - Me.KdSearchBox2._displayWoelflKd = False - Me.KdSearchBox2._hideIfListEmpty = True - Me.KdSearchBox2._loadKdData = False - Me.KdSearchBox2._searchName1 = True - Me.KdSearchBox2._UseFIRMA = "" - Me.KdSearchBox2._ValueKdAndName = True - Me.KdSearchBox2.dgvpos = "LEFT" - Me.KdSearchBox2.KdName = "" - Me.KdSearchBox2.KdNr = "-1" - Me.KdSearchBox2.kdNrField = Nothing - Me.KdSearchBox2.KdNrNullInt = Nothing - Me.KdSearchBox2.Location = New System.Drawing.Point(223, 43) - Me.KdSearchBox2.Name = "KdSearchBox2" - Me.KdSearchBox2.nurAktive = True - Me.KdSearchBox2.searchActive = True - Me.KdSearchBox2.Size = New System.Drawing.Size(350, 20) - Me.KdSearchBox2.TabIndex = 14 - Me.KdSearchBox2.TIMER_SEARCH = True - Me.KdSearchBox2.usrcntl = Nothing - ' 'PictureBox3 ' Me.PictureBox3.Image = Global.SDL.My.Resources.Resources.cards @@ -1098,17 +991,6 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox8.TabIndex = 23 Me.GroupBox8.TabStop = False ' - 'cboIDSDateType - ' - Me.cboIDSDateType._allowedValuesFreiText = Nothing - Me.cboIDSDateType._allowFreiText = False - Me.cboIDSDateType._value = "" - Me.cboIDSDateType.FormattingEnabled = True - Me.cboIDSDateType.Location = New System.Drawing.Point(9, 63) - Me.cboIDSDateType.Name = "cboIDSDateType" - Me.cboIDSDateType.Size = New System.Drawing.Size(152, 21) - Me.cboIDSDateType.TabIndex = 27 - ' 'txtOrt ' Me.txtOrt.Location = New System.Drawing.Point(201, 87) @@ -1281,22 +1163,6 @@ Partial Class usrCntlMDMAuswertungen Me.PictureBox5.TabIndex = 11 Me.PictureBox5.TabStop = False ' - 'MyComboBox2 - ' - Me.MyComboBox2._allowedValuesFreiText = Nothing - Me.MyComboBox2._allowFreiText = False - Me.MyComboBox2._value = "" - Me.MyComboBox2.DropDownHeight = 350 - Me.MyComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.MyComboBox2.DropDownWidth = 250 - Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.MyComboBox2.FormattingEnabled = True - Me.MyComboBox2.IntegralHeight = False - Me.MyComboBox2.Location = New System.Drawing.Point(223, 40) - Me.MyComboBox2.Name = "MyComboBox2" - Me.MyComboBox2.Size = New System.Drawing.Size(221, 24) - Me.MyComboBox2.TabIndex = 17 - ' 'Label36 ' Me.Label36.AutoSize = True @@ -1318,16 +1184,10 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage3.Text = "WÖLFL" Me.TabPage3.UseVisualStyleBackColor = True ' - 'UsrCntlWoelfl_IM_CSVRg1 - ' - Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White - Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167) - Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1" - Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97) - Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10 - ' 'tbIDS ' + Me.tbIDS.Controls.Add(Me.Label60) + Me.tbIDS.Controls.Add(Me.GroupBox18) Me.tbIDS.Controls.Add(Me.Label18) Me.tbIDS.Controls.Add(Me.GroupBox7) Me.tbIDS.Controls.Add(Me.Label32) @@ -1623,14 +1483,6 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage4.Text = "MSE" Me.TabPage4.UseVisualStyleBackColor = True ' - 'UsrCntlMSE_KonvertCSV1 - ' - Me.UsrCntlMSE_KonvertCSV1.BackColor = System.Drawing.Color.White - Me.UsrCntlMSE_KonvertCSV1.Location = New System.Drawing.Point(7, 7) - Me.UsrCntlMSE_KonvertCSV1.Name = "UsrCntlMSE_KonvertCSV1" - Me.UsrCntlMSE_KonvertCSV1.Size = New System.Drawing.Size(728, 97) - Me.UsrCntlMSE_KonvertCSV1.TabIndex = 0 - ' 'TabPage5 ' Me.TabPage5.Controls.Add(Me.Label56) @@ -1648,6 +1500,47 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage5.Text = "ASFINAG" Me.TabPage5.UseVisualStyleBackColor = True ' + 'Label56 + ' + Me.Label56.AutoSize = True + Me.Label56.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label56.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label56.Location = New System.Drawing.Point(9, 354) + Me.Label56.Name = "Label56" + Me.Label56.Size = New System.Drawing.Size(150, 17) + Me.Label56.TabIndex = 14 + Me.Label56.Text = "Datenbereitstellung" + ' + 'GroupBox17 + ' + Me.GroupBox17.Controls.Add(Me.Label55) + Me.GroupBox17.Controls.Add(Me.Button16) + Me.GroupBox17.Location = New System.Drawing.Point(6, 367) + Me.GroupBox17.Name = "GroupBox17" + Me.GroupBox17.Size = New System.Drawing.Size(697, 94) + Me.GroupBox17.TabIndex = 13 + Me.GroupBox17.TabStop = False + ' + 'Label55 + ' + Me.Label55.AutoSize = True + Me.Label55.Location = New System.Drawing.Point(147, 19) + Me.Label55.Name = "Label55" + Me.Label55.Size = New System.Drawing.Size(161, 13) + Me.Label55.TabIndex = 6 + Me.Label55.Text = "Abrechnungszeitraum auswerten" + ' + 'Button16 + ' + Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button16.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button16.Location = New System.Drawing.Point(6, 19) + Me.Button16.Name = "Button16" + Me.Button16.Size = New System.Drawing.Size(121, 49) + Me.Button16.TabIndex = 4 + Me.Button16.Text = "Abrechnungsliste" + Me.Button16.UseVisualStyleBackColor = True + ' 'Label53 ' Me.Label53.AutoSize = True @@ -1849,46 +1742,242 @@ Partial Class usrCntlMDMAuswertungen Me.pnl.Size = New System.Drawing.Size(1057, 54) Me.pnl.TabIndex = 26 ' - 'GroupBox17 + 'UsrCntlWoelfl_IM_CSVRg1 ' - Me.GroupBox17.Controls.Add(Me.Label55) - Me.GroupBox17.Controls.Add(Me.Button16) - Me.GroupBox17.Location = New System.Drawing.Point(6, 367) - Me.GroupBox17.Name = "GroupBox17" - Me.GroupBox17.Size = New System.Drawing.Size(697, 94) - Me.GroupBox17.TabIndex = 13 - Me.GroupBox17.TabStop = False + Me.UsrCntlWoelfl_IM_CSVRg1.BackColor = System.Drawing.Color.White + Me.UsrCntlWoelfl_IM_CSVRg1.Location = New System.Drawing.Point(6, 167) + Me.UsrCntlWoelfl_IM_CSVRg1.Name = "UsrCntlWoelfl_IM_CSVRg1" + Me.UsrCntlWoelfl_IM_CSVRg1.Size = New System.Drawing.Size(728, 97) + Me.UsrCntlWoelfl_IM_CSVRg1.TabIndex = 10 ' - 'Label55 + 'UsrCntlMSE_KonvertCSV1 ' - Me.Label55.AutoSize = True - Me.Label55.Location = New System.Drawing.Point(147, 19) - Me.Label55.Name = "Label55" - Me.Label55.Size = New System.Drawing.Size(161, 13) - Me.Label55.TabIndex = 6 - Me.Label55.Text = "Abrechnungszeitraum auswerten" + Me.UsrCntlMSE_KonvertCSV1.BackColor = System.Drawing.Color.White + Me.UsrCntlMSE_KonvertCSV1.Location = New System.Drawing.Point(7, 7) + Me.UsrCntlMSE_KonvertCSV1.Name = "UsrCntlMSE_KonvertCSV1" + Me.UsrCntlMSE_KonvertCSV1.Size = New System.Drawing.Size(728, 97) + Me.UsrCntlMSE_KonvertCSV1.TabIndex = 0 ' - 'Button16 + 'MyComboBox2 ' - Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button16.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button16.Location = New System.Drawing.Point(6, 19) - Me.Button16.Name = "Button16" - Me.Button16.Size = New System.Drawing.Size(121, 49) - Me.Button16.TabIndex = 4 - Me.Button16.Text = "Abrechnungsliste" - Me.Button16.UseVisualStyleBackColor = True + Me.MyComboBox2._allowedValuesFreiText = Nothing + Me.MyComboBox2._allowFreiText = False + Me.MyComboBox2._value = "" + Me.MyComboBox2.DropDownHeight = 350 + Me.MyComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.MyComboBox2.DropDownWidth = 250 + Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.MyComboBox2.FormattingEnabled = True + Me.MyComboBox2.IntegralHeight = False + Me.MyComboBox2.Location = New System.Drawing.Point(223, 40) + Me.MyComboBox2.Name = "MyComboBox2" + Me.MyComboBox2.Size = New System.Drawing.Size(221, 24) + Me.MyComboBox2.TabIndex = 17 ' - 'Label56 + 'cboUeberfaelligeBestLeistung ' - Me.Label56.AutoSize = True - Me.Label56.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label56.ForeColor = System.Drawing.SystemColors.ControlDarkDark - Me.Label56.Location = New System.Drawing.Point(9, 354) - Me.Label56.Name = "Label56" - Me.Label56.Size = New System.Drawing.Size(150, 17) - Me.Label56.TabIndex = 14 - Me.Label56.Text = "Datenbereitstellung" + Me.cboUeberfaelligeBestLeistung._allowedValuesFreiText = Nothing + Me.cboUeberfaelligeBestLeistung._allowFreiText = False + Me.cboUeberfaelligeBestLeistung._value = "" + Me.cboUeberfaelligeBestLeistung.DropDownHeight = 350 + Me.cboUeberfaelligeBestLeistung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboUeberfaelligeBestLeistung.DropDownWidth = 250 + Me.cboUeberfaelligeBestLeistung.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboUeberfaelligeBestLeistung.FormattingEnabled = True + Me.cboUeberfaelligeBestLeistung.IntegralHeight = False + Me.cboUeberfaelligeBestLeistung.Location = New System.Drawing.Point(223, 58) + Me.cboUeberfaelligeBestLeistung.Name = "cboUeberfaelligeBestLeistung" + Me.cboUeberfaelligeBestLeistung.Size = New System.Drawing.Size(221, 24) + Me.cboUeberfaelligeBestLeistung.TabIndex = 15 + ' + 'kdUeberfaelligeBest + ' + Me.kdUeberfaelligeBest._AlleFirmenCLUSTER = False + Me.kdUeberfaelligeBest._AllowSetValue = True + Me.kdUeberfaelligeBest._autoSizeGross = False + Me.kdUeberfaelligeBest._display_Name1 = False + Me.kdUeberfaelligeBest._displayAVISO_Email = False + Me.kdUeberfaelligeBest._displayFullName = False + Me.kdUeberfaelligeBest._displayWoelflKd = False + Me.kdUeberfaelligeBest._hideIfListEmpty = True + Me.kdUeberfaelligeBest._loadKdData = False + Me.kdUeberfaelligeBest._searchName1 = True + Me.kdUeberfaelligeBest._UseFIRMA = "" + Me.kdUeberfaelligeBest._ValueKdAndName = True + Me.kdUeberfaelligeBest.dgvpos = "LEFT" + Me.kdUeberfaelligeBest.KdName = "" + Me.kdUeberfaelligeBest.KdNr = "-1" + Me.kdUeberfaelligeBest.kdNrField = Nothing + Me.kdUeberfaelligeBest.KdNrNullInt = Nothing + Me.kdUeberfaelligeBest.Location = New System.Drawing.Point(223, 109) + Me.kdUeberfaelligeBest.Name = "kdUeberfaelligeBest" + Me.kdUeberfaelligeBest.nurAktive = True + Me.kdUeberfaelligeBest.searchActive = True + Me.kdUeberfaelligeBest.Size = New System.Drawing.Size(350, 20) + Me.kdUeberfaelligeBest.TabIndex = 14 + Me.kdUeberfaelligeBest.TIMER_SEARCH = True + Me.kdUeberfaelligeBest.usrcntl = Nothing + ' + 'KdSearchBox1 + ' + Me.KdSearchBox1._AlleFirmenCLUSTER = False + Me.KdSearchBox1._AllowSetValue = True + Me.KdSearchBox1._autoSizeGross = False + Me.KdSearchBox1._display_Name1 = False + Me.KdSearchBox1._displayAVISO_Email = False + Me.KdSearchBox1._displayFullName = False + Me.KdSearchBox1._displayWoelflKd = False + Me.KdSearchBox1._hideIfListEmpty = True + Me.KdSearchBox1._loadKdData = False + Me.KdSearchBox1._searchName1 = True + Me.KdSearchBox1._UseFIRMA = "" + Me.KdSearchBox1._ValueKdAndName = True + Me.KdSearchBox1.dgvpos = "LEFT" + Me.KdSearchBox1.KdName = "" + Me.KdSearchBox1.KdNr = "-1" + Me.KdSearchBox1.kdNrField = Nothing + Me.KdSearchBox1.KdNrNullInt = Nothing + Me.KdSearchBox1.Location = New System.Drawing.Point(223, 48) + Me.KdSearchBox1.Name = "KdSearchBox1" + Me.KdSearchBox1.nurAktive = True + Me.KdSearchBox1.searchActive = True + Me.KdSearchBox1.Size = New System.Drawing.Size(350, 20) + Me.KdSearchBox1.TabIndex = 14 + Me.KdSearchBox1.TIMER_SEARCH = True + Me.KdSearchBox1.usrcntl = Nothing + ' + 'MyComboBox1 + ' + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.DropDownHeight = 350 + Me.MyComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.MyComboBox1.DropDownWidth = 250 + Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.IntegralHeight = False + Me.MyComboBox1.Location = New System.Drawing.Point(223, 72) + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(221, 24) + Me.MyComboBox1.TabIndex = 15 + ' + 'KdSearchBox2 + ' + Me.KdSearchBox2._AlleFirmenCLUSTER = False + Me.KdSearchBox2._AllowSetValue = True + Me.KdSearchBox2._autoSizeGross = False + Me.KdSearchBox2._display_Name1 = False + Me.KdSearchBox2._displayAVISO_Email = False + Me.KdSearchBox2._displayFullName = False + Me.KdSearchBox2._displayWoelflKd = False + Me.KdSearchBox2._hideIfListEmpty = True + Me.KdSearchBox2._loadKdData = False + Me.KdSearchBox2._searchName1 = True + Me.KdSearchBox2._UseFIRMA = "" + Me.KdSearchBox2._ValueKdAndName = True + Me.KdSearchBox2.dgvpos = "LEFT" + Me.KdSearchBox2.KdName = "" + Me.KdSearchBox2.KdNr = "-1" + Me.KdSearchBox2.kdNrField = Nothing + Me.KdSearchBox2.KdNrNullInt = Nothing + Me.KdSearchBox2.Location = New System.Drawing.Point(223, 43) + Me.KdSearchBox2.Name = "KdSearchBox2" + Me.KdSearchBox2.nurAktive = True + Me.KdSearchBox2.searchActive = True + Me.KdSearchBox2.Size = New System.Drawing.Size(350, 20) + Me.KdSearchBox2.TabIndex = 14 + Me.KdSearchBox2.TIMER_SEARCH = True + Me.KdSearchBox2.usrcntl = Nothing + ' + 'cboIDSDateType + ' + Me.cboIDSDateType._allowedValuesFreiText = Nothing + Me.cboIDSDateType._allowFreiText = False + Me.cboIDSDateType._value = "" + Me.cboIDSDateType.FormattingEnabled = True + Me.cboIDSDateType.Location = New System.Drawing.Point(9, 63) + Me.cboIDSDateType.Name = "cboIDSDateType" + Me.cboIDSDateType.Size = New System.Drawing.Size(152, 21) + Me.cboIDSDateType.TabIndex = 27 + ' + 'GroupBox18 + ' + Me.GroupBox18.Controls.Add(Me.Label57) + Me.GroupBox18.Controls.Add(Me.Label58) + Me.GroupBox18.Controls.Add(Me.ProgressBar2) + Me.GroupBox18.Controls.Add(Me.TextBox2) + Me.GroupBox18.Controls.Add(Me.Label59) + Me.GroupBox18.Controls.Add(Me.Button17) + Me.GroupBox18.Location = New System.Drawing.Point(6, 182) + Me.GroupBox18.Name = "GroupBox18" + Me.GroupBox18.Size = New System.Drawing.Size(297, 134) + Me.GroupBox18.TabIndex = 24 + Me.GroupBox18.TabStop = False + ' + 'Label57 + ' + Me.Label57.Location = New System.Drawing.Point(133, 19) + Me.Label57.Name = "Label57" + Me.Label57.Size = New System.Drawing.Size(158, 49) + Me.Label57.TabIndex = 23 + Me.Label57.Text = "Liest die .CSV Datei von IDS ein und sichert die Daten in der Datenbank." + ' + 'Label58 + ' + Me.Label58.Location = New System.Drawing.Point(220, 103) + Me.Label58.Name = "Label58" + Me.Label58.Size = New System.Drawing.Size(69, 13) + Me.Label58.TabIndex = 22 + Me.Label58.Text = "0%" + Me.Label58.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'ProgressBar2 + ' + Me.ProgressBar2.Location = New System.Drawing.Point(6, 74) + Me.ProgressBar2.Name = "ProgressBar2" + Me.ProgressBar2.Size = New System.Drawing.Size(283, 23) + Me.ProgressBar2.TabIndex = 20 + ' + 'TextBox2 + ' + Me.TextBox2.BackColor = System.Drawing.Color.White + Me.TextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.TextBox2.Location = New System.Drawing.Point(78, 103) + Me.TextBox2.Name = "TextBox2" + Me.TextBox2.Size = New System.Drawing.Size(106, 13) + Me.TextBox2.TabIndex = 19 + ' + 'Label59 + ' + Me.Label59.AutoSize = True + Me.Label59.Location = New System.Drawing.Point(3, 103) + Me.Label59.Name = "Label59" + Me.Label59.Size = New System.Drawing.Size(69, 13) + Me.Label59.TabIndex = 18 + Me.Label59.Text = "Einarbeitung:" + ' + 'Button17 + ' + Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button17.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button17.Location = New System.Drawing.Point(6, 19) + Me.Button17.Name = "Button17" + Me.Button17.Size = New System.Drawing.Size(121, 49) + Me.Button17.TabIndex = 4 + Me.Button17.Text = "Einlesen" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Datei auswählen ..." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) + Me.Button17.UseVisualStyleBackColor = True + ' + 'Label60 + ' + Me.Label60.AutoSize = True + Me.Label60.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label60.ForeColor = System.Drawing.SystemColors.ControlDarkDark + Me.Label60.Location = New System.Drawing.Point(9, 162) + Me.Label60.Name = "Label60" + Me.Label60.Size = New System.Drawing.Size(284, 17) + Me.Label60.TabIndex = 25 + Me.Label60.Text = "IDS Dieselabrechnungsdaten einlesen" ' 'usrCntlMDMAuswertungen ' @@ -1945,6 +2034,8 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage4.ResumeLayout(False) Me.TabPage5.ResumeLayout(False) Me.TabPage5.PerformLayout() + Me.GroupBox17.ResumeLayout(False) + Me.GroupBox17.PerformLayout() Me.GroupBox16.ResumeLayout(False) Me.GroupBox16.PerformLayout() Me.GroupBox15.ResumeLayout(False) @@ -1953,8 +2044,8 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox14.PerformLayout() Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() - Me.GroupBox17.ResumeLayout(False) - Me.GroupBox17.PerformLayout() + Me.GroupBox18.ResumeLayout(False) + Me.GroupBox18.PerformLayout() Me.ResumeLayout(False) End Sub @@ -2109,4 +2200,12 @@ Partial Class usrCntlMDMAuswertungen Friend WithEvents GroupBox17 As GroupBox Friend WithEvents Label55 As Label Friend WithEvents Button16 As Button + Friend WithEvents Label60 As Label + Friend WithEvents GroupBox18 As GroupBox + Friend WithEvents Label57 As Label + Friend WithEvents Label58 As Label + Friend WithEvents ProgressBar2 As ProgressBar + Friend WithEvents TextBox2 As TextBox + Friend WithEvents Label59 As Label + Friend WithEvents Button17 As Button End Class diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index fef614c9..5d94a621 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -5,6 +5,9 @@ Imports System.Data.SqlClient Imports System.Reflection Imports VERAG_PROG_ALLGEMEIN Imports System.Security.Cryptography.Xml +Imports System.IO +Imports Tamir.SharpSsh.jsch +Imports sun.swing Public Class usrCntlMDMAuswertungen @@ -1355,6 +1358,63 @@ Public Class usrCntlMDMAuswertungen End Try End Sub + + Private Sub Button17_Click_1(sender As Object, e As EventArgs) Handles Button17.Click + Me.Cursor = Cursors.WaitCursor + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + MsgBox("Funktion noch nicht umgesetzt") + Exit Sub + + Try + Dim dir = "F:\FMZoll\Diesel\IDS\Import\Test" 'Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\MDM\tmp\" + If System.IO.Directory.Exists(dir) Then + For Each file As String In System.IO.Directory.GetFiles(dir) ' Ermittelt alle Dateien des Ordners + + If System.IO.File.Exists(file) Then + + Dim fi As FileInfo = New FileInfo(file) + If fi.Extension.ToLower = ".xls" Then + Dim filepath = file.Replace(".xls", ".txt") + System.IO.File.Move(file, filepath) + End If + End If + + Next + Dim dialog As New OpenFileDialog() + dialog.InitialDirectory = dir + dialog.Filter = "CSV Files (*.csv)|*.csv" + If (dialog.ShowDialog() = DialogResult.OK) Then + Dim table As DataTable = convertToDT(dialog.FileName) + Dim cnt = 1 + + + For Each r As DataRow In Table.Rows + + If cnt Mod 10 = 0 Then + txtIDSEinarbeitung.Text = cnt & " / " & Table.Rows.Count + Dim proz As Double = (cnt / Table.Rows.Count) * 100 + ProgressBar.Value = proz + lblProz.Text = proz.ToString("N2") & " %" + GroupBox7.Refresh() + My.Application.DoEvents() + End If + cnt += 1 + Next + ProgressBar.Value = 100 + txtIDSEinarbeitung.Text = Table.Rows.Count & " / " & Table.Rows.Count + lblProz.Text = "100.00 %" + End If + + End If + + + Catch ex As System.Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + + Me.Cursor = Cursors.Default + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb index 5f430869..5054035b 100644 --- a/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb @@ -24,7 +24,6 @@ Partial Class frmMessenger 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() @@ -39,12 +38,12 @@ Partial Class frmMessenger Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger)) Me.SplitContainer = New System.Windows.Forms.SplitContainer() Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() - Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.Panel6 = New System.Windows.Forms.Panel() Me.Label3 = New System.Windows.Forms.Label() Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label() Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox() - Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.Panel5 = New System.Windows.Forms.Panel() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox2 = New System.Windows.Forms.PictureBox() @@ -65,7 +64,7 @@ Partial Class frmMessenger Me.btnNeu = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() - Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components) + Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel() Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement() Me.Panel3 = New System.Windows.Forms.Panel() Me.btnTeilnehmer = New System.Windows.Forms.Button() @@ -93,9 +92,9 @@ Partial Class frmMessenger Me.btnSendAtt = New System.Windows.Forms.Button() Me.btnSenden = New System.Windows.Forms.Button() Me.rtbChatMessage = New System.Windows.Forms.RichTextBox() - Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components) - Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) - Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer() + Me.Timer_REFRESH = New System.Windows.Forms.Timer() + Me.cntxt = New System.Windows.Forms.ContextMenuStrip() Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb index 28efb88b..29d121e7 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb @@ -597,7 +597,8 @@ Public Class frmUeberstundenauszahlen Dim meldung As String = "" Dim stichtag As Integer = 25 Dim ignoreAuszahlungsdatum As Boolean = False - Select Case MA.mit_firma + + Select Case IIf(MA.mit_firma = "ALL", MA.mit_FirmaHaupt, MA.mit_firma) Case "ATILLA" meldung = " des Vormonats" If auszahlugsdatum.Month = Now.Month - 1 AndAlso Now.Day < 25 Or auszahlugsdatum.Month = Now.Month AndAlso Now.Day < 25 Or auszahlugsdatum.Month > Now.Month Then @@ -647,10 +648,6 @@ Public Class frmUeberstundenauszahlen '1551;"AUSZ ÜS 50%" '1598; Korrektur MJ - ÜBER API ansprechen! - - - - 'sum100 = RoundOfDigits(CDbl(txtAusz100.Text) * 100 / faktor100Zuschlag, 2) 'Übergabe in ZE-System als heruntergerechnete 100%ige bzw. 50%ige ÜS! 'sum50 = RoundOfDigits(CDbl(txtAusz50.Text) * 100 / faktor50Zuschlag, 2) 'sum0 = RoundOfDigits(CDbl(txtAusz50vonSaldo.Text) * 100 / faktorTeilzeit, 2) @@ -768,7 +765,6 @@ Public Class frmUeberstundenauszahlen Dim info As String = "" If timas.setTimeAccountEntries(MA, dtsetEntries, auszahlugsdatum, info) AndAlso ues.SAVE() Then - MsgBox("Erfolgreich in Timas eingetragen") Else MsgBox(info)