diff --git a/Parkzeit.accdb b/Parkzeit.accdb index e0899f23..3d44b1e3 100644 Binary files a/Parkzeit.accdb and b/Parkzeit.accdb differ diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index c7acb5f3..43eb5539 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -651,15 +651,16 @@ Public Class cFakturierung Return doRechnungsDruck(New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID), RechnungsDatum, vorschau, Rechnugnsdruck, Path, PrinterName, printOriginalRg, SammelrechnungAnlagendruck, printStbVdb) End Function - Public Shared Function doRechnungsDruck_MAIL(RK_ID As Integer, Optional RechnungsDatum As Object = Nothing, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional SammelrechnungAnlagendruck As Boolean = False, Optional printStbVdb As Boolean = False) As Boolean + Public Shared Function doRechnungsDruck_MAIL(RK_ID As Integer, Optional RechnungsDatum As Object = Nothing, Optional vorschau As Boolean = False, Optional Rechnugnsdruck As Integer = -1, Optional ByRef Path As String = "", Optional ByRef PrinterName As String = "", Optional SammelrechnungAnlagendruck As Boolean = False, Optional printStbVdb As Boolean = False, Optional printRgCopy As Boolean = False) As Boolean If RK_ID <= 0 Then Return False Dim RG_TMP = New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID) If RG_TMP Is Nothing Then Return False Dim SPEDBUCH_TMP = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(RG_TMP.FilialenNr, RG_TMP.AbfertigungsNr, RG_TMP.SpeditionsbuchUnterNr) + If Rechnugnsdruck <= 0 Then Rechnugnsdruck = 3 ' Default Mail If SPEDBUCH_TMP Is Nothing Then Return False - Dim f As New frmFaktEmail(RG_TMP, SPEDBUCH_TMP, Nothing) + Dim f As New frmFaktEmail(RG_TMP, SPEDBUCH_TMP, Nothing, Rechnugnsdruck) f.Show() Return True ' Return doRechnungsDruck(New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID), RechnungsDatum, vorschau, Rechnugnsdruck, Path, PrinterName, SammelrechnungAnlagendruck, printStbVdb) @@ -1362,8 +1363,8 @@ Public Class cFakturierung End If '------------------------------------------------------------------------------- - - Select Case If(Rechnugnsdruck > 0, Rechnugnsdruck, If(AD.Rechnungsdruck, 0))'If(AD.Rechnungsdruck, 0) + Dim RD_DRUCK = If(Rechnugnsdruck > 0, Rechnugnsdruck, If(AD.Rechnungsdruck, 0)) 'If(AD.Rechnungsdruck, 0) + Select Case RD_DRUCK Case 0, 1 'DRUCKEN Dim ret = cProgramFunctions.printRpt(rpt, PrinterName, False) @@ -1377,7 +1378,7 @@ Public Class cFakturierung Return ret 'Case 1 'FAX - Case 2 'MAIL + Case 2, 5 'MAIL 'Dim tmpPath = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getTMPPath(RG_Bezeichnung, ".pdf", , False) 'Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport 'rpt.Run(False) @@ -1410,6 +1411,22 @@ Public Class cFakturierung Mail.Attachments.Add(tmpPath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , "Rechnung.pdf") Mail.Display() + If RD_DRUCK = 5 Then + ' --> RPOT KOPIE DRUCKEN + Select Case RECHNUNG.RechnungSprache + Case "EN" : rpt.lblUeberschriftRG_GS.Text &= " - COPY" + Case Else : rpt.lblUeberschriftRG_GS.Text &= " - KOPIE" + End Select + + Dim ret = cProgramFunctions.printRpt(rpt, PrinterName, False) + If printStbVdb Then + If (RECHNUNG.[DruckDatumZeit] Is Nothing OrElse vbYes = MsgBox("Zollbeleg drucken?", vbYesNoCancel)) Then + printSpedBuchAnhaenge(RECHNUNG, True, True) + End If + End If + + End If + Catch ex As Exception MsgBox("Fehler bim Öffnen des Mail-Programmes. PDF wird geladen!") Process.Start(tmpPath) diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb b/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb index ff110f33..ef762a06 100644 --- a/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb +++ b/SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb @@ -30,8 +30,10 @@ Partial Class frmAbrechnungsMaske Me.TabPage1 = New System.Windows.Forms.TabPage() Me.Button4 = New System.Windows.Forms.Button() Me.Label12 = New System.Windows.Forms.Label() - Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.dgvRechnungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel2 = New System.Windows.Forms.Panel() + Me.Button11 = New System.Windows.Forms.Button() + Me.cbxOriginalDrucken = New System.Windows.Forms.CheckBox() Me.cboSort = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Button9 = New System.Windows.Forms.Button() @@ -81,7 +83,6 @@ Partial Class frmAbrechnungsMaske Me.btnBisJahr = New System.Windows.Forms.Button() Me.btnVonJahr = New System.Windows.Forms.Button() Me.UsrCntlFaktAbrechnung1 = New SDL.usrCntlFaktAbrechnung() - Me.cbxOriginalDrucken = New System.Windows.Forms.CheckBox() Me.pnl.SuspendLayout() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() @@ -89,7 +90,7 @@ Partial Class frmAbrechnungsMaske Me.SplitContainer.SuspendLayout() Me.tbcntr.SuspendLayout() Me.TabPage1.SuspendLayout() - CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvRechnungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel2.SuspendLayout() Me.Panel1.SuspendLayout() Me.MyPanel1.SuspendLayout() @@ -138,7 +139,7 @@ Partial Class frmAbrechnungsMaske ' Me.TabPage1.Controls.Add(Me.Button4) Me.TabPage1.Controls.Add(Me.Label12) - Me.TabPage1.Controls.Add(Me.MyDatagridview1) + Me.TabPage1.Controls.Add(Me.dgvRechnungen) Me.TabPage1.Controls.Add(Me.Panel2) Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" @@ -171,28 +172,29 @@ Partial Class frmAbrechnungsMaske Me.Label12.TextAlign = System.Drawing.ContentAlignment.TopCenter Me.Label12.Visible = False ' - 'MyDatagridview1 + 'dgvRechnungen ' - Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1 - Me.MyDatagridview1.AllowUserToAddRows = False - Me.MyDatagridview1.AllowUserToDeleteRows = False - Me.MyDatagridview1.AllowUserToResizeColumns = False - Me.MyDatagridview1.AllowUserToResizeRows = False - Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.MyDatagridview1.Dock = System.Windows.Forms.DockStyle.Fill - Me.MyDatagridview1.Location = New System.Drawing.Point(3, 3) - Me.MyDatagridview1.Margin = New System.Windows.Forms.Padding(2) - Me.MyDatagridview1.Name = "MyDatagridview1" - Me.MyDatagridview1.ReadOnly = True - Me.MyDatagridview1.RowHeadersVisible = False - Me.MyDatagridview1.RowTemplate.Height = 28 - Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.MyDatagridview1.Size = New System.Drawing.Size(561, 316) - Me.MyDatagridview1.TabIndex = 1 + Me.dgvRechnungen.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvRechnungen.AllowUserToAddRows = False + Me.dgvRechnungen.AllowUserToDeleteRows = False + Me.dgvRechnungen.AllowUserToResizeColumns = False + Me.dgvRechnungen.AllowUserToResizeRows = False + Me.dgvRechnungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvRechnungen.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvRechnungen.Location = New System.Drawing.Point(3, 3) + Me.dgvRechnungen.Margin = New System.Windows.Forms.Padding(2) + Me.dgvRechnungen.Name = "dgvRechnungen" + Me.dgvRechnungen.ReadOnly = True + Me.dgvRechnungen.RowHeadersVisible = False + Me.dgvRechnungen.RowTemplate.Height = 28 + Me.dgvRechnungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvRechnungen.Size = New System.Drawing.Size(561, 316) + Me.dgvRechnungen.TabIndex = 1 ' 'Panel2 ' Me.Panel2.BackColor = System.Drawing.Color.White + Me.Panel2.Controls.Add(Me.Button11) Me.Panel2.Controls.Add(Me.cbxOriginalDrucken) Me.Panel2.Controls.Add(Me.cboSort) Me.Panel2.Controls.Add(Me.cboPrinter) @@ -217,6 +219,31 @@ Partial Class frmAbrechnungsMaske Me.Panel2.Size = New System.Drawing.Size(561, 97) Me.Panel2.TabIndex = 0 ' + 'Button11 + ' + Me.Button11.BackgroundImage = Global.SDL.My.Resources.Resources.email_print1 + Me.Button11.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button11.Location = New System.Drawing.Point(220, 21) + Me.Button11.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) + Me.Button11.Name = "Button11" + Me.Button11.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0) + Me.Button11.Size = New System.Drawing.Size(40, 25) + Me.Button11.TabIndex = 28 + Me.Button11.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button11.UseVisualStyleBackColor = True + ' + 'cbxOriginalDrucken + ' + Me.cbxOriginalDrucken.AutoSize = True + Me.cbxOriginalDrucken.Location = New System.Drawing.Point(142, 75) + Me.cbxOriginalDrucken.Name = "cbxOriginalDrucken" + Me.cbxOriginalDrucken.Size = New System.Drawing.Size(134, 17) + Me.cbxOriginalDrucken.TabIndex = 27 + Me.cbxOriginalDrucken.Text = "Original (ohne ""Kopie"")" + Me.cbxOriginalDrucken.UseVisualStyleBackColor = True + ' 'cboSort ' Me.cboSort._allowedValuesFreiText = Nothing @@ -238,7 +265,7 @@ Partial Class frmAbrechnungsMaske Me.cboPrinter.FormattingEnabled = True Me.cboPrinter.Location = New System.Drawing.Point(142, 52) Me.cboPrinter.Name = "cboPrinter" - Me.cboPrinter.Size = New System.Drawing.Size(148, 21) + Me.cboPrinter.Size = New System.Drawing.Size(157, 21) Me.cboPrinter.TabIndex = 25 ' 'Button9 @@ -251,7 +278,7 @@ Partial Class frmAbrechnungsMaske Me.Button9.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) Me.Button9.Name = "Button9" Me.Button9.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0) - Me.Button9.Size = New System.Drawing.Size(50, 25) + Me.Button9.Size = New System.Drawing.Size(40, 25) Me.Button9.TabIndex = 22 Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button9.UseVisualStyleBackColor = True @@ -262,11 +289,11 @@ Partial Class frmAbrechnungsMaske Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button8.Location = New System.Drawing.Point(191, 21) + Me.Button8.Location = New System.Drawing.Point(181, 21) Me.Button8.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) Me.Button8.Name = "Button8" Me.Button8.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0) - Me.Button8.Size = New System.Drawing.Size(50, 25) + Me.Button8.Size = New System.Drawing.Size(40, 25) Me.Button8.TabIndex = 21 Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button8.UseVisualStyleBackColor = True @@ -277,11 +304,11 @@ Partial Class frmAbrechnungsMaske Me.Button7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button7.Location = New System.Drawing.Point(240, 21) + Me.Button7.Location = New System.Drawing.Point(259, 21) Me.Button7.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) Me.Button7.Name = "Button7" Me.Button7.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0) - Me.Button7.Size = New System.Drawing.Size(50, 25) + Me.Button7.Size = New System.Drawing.Size(40, 25) Me.Button7.TabIndex = 20 Me.Button7.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button7.UseVisualStyleBackColor = True @@ -557,6 +584,7 @@ Partial Class frmAbrechnungsMaske Me.MyTextBox2._DateTimeOnly = False Me.MyTextBox2._numbersOnly = True Me.MyTextBox2._numbersOnlyKommastellen = "" + Me.MyTextBox2._numbersOnlyTrennzeichen = True Me.MyTextBox2._Prozent = False Me.MyTextBox2._ShortDateNew = False Me.MyTextBox2._ShortDateOnly = False @@ -581,6 +609,7 @@ Partial Class frmAbrechnungsMaske Me.MyTextBox3._DateTimeOnly = False Me.MyTextBox3._numbersOnly = True Me.MyTextBox3._numbersOnlyKommastellen = "" + Me.MyTextBox3._numbersOnlyTrennzeichen = True Me.MyTextBox3._Prozent = False Me.MyTextBox3._ShortDateNew = False Me.MyTextBox3._ShortDateOnly = False @@ -634,6 +663,7 @@ Partial Class frmAbrechnungsMaske Me.txtAbfertDat._DateTimeOnly = False Me.txtAbfertDat._numbersOnly = False Me.txtAbfertDat._numbersOnlyKommastellen = "" + Me.txtAbfertDat._numbersOnlyTrennzeichen = True Me.txtAbfertDat._Prozent = False Me.txtAbfertDat._ShortDateNew = True Me.txtAbfertDat._ShortDateOnly = False @@ -668,6 +698,7 @@ Partial Class frmAbrechnungsMaske Me.txtAbfertDatBis._DateTimeOnly = False Me.txtAbfertDatBis._numbersOnly = False Me.txtAbfertDatBis._numbersOnlyKommastellen = "" + Me.txtAbfertDatBis._numbersOnlyTrennzeichen = True Me.txtAbfertDatBis._Prozent = False Me.txtAbfertDatBis._ShortDateNew = True Me.txtAbfertDatBis._ShortDateOnly = False @@ -871,16 +902,6 @@ Partial Class frmAbrechnungsMaske Me.UsrCntlFaktAbrechnung1.Size = New System.Drawing.Size(863, 615) Me.UsrCntlFaktAbrechnung1.TabIndex = 0 ' - 'cbxOriginalDrucken - ' - Me.cbxOriginalDrucken.AutoSize = True - Me.cbxOriginalDrucken.Location = New System.Drawing.Point(142, 75) - Me.cbxOriginalDrucken.Name = "cbxOriginalDrucken" - Me.cbxOriginalDrucken.Size = New System.Drawing.Size(134, 17) - Me.cbxOriginalDrucken.TabIndex = 27 - Me.cbxOriginalDrucken.Text = "Original (ohne ""Kopie"")" - Me.cbxOriginalDrucken.UseVisualStyleBackColor = True - ' 'frmAbrechnungsMaske ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -899,7 +920,7 @@ Partial Class frmAbrechnungsMaske Me.SplitContainer.ResumeLayout(False) Me.tbcntr.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) - CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvRechnungen, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() Me.Panel1.ResumeLayout(False) @@ -914,7 +935,7 @@ Partial Class frmAbrechnungsMaske Friend WithEvents UsrCntlFaktAbrechnung1 As SDL.usrCntlFaktAbrechnung Friend WithEvents Panel2 As System.Windows.Forms.Panel Friend WithEvents Panel1 As System.Windows.Forms.Panel - Friend WithEvents MyDatagridview1 As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents dgvRechnungen As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents cboFirma As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents lblSachbearbeiter As System.Windows.Forms.Label Friend WithEvents MyComboBox2 As VERAG_PROG_ALLGEMEIN.MyComboBox @@ -967,4 +988,5 @@ Partial Class frmAbrechnungsMaske Friend WithEvents Label14 As Label Public WithEvents cboSort As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents cbxOriginalDrucken As CheckBox + Friend WithEvents Button11 As Button End Class diff --git a/SDL/Fakturierung/frmAbrechnungsMaske.vb b/SDL/Fakturierung/frmAbrechnungsMaske.vb index 7c78eaaa..f738ce3a 100644 --- a/SDL/Fakturierung/frmAbrechnungsMaske.vb +++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb @@ -33,6 +33,7 @@ Public Class frmAbrechnungsMaske MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("POST", "0")) MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FAX", "1")) MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("E-MAIL", "2")) + MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MAIL+KOPIE", "5")) MyComboBox1.changeItem("") cboSort.Items.Clear() @@ -99,7 +100,7 @@ Public Class frmAbrechnungsMaske End Sub Sub newRechnung() - MyDatagridview1.ClearSelection() + dgvRechnungen.ClearSelection() UsrCntlFaktAbrechnung1.newRECHNUNG() End Sub @@ -109,7 +110,7 @@ Public Class frmAbrechnungsMaske Function getDGV() As VERAG_PROG_ALLGEMEIN.MyDatagridview - Return MyDatagridview1 + Return dgvRechnungen 'If tbcntr.SelectedTab Is TabPage1 Then ' Return MyDatagridview1 'Else @@ -127,7 +128,7 @@ Public Class frmAbrechnungsMaske Dim sqlstr = "" ' sqlstr &= " SELECT FilialenNr, AbfertigungsNr, UnterNr, Firma_ID, Status, Sammelrechnung, Sachbearbeiter, SteuerpflichtigerGesamtbetrag, SteuerfreierGesamtbetrag, RechnungsNr, RechnungsDatum, DruckDatumZeit, Buchungsjahr, RK_ID" sqlstr &= " SELECT FilialenNr, AbfertigungsNr, cast(FilialenNr as varchar) + ' ' + cast(AbfertigungsNr as varchar) as PosNr, UnterNr, Firma_ID,Rechnungsausgang.Sammelrechnung as Art, [RechnungsName 1] as Rechnungsempfänger, (isnull(SteuerpflichtigerGesamtbetrag,0) + isnull(SteuerfreierGesamtbetrag,0)) as Betrag, RK_ID,RechnungsLandKz,RechnungsKundenNr" - sqlstr &= " ,(CASE WHEN Rechnungsdruck =0 THEN 'POST' WHEN Rechnungsdruck=1 THEN 'FAX' WHEN Rechnungsdruck=2 THEN 'E-MAIL' ELSE '-' END) as Rechnungsdruck " + sqlstr &= " ,(CASE WHEN Rechnungsdruck =0 THEN 'POST' WHEN Rechnungsdruck=1 THEN 'FAX' WHEN Rechnungsdruck=2 THEN 'E-MAIL' WHEN Rechnungsdruck=5 THEN 'MAIL+KOPIE' ELSE '-' END) as Rechnungsdruck " sqlstr &= " FROM Rechnungsausgang INNER JOIN Adressen ON AdressenNr=Rechnungsausgang.RechnungsKundenNr" sqlstr &= " WHERE 1=1 " @@ -205,7 +206,7 @@ Public Class frmAbrechnungsMaske End Function - Private Sub MyDatagridview1_SelectionChanged(sender As Object, e As EventArgs) Handles MyDatagridview1.SelectionChanged + Private Sub MyDatagridview1_SelectionChanged(sender As Object, e As EventArgs) Handles dgvRechnungen.SelectionChanged If Not selChangedAllowed Then Exit Sub If sender.SelectedRows.Count > 0 Then If UsrCntlFaktAbrechnung1.SAVED Then @@ -240,10 +241,10 @@ Public Class frmAbrechnungsMaske Private Sub UsrCntlFaktAbrechnung1_SOMETHING_CHANGED(rk_id) Handles UsrCntlFaktAbrechnung1.SOMETHING_CHANGED selChangedAllowed = False getDGV().RELOAD() - MyDatagridview1.ClearSelection() + dgvRechnungen.ClearSelection() selChangedAllowed = True If rk_id > 0 Then - For Each r As DataGridViewRow In MyDatagridview1.Rows + For Each r As DataGridViewRow In dgvRechnungen.Rows If r.Cells("RK_ID").Value = rk_id Then r.Selected = True Exit Sub @@ -273,8 +274,8 @@ Public Class frmAbrechnungsMaske Dim RechnungsDatum As Date = Now If cFakturierung.getRgDatInput("Es werden " & dt.Rows.Count & " Rechnungen gedruckt." & vbNewLine & "Möchten Sie fortfahren?" & vbNewLine, [RechnungsDatum]) Then 'Now.ToShortDateString For Each r In dt.Rows - If r("Rechnungsdruck") = "2" Then - cFakturierung.doRechnungsDruck_MAIL(r("RK_ID"), RechnungsDatum,,,, cboPrinter.Text,, PARAM_printZollbeleg) + If r("Rechnungsdruck") = "2" Or r("Rechnungsdruck") = "5" Then + cFakturierung.doRechnungsDruck_MAIL(r("RK_ID"), RechnungsDatum,, r("Rechnungsdruck"),, cboPrinter.Text,, PARAM_printZollbeleg) Else cFakturierung.doRechnungsDruck(r("RK_ID"), RechnungsDatum,,,, cboPrinter.Text,, PARAM_printZollbeleg) End If @@ -337,7 +338,7 @@ Public Class frmAbrechnungsMaske Dim f As New frmFaktSammelRgDrucken(cboFirma._value) f.ShowDialog(Me) getDGV().RELOAD() - If MyDatagridview1.Rows.Count = 0 Then newRechnung() + If dgvRechnungen.Rows.Count = 0 Then newRechnung() End If End Sub @@ -346,8 +347,8 @@ Public Class frmAbrechnungsMaske End Sub Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click - If MyDatagridview1.SelectedRows.Count > 0 Then - If vbYes = MsgBox("Es werden " & MyDatagridview1.SelectedRows.Count & " Rechnungen in ein PDF gewandelt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then + If dgvRechnungen.SelectedRows.Count > 0 Then + If vbYes = MsgBox("Es werden " & dgvRechnungen.SelectedRows.Count & " Rechnungen in ein PDF gewandelt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then 'Rechnungsdatum festlegen: Dim RechnungsDatumTMP As Object = Nothing @@ -360,7 +361,7 @@ Public Class frmAbrechnungsMaske Dim list As New List(Of String) ' Sammlung PDFs - For Each r As DataGridViewRow In MyDatagridview1.SelectedRows + For Each r As DataGridViewRow In dgvRechnungen.SelectedRows Dim path = "" cFakturierung.doRechnungsDruck(r.Cells("RK_ID").Value, RechnungsDatumTMP,, 4, path, cboPrinter.Text, cbxOriginalDrucken.Checked) If path <> "" Then list.Add(path) @@ -382,23 +383,30 @@ Public Class frmAbrechnungsMaske End If End Sub - Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click - For Each r As DataGridViewRow In MyDatagridview1.SelectedRows + Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click, Button11.Click + For Each r As DataGridViewRow In dgvRechnungen.SelectedRows If r.Cells("Art").Value <> "0" Then MsgBox("Nur bei Einzelrechnung") Exit Sub End If Next - If MyDatagridview1.SelectedRows.Count = 1 Then + If dgvRechnungen.SelectedRows.Count = 1 Then Try - Dim RECHNUNG As New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(MyDatagridview1.SelectedRows(0).Cells("RK_ID").Value) + Dim RECHNUNG As New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(dgvRechnungen.SelectedRows(0).Cells("RK_ID").Value) Dim SPEDBUCH As New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch(RECHNUNG.FilialenNr, RECHNUNG.AbfertigungsNr, RECHNUNG.SpeditionsbuchUnterNr) If SPEDBUCH IsNot Nothing Then - Dim f As New frmFaktEmail(RECHNUNG, SPEDBUCH, True) - 'Dim f As New frmFaktEmail(RECHNUNG, SPEDBUCH, cbxOriginalDrucken.Checked) + + 'RG-Druck - Mail (+Kopie) + Dim RG_DRUCK = 2 + If sender Is Button11 Then + RG_DRUCK = 5 + End If + + Dim f As New frmFaktEmail(RECHNUNG, SPEDBUCH, True, RG_DRUCK) f.ShowDialog(Me) + End If 'merge PDFs path @@ -407,9 +415,9 @@ Public Class frmAbrechnungsMaske MsgBox("Fehler beim Öffnen des Mail-Fensters!" & vbNewLine & vbNewLine & ex.StackTrace & ex.Message) End Try - ElseIf MyDatagridview1.SelectedRows.Count > 1 Then + ElseIf dgvRechnungen.SelectedRows.Count > 1 Then - If vbYes = MsgBox("Es werden " & MyDatagridview1.SelectedRows.Count & " Rechnungen ans Mail angefügt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then + If vbYes = MsgBox("Es werden " & dgvRechnungen.SelectedRows.Count & " Rechnungen ans Mail angefügt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then 'Rechnungsdatum festlegen: Dim RechnungsDatumTMP As Object = Nothing @@ -423,7 +431,7 @@ Public Class frmAbrechnungsMaske Dim list As New List(Of String) ' Sammlung PDFs - For Each r As DataGridViewRow In MyDatagridview1.SelectedRows + For Each r As DataGridViewRow In dgvRechnungen.SelectedRows Dim path = "" cFakturierung.doRechnungsDruck(r.Cells("RK_ID").Value, RechnungsDatumTMP,, 4, path, cboPrinter.Text) If path <> "" Then list.Add(path) @@ -489,10 +497,10 @@ Public Class frmAbrechnungsMaske Function getSelectionKdNr() As String getSelectionKdNr = "" - If MyDatagridview1.SelectedRows.Count > 0 Then - If MyDatagridview1.SelectedRows.Count = MyDatagridview1.Rows.Count Then Return "" ' Alle ausgewählt + If dgvRechnungen.SelectedRows.Count > 0 Then + If dgvRechnungen.SelectedRows.Count = dgvRechnungen.Rows.Count Then Return "" ' Alle ausgewählt - For Each r As DataGridViewRow In MyDatagridview1.SelectedRows + For Each r As DataGridViewRow In dgvRechnungen.SelectedRows getSelectionKdNr &= r.Cells("RechnungsKundenNr").Value & "," Next getSelectionKdNr = getSelectionKdNr.Substring(0, getSelectionKdNr.Length - 1) @@ -501,17 +509,17 @@ Public Class frmAbrechnungsMaske Function getSelection(value) As String getSelection = "" - If MyDatagridview1.SelectedRows.Count > 0 Then - getSelection = MyDatagridview1.SelectedRows(0).Cells(value).Value - For Each r As DataGridViewRow In MyDatagridview1.SelectedRows + If dgvRechnungen.SelectedRows.Count > 0 Then + getSelection = dgvRechnungen.SelectedRows(0).Cells(value).Value + For Each r As DataGridViewRow In dgvRechnungen.SelectedRows If getSelection <> r.Cells(value).Value Then Return "" Next End If End Function Private Sub Button7_Click2(sender As Object, e As EventArgs) Handles Button7.Click - If MyDatagridview1.SelectedRows.Count > 0 Then - If vbYes = MsgBox("Es werden " & MyDatagridview1.SelectedRows.Count & " Rechnungen gedruckt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then + If dgvRechnungen.SelectedRows.Count > 0 Then + If vbYes = MsgBox("Es werden " & dgvRechnungen.SelectedRows.Count & " Rechnungen gedruckt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then 'Rechnungsdatum festlegen: Dim RechnungsDatumTMP As Object = Nothing @@ -524,7 +532,7 @@ Public Class frmAbrechnungsMaske Dim PARAM_printZollbeleg = VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("FAKTURIERUNG_PRINT_Zollbeleg") - For Each r As DataGridViewRow In MyDatagridview1.SelectedRows + For Each r As DataGridViewRow In dgvRechnungen.SelectedRows cFakturierung.doRechnungsDruck(r.Cells("RK_ID").Value, RechnungsDatumTMP,, 0, , cboPrinter.Text, cbxOriginalDrucken.Checked, , PARAM_printZollbeleg) Next 'merge PDFs path diff --git a/SDL/Fakturierung/frmFaktEmail.Designer.vb b/SDL/Fakturierung/frmFaktEmail.Designer.vb index 8aab280b..89710a13 100644 --- a/SDL/Fakturierung/frmFaktEmail.Designer.vb +++ b/SDL/Fakturierung/frmFaktEmail.Designer.vb @@ -67,6 +67,8 @@ Partial Class frmFaktEmail Me.cbxMergeRg = New System.Windows.Forms.CheckBox() Me.cbxExcelEvolog = New System.Windows.Forms.CheckBox() Me.cbxTransFerry = New System.Windows.Forms.CheckBox() + Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbxRgKopieDrucken = New System.Windows.Forms.CheckBox() CType(Me.dgvEmailBCC, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvEmailCC, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvEmail, System.ComponentModel.ISupportInitialize).BeginInit() @@ -87,10 +89,12 @@ Partial Class frmFaktEmail Me.txtSubject._DateTimeOnly = False Me.txtSubject._numbersOnly = False Me.txtSubject._numbersOnlyKommastellen = "" + Me.txtSubject._numbersOnlyTrennzeichen = True Me.txtSubject._Prozent = False Me.txtSubject._ShortDateNew = False Me.txtSubject._ShortDateOnly = False Me.txtSubject._TimeOnly = False + Me.txtSubject._TimeOnly_Seconds = False Me.txtSubject._value = "" Me.txtSubject._Waehrung = False Me.txtSubject._WaehrungZeichen = True @@ -419,10 +423,12 @@ Partial Class frmFaktEmail Me.txtSteuerberaterEmail._DateTimeOnly = False Me.txtSteuerberaterEmail._numbersOnly = False Me.txtSteuerberaterEmail._numbersOnlyKommastellen = "" + Me.txtSteuerberaterEmail._numbersOnlyTrennzeichen = True Me.txtSteuerberaterEmail._Prozent = False Me.txtSteuerberaterEmail._ShortDateNew = False Me.txtSteuerberaterEmail._ShortDateOnly = False Me.txtSteuerberaterEmail._TimeOnly = False + Me.txtSteuerberaterEmail._TimeOnly_Seconds = False Me.txtSteuerberaterEmail._value = "" Me.txtSteuerberaterEmail._Waehrung = False Me.txtSteuerberaterEmail._WaehrungZeichen = True @@ -441,10 +447,12 @@ Partial Class frmFaktEmail Me.txtFAEmail._DateTimeOnly = False Me.txtFAEmail._numbersOnly = False Me.txtFAEmail._numbersOnlyKommastellen = "" + Me.txtFAEmail._numbersOnlyTrennzeichen = True Me.txtFAEmail._Prozent = False Me.txtFAEmail._ShortDateNew = False Me.txtFAEmail._ShortDateOnly = False Me.txtFAEmail._TimeOnly = False + Me.txtFAEmail._TimeOnly_Seconds = False Me.txtFAEmail._value = "" Me.txtFAEmail._Waehrung = False Me.txtFAEmail._WaehrungZeichen = True @@ -523,12 +531,37 @@ Partial Class frmFaktEmail Me.cbxTransFerry.Text = "Excel TransFerry" Me.cbxTransFerry.UseVisualStyleBackColor = True ' + 'cboPrinter + ' + Me.cboPrinter._allowedValuesFreiText = Nothing + Me.cboPrinter._allowFreiText = False + Me.cboPrinter._value = "" + Me.cboPrinter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.cboPrinter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboPrinter.FormattingEnabled = True + Me.cboPrinter.Location = New System.Drawing.Point(610, 562) + Me.cboPrinter.Name = "cboPrinter" + Me.cboPrinter.Size = New System.Drawing.Size(118, 21) + Me.cboPrinter.TabIndex = 33 + ' + 'cbxRgKopieDrucken + ' + Me.cbxRgKopieDrucken.AutoSize = True + Me.cbxRgKopieDrucken.Location = New System.Drawing.Point(610, 543) + Me.cbxRgKopieDrucken.Name = "cbxRgKopieDrucken" + Me.cbxRgKopieDrucken.Size = New System.Drawing.Size(117, 17) + Me.cbxRgKopieDrucken.TabIndex = 34 + Me.cbxRgKopieDrucken.Text = "RG-Kopie drucken:" + Me.cbxRgKopieDrucken.UseVisualStyleBackColor = True + ' 'frmFaktEmail ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.WhiteSmoke Me.ClientSize = New System.Drawing.Size(750, 850) + Me.Controls.Add(Me.cbxRgKopieDrucken) + Me.Controls.Add(Me.cboPrinter) Me.Controls.Add(Me.cbxTransFerry) Me.Controls.Add(Me.cbxExcelEvolog) Me.Controls.Add(Me.cbxMergeRg) @@ -618,4 +651,6 @@ Partial Class frmFaktEmail Friend WithEvents cbxMergeRg As CheckBox Friend WithEvents cbxExcelEvolog As CheckBox Friend WithEvents cbxTransFerry As CheckBox + Friend WithEvents cboPrinter As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cbxRgKopieDrucken As CheckBox End Class diff --git a/SDL/Fakturierung/frmFaktEmail.vb b/SDL/Fakturierung/frmFaktEmail.vb index 33ff9057..0b6d81e0 100644 --- a/SDL/Fakturierung/frmFaktEmail.vb +++ b/SDL/Fakturierung/frmFaktEmail.vb @@ -1,4 +1,5 @@ Imports Microsoft.Office.Interop +Imports VERAG_PROG_ALLGEMEIN @@ -18,6 +19,7 @@ Public Class frmFaktEmail Dim DatumBis As Date Dim Rechnungsdatum As Date Dim SB As String + Dim Rechnungsdruck As Integer = 3 Dim EinzelAnlagen As Boolean Dim Sammelbericht As Boolean @@ -30,7 +32,7 @@ Public Class frmFaktEmail Dim AvisoIds As List(Of Integer) Dim SR = False - Sub New(RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, printOriginalRg As Object) + Sub New(RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, printOriginalRg As Object, Rechnungsdruck As Integer) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -40,12 +42,13 @@ Public Class frmFaktEmail Me.SPEDBUCH = SPEDBUCH Me.printOriginalRg = printOriginalRg Me.KdNr = RECHNUNG.RechnungsKundenNr + Me.Rechnungsdruck = Rechnungsdruck ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. 'McDull.Windows.Forms.HTMLTextBox End Sub - Sub New(Firma_ID As Integer, SammelrechungArt As Integer, DatumBis As Date, Rechnungsdatum As Date, PrinterName As String, Optional EinzelAnlagen As Boolean = True, Optional Sammelbericht As Boolean = True, Optional KdNr As Integer = -1, Optional RechnungsdruckArt As Integer = -1, Optional ByRef listPDFs As List(Of String) = Nothing, Optional SB As String = "", ByRef Optional lastAktuelle_RgNr As Integer = -1, Optional AvisoIds As List(Of Integer) = Nothing, Optional xlsEvolog As Boolean = False, Optional xlsTransFerry As Boolean = False, Optional FakturierungsGruppe As String = "", Optional Abfertigungsart As String = "") + Sub New(Firma_ID As Integer, SammelrechungArt As Integer, DatumBis As Date, Rechnungsdatum As Date, PrinterName As String, Rechnungsdruck As Integer, Optional EinzelAnlagen As Boolean = True, Optional Sammelbericht As Boolean = True, Optional KdNr As Integer = -1, Optional RechnungsdruckArt As Integer = -1, Optional ByRef listPDFs As List(Of String) = Nothing, Optional SB As String = "", ByRef Optional lastAktuelle_RgNr As Integer = -1, Optional AvisoIds As List(Of Integer) = Nothing, Optional xlsEvolog As Boolean = False, Optional xlsTransFerry As Boolean = False, Optional FakturierungsGruppe As String = "", Optional Abfertigungsart As String = "", Optional printRgCopy As Boolean = False) '(Firma_ID As Integer, SammelrechungArt As Integer, KdNr As Integer, DatumBis As Date, SB As String, EinzelAnlagen As Boolean, Sammelbericht As Boolean) 'Sammelrechnung ' Dieser Aufruf ist für den Designer erforderlich. @@ -66,6 +69,7 @@ Public Class frmFaktEmail Me.FakturierungsGruppe = FakturierungsGruppe Me.Abfertigungsart = Abfertigungsart Me.AvisoIds = AvisoIds + Me.Rechnungsdruck = Rechnungsdruck SR = True End Sub @@ -92,6 +96,10 @@ Public Class frmFaktEmail cboFaStb_Sprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EN", "EN")) cboFaStb_Sprache.changeItem("DE") + cProgramFunctions.initDrucker(cboPrinter) + Select Case Rechnungsdruck + Case 5 : cbxRgKopieDrucken.Checked = True + End Select Dim AD As VERAG_PROG_ALLGEMEIN.cAdressen Dim FISKAL As cFiskal_Daten = Nothing @@ -273,6 +281,16 @@ Public Class frmFaktEmail End If + If cbxRgKopieDrucken.Checked Then + 'KOPIE DRUCK + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + Dim RK_ID = sql.getValueTxtBySql("SELECT TOP 1 RK_ID FROM Rechnungsausgang WHERE RechnungsNr='" & RechnungsNr & "' AND Firma_ID='" & Firma_ID & "' ORDER BY DruckDatumZeit DESC", "FMZOLL") + Dim RG_TMP As New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RK_ID) + If RG_TMP IsNot Nothing Then + cFakturierung.doSAMMELRechnungsDruck_Abschnitt(RG_TMP.RechnungsNr, -1, -1, RG_TMP.DruckDatumZeit, cboPrinter.Text, False, , 3,, True) + End If + End If + Dim outl As New Outlook.Application Dim Mail As Microsoft.Office.Interop.Outlook.MailItem Mail = outl.CreateItem(0) @@ -391,6 +409,11 @@ Public Class frmFaktEmail End If RechnungsNr = RECHNUNG.RechnungsNr + If cbxRgKopieDrucken.Checked Then + 'KOPIE DRUCK + cFakturierung.doRechnungsDruck(RECHNUNG,,, 1, "", cboPrinter.Text, False) + End If + If pathRG <> "" Then ATTACHMENTS.Add(New cFakt_MailATTach(pathRG, If(RECHNUNG.BelegartenKz = "AR", "Rechnung.pdf", "Gutschrift.pdf"))) diff --git a/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb b/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb index d661e286..d4259be2 100644 --- a/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb +++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.Designer.vb @@ -57,6 +57,7 @@ Partial Class frmFaktSammelRgDrucken Me.cboFaktGrp = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label6 = New System.Windows.Forms.Label() Me.cboAbfertigungsart = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Button2 = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -207,7 +208,7 @@ Partial Class frmFaktSammelRgDrucken Me.cboPrinter.FormattingEnabled = True Me.cboPrinter.Location = New System.Drawing.Point(12, 364) Me.cboPrinter.Name = "cboPrinter" - Me.cboPrinter.Size = New System.Drawing.Size(113, 21) + Me.cboPrinter.Size = New System.Drawing.Size(118, 21) Me.cboPrinter.TabIndex = 17 ' 'txtRechnungsdatum @@ -286,7 +287,7 @@ Partial Class frmFaktSammelRgDrucken Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn.Location = New System.Drawing.Point(12, 262) Me.btn.Name = "btn" - Me.btn.Size = New System.Drawing.Size(113, 60) + Me.btn.Size = New System.Drawing.Size(118, 60) Me.btn.TabIndex = 11 Me.btn.UseVisualStyleBackColor = True ' @@ -301,7 +302,7 @@ Partial Class frmFaktSammelRgDrucken Me.Button9.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) Me.Button9.Name = "Button9" Me.Button9.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0) - Me.Button9.Size = New System.Drawing.Size(58, 25) + Me.Button9.Size = New System.Drawing.Size(40, 25) Me.Button9.TabIndex = 12 Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button9.UseVisualStyleBackColor = True @@ -313,11 +314,11 @@ Partial Class frmFaktSammelRgDrucken Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button8.Location = New System.Drawing.Point(67, 321) + Me.Button8.Location = New System.Drawing.Point(51, 321) Me.Button8.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) Me.Button8.Name = "Button8" Me.Button8.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0) - Me.Button8.Size = New System.Drawing.Size(58, 25) + Me.Button8.Size = New System.Drawing.Size(40, 25) Me.Button8.TabIndex = 13 Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button8.UseVisualStyleBackColor = True @@ -481,12 +482,29 @@ Partial Class frmFaktSammelRgDrucken Me.cboAbfertigungsart.Size = New System.Drawing.Size(166, 21) Me.cboAbfertigungsart.TabIndex = 26 ' + 'Button2 + ' + Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Button2.BackgroundImage = Global.SDL.My.Resources.Resources.email_print1 + Me.Button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button2.Location = New System.Drawing.Point(90, 321) + Me.Button2.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) + Me.Button2.Name = "Button2" + Me.Button2.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0) + Me.Button2.Size = New System.Drawing.Size(40, 25) + Me.Button2.TabIndex = 27 + Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button2.UseVisualStyleBackColor = True + ' 'frmFaktSammelRgDrucken ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White Me.ClientSize = New System.Drawing.Size(811, 393) + Me.Controls.Add(Me.Button2) Me.Controls.Add(Me.Label6) Me.Controls.Add(Me.cboAbfertigungsart) Me.Controls.Add(Me.Label5) @@ -559,4 +577,5 @@ Partial Class frmFaktSammelRgDrucken Friend WithEvents cboFaktGrp As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label6 As Label Friend WithEvents cboAbfertigungsart As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Button2 As Button End Class diff --git a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb index 0a1e1d95..f43fe9df 100644 --- a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb +++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb @@ -212,11 +212,17 @@ Public Class frmFaktSammelRgDrucken doSammelrechnung(3) End Sub - Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click + Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click, Button2.Click If Not IsNumeric(getSelectionKdNr_Simple) Then MsgBox("Es muss eine eindeutige KundenNr ausgewählt werden!") : Exit Sub - Dim f As New frmFaktEmail(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr_Simple, -1, Nothing, cboSB._value,, getAvisoIds, cbxEVOLOG.Checked, cbxTransFerry.Checked, cboFaktGrp._value, cboAbfertigungsart._value) + 'RG-Druck - Mail (+Kopie) + Dim RG_DRUCK = 2 + If sender Is Button2 Then + RG_DRUCK = 5 + End If + + Dim f As New frmFaktEmail(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, RG_DRUCK, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr_Simple, -1, Nothing, cboSB._value,, getAvisoIds, cbxEVOLOG.Checked, cbxTransFerry.Checked, cboFaktGrp._value, cboAbfertigungsart._value) f.ShowDialog(Me) initDGV() 'Else diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb index 2b0cc524..10626e74 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb @@ -23,27 +23,27 @@ Partial Class usrCntlFaktAbrechnung Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 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() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlFaktAbrechnung)) Me.Label9 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() @@ -228,6 +228,7 @@ Partial Class usrCntlFaktAbrechnung Me.kdFirmaEmpfaenger = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.pnl = New System.Windows.Forms.Panel() + Me.Button16 = New System.Windows.Forms.Button() Me.lblEUR_1 = New System.Windows.Forms.Label() Me.lblEUR_2 = New System.Windows.Forms.Label() Me.lblEUR_4 = New System.Windows.Forms.Label() @@ -858,36 +859,36 @@ Partial Class usrCntlFaktAbrechnung Me.dgvAnhaenge.AllowUserToResizeColumns = False Me.dgvAnhaenge.AllowUserToResizeRows = False Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvAnhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAnhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22 Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.optAnhSel, Me.DataGridViewTextBoxColumn2, Me.clmnBezeichnung, Me.clmnDsId, Me.clmnAnhId}) - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvAnhaenge.DefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvAnhaenge.DefaultCellStyle = DataGridViewCellStyle25 Me.dgvAnhaenge.Location = New System.Drawing.Point(493, 911) Me.dgvAnhaenge.MultiSelect = False Me.dgvAnhaenge.Name = "dgvAnhaenge" Me.dgvAnhaenge.ReadOnly = True - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvAnhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvAnhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle26 Me.dgvAnhaenge.RowHeadersVisible = False Me.dgvAnhaenge.RowHeadersWidth = 62 Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -909,10 +910,10 @@ Partial Class usrCntlFaktAbrechnung ' 'DataGridViewTextBoxColumn2 ' - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle2.Format = "N0" - DataGridViewCellStyle2.NullValue = Nothing - Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle23.Format = "N0" + DataGridViewCellStyle23.NullValue = Nothing + Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle23 Me.DataGridViewTextBoxColumn2.HeaderText = "Art" Me.DataGridViewTextBoxColumn2.MinimumWidth = 8 Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" @@ -922,9 +923,9 @@ Partial Class usrCntlFaktAbrechnung 'clmnBezeichnung ' Me.clmnBezeichnung.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.Format = "c2" - Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle24.Format = "c2" + Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle24 Me.clmnBezeichnung.FillWeight = 121.2598! Me.clmnBezeichnung.HeaderText = "Bezeichnung" Me.clmnBezeichnung.MinimumWidth = 8 @@ -1255,6 +1256,7 @@ Partial Class usrCntlFaktAbrechnung Me.kdFirmaAvisierer._displayWoelflKd = False Me.kdFirmaAvisierer._hideIfListEmpty = True Me.kdFirmaAvisierer._loadKdData = True + Me.kdFirmaAvisierer._searchName1 = True Me.kdFirmaAvisierer._UseFIRMA = "" Me.kdFirmaAvisierer._ValueKdAndName = False Me.kdFirmaAvisierer.BackColor = System.Drawing.Color.White @@ -1643,6 +1645,7 @@ Partial Class usrCntlFaktAbrechnung Me.kdFirmaAuftraggeber._displayWoelflKd = False Me.kdFirmaAuftraggeber._hideIfListEmpty = True Me.kdFirmaAuftraggeber._loadKdData = True + Me.kdFirmaAuftraggeber._searchName1 = True Me.kdFirmaAuftraggeber._UseFIRMA = "" Me.kdFirmaAuftraggeber._ValueKdAndName = False Me.kdFirmaAuftraggeber.BackColor = System.Drawing.Color.White @@ -2129,6 +2132,7 @@ Partial Class usrCntlFaktAbrechnung Me.kdFirmaRechnungAn._displayWoelflKd = False Me.kdFirmaRechnungAn._hideIfListEmpty = True Me.kdFirmaRechnungAn._loadKdData = True + Me.kdFirmaRechnungAn._searchName1 = True Me.kdFirmaRechnungAn._UseFIRMA = "" Me.kdFirmaRechnungAn._ValueKdAndName = False Me.kdFirmaRechnungAn.dgvpos = "LEFT" @@ -2478,6 +2482,7 @@ Partial Class usrCntlFaktAbrechnung Me.kdFirmaAbsender._displayWoelflKd = False Me.kdFirmaAbsender._hideIfListEmpty = True Me.kdFirmaAbsender._loadKdData = True + Me.kdFirmaAbsender._searchName1 = True Me.kdFirmaAbsender._UseFIRMA = "" Me.kdFirmaAbsender._ValueKdAndName = False Me.kdFirmaAbsender.BackColor = System.Drawing.Color.White @@ -2851,35 +2856,35 @@ Partial Class usrCntlFaktAbrechnung Me.dgvRechnungenPositionen.AllowUserToResizeColumns = False Me.dgvRechnungenPositionen.AllowUserToResizeRows = False Me.dgvRechnungenPositionen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvRechnungenPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvRechnungenPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27 Me.dgvRechnungenPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvRechnungenPositionen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.Leistung, Me.Anzahl, Me.Preis, Me.SteuerpflichtigerBetrag, Me.SteuerfreierBetrag, Me.Aufschubkonto}) - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvRechnungenPositionen.DefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvRechnungenPositionen.DefaultCellStyle = DataGridViewCellStyle32 Me.dgvRechnungenPositionen.Location = New System.Drawing.Point(10, 258) Me.dgvRechnungenPositionen.Name = "dgvRechnungenPositionen" Me.dgvRechnungenPositionen.ReadOnly = True - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvRechnungenPositionen.RowHeadersDefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvRechnungenPositionen.RowHeadersDefaultCellStyle = DataGridViewCellStyle33 Me.dgvRechnungenPositionen.RowHeadersVisible = False Me.dgvRechnungenPositionen.RowHeadersWidth = 62 Me.dgvRechnungenPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -2897,10 +2902,10 @@ Partial Class usrCntlFaktAbrechnung ' 'Anzahl ' - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle7.Format = "N0" - DataGridViewCellStyle7.NullValue = Nothing - Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle28.Format = "N0" + DataGridViewCellStyle28.NullValue = Nothing + Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle28 Me.Anzahl.HeaderText = "Anzahl" Me.Anzahl.MinimumWidth = 8 Me.Anzahl.Name = "Anzahl" @@ -2909,9 +2914,9 @@ Partial Class usrCntlFaktAbrechnung ' 'Preis ' - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle8.Format = "c2" - Me.Preis.DefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle29.Format = "c2" + Me.Preis.DefaultCellStyle = DataGridViewCellStyle29 Me.Preis.HeaderText = "Preis" Me.Preis.MinimumWidth = 8 Me.Preis.Name = "Preis" @@ -2920,9 +2925,9 @@ Partial Class usrCntlFaktAbrechnung ' 'SteuerpflichtigerBetrag ' - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle9.Format = "c2" - Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle30.Format = "c2" + Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle30 Me.SteuerpflichtigerBetrag.HeaderText = "Steuerpfl." Me.SteuerpflichtigerBetrag.MinimumWidth = 8 Me.SteuerpflichtigerBetrag.Name = "SteuerpflichtigerBetrag" @@ -2931,10 +2936,10 @@ Partial Class usrCntlFaktAbrechnung ' 'SteuerfreierBetrag ' - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle10.Format = "C2" - DataGridViewCellStyle10.NullValue = Nothing - Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle31.Format = "C2" + DataGridViewCellStyle31.NullValue = Nothing + Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle31 Me.SteuerfreierBetrag.HeaderText = "Steuerfrei" Me.SteuerfreierBetrag.MinimumWidth = 8 Me.SteuerfreierBetrag.Name = "SteuerfreierBetrag" @@ -2957,41 +2962,41 @@ Partial Class usrCntlFaktAbrechnung Me.dgvOffertenSperrliste.AllowUserToResizeRows = False Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOffertenSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOffertenSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle34 Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvOffertenSperrliste.DefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvOffertenSperrliste.DefaultCellStyle = DataGridViewCellStyle35 Me.dgvOffertenSperrliste.Location = New System.Drawing.Point(11, 29) Me.dgvOffertenSperrliste.MultiSelect = False Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste" Me.dgvOffertenSperrliste.ReadOnly = True - DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOffertenSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOffertenSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle36 Me.dgvOffertenSperrliste.RowHeadersVisible = False Me.dgvOffertenSperrliste.RowHeadersWidth = 62 - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.PapayaWhip - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.Color.Black - Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle37.SelectionBackColor = System.Drawing.Color.PapayaWhip + DataGridViewCellStyle37.SelectionForeColor = System.Drawing.Color.Black + Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle37 Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(204, 201) Me.dgvOffertenSperrliste.TabIndex = 2 @@ -3004,44 +3009,44 @@ Partial Class usrCntlFaktAbrechnung Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False - DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle38.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle38 Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOfferteDetailsUebersicht.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOfferteDetailsUebersicht.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle39 Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvOfferteDetailsUebersicht.DefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvOfferteDetailsUebersicht.DefaultCellStyle = DataGridViewCellStyle40 Me.dgvOfferteDetailsUebersicht.Location = New System.Drawing.Point(220, 29) Me.dgvOfferteDetailsUebersicht.MultiSelect = False Me.dgvOfferteDetailsUebersicht.Name = "dgvOfferteDetailsUebersicht" - DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOfferteDetailsUebersicht.RowHeadersDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOfferteDetailsUebersicht.RowHeadersDefaultCellStyle = DataGridViewCellStyle41 Me.dgvOfferteDetailsUebersicht.RowHeadersVisible = False Me.dgvOfferteDetailsUebersicht.RowHeadersWidth = 62 - DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) - DataGridViewCellStyle21.SelectionForeColor = System.Drawing.Color.Black - Me.dgvOfferteDetailsUebersicht.RowsDefaultCellStyle = DataGridViewCellStyle21 + DataGridViewCellStyle42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle42.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) + DataGridViewCellStyle42.SelectionForeColor = System.Drawing.Color.Black + Me.dgvOfferteDetailsUebersicht.RowsDefaultCellStyle = DataGridViewCellStyle42 Me.dgvOfferteDetailsUebersicht.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOfferteDetailsUebersicht.Size = New System.Drawing.Size(601, 201) Me.dgvOfferteDetailsUebersicht.TabIndex = 3 @@ -3286,6 +3291,7 @@ Partial Class usrCntlFaktAbrechnung Me.kdFirmaEmpfaenger._displayWoelflKd = False Me.kdFirmaEmpfaenger._hideIfListEmpty = True Me.kdFirmaEmpfaenger._loadKdData = True + Me.kdFirmaEmpfaenger._searchName1 = True Me.kdFirmaEmpfaenger._UseFIRMA = "" Me.kdFirmaEmpfaenger._ValueKdAndName = False Me.kdFirmaEmpfaenger.BackColor = System.Drawing.Color.White @@ -3323,6 +3329,7 @@ Partial Class usrCntlFaktAbrechnung ' Me.pnl.BackColor = System.Drawing.Color.Gainsboro Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.Button16) Me.pnl.Controls.Add(Me.lblEUR_1) Me.pnl.Controls.Add(Me.lblEUR_2) Me.pnl.Controls.Add(Me.lblEUR_4) @@ -3358,6 +3365,21 @@ Partial Class usrCntlFaktAbrechnung Me.pnl.Size = New System.Drawing.Size(830, 164) Me.pnl.TabIndex = 2 ' + 'Button16 + ' + Me.Button16.BackgroundImage = Global.SDL.My.Resources.Resources.email_print1 + Me.Button16.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button16.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button16.Location = New System.Drawing.Point(745, 26) + Me.Button16.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) + Me.Button16.Name = "Button16" + Me.Button16.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0) + Me.Button16.Size = New System.Drawing.Size(37, 25) + Me.Button16.TabIndex = 240 + Me.Button16.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button16.UseVisualStyleBackColor = True + ' 'lblEUR_1 ' Me.lblEUR_1.AutoSize = True @@ -3456,7 +3478,7 @@ Partial Class usrCntlFaktAbrechnung Me.Button9.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) Me.Button9.Name = "Button9" Me.Button9.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0) - Me.Button9.Size = New System.Drawing.Size(50, 25) + Me.Button9.Size = New System.Drawing.Size(38, 25) Me.Button9.TabIndex = 19 Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button9.UseVisualStyleBackColor = True @@ -3467,11 +3489,11 @@ Partial Class usrCntlFaktAbrechnung Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button8.Location = New System.Drawing.Point(720, 26) + Me.Button8.Location = New System.Drawing.Point(708, 26) Me.Button8.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) Me.Button8.Name = "Button8" Me.Button8.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0) - Me.Button8.Size = New System.Drawing.Size(50, 25) + Me.Button8.Size = New System.Drawing.Size(38, 25) Me.Button8.TabIndex = 18 Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button8.UseVisualStyleBackColor = True @@ -3482,11 +3504,11 @@ Partial Class usrCntlFaktAbrechnung Me.Button4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button4.Location = New System.Drawing.Point(769, 26) + Me.Button4.Location = New System.Drawing.Point(781, 26) Me.Button4.Margin = New System.Windows.Forms.Padding(10, 3, 3, 3) Me.Button4.Name = "Button4" Me.Button4.Padding = New System.Windows.Forms.Padding(20, 0, 0, 0) - Me.Button4.Size = New System.Drawing.Size(50, 25) + Me.Button4.Size = New System.Drawing.Size(38, 25) Me.Button4.TabIndex = 15 Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button4.UseVisualStyleBackColor = True @@ -4133,4 +4155,5 @@ Partial Class usrCntlFaktAbrechnung Friend WithEvents AuftraggeberToolStripMenuItem As ToolStripMenuItem Friend WithEvents AvisiererToolStripMenuItem As ToolStripMenuItem Friend WithEvents txtTextZZ As VERAG_PROG_ALLGEMEIN.MyRichTextBox + Friend WithEvents Button16 As Button End Class diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 6f9387a0..da376bae 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -3204,7 +3204,7 @@ Nächste_Textzeile_lesen: End If End Sub - Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click + Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click, Button16.Click If RECHNUNG.Sammelrechnung <> "0" Then MsgBox("Nur bei Einzelrechnung möglich!") : Exit Sub If RECHNUNG.Status <> 0 OrElse saveMe() Then ' Anhänge sichern, falls geändert @@ -3213,7 +3213,13 @@ Nächste_Textzeile_lesen: RECHNUNG.SAVE_ANHAENGE(RECHNUNG.RK_ID) End If - Dim f As New frmFaktEmail(RECHNUNG, SPEDBUCH, If(cbxOriginalPrint.Visible, cbxOriginalPrint.Checked, Nothing)) + 'RG-Druck - Mail (+Kopie) + Dim RG_DRUCK = 2 + If sender Is Button16 Then + RG_DRUCK = 5 + End If + + Dim f As New frmFaktEmail(RECHNUNG, SPEDBUCH, If(cbxOriginalPrint.Visible, cbxOriginalPrint.Checked, Nothing), RG_DRUCK) f.ShowDialog(Me) initRECHNUNG() RaiseEvent SOMETHING_CHANGED(-1) diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb index c4a025d9..08eb3eee 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungspreise.vb @@ -101,6 +101,7 @@ MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung", "VZ")) MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VZ Gemüse,Arznei,Lebensmittel", "VZ_SPECIAL_1")) MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Rückware", "VZ_RW")) + MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verzollung Fiskal DE", "VZ_FISKAL_DE")) MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T1", "VZ")) MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("nur EUST", "EUST")) Case Else @@ -337,6 +338,23 @@ dgvZusatzleistung.Rows.Add("", "348", "Fremdgrenze", CDbl(20).ToString("C2")) dgvZusatzleistung.Rows.Add("", "", "Neutralisierung / CMR Erstellung", CDbl(15).ToString("C2")) + Case "VZ_FISKAL_DE" + + DataGridView.Rows.Add(cnt, "", "Fiskal-Verzollung (inkl. 1 Tarifnummer)", CDbl(240).ToString("C2")) : cnt += 1 + DataGridView.Rows.Add(cnt, "", "je weitere Tarifnummer", CDbl(12).ToString("C2")) : cnt += 1 + DataGridView.Rows.Add(cnt, "440", "Fixe Taxe", CDbl(12).ToString("C2")) : cnt += 1 + DataGridView.Rows.Add(cnt, "440", "Sonstige Kosten*", CDbl(40).ToString("C2")) : cnt += 1 + DataGridView.Rows.Add(cnt, "260", "SVS", "lt. Tabelle") : cnt += 1 + DataGridView.Rows.Add(cnt, "324", "ATLAS (DE) Zuschlag", CDbl(8).ToString("C2")) : cnt += 1 + + dgvZusatzleistung.Rows.Add("", "347", "Clearingkosten (EINMALIG nur bei 1. Abfertigung)", CDbl(40).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "498", "Korr. Rechnung anfordern", CDbl(25).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "", "Zollbeschau**", CDbl(60).ToString("C2") & "/Std.") + dgvZusatzleistung.Rows.Add("", "348", "Fremdgrenze", CDbl(20).ToString("C2")) + dgvZusatzleistung.Rows.Add("", "", "Neutralisierung / CMR Erstellung", CDbl(15).ToString("C2")) + 'dgvZusatzleistung.Rows.Add("", "", "Aufschlag Arzneiwaren oder Lebensmittel", CDbl(25).ToString("C2")) + + ' cboFirma.changeItem("AG") Case "T1" DataGridView.Rows.Add(cnt, "", "T1/T2 Abfertigung", CDbl(60).ToString("C2")) : cnt += 1 diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 68b4e9a1..924a7304 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -236,6 +236,7 @@ Public Class frmFormulare MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AT Vollmacht (EV)", FormularManagerArten.AT_Vollmacht_EV)) MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Export Vollmacht", FormularManagerArten.VERAG_EXPORT)) MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("(indirekt) DE VM", FormularManagerArten.DE_Vollmacht_indirekt)) + MyListBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DE Fiskal-Vollmacht", FormularManagerArten.DE_Fiskal)) MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VUB", FormularManagerArten.VUB)) MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Importaviso Vorauskasse", FormularManagerArten.Importaviso_VK)) MyListBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Gestellungsgarantie", FormularManagerArten.Gestellungsgarantie)) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 8458fba6..aa81d43e 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/My Project/Resources.Designer.vb b/SDL/My Project/Resources.Designer.vb index 461c1e63..2736a5f1 100644 --- a/SDL/My Project/Resources.Designer.vb +++ b/SDL/My Project/Resources.Designer.vb @@ -648,6 +648,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property email_print() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("email_print", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property email_print1() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("email_print1", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/SDL/My Project/Resources.resx b/SDL/My Project/Resources.resx index a54852ed..5a5c981b 100644 --- a/SDL/My Project/Resources.resx +++ b/SDL/My Project/Resources.resx @@ -148,9 +148,6 @@ ..\Resources\person.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\vorauszahlung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\verag_Card1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -160,24 +157,30 @@ ..\..\..\data\reloadFinance.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\plose_it.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\mse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\LEX.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pay_card_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\liste-logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\axxes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ambar_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\RG_ZF.xlsx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\Plakette1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\dakosy1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -199,6 +202,9 @@ ..\Resources\mic-logo - short.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pay_cash_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\android-note1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -229,9 +235,6 @@ ..\Resources\android-add-contact.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\zoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\exit.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -292,6 +295,9 @@ ..\Resources\abc_obu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Route4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\flagge_tr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -331,8 +337,8 @@ ..\Resources\lorry_motion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Route1_IR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\zoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\uhr_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -340,9 +346,6 @@ ..\Resources\statistik.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pfeil_rechts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - F:\Grafik\VERAG\AEO\aeo_CS.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -358,6 +361,9 @@ ..\Resources\sgs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Route1_IR.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\passpic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -445,6 +451,9 @@ ..\Resources\flagge_D.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email_big_gray.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\VERAG_AEO_MailSig.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -460,9 +469,6 @@ ..\Resources\data.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ambar_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\unisped_aeo_ZS_AT.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -499,8 +505,8 @@ ..\..\..\data\awor.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WAI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\asfinag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Verag-AG-Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -523,14 +529,14 @@ ..\Resources\SBG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\beleg_rot1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\sms.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Route4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\..\..\..\AVISO\Aviso\Diverses\Verag_Customs_Service_AEO.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\pay_card_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\woelfl.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -598,9 +604,6 @@ ..\Resources\Unisped_DE_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\checklist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\list_new_small1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -643,8 +646,8 @@ ..\Resources\unisped_aeo_DE.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email_big_gray.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Atilla _sig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\stift1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -742,8 +745,8 @@ ..\Resources\print_rg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\plose_it.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\axxes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\road.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -754,14 +757,14 @@ ..\Resources\Einheitspapier-0735_Position.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Plakette1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\beleg_rot1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\pdf1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\asfinag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pfeil_rechts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\NDK.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -769,8 +772,11 @@ ..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\..\..\..\AVISO\Aviso\Diverses\Verag_Customs_Service_AEO.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\vorauszahlung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\email_print.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\sicherheit1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -850,8 +856,8 @@ ..\Resources\Einheitspapier-0777_Position.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Atilla _sig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\checklist.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Verag-AG-Logo21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -865,7 +871,7 @@ ..\Resources\flagge_A.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pay_cash_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email_print1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/SDL/Resources/email_print.png b/SDL/Resources/email_print.png new file mode 100644 index 00000000..4bd83be9 Binary files /dev/null and b/SDL/Resources/email_print.png differ diff --git a/SDL/Resources/email_print1.png b/SDL/Resources/email_print1.png new file mode 100644 index 00000000..d5ce4498 Binary files /dev/null and b/SDL/Resources/email_print1.png differ diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index c16a8366..688466fe 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -663,6 +663,12 @@ UserControl + + usrCntlSDLLeistungVERAGCardNEU.vb + + + UserControl + True True @@ -2884,6 +2890,9 @@ usrCntlSDLLeistungenPLOSE_MEDPASS.vb + + usrCntlSDLLeistungVERAGCardNEU.vb + rptKontrolleLKW_TELOTEC.vb @@ -4318,6 +4327,8 @@ + + diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb index 5506ec51..ba7f0392 100644 --- a/SDL/cProgramFunctions.vb +++ b/SDL/cProgramFunctions.vb @@ -837,12 +837,12 @@ Public Class cProgramFunctions Public Function newEntryVERAG_Card(ByRef kdNr, ByRef kfz, ByRef sdlNr) Try - Dim f As New frmFindNewVeragCard(kfz) + Dim f As New frmFindNewVeragCard(kfz, sdlNr) If f.ShowDialog() = DialogResult.OK Then 'UPDATE Dim kundenSQL As New kundenSQL - Dim History = kundenSQL.getValueTxtBySql("SELECT isnull(max([History]),0)+1 as History FROM SDL where KundenNr = '" & kdNr & "' AND KfzKennzeichen='" & kfz & "' And SDLNr ='501' ", "SDL") - kundenSQL.doSQL("UPDATE [SDL] set KundenNr='" & kdNr & "', KfzKennzeichen='" & kfz & "', History='" & History & "', Bestelldatum='" & Now.ToShortDateString & "', Lieferdatum='" & Now.ToShortDateString & "' WHERE KundenNr='" & f.kdNr & "' and KfzKennzeichen='" & f.KfzKennzeichen & "' and History='" & f.History & "' and SDLNr=501 ", "SDL") + Dim History = kundenSQL.getValueTxtBySql("SELECT isnull(max([History]),0)+1 as History FROM SDL where KundenNr = '" & kdNr & "' AND KfzKennzeichen='" & kfz & "' And SDLNr ='" & sdlNr & "' ", "SDL") + kundenSQL.doSQL("UPDATE [SDL] set KundenNr='" & kdNr & "', KfzKennzeichen='" & kfz & "', History='" & History & "', Bestelldatum='" & Now.ToShortDateString & "', Lieferdatum='" & Now.ToShortDateString & "' WHERE KundenNr='" & f.kdNr & "' and KfzKennzeichen='" & f.KfzKennzeichen & "' and History='" & f.History & "' and SDLNr=" & sdlNr & " ", "SDL") Return History End If Catch ex As Exception diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index f409a667..e8eb0619 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -225,7 +225,7 @@ Partial Class frmKundenblatt Me.pnlInfo.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer)) Me.pnlInfo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.pnlInfo.Controls.Add(Me.txtInfotext) - Me.pnlInfo.Location = New System.Drawing.Point(321, 6) + Me.pnlInfo.Location = New System.Drawing.Point(325, 6) Me.pnlInfo.Name = "pnlInfo" Me.pnlInfo.Size = New System.Drawing.Size(602, 35) Me.pnlInfo.TabIndex = 1 @@ -247,7 +247,7 @@ Partial Class frmKundenblatt Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25) Me.tbFirmendaten.Name = "tbFirmendaten" Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3) - Me.tbFirmendaten.Size = New System.Drawing.Size(1623, 710) + Me.tbFirmendaten.Size = New System.Drawing.Size(1623, 727) Me.tbFirmendaten.TabIndex = 3 Me.tbFirmendaten.Text = "Firmendaten" ' @@ -257,7 +257,7 @@ Partial Class frmKundenblatt Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(3, 3) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1617, 704) + Me.Panel4.Size = New System.Drawing.Size(1617, 721) Me.Panel4.TabIndex = 0 ' 'tbcntrMain @@ -274,7 +274,7 @@ Partial Class frmKundenblatt Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMain.Name = "tbcntrMain" Me.tbcntrMain.SelectedIndex = 0 - Me.tbcntrMain.Size = New System.Drawing.Size(1631, 739) + Me.tbcntrMain.Size = New System.Drawing.Size(1638, 756) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -307,7 +307,7 @@ Partial Class frmKundenblatt Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0) Me.tbAllgemein.Name = "tbAllgemein" Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3) - Me.tbAllgemein.Size = New System.Drawing.Size(1623, 710) + Me.tbAllgemein.Size = New System.Drawing.Size(1630, 744) Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' @@ -642,7 +642,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 - Me.dgvSperrliste.Size = New System.Drawing.Size(828, 600) + Me.dgvSperrliste.Size = New System.Drawing.Size(835, 634) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -696,7 +696,7 @@ Partial Class frmKundenblatt Me.tbZoll.Location = New System.Drawing.Point(4, 25) Me.tbZoll.Name = "tbZoll" Me.tbZoll.Padding = New System.Windows.Forms.Padding(3) - Me.tbZoll.Size = New System.Drawing.Size(1623, 710) + Me.tbZoll.Size = New System.Drawing.Size(1623, 727) Me.tbZoll.TabIndex = 9 Me.tbZoll.Text = "ZOLL" Me.tbZoll.UseVisualStyleBackColor = True @@ -708,7 +708,7 @@ Partial Class frmKundenblatt Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3) Me.tbcntrZOLL.Name = "tbcntrZOLL" Me.tbcntrZOLL.SelectedIndex = 0 - Me.tbcntrZOLL.Size = New System.Drawing.Size(1617, 704) + Me.tbcntrZOLL.Size = New System.Drawing.Size(1617, 721) Me.tbcntrZOLL.TabIndex = 0 ' 'tabZoll_Artikel @@ -716,7 +716,7 @@ Partial Class frmKundenblatt Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22) Me.tabZoll_Artikel.Name = "tabZoll_Artikel" Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3) - Me.tabZoll_Artikel.Size = New System.Drawing.Size(1609, 678) + Me.tabZoll_Artikel.Size = New System.Drawing.Size(1609, 695) Me.tabZoll_Artikel.TabIndex = 1 Me.tabZoll_Artikel.Text = "Artikel" Me.tabZoll_Artikel.UseVisualStyleBackColor = True @@ -727,7 +727,7 @@ Partial Class frmKundenblatt Me.tbMdm.Location = New System.Drawing.Point(4, 25) Me.tbMdm.Name = "tbMdm" Me.tbMdm.Padding = New System.Windows.Forms.Padding(3) - Me.tbMdm.Size = New System.Drawing.Size(1623, 710) + Me.tbMdm.Size = New System.Drawing.Size(1630, 727) Me.tbMdm.TabIndex = 10 Me.tbMdm.Text = "MDM" Me.tbMdm.UseVisualStyleBackColor = True @@ -745,7 +745,7 @@ Partial Class frmKundenblatt Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0) Me.tbcntrMDM.Name = "tbcntrMDM" Me.tbcntrMDM.SelectedIndex = 0 - Me.tbcntrMDM.Size = New System.Drawing.Size(1617, 704) + Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 721) Me.tbcntrMDM.TabIndex = 0 ' 'tbSDL @@ -757,7 +757,7 @@ Partial Class frmKundenblatt Me.tbSDL.Margin = New System.Windows.Forms.Padding(0) Me.tbSDL.Name = "tbSDL" Me.tbSDL.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDL.Size = New System.Drawing.Size(1609, 678) + Me.tbSDL.Size = New System.Drawing.Size(1616, 712) Me.tbSDL.TabIndex = 5 Me.tbSDL.Text = "SDL-Leistungen" Me.tbSDL.UseVisualStyleBackColor = True @@ -799,7 +799,7 @@ Partial Class frmKundenblatt DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle10 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1603, 482) + Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 516) Me.dgvSDLLeistungenFull.TabIndex = 5 ' 'Panel6 @@ -813,7 +813,7 @@ Partial Class frmKundenblatt Me.Panel6.Dock = System.Windows.Forms.DockStyle.Top Me.Panel6.Location = New System.Drawing.Point(3, 3) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(1603, 47) + Me.Panel6.Size = New System.Drawing.Size(1610, 47) Me.Panel6.TabIndex = 178 ' 'Label28 @@ -903,9 +903,9 @@ Partial Class frmKundenblatt Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL) Me.Panel5.Controls.Add(Me.rtbVermerke) Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel5.Location = New System.Drawing.Point(3, 532) + Me.Panel5.Location = New System.Drawing.Point(3, 566) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(1603, 143) + Me.Panel5.Size = New System.Drawing.Size(1610, 143) Me.Panel5.TabIndex = 177 ' 'Label35 @@ -1276,7 +1276,7 @@ Partial Class frmKundenblatt Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22) Me.tbSDLKarten.Name = "tbSDLKarten" Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3) - Me.tbSDLKarten.Size = New System.Drawing.Size(1609, 678) + Me.tbSDLKarten.Size = New System.Drawing.Size(1609, 695) Me.tbSDLKarten.TabIndex = 7 Me.tbSDLKarten.Text = "SDL-Kartenverwaltung" Me.tbSDLKarten.UseVisualStyleBackColor = True @@ -1288,7 +1288,7 @@ Partial Class frmKundenblatt Me.tbLKW.Location = New System.Drawing.Point(4, 22) Me.tbLKW.Name = "tbLKW" Me.tbLKW.Padding = New System.Windows.Forms.Padding(3) - Me.tbLKW.Size = New System.Drawing.Size(1609, 678) + Me.tbLKW.Size = New System.Drawing.Size(1616, 695) Me.tbLKW.TabIndex = 4 Me.tbLKW.Text = "LKWs" Me.tbLKW.UseVisualStyleBackColor = True @@ -1300,7 +1300,7 @@ Partial Class frmKundenblatt Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3) Me.pnlLKWRight.Name = "pnlLKWRight" Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) - Me.pnlLKWRight.Size = New System.Drawing.Size(1297, 672) + Me.pnlLKWRight.Size = New System.Drawing.Size(1304, 689) Me.pnlLKWRight.TabIndex = 2 ' 'pnlLKW @@ -1311,7 +1311,7 @@ Partial Class frmKundenblatt Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left Me.pnlLKW.Location = New System.Drawing.Point(3, 3) Me.pnlLKW.Name = "pnlLKW" - Me.pnlLKW.Size = New System.Drawing.Size(306, 672) + Me.pnlLKW.Size = New System.Drawing.Size(306, 689) Me.pnlLKW.TabIndex = 3 ' 'dgvLKW @@ -1352,7 +1352,7 @@ Partial Class frmKundenblatt Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle14 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLKW.Size = New System.Drawing.Size(306, 498) + Me.dgvLKW.Size = New System.Drawing.Size(306, 515) Me.dgvLKW.TabIndex = 2 ' 'pnlLKWBottom @@ -1364,7 +1364,7 @@ Partial Class frmKundenblatt Me.pnlLKWBottom.Controls.Add(Me.Button13) Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse) Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 560) + Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 577) Me.pnlLKWBottom.Name = "pnlLKWBottom" Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112) Me.pnlLKWBottom.TabIndex = 3 @@ -1505,7 +1505,7 @@ Partial Class frmKundenblatt Me.tbVERAGCard.Location = New System.Drawing.Point(4, 22) Me.tbVERAGCard.Name = "tbVERAGCard" Me.tbVERAGCard.Padding = New System.Windows.Forms.Padding(3) - Me.tbVERAGCard.Size = New System.Drawing.Size(1609, 678) + Me.tbVERAGCard.Size = New System.Drawing.Size(1609, 695) Me.tbVERAGCard.TabIndex = 6 Me.tbVERAGCard.Text = "VERAG Card" Me.tbVERAGCard.UseVisualStyleBackColor = True @@ -1517,7 +1517,7 @@ Partial Class frmKundenblatt Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel3.Location = New System.Drawing.Point(3, 3) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1603, 672) + Me.Panel3.Size = New System.Drawing.Size(1603, 689) Me.Panel3.TabIndex = 0 ' 'tbDokumente @@ -1535,7 +1535,7 @@ Partial Class frmKundenblatt Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd) Me.tbDokumente.Location = New System.Drawing.Point(4, 22) Me.tbDokumente.Name = "tbDokumente" - Me.tbDokumente.Size = New System.Drawing.Size(1609, 678) + Me.tbDokumente.Size = New System.Drawing.Size(1609, 695) Me.tbDokumente.TabIndex = 8 Me.tbDokumente.Text = "Dokumente" Me.tbDokumente.UseVisualStyleBackColor = True @@ -1733,7 +1733,7 @@ Partial Class frmKundenblatt Me.tbBesuchsberichte.Location = New System.Drawing.Point(4, 22) Me.tbBesuchsberichte.Name = "tbBesuchsberichte" Me.tbBesuchsberichte.Padding = New System.Windows.Forms.Padding(3) - Me.tbBesuchsberichte.Size = New System.Drawing.Size(1609, 678) + Me.tbBesuchsberichte.Size = New System.Drawing.Size(1609, 695) Me.tbBesuchsberichte.TabIndex = 9 Me.tbBesuchsberichte.Text = "Besuchsberichte" Me.tbBesuchsberichte.UseVisualStyleBackColor = True @@ -1744,7 +1744,7 @@ Partial Class frmKundenblatt Me.tbOfferte.Location = New System.Drawing.Point(4, 25) Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2) Me.tbOfferte.Name = "tbOfferte" - Me.tbOfferte.Size = New System.Drawing.Size(1623, 710) + Me.tbOfferte.Size = New System.Drawing.Size(1623, 727) Me.tbOfferte.TabIndex = 11 Me.tbOfferte.Text = "Offerte" Me.tbOfferte.UseVisualStyleBackColor = True @@ -1774,7 +1774,7 @@ Partial Class frmKundenblatt Me.btnAbfVerb.BackColor = System.Drawing.Color.White Me.btnAbfVerb.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAbfVerb.ForeColor = System.Drawing.Color.Black - Me.btnAbfVerb.Location = New System.Drawing.Point(1003, 43) + Me.btnAbfVerb.Location = New System.Drawing.Point(1010, 43) Me.btnAbfVerb.Name = "btnAbfVerb" Me.btnAbfVerb.Size = New System.Drawing.Size(165, 25) Me.btnAbfVerb.TabIndex = 1 @@ -1788,7 +1788,7 @@ Partial Class frmKundenblatt Me.lblAbfVerb.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.lblAbfVerb.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAbfVerb.ForeColor = System.Drawing.Color.White - Me.lblAbfVerb.Location = New System.Drawing.Point(1389, 117) + Me.lblAbfVerb.Location = New System.Drawing.Point(1396, 117) Me.lblAbfVerb.Name = "lblAbfVerb" Me.lblAbfVerb.Size = New System.Drawing.Size(242, 20) Me.lblAbfVerb.TabIndex = 2 @@ -1838,7 +1838,7 @@ Partial Class frmKundenblatt Me.mne.Location = New System.Drawing.Point(0, 31) Me.mne.Name = "mne" Me.mne.Padding = New System.Windows.Forms.Padding(5, 0, 0, 0) - Me.mne.Size = New System.Drawing.Size(1631, 81) + Me.mne.Size = New System.Drawing.Size(1638, 81) Me.mne.TabIndex = 3 Me.mne.Text = "mnue" ' @@ -1934,7 +1934,7 @@ Partial Class frmKundenblatt Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(1631, 112) + Me.pnl.Size = New System.Drawing.Size(1638, 112) Me.pnl.TabIndex = 0 ' 'lblINAKTIV @@ -1961,6 +1961,7 @@ Partial Class frmKundenblatt 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.BackColor = System.Drawing.Color.White @@ -1978,7 +1979,7 @@ Partial Class frmKundenblatt Me.KdSearchBox1.Name = "KdSearchBox1" Me.KdSearchBox1.nurAktive = False Me.KdSearchBox1.searchActive = True - Me.KdSearchBox1.Size = New System.Drawing.Size(1631, 34) + Me.KdSearchBox1.Size = New System.Drawing.Size(1638, 34) Me.KdSearchBox1.TabIndex = 0 Me.KdSearchBox1.TIMER_SEARCH = True Me.KdSearchBox1.usrcntl = Nothing @@ -2014,7 +2015,7 @@ Partial Class frmKundenblatt Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0) Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1" - Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1617, 704) + Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1617, 721) Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0 ' 'usrcntlKarten @@ -2024,7 +2025,7 @@ Partial Class frmKundenblatt Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3) Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.usrcntlKarten.Name = "usrcntlKarten" - Me.usrcntlKarten.Size = New System.Drawing.Size(1603, 672) + Me.usrcntlKarten.Size = New System.Drawing.Size(1603, 689) Me.usrcntlKarten.TabIndex = 0 ' 'UsrCntlLKW1 @@ -2037,7 +2038,7 @@ Partial Class frmKundenblatt Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) Me.UsrCntlLKW1.Name = "UsrCntlLKW1" - Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 672) + Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 689) Me.UsrCntlLKW1.TabIndex = 0 ' 'UsrCntlOfferte1 @@ -2047,7 +2048,7 @@ Partial Class frmKundenblatt Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0) Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1) Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1" - Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1623, 710) + Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1623, 727) Me.UsrCntlOfferte1.TabIndex = 0 ' 'frmKundenblatt @@ -2056,7 +2057,7 @@ Partial Class frmKundenblatt Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1180, 868) + Me.ClientSize = New System.Drawing.Size(1180, 885) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) diff --git a/SDL/kunden/usrCntlLKW.Designer.vb b/SDL/kunden/usrCntlLKW.Designer.vb index dc7127e3..968c358e 100644 --- a/SDL/kunden/usrCntlLKW.Designer.vb +++ b/SDL/kunden/usrCntlLKW.Designer.vb @@ -40,7 +40,7 @@ Partial Class usrCntlLKW Me.Label3 = New System.Windows.Forms.Label() Me.btnNextSDL = New System.Windows.Forms.Button() Me.btnPrevSDL = New System.Windows.Forms.Button() - Me.Button3 = New System.Windows.Forms.Button() + Me.btnAddLeistung = New System.Windows.Forms.Button() Me.cntxtAddSdl = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PictureBox1 = New System.Windows.Forms.PictureBox() @@ -52,11 +52,11 @@ Partial Class usrCntlLKW Me.Label7 = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.scanMietVertrag = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.scanZulassungsschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() Me.scanLeasingVertrag = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() Me.scanCEMT = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() - Me.scanMietVertrag = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() CType(Me.dgvSDLLeistungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.cntxtSDLLeistungenOptions.SuspendLayout() Me.pnlSDLLeistungenDetails.SuspendLayout() @@ -228,19 +228,19 @@ Partial Class usrCntlLKW Me.btnPrevSDL.Text = "⇑" Me.btnPrevSDL.UseVisualStyleBackColor = True ' - 'Button3 + 'btnAddLeistung ' - Me.Button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button3.Image = Global.SDL.My.Resources.Resources.plus - Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button3.Location = New System.Drawing.Point(354, 2) - Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(146, 49) - Me.Button3.TabIndex = 151 - Me.Button3.Text = "Leistung hinzufügen" - Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button3.UseVisualStyleBackColor = True + Me.btnAddLeistung.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.btnAddLeistung.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAddLeistung.Image = Global.SDL.My.Resources.Resources.plus + Me.btnAddLeistung.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnAddLeistung.Location = New System.Drawing.Point(354, 2) + Me.btnAddLeistung.Name = "btnAddLeistung" + Me.btnAddLeistung.Size = New System.Drawing.Size(146, 49) + Me.btnAddLeistung.TabIndex = 151 + Me.btnAddLeistung.Text = "Leistung hinzufügen" + Me.btnAddLeistung.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnAddLeistung.UseVisualStyleBackColor = True ' 'cntxtAddSdl ' @@ -315,7 +315,7 @@ Partial Class usrCntlLKW Me.TabPage1.Controls.Add(Me.Label7) Me.TabPage1.Controls.Add(Me.btnNextSDL) Me.TabPage1.Controls.Add(Me.Label8) - Me.TabPage1.Controls.Add(Me.Button3) + Me.TabPage1.Controls.Add(Me.btnAddLeistung) Me.TabPage1.Location = New System.Drawing.Point(4, 19) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) @@ -366,6 +366,26 @@ Partial Class usrCntlLKW Me.TabPage2.Text = "Dokumente" Me.TabPage2.UseVisualStyleBackColor = True ' + 'scanMietVertrag + ' + Me.scanMietVertrag._ARCHIV = True + Me.scanMietVertrag._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanMietVertrag._DATENSERVER_ORDNER = "MDM" + Me.scanMietVertrag._DATENSERVER_UOrdner1 = Nothing + Me.scanMietVertrag._DATENSERVER_UOrdner2 = Nothing + Me.scanMietVertrag._DATENSERVER_UOrdner3 = Nothing + Me.scanMietVertrag._MULTI_FILES = True + Me.scanMietVertrag._TEXT_PDF = "Miet-Vertrag" + Me.scanMietVertrag.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanMietVertrag.BackColor = System.Drawing.Color.White + Me.scanMietVertrag.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanMietVertrag.Cursor = System.Windows.Forms.Cursors.Default + Me.scanMietVertrag.Enabled = False + Me.scanMietVertrag.Location = New System.Drawing.Point(138, 29) + Me.scanMietVertrag.Name = "scanMietVertrag" + Me.scanMietVertrag.Size = New System.Drawing.Size(126, 22) + Me.scanMietVertrag.TabIndex = 163 + ' 'scanSonstiges ' Me.scanSonstiges._DATENSERVER_KATEGORIE = "DOKUMENTE" @@ -446,26 +466,6 @@ Partial Class usrCntlLKW Me.scanCEMT.Size = New System.Drawing.Size(126, 22) Me.scanCEMT.TabIndex = 159 ' - 'scanMietVertrag - ' - Me.scanMietVertrag._ARCHIV = True - Me.scanMietVertrag._DATENSERVER_KATEGORIE = "DOKUMENTE" - Me.scanMietVertrag._DATENSERVER_ORDNER = "MDM" - Me.scanMietVertrag._DATENSERVER_UOrdner1 = Nothing - Me.scanMietVertrag._DATENSERVER_UOrdner2 = Nothing - Me.scanMietVertrag._DATENSERVER_UOrdner3 = Nothing - Me.scanMietVertrag._MULTI_FILES = True - Me.scanMietVertrag._TEXT_PDF = "Miet-Vertrag" - Me.scanMietVertrag.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.scanMietVertrag.BackColor = System.Drawing.Color.White - Me.scanMietVertrag.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.scanMietVertrag.Cursor = System.Windows.Forms.Cursors.Default - Me.scanMietVertrag.Enabled = False - Me.scanMietVertrag.Location = New System.Drawing.Point(138, 29) - Me.scanMietVertrag.Name = "scanMietVertrag" - Me.scanMietVertrag.Size = New System.Drawing.Size(126, 22) - Me.scanMietVertrag.TabIndex = 163 - ' 'usrCntlLKW ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -506,7 +506,7 @@ Partial Class usrCntlLKW Friend WithEvents btnNextSDL As System.Windows.Forms.Button Friend WithEvents btnPrevSDL As System.Windows.Forms.Button Friend WithEvents Label4 As System.Windows.Forms.Label - Friend WithEvents Button3 As System.Windows.Forms.Button + Friend WithEvents btnAddLeistung As System.Windows.Forms.Button Friend WithEvents cntxtAddSdl As System.Windows.Forms.ContextMenuStrip Friend WithEvents DToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents cntxtSDLLeistungenOptions As System.Windows.Forms.ContextMenuStrip diff --git a/SDL/kunden/usrCntlLKW.vb b/SDL/kunden/usrCntlLKW.vb index ec2f8ed8..eecf0850 100644 --- a/SDL/kunden/usrCntlLKW.vb +++ b/SDL/kunden/usrCntlLKW.vb @@ -2,6 +2,7 @@ Imports System.Reflection Imports System.ComponentModel Imports System.Windows.Media +Imports sun.reflect Public Class usrCntlLKW Dim kdnr As String @@ -34,7 +35,7 @@ Public Class usrCntlLKW End Sub 'Dim usrCntlBinding As cBinding = Nothing - + ' Private Sub usrCntlLKW_Changed(kdNr As Object, newKfz As Object, SDLNr As Object, History As Object) Handles Me.Changed ' init(kdNr, kz, lkwNationalitaet, erfassungsdatum, aenderungsdatum, sachbearbeiter) @@ -45,7 +46,7 @@ Public Class usrCntlLKW init(kdnr, kz, lkwNationalitaet, erfassungsdatum, aenderungsdatum, sachbearbeiter) If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then - Button3.Enabled = False + btnAddLeistung.Enabled = False End If loaded = True End Sub @@ -436,6 +437,17 @@ Public Class usrCntlLKW End Sub + ElseIf dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = 2017 Then ' PLOSE CZ + Dim usrcntl As New usrCntlSDLLeistungenPLOSE_MEDPASS(dgvSDLLeistungen.SelectedRows(0).Cells(0).Value, dgvSDLLeistungen.SelectedRows(0).Cells(1).Value, dgvSDLLeistungen.SelectedRows(0).Cells(2).Value, dgvSDLLeistungen.SelectedRows(0).Cells(3).Value) + pnlSDLLeistungenDetails.Controls.Add(usrcntl) + AddHandler usrcntl.LKWChanged, Sub(kdNr, newKfz, SDLNr, History) + RaiseEvent LKWChanged(kdNr, newKfz, SDLNr, History) + End Sub + AddHandler usrcntl.CHANGED, Sub(kdNr, newKfz, SDLNr, History) + doChange(kdNr, newKfz, SDLNr, History) + End Sub + + ElseIf dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = 500 Then ' MAN Dim usrcntl As New usrCntlSDLLeistungenMANAbgas(dgvSDLLeistungen.SelectedRows(0).Cells(0).Value, dgvSDLLeistungen.SelectedRows(0).Cells(1).Value, dgvSDLLeistungen.SelectedRows(0).Cells(2).Value, dgvSDLLeistungen.SelectedRows(0).Cells(3).Value) pnlSDLLeistungenDetails.Controls.Add(usrcntl) @@ -456,6 +468,16 @@ Public Class usrCntlLKW doChange(kdNr, newKfz, SDLNr, History) End Sub + ElseIf dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = 502 Then ' parkplatz + Dim usrcntl As New usrCntlSDLLeistungVERAGCardNEU(dgvSDLLeistungen.SelectedRows(0).Cells(0).Value, dgvSDLLeistungen.SelectedRows(0).Cells(1).Value, dgvSDLLeistungen.SelectedRows(0).Cells(2).Value, dgvSDLLeistungen.SelectedRows(0).Cells(3).Value) + pnlSDLLeistungenDetails.Controls.Add(usrcntl) + AddHandler usrcntl.LKWChanged, Sub(kdNr, newKfz, SDLNr, History) + RaiseEvent LKWChanged(kdNr, newKfz, SDLNr, History) + End Sub + AddHandler usrcntl.CHANGED, Sub(kdNr, newKfz, SDLNr, History) + doChange(kdNr, newKfz, SDLNr, History) + End Sub + End If ' If Not usrCntlBinding Is Nothing Then @@ -487,7 +509,7 @@ Public Class usrCntlLKW list.RemoveHandler(obj, list(obj)) End Sub - + 'Private Sub setChange() ' valueChanged = True @@ -524,18 +546,25 @@ Public Class usrCntlLKW End Sub - Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles btnAddLeistung.Click Dim Speditionsdienstleistungen As List(Of cSpeditionsdienstleistungen) = kundenSQL.getSpeditionsdienstleistungenByKdNr(kdnr) cntxtAddSdl.Items.Clear() For Each s In Speditionsdienstleistungen + 'Select Case s.SDLNr + ' Case 501, 502 ' Parkplatzkarten sollten hier nicht hinzugefügt werden können.... + + + 'Case Else Dim i As New ToolStripMenuItem - i.Text = s.SDLNr & " - " & s.SDLBez - i.Name = "tsmiSDLNr_" & s.SDLNr - cntxtAddSdl.Items.Add(i) - If s.Sperre <> 0 Then i.Enabled = False : i.Text = i.Text & " (gesperrt)" - AddHandler i.Click, AddressOf DToolStripMenuItem_Click + i.Text = s.SDLNr & " - " & s.SDLBez + i.Name = "tsmiSDLNr_" & s.SDLNr + cntxtAddSdl.Items.Add(i) + If s.Sperre <> 0 Then i.Enabled = False : i.Text = i.Text & " (gesperrt)" + AddHandler i.Click, AddressOf DToolStripMenuItem_Click + + ' End Select Next - Button3.ContextMenuStrip = cntxtAddSdl + btnAddLeistung.ContextMenuStrip = cntxtAddSdl ' cntxtAddSdl Dim ptLowerLeft As New Point(sender.width, sender.Height) ptLowerLeft = sender.PointToScreen(ptLowerLeft) @@ -553,11 +582,12 @@ Public Class usrCntlLKW Dim cpf As New cProgramFunctions Dim hist = -1 - If sdlNr = "501" Then - hist = cpf.newEntryVERAG_Card(kdnr, kz, sdlNr) - Else - hist = cpf.newEntry(kdnr, kz, sdlNr) - End If + Select Case sdlNr + Case 501, 502 + hist = cpf.newEntryVERAG_Card(kdnr, kz, sdlNr) + Case Else + hist = cpf.newEntry(kdnr, kz, sdlNr) + End Select If hist > 0 Then @@ -609,7 +639,7 @@ Public Class usrCntlLKW Sub deletedgvSDLLeistungenRow() If dgvSDLLeistungen.SelectedRows.Count > 0 Then - If dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = "501" Then + If dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = "501" Or dgvSDLLeistungen.SelectedRows(0).Cells(2).Value = "502" Then MsgBox("VERAG-Parkplatzkarten können nicht gelöscht werden. Bitte auf gesperrt/verloren/gestohlen/defekt setzen!") Exit Sub End If diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 6f1d171b..c9600634 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -764,6 +764,7 @@ Public Class usrcntlKundeBearbeitenFull cboSonst_Rechnungsdruck.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Formular", "0")) cboSonst_Rechnungsdruck.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Fax", "1")) cboSonst_Rechnungsdruck.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("E-Mail", "2")) + cboSonst_Rechnungsdruck.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Mail+Kopie", "5")) cboAbf_Sammelrechnung.Items.Clear() cboAbf_Sammelrechnung.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("0 - nein", "0")) diff --git a/SDL/mdm/SDLLeistungenDetails/frmFindNewVeragCard.vb b/SDL/mdm/SDLLeistungenDetails/frmFindNewVeragCard.vb index c21481e9..d7f6c20c 100644 --- a/SDL/mdm/SDLLeistungenDetails/frmFindNewVeragCard.vb +++ b/SDL/mdm/SDLLeistungenDetails/frmFindNewVeragCard.vb @@ -17,18 +17,19 @@ End Sub - Sub New(lkw) + Sub New(lkw, SDLNr) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() lblLKW.Text = lkw + Me.SDLNr = SDLNr ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. End Sub Private Sub frmFindNewVeragCard_Load(sender As Object, e As EventArgs) Handles Me.Load With DataGridView - .DataSource = SQL.loadDgvBySql("SELECT KundenNr,KfzKennzeichen,SDLNr,History,[KartenNr],[Bestelldatum],[Lieferdatum],[Vermerk],[Fahrer],[Ersatzkarte],[Gesperrt],[Defekt],[Verloren],[Gestohlen] FROM [SDL] where SDLNr=501 and KundenNr <=0 order by cast(kartennr as int)", "SDL") + .DataSource = SQL.loadDgvBySql("SELECT KundenNr,KfzKennzeichen,SDLNr,History,[KartenNr],[Bestelldatum],[Lieferdatum],[Vermerk],[Fahrer],[Ersatzkarte],[Gesperrt],[Defekt],[Verloren],[Gestohlen] FROM [SDL] where SDLNr=" & SDLNr & " and KundenNr <=0 order by cast(kartennr as int)", "SDL") If .RowCount > 0 Then .Columns("KundenNr").Visible = False .Columns("KfzKennzeichen").Visible = False diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungVERAGCardNEU.Designer.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungVERAGCardNEU.Designer.vb new file mode 100644 index 00000000..80297094 --- /dev/null +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungVERAGCardNEU.Designer.vb @@ -0,0 +1,510 @@ + +Partial Class usrCntlSDLLeistungVERAGCardNEU + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Me.Label4 = New System.Windows.Forms.Label() + Me.cbxErsatzkarte = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.cbxGestohlen = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.cbxVerloren = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.cbxGesperrt = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.cbxDefekt = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.Panel2 = New System.Windows.Forms.Panel() + Me.Label8 = New System.Windows.Forms.Label() + Me.Label7 = New System.Windows.Forms.Label() + Me.Label9 = New System.Windows.Forms.Label() + Me.txtKartenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtBestelldatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtVermerk = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.tbcntr = New System.Windows.Forms.TabControl() + Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.UsrCntlDetails = New SDL.usrCntlAllg() + Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() + Me.cbxArchiviert = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.cbxAbgemeldet = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.Label12 = New System.Windows.Forms.Label() + Me.txtKaution = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label11 = New System.Windows.Forms.Label() + Me.txtFahrer = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtBelegNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtLieferung = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label6 = New System.Windows.Forms.Label() + Me.PictureBox1 = New System.Windows.Forms.PictureBox() + Me.Panel2.SuspendLayout() + Me.tbcntr.SuspendLayout() + Me.TabPage1.SuspendLayout() + Me.TabPage2.SuspendLayout() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(3, 165) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(49, 13) + Me.Label4.TabIndex = 17 + Me.Label4.Text = "Vermerk:" + ' + 'cbxErsatzkarte + ' + Me.cbxErsatzkarte._date = Nothing + Me.cbxErsatzkarte._showdate = True + Me.cbxErsatzkarte._value = "" + Me.cbxErsatzkarte.AutoSize = True + Me.cbxErsatzkarte.Location = New System.Drawing.Point(333, 64) + Me.cbxErsatzkarte.Name = "cbxErsatzkarte" + Me.cbxErsatzkarte.Size = New System.Drawing.Size(79, 17) + Me.cbxErsatzkarte.TabIndex = 5 + Me.cbxErsatzkarte.Text = "Ersatzkarte" + Me.cbxErsatzkarte.UseVisualStyleBackColor = True + ' + 'cbxGestohlen + ' + Me.cbxGestohlen._date = Nothing + Me.cbxGestohlen._showdate = True + Me.cbxGestohlen._value = "" + Me.cbxGestohlen.AutoSize = True + Me.cbxGestohlen.Location = New System.Drawing.Point(333, 134) + Me.cbxGestohlen.Name = "cbxGestohlen" + Me.cbxGestohlen.Size = New System.Drawing.Size(74, 17) + Me.cbxGestohlen.TabIndex = 13 + Me.cbxGestohlen.Text = "Gestohlen" + Me.cbxGestohlen.UseVisualStyleBackColor = True + ' + 'cbxVerloren + ' + Me.cbxVerloren._date = Nothing + Me.cbxVerloren._showdate = True + Me.cbxVerloren._value = "" + Me.cbxVerloren.AutoSize = True + Me.cbxVerloren.Location = New System.Drawing.Point(333, 111) + Me.cbxVerloren.Name = "cbxVerloren" + Me.cbxVerloren.Size = New System.Drawing.Size(65, 17) + Me.cbxVerloren.TabIndex = 9 + Me.cbxVerloren.Text = "Verloren" + Me.cbxVerloren.UseVisualStyleBackColor = True + ' + 'cbxGesperrt + ' + Me.cbxGesperrt._date = Nothing + Me.cbxGesperrt._showdate = True + Me.cbxGesperrt._value = "" + Me.cbxGesperrt.AutoSize = True + Me.cbxGesperrt.Location = New System.Drawing.Point(333, 155) + Me.cbxGesperrt.Name = "cbxGesperrt" + Me.cbxGesperrt.Size = New System.Drawing.Size(66, 17) + Me.cbxGesperrt.TabIndex = 16 + Me.cbxGesperrt.Text = "Gesperrt" + Me.cbxGesperrt.UseVisualStyleBackColor = True + ' + 'cbxDefekt + ' + Me.cbxDefekt._date = Nothing + Me.cbxDefekt._showdate = True + Me.cbxDefekt._value = "" + Me.cbxDefekt.AutoSize = True + Me.cbxDefekt.Location = New System.Drawing.Point(333, 177) + Me.cbxDefekt.Name = "cbxDefekt" + Me.cbxDefekt.Size = New System.Drawing.Size(58, 17) + Me.cbxDefekt.TabIndex = 19 + Me.cbxDefekt.Text = "Defekt" + Me.cbxDefekt.UseVisualStyleBackColor = True + ' + 'Panel2 + ' + Me.Panel2.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Panel2.Controls.Add(Me.Label8) + Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel2.Location = New System.Drawing.Point(0, 0) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(760, 30) + Me.Panel2.TabIndex = 0 + ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label8.ForeColor = System.Drawing.Color.White + Me.Label8.Location = New System.Drawing.Point(6, 9) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(79, 13) + Me.Label8.TabIndex = 0 + Me.Label8.Text = "VERAG-Card" + ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Location = New System.Drawing.Point(3, 39) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(70, 13) + Me.Label7.TabIndex = 1 + Me.Label7.Text = "Bestelldatum:" + ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label9.Location = New System.Drawing.Point(3, 99) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(83, 13) + Me.Label9.TabIndex = 7 + Me.Label9.Text = "Karten-Nummer:" + ' + 'txtKartenNr + ' + Me.txtKartenNr._DateTimeOnly = False + Me.txtKartenNr._numbersOnly = False + Me.txtKartenNr._numbersOnlyKommastellen = "" + Me.txtKartenNr._Prozent = False + Me.txtKartenNr._ShortDateNew = False + Me.txtKartenNr._ShortDateOnly = False + Me.txtKartenNr._TimeOnly = False + Me.txtKartenNr._value = Nothing + Me.txtKartenNr._Waehrung = False + Me.txtKartenNr.Enabled = False + Me.txtKartenNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtKartenNr.Location = New System.Drawing.Point(106, 94) + Me.txtKartenNr.MaxLength = 4 + Me.txtKartenNr.MaxLineLength = -1 + Me.txtKartenNr.MaxLines_Warning = "" + Me.txtKartenNr.MaxLines_Warning_Label = Nothing + Me.txtKartenNr.Name = "txtKartenNr" + Me.txtKartenNr.Size = New System.Drawing.Size(158, 23) + Me.txtKartenNr.TabIndex = 8 + ' + 'txtBestelldatum + ' + Me.txtBestelldatum._DateTimeOnly = False + Me.txtBestelldatum._numbersOnly = False + Me.txtBestelldatum._numbersOnlyKommastellen = "" + Me.txtBestelldatum._Prozent = False + Me.txtBestelldatum._ShortDateNew = True + Me.txtBestelldatum._ShortDateOnly = False + Me.txtBestelldatum._TimeOnly = False + Me.txtBestelldatum._value = "" + Me.txtBestelldatum._Waehrung = False + Me.txtBestelldatum.ForeColor = System.Drawing.Color.Red + Me.txtBestelldatum.Location = New System.Drawing.Point(106, 36) + Me.txtBestelldatum.MaxLength = 10 + Me.txtBestelldatum.MaxLineLength = -1 + Me.txtBestelldatum.MaxLines_Warning = "" + Me.txtBestelldatum.MaxLines_Warning_Label = Nothing + Me.txtBestelldatum.Name = "txtBestelldatum" + Me.txtBestelldatum.Size = New System.Drawing.Size(74, 20) + Me.txtBestelldatum.TabIndex = 2 + ' + 'txtVermerk + ' + Me.txtVermerk._DateTimeOnly = False + Me.txtVermerk._numbersOnly = False + Me.txtVermerk._numbersOnlyKommastellen = "" + Me.txtVermerk._Prozent = False + Me.txtVermerk._ShortDateNew = False + Me.txtVermerk._ShortDateOnly = False + Me.txtVermerk._TimeOnly = False + Me.txtVermerk._value = Nothing + Me.txtVermerk._Waehrung = False + Me.txtVermerk.Location = New System.Drawing.Point(106, 162) + Me.txtVermerk.MaxLength = 100 + Me.txtVermerk.MaxLineLength = -1 + Me.txtVermerk.MaxLines_Warning = "" + Me.txtVermerk.MaxLines_Warning_Label = Nothing + Me.txtVermerk.Multiline = True + Me.txtVermerk.Name = "txtVermerk" + Me.txtVermerk.Size = New System.Drawing.Size(183, 55) + Me.txtVermerk.TabIndex = 18 + ' + 'tbcntr + ' + Me.tbcntr.Controls.Add(Me.TabPage1) + Me.tbcntr.Controls.Add(Me.TabPage2) + Me.tbcntr.Dock = System.Windows.Forms.DockStyle.Right + Me.tbcntr.Location = New System.Drawing.Point(496, 30) + Me.tbcntr.Name = "tbcntr" + Me.tbcntr.SelectedIndex = 0 + Me.tbcntr.Size = New System.Drawing.Size(264, 190) + Me.tbcntr.TabIndex = 21 + ' + 'TabPage1 + ' + Me.TabPage1.Controls.Add(Me.UsrCntlDetails) + Me.TabPage1.Location = New System.Drawing.Point(4, 22) + Me.TabPage1.Name = "TabPage1" + Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage1.Size = New System.Drawing.Size(256, 164) + Me.TabPage1.TabIndex = 0 + Me.TabPage1.Text = "Details" + Me.TabPage1.UseVisualStyleBackColor = True + ' + 'UsrCntlDetails + ' + Me.UsrCntlDetails.BackColor = System.Drawing.Color.White + Me.UsrCntlDetails.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlDetails.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlDetails.Name = "UsrCntlDetails" + Me.UsrCntlDetails.Size = New System.Drawing.Size(250, 158) + Me.UsrCntlDetails.TabIndex = 0 + ' + 'TabPage2 + ' + Me.TabPage2.Controls.Add(Me.scanSonstiges) + Me.TabPage2.Location = New System.Drawing.Point(4, 22) + Me.TabPage2.Name = "TabPage2" + Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage2.Size = New System.Drawing.Size(256, 164) + Me.TabPage2.TabIndex = 1 + Me.TabPage2.Text = "Dokumente" + Me.TabPage2.UseVisualStyleBackColor = True + ' + 'scanSonstiges + ' + Me.scanSonstiges._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanSonstiges._DATENSERVER_ORDNER = "MDM" + Me.scanSonstiges._DATENSERVER_UOrdner1 = "" + Me.scanSonstiges._DATENSERVER_UOrdner2 = "" + Me.scanSonstiges._DATENSERVER_UOrdner3 = "" + Me.scanSonstiges.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanSonstiges.BackColor = System.Drawing.Color.White + Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanSonstiges.Cursor = System.Windows.Forms.Cursors.Hand + Me.scanSonstiges.Location = New System.Drawing.Point(3, 3) + Me.scanSonstiges.Margin = New System.Windows.Forms.Padding(0) + Me.scanSonstiges.Name = "scanSonstiges" + Me.scanSonstiges.Size = New System.Drawing.Size(250, 158) + Me.scanSonstiges.TabIndex = 0 + ' + 'cbxArchiviert + ' + Me.cbxArchiviert._date = Nothing + Me.cbxArchiviert._showdate = True + Me.cbxArchiviert._value = "" + Me.cbxArchiviert.AutoSize = True + Me.cbxArchiviert.Location = New System.Drawing.Point(333, 200) + Me.cbxArchiviert.Name = "cbxArchiviert" + Me.cbxArchiviert.Size = New System.Drawing.Size(91, 17) + Me.cbxArchiviert.TabIndex = 20 + Me.cbxArchiviert.Text = "ARCHIVIERT" + Me.cbxArchiviert.UseVisualStyleBackColor = True + ' + 'cbxAbgemeldet + ' + Me.cbxAbgemeldet._date = Nothing + Me.cbxAbgemeldet._showdate = True + Me.cbxAbgemeldet._value = "" + Me.cbxAbgemeldet.AutoSize = True + Me.cbxAbgemeldet.Location = New System.Drawing.Point(333, 88) + Me.cbxAbgemeldet.Name = "cbxAbgemeldet" + Me.cbxAbgemeldet.Size = New System.Drawing.Size(82, 17) + Me.cbxAbgemeldet.TabIndex = 6 + Me.cbxAbgemeldet.Text = "Abgemeldet" + Me.cbxAbgemeldet.UseVisualStyleBackColor = True + ' + 'Label12 + ' + Me.Label12.AutoSize = True + Me.Label12.Location = New System.Drawing.Point(3, 138) + Me.Label12.Name = "Label12" + Me.Label12.Size = New System.Drawing.Size(89, 13) + Me.Label12.TabIndex = 12 + Me.Label12.Text = "Kaution/BelegNr:" + ' + 'txtKaution + ' + Me.txtKaution._DateTimeOnly = False + Me.txtKaution._numbersOnly = False + Me.txtKaution._numbersOnlyKommastellen = "" + Me.txtKaution._Prozent = False + Me.txtKaution._ShortDateNew = False + Me.txtKaution._ShortDateOnly = False + Me.txtKaution._TimeOnly = False + Me.txtKaution._value = "" + Me.txtKaution._Waehrung = True + Me.txtKaution.Location = New System.Drawing.Point(106, 135) + Me.txtKaution.MaxLineLength = -1 + Me.txtKaution.MaxLines_Warning = "" + Me.txtKaution.MaxLines_Warning_Label = Nothing + Me.txtKaution.Name = "txtKaution" + Me.txtKaution.Size = New System.Drawing.Size(113, 20) + Me.txtKaution.TabIndex = 14 + ' + 'Label11 + ' + Me.Label11.AutoSize = True + Me.Label11.Location = New System.Drawing.Point(3, 119) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(40, 13) + Me.Label11.TabIndex = 10 + Me.Label11.Text = "Fahrer:" + ' + 'txtFahrer + ' + Me.txtFahrer._DateTimeOnly = False + Me.txtFahrer._numbersOnly = False + Me.txtFahrer._numbersOnlyKommastellen = "" + Me.txtFahrer._Prozent = False + Me.txtFahrer._ShortDateNew = False + Me.txtFahrer._ShortDateOnly = False + Me.txtFahrer._TimeOnly = False + Me.txtFahrer._value = Nothing + Me.txtFahrer._Waehrung = False + Me.txtFahrer.Location = New System.Drawing.Point(106, 116) + Me.txtFahrer.MaxLength = 40 + Me.txtFahrer.MaxLineLength = -1 + Me.txtFahrer.MaxLines_Warning = "" + Me.txtFahrer.MaxLines_Warning_Label = Nothing + Me.txtFahrer.Name = "txtFahrer" + Me.txtFahrer.Size = New System.Drawing.Size(183, 20) + Me.txtFahrer.TabIndex = 11 + ' + 'txtBelegNr + ' + Me.txtBelegNr._DateTimeOnly = False + Me.txtBelegNr._numbersOnly = False + Me.txtBelegNr._numbersOnlyKommastellen = "" + Me.txtBelegNr._Prozent = False + Me.txtBelegNr._ShortDateNew = False + Me.txtBelegNr._ShortDateOnly = False + Me.txtBelegNr._TimeOnly = False + Me.txtBelegNr._value = "" + Me.txtBelegNr._Waehrung = False + Me.txtBelegNr.Location = New System.Drawing.Point(218, 135) + Me.txtBelegNr.MaxLineLength = -1 + Me.txtBelegNr.MaxLines_Warning = "" + Me.txtBelegNr.MaxLines_Warning_Label = Nothing + Me.txtBelegNr.Name = "txtBelegNr" + Me.txtBelegNr.Size = New System.Drawing.Size(71, 20) + Me.txtBelegNr.TabIndex = 15 + ' + 'txtLieferung + ' + Me.txtLieferung._DateTimeOnly = False + Me.txtLieferung._numbersOnly = False + Me.txtLieferung._numbersOnlyKommastellen = "" + Me.txtLieferung._Prozent = False + Me.txtLieferung._ShortDateNew = True + Me.txtLieferung._ShortDateOnly = False + Me.txtLieferung._TimeOnly = False + Me.txtLieferung._value = "" + Me.txtLieferung._Waehrung = False + Me.txtLieferung.ForeColor = System.Drawing.Color.Red + Me.txtLieferung.Location = New System.Drawing.Point(106, 61) + Me.txtLieferung.MaxLength = 10 + Me.txtLieferung.MaxLineLength = -1 + Me.txtLieferung.MaxLines_Warning = "" + Me.txtLieferung.MaxLines_Warning_Label = Nothing + Me.txtLieferung.Name = "txtLieferung" + Me.txtLieferung.Size = New System.Drawing.Size(74, 20) + Me.txtLieferung.TabIndex = 4 + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Location = New System.Drawing.Point(3, 64) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(65, 13) + Me.Label6.TabIndex = 3 + Me.Label6.Text = "Lieferdatum:" + ' + 'PictureBox1 + ' + Me.PictureBox1.BackgroundImage = Global.SDL.My.Resources.del + Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox1.Cursor = System.Windows.Forms.Cursors.Hand + Me.PictureBox1.Location = New System.Drawing.Point(270, 94) + Me.PictureBox1.Name = "PictureBox1" + Me.PictureBox1.Size = New System.Drawing.Size(20, 22) + Me.PictureBox1.TabIndex = 156 + Me.PictureBox1.TabStop = False + ' + 'usrCntlSDLLeistungVERAGCard + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.PictureBox1) + Me.Controls.Add(Me.txtLieferung) + Me.Controls.Add(Me.Label6) + Me.Controls.Add(Me.txtBelegNr) + Me.Controls.Add(Me.Label12) + Me.Controls.Add(Me.txtKaution) + Me.Controls.Add(Me.Label11) + Me.Controls.Add(Me.txtFahrer) + Me.Controls.Add(Me.cbxAbgemeldet) + Me.Controls.Add(Me.cbxArchiviert) + Me.Controls.Add(Me.tbcntr) + Me.Controls.Add(Me.txtKartenNr) + Me.Controls.Add(Me.Label9) + Me.Controls.Add(Me.txtBestelldatum) + Me.Controls.Add(Me.Label7) + Me.Controls.Add(Me.Panel2) + Me.Controls.Add(Me.txtVermerk) + Me.Controls.Add(Me.Label4) + Me.Controls.Add(Me.cbxErsatzkarte) + Me.Controls.Add(Me.cbxGestohlen) + Me.Controls.Add(Me.cbxVerloren) + Me.Controls.Add(Me.cbxGesperrt) + Me.Controls.Add(Me.cbxDefekt) + Me.Name = "usrCntlSDLLeistungVERAGCard" + Me.Size = New System.Drawing.Size(760, 220) + Me.Panel2.ResumeLayout(False) + Me.Panel2.PerformLayout() + Me.tbcntr.ResumeLayout(False) + Me.TabPage1.ResumeLayout(False) + Me.TabPage2.ResumeLayout(False) + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents txtVermerk As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label4 As System.Windows.Forms.Label + Friend WithEvents cbxErsatzkarte As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue + Friend WithEvents cbxGestohlen As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue + Friend WithEvents cbxVerloren As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue + Friend WithEvents cbxGesperrt As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue + Friend WithEvents cbxDefekt As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue + Friend WithEvents Panel2 As System.Windows.Forms.Panel + Friend WithEvents Label8 As System.Windows.Forms.Label + Friend WithEvents txtBestelldatum As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label7 As System.Windows.Forms.Label + Friend WithEvents txtKartenNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label9 As System.Windows.Forms.Label + Friend WithEvents tbcntr As System.Windows.Forms.TabControl + Friend WithEvents TabPage1 As System.Windows.Forms.TabPage + Friend WithEvents UsrCntlDetails As SDL.usrCntlAllg + Friend WithEvents TabPage2 As System.Windows.Forms.TabPage + Friend WithEvents scanSonstiges As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList + Friend WithEvents cbxArchiviert As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue + Friend WithEvents cbxAbgemeldet As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue + Friend WithEvents Label12 As System.Windows.Forms.Label + Friend WithEvents txtKaution As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label11 As System.Windows.Forms.Label + Friend WithEvents txtFahrer As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtBelegNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtLieferung As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label6 As System.Windows.Forms.Label + Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox + +End Class diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungVERAGCardNEU.resx b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungVERAGCardNEU.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungVERAGCardNEU.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungVERAGCardNEU.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungVERAGCardNEU.vb new file mode 100644 index 00000000..70ad4ab9 --- /dev/null +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungVERAGCardNEU.vb @@ -0,0 +1,270 @@ +Imports System.Globalization +Imports SDL.cBinding + +Public Class usrCntlSDLLeistungVERAGCardNEU + Public KfzKennzeichen As String + Public kdNr As String + Public History As String + Dim PROG As New cProgramFunctions + Dim kundenSQL As New kundenSQL + Public SDLNr As String + + Dim culture As CultureInfo = New CultureInfo("de-DE") + Private PartnerKdNrFromFMZOLL As cPartnerKdNRFMZoll + Public addnew As Boolean = False + Dim VAL As New cValidationSDLLeistungen + Public Event LKWChanged(kdNr, newKfz, SDLNr, History) + Public Event CHANGED(kdNr, newKfz, SDLNr, History) + 'Public WithEvents s As New cBinding 'fürs Binding + Public SDL As VERAG_PROG_ALLGEMEIN.cSDL + Dim boud = False + + Sub New(kdNr, KfzKennzeichen, SDLNr, History) + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + Me.kdNr = kdNr + Me.KfzKennzeichen = KfzKennzeichen + Me.SDLNr = SDLNr + Me.History = History + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + + End Sub + + Private Sub usrCntlSDLLeistungen_Load(sender As Object, e As EventArgs) Handles Me.Load + + UsrCntlDetails.kdNr = kdNr + UsrCntlDetails.SDLNr = SDLNr + UsrCntlDetails.History = History + UsrCntlDetails.lblLKWNr.Text = KfzKennzeichen + AddHandler UsrCntlDetails.LKWChanged, Sub(newKfz) + RaiseEvent LKWChanged(kdNr, newKfz, SDLNr, History) + End Sub + + 'Scan-Elemente initialisieren: + ' scanRetourniert.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History) + scanSonstiges.INIT(kdNr, KfzKennzeichen, "SDL_" & SDLNr, "HIST_" & History) + + ' PROG.addPicToGueltigBis(txtGueltigkeit) + initDataBinding() + + boud = True + + + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then + cProgramFunctions.setControlReadOnly(Me) + End If + End Sub + Sub getPartnerKdNrFromFMZOLL() ' Lädt die Partner-KdNr + PartnerKdNrFromFMZOLL = kundenSQL.getPartnerKdNrFromFMZOLL(kdNr) + End Sub + Sub initDataBinding() + Try + SDL = New VERAG_PROG_ALLGEMEIN.cSDL(kdNr, KfzKennzeichen, SDLNr, History) + + PROG.initDTPE(txtBestelldatum) + PROG.initDTPE(txtLieferung) + + txtBestelldatum._value = SDL.Bestelldatum + txtLieferung._value = SDL.Lieferdatum + + + + cbxErsatzkarte._date = SDL.ErsatzkarteAm + cbxVerloren._date = SDL.VerlorenAm + cbxGestohlen._date = SDL.GestohlenAm + cbxGesperrt._date = SDL.GesperrtAm + cbxDefekt._date = SDL.DefektAm + cbxAbgemeldet._date = SDL.LKWAbgemeldetAM + + cbxGesperrt.Checked = SDL.Gesperrt + cbxDefekt.Checked = SDL.Defekt + cbxGestohlen.Checked = SDL.Gestohlen + cbxVerloren.Checked = SDL.Verloren + cbxArchiviert.Checked = SDL.Archiviert + cbxAbgemeldet.Checked = SDL.LKWAbgemeldet + + + cbxErsatzkarte.Checked = SDL.Ersatzkarte + + txtVermerk.Text = SDL.Vermerk + + UsrCntlDetails.lblErfassung.Text = SDL.Erfassungsdatum + UsrCntlDetails.lblAenderung.Text = SDL.Änderungsdatum + UsrCntlDetails.lblSachbearb.Text = SDL.Sachbearbeiter + + + txtKartenNr.Text = SDL.KartenNr + txtFahrer.Text = SDL.Fahrer + txtKaution._value = SDL.Kaution + txtBelegNr.Text = SDL.BelegNr + + + + Catch ex As Exception + MsgBox(ex.Message) + MsgBox(ex.StackTrace) + End Try + + + + End Sub + + + + Public Sub newEntry() + ' s.updateBinding() + ' s.newEntry(kdNr, KfzKennzeichen, SDLNr) 'NEUER EINTRAG! + If txtBestelldatum.Text = "" Then txtBestelldatum.Text = Now.ToShortDateString + + + End Sub + + Sub BindingTableColumnChanged() + UsrCntlDetails.lblSachbearb.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + UsrCntlDetails.lblAenderung.Text = Now.ToString("dd.MM.yyyy HH:mm") + ' If e.Column.ColumnName = "Sachbearbeiter" Or e.Column.ColumnName = "Änderungsdatum" Then Exit Sub + If save() Then RaiseEvent CHANGED(kdNr, KfzKennzeichen, SDLNr, History) + End Sub + + Private Sub TextBox1_TextChanged(sender As Object, e As EventArgs) + Dim valid As Boolean = VAL.checkValidDate(sender, True) + End Sub + + Public Function save() As Boolean + loadDataInClass() + + Return SDL.SAVE + 'If checkSave() Then + ' Return kundenSQL.doSQLByList(s.bindingSource) + 'End If + Return False + End Function + + Sub loadDataInClass() + SDL.Bestelldatum = PROG.isEmptyNull(txtBestelldatum._value) + SDL.Lieferdatum = PROG.isEmptyNull(txtLieferung._value) + SDL.Gesperrt = cbxGesperrt.Checked + SDL.Defekt = cbxDefekt.Checked + SDL.Gestohlen = cbxGestohlen.Checked + SDL.Verloren = cbxVerloren.Checked + SDL.LKWAbgemeldet = cbxAbgemeldet.Checked + SDL.Ersatzkarte = cbxErsatzkarte.Checked + SDL.Vermerk = txtVermerk.Text + SDL.Erfassungsdatum = UsrCntlDetails.lblErfassung.Text + SDL.Änderungsdatum = UsrCntlDetails.lblAenderung.Text + SDL.Sachbearbeiter = UsrCntlDetails.lblSachbearb.Text + SDL.KartenNr = txtKartenNr.Text + + SDL.Fahrer = txtFahrer.Text + SDL.Kaution = txtKaution._value + SDL.BelegNr = txtBelegNr.Text + + SDL.ErsatzkarteAm = cbxErsatzkarte._date + SDL.VerlorenAm = cbxVerloren._date + SDL.LKWAbgemeldetAM = cbxAbgemeldet._date + SDL.GestohlenAm = cbxGestohlen._date + SDL.GesperrtAm = cbxGesperrt._date + SDL.DefektAm = cbxDefekt._date + SDL.Archiviert = cbxArchiviert.Checked + End Sub + + Function checkSave() As Boolean + ' If Not VAL.checkValidDate(txtBestellung, True) Then cProgramFunctions.setInfo(Me.FindForm, "ERR", "Bestelldatum: Datumsformat nicht korrekt!", 3) : Return False + ' If Not VAL.checkValidDate(txtLieferung, True) Then cProgramFunctions.setInfo(Me.FindForm, "ERR", "Lieferdatum: Datumsformat nicht korrekt!", 3) : Return False + ' If Not VAL.checkValidDate(txtGueltigkeit, True) Then cProgramFunctions.setInfo(Me.FindForm, "ERR", "Gültigkeitsdatum: Datumsformat nicht korrekt!", 3) : Return False + Return True + End Function + + Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtBestelldatum.PropertyChanged, txtLieferung.PropertyChanged, txtKartenNr.TextChanged, txtVermerk.TextChanged, cbxErsatzkarte.CheckedChanged, cbxDefekt.CheckedChanged, cbxVerloren.CheckedChanged, cbxGestohlen.CheckedChanged, cbxGesperrt.CheckedChanged, cbxArchiviert.CheckedChanged, cbxAbgemeldet.CheckedChanged, + txtKaution.TextChanged, txtFahrer.TextChanged, txtBelegNr.TextChanged + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then Exit Sub + + If boud And Me.FindForm IsNot Nothing Then + If sender Is txtBestelldatum Then + If Not PROG.checkSDLNrPartnerKdNr(kdNr, SDLNr) Then MsgBox("Bitte geben Sie die Partner-Kundennummer im Kundenblatt oder im FM-ZOLL ein!") + End If + BindingTableColumnChanged() + End If + End Sub + Function addTxtToVermerk(tmp, txt) As String + If txtVermerk.Text <> "" Then tmp &= " / " + tmp &= txt & ", am " & Now.ToShortDateString + If tmp.Length > txtVermerk.MaxLength Then tmp = tmp.Substring(0, txtVermerk.MaxLength) + Return tmp + End Function + + + + 'Private Sub pic_Click(sender As Object, e As EventArgs) Handles pic.Click + ' If txtKartenNr.Text = "" Then + + ' Dim f As New frmFindNewVeragCard + ' If f.ShowDialog(Me) = DialogResult.OK Then + + ' Dim tmpKFZ = Me.KfzKennzeichen + ' Dim tmpKdNr = Me.KfzKennzeichen + + + ' Me.kdNr = f.kdNr + ' Me.KfzKennzeichen = f.KfzKennzeichen + ' Me.SDLNr = f.SDLNr + ' Me.History = f.History + + ' initDataBinding() + + ' Me.KfzKennzeichen = tmpKFZ + ' Me.kdNr = tmpKdNr + + ' save() + ' End If + + + ' ' + + + ' End If + ' + ' End Sub + + Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click + If clearVeragCard(kdNr, KfzKennzeichen, History) Then + RaiseEvent CHANGED(kdNr, KfzKennzeichen, SDLNr, History) + Me.Visible = False + End If + End Sub + + Shared Function clearVeragCard(kdNr, KfzKennzeichen, History) As Boolean + Dim kundenSQL As New kundenSQL + 'VERAG Card zurücksetzen --> Kdnr=-1 + If vbYes = MsgBox("Möchten Sie die Zuordnung der VERAG-Card wirklich aufheben?", vbYesNoCancel) Then + Dim hist = kundenSQL.getValueTxtBySql("SELECT isnull(max([History]),0)+1 as History FROM SDL where KundenNr = '-1' AND KfzKennzeichen='" & KfzKennzeichen & "' And SDLNr ='502' ", "SDL") + ' MsgBox("UPDATE [SDL] set KundenNr='-1', History='" & History & "' WHERE KundenNr='" & kdNr & "' and KfzKennzeichen='" & KfzKennzeichen & "' and History='" & History & "' and SDLNr=502 ") + If kundenSQL.doSQL("UPDATE [SDL] set KundenNr='-1', History='" & hist & "' WHERE KundenNr='" & kdNr & "' and KfzKennzeichen='" & KfzKennzeichen & "' and History='" & History & "' and SDLNr=502 ", "SDL") Then + Return True + End If + End If + Return False + End Function + Shared Function clearAllVeragCard(kdNr, KfzKennzeichen) As Boolean + Try + + Dim kundenSQL As New kundenSQL + 'VERAG Card zurücksetzen --> Kdnr=-1 + Dim dt = kundenSQL.loadDgvBySql("Select History FROM SDL WHERE KundenNr='" & kdNr & "' and KfzKennzeichen='" & KfzKennzeichen & "'and SDLNr=502") + If dt IsNot Nothing Then + For Each r In dt.Rows + Dim hist = kundenSQL.getValueTxtBySql("SELECT isnull(max([History]),0)+1 as History FROM SDL where KundenNr = '-1' AND KfzKennzeichen='" & KfzKennzeichen & "' And SDLNr ='502' ", "SDL") + kundenSQL.doSQL("UPDATE [SDL] set KundenNr='-1', History='" & hist & "' WHERE KundenNr='" & kdNr & "' and KfzKennzeichen='" & KfzKennzeichen & "' and History='" & r("History") & "' and SDLNr=502 ", "SDL") + Next + End If + + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + Return False + End Function + + +End Class diff --git a/SDL/mdm/frmNewData.Designer.vb b/SDL/mdm/frmNewData.Designer.vb index 4eb5095c..9d703fc4 100644 --- a/SDL/mdm/frmNewData.Designer.vb +++ b/SDL/mdm/frmNewData.Designer.vb @@ -26,9 +26,7 @@ Partial Class frmNewData Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNewData)) Me.pnlMain = New System.Windows.Forms.Panel() Me.Panel1 = New System.Windows.Forms.Panel() - Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Panel2 = New System.Windows.Forms.Panel() - Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components) Me.Label2 = New System.Windows.Forms.Label() Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel() Me.btnSDL_IDS = New System.Windows.Forms.Button() @@ -53,11 +51,14 @@ Partial Class frmNewData Me.btnSDL_PLOSE_CZ = New System.Windows.Forms.Button() Me.btnSDL_PLOSE_MEDPASS = New System.Windows.Forms.Button() Me.btnVeragParkplatz = New System.Windows.Forms.Button() + Me.btnVeragParkplatzNEU = New System.Windows.Forms.Button() Me.Label4 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.txtKundenNr = New System.Windows.Forms.TextBox() - Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.btnAddLeistungVordefiniert = New System.Windows.Forms.Button() + Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components) + Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.pnlMain.SuspendLayout() Me.Panel1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -87,22 +88,6 @@ Partial Class frmNewData Me.Panel1.Size = New System.Drawing.Size(753, 333) Me.Panel1.TabIndex = 0 ' - 'FlatButton1 - ' - Me.FlatButton1.allowBorder = False - Me.FlatButton1.BackColor = System.Drawing.Color.Red - Me.FlatButton1.FlatAppearance.BorderSize = 0 - Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.FlatButton1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.FlatButton1.ForeColor = System.Drawing.Color.White - Me.FlatButton1.Location = New System.Drawing.Point(689, -1) - Me.FlatButton1.Margin = New System.Windows.Forms.Padding(0) - Me.FlatButton1.Name = "FlatButton1" - Me.FlatButton1.Size = New System.Drawing.Size(63, 23) - Me.FlatButton1.TabIndex = 0 - Me.FlatButton1.Text = "X" - Me.FlatButton1.UseVisualStyleBackColor = False - ' 'Panel2 ' Me.Panel2.AutoSize = True @@ -121,20 +106,6 @@ Partial Class frmNewData Me.Panel2.Size = New System.Drawing.Size(751, 331) Me.Panel2.TabIndex = 13 ' - 'MyFlowLayoutPanel1 - ' - Me.MyFlowLayoutPanel1.AutoScroll = True - Me.MyFlowLayoutPanel1.AutoSize = True - Me.MyFlowLayoutPanel1.BackColor = System.Drawing.Color.White - Me.MyFlowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown - Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 70) - Me.MyFlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(0) - Me.MyFlowLayoutPanel1.MaximumSize = New System.Drawing.Size(657, 5000) - Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1" - Me.MyFlowLayoutPanel1.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0) - Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(657, 46) - Me.MyFlowLayoutPanel1.TabIndex = 57 - ' 'Label2 ' Me.Label2.ForeColor = System.Drawing.Color.Black @@ -170,6 +141,7 @@ Partial Class frmNewData Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_PLOSE_CZ) Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_PLOSE_MEDPASS) Me.FlowLayoutPanel.Controls.Add(Me.btnVeragParkplatz) + Me.FlowLayoutPanel.Controls.Add(Me.btnVeragParkplatzNEU) Me.FlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Bottom Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 119) Me.FlowLayoutPanel.Name = "FlowLayoutPanel" @@ -588,7 +560,7 @@ Partial Class frmNewData Me.btnSDL_PLOSE_MEDPASS.Name = "btnSDL_PLOSE_MEDPASS" Me.btnSDL_PLOSE_MEDPASS.Size = New System.Drawing.Size(78, 64) Me.btnSDL_PLOSE_MEDPASS.TabIndex = 61 - Me.btnSDL_PLOSE_MEDPASS.Tag = "216" + Me.btnSDL_PLOSE_MEDPASS.Tag = "217" Me.btnSDL_PLOSE_MEDPASS.Text = "MEDPASS" Me.btnSDL_PLOSE_MEDPASS.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.btnSDL_PLOSE_MEDPASS.UseVisualStyleBackColor = True @@ -609,10 +581,30 @@ Partial Class frmNewData Me.btnVeragParkplatz.Size = New System.Drawing.Size(78, 64) Me.btnVeragParkplatz.TabIndex = 57 Me.btnVeragParkplatz.Tag = "501" - Me.btnVeragParkplatz.Text = "Parkplatz" + Me.btnVeragParkplatz.Text = "Parkp. ALT" Me.btnVeragParkplatz.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.btnVeragParkplatz.UseVisualStyleBackColor = True ' + 'btnVeragParkplatzNEU + ' + Me.btnVeragParkplatzNEU.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnVeragParkplatzNEU.Cursor = System.Windows.Forms.Cursors.Default + Me.btnVeragParkplatzNEU.Enabled = False + Me.btnVeragParkplatzNEU.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Silver + Me.btnVeragParkplatzNEU.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnVeragParkplatzNEU.ForeColor = System.Drawing.Color.Black + Me.btnVeragParkplatzNEU.Image = Global.SDL.My.Resources.Resources.verag_Card1 + Me.btnVeragParkplatzNEU.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnVeragParkplatzNEU.Location = New System.Drawing.Point(332, 140) + Me.btnVeragParkplatzNEU.Margin = New System.Windows.Forms.Padding(2) + Me.btnVeragParkplatzNEU.Name = "btnVeragParkplatzNEU" + Me.btnVeragParkplatzNEU.Size = New System.Drawing.Size(78, 64) + Me.btnVeragParkplatzNEU.TabIndex = 62 + Me.btnVeragParkplatzNEU.Tag = "502" + Me.btnVeragParkplatzNEU.Text = "Parkplatz" + Me.btnVeragParkplatzNEU.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnVeragParkplatzNEU.UseVisualStyleBackColor = True + ' 'Label4 ' Me.Label4.BackColor = System.Drawing.Color.Red @@ -645,34 +637,6 @@ Partial Class frmNewData Me.txtKundenNr.Size = New System.Drawing.Size(122, 23) Me.txtKundenNr.TabIndex = 2 ' - '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._UseFIRMA = "" - Me.KdSearchBox1._ValueKdAndName = False - Me.KdSearchBox1.dgvpos = "LEFT" - Me.KdSearchBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.KdSearchBox1.KdName = "" - Me.KdSearchBox1.KdNr = "-1" - Me.KdSearchBox1.kdNrField = Nothing - Me.KdSearchBox1.KdNrNullInt = Nothing - Me.KdSearchBox1.Location = New System.Drawing.Point(67, 44) - Me.KdSearchBox1.Name = "KdSearchBox1" - Me.KdSearchBox1.nurAktive = True - Me.KdSearchBox1.searchActive = True - Me.KdSearchBox1.Size = New System.Drawing.Size(312, 23) - Me.KdSearchBox1.TabIndex = 1 - Me.KdSearchBox1.TIMER_SEARCH = True - Me.KdSearchBox1.usrcntl = Nothing - ' 'btnAddLeistungVordefiniert ' Me.btnAddLeistungVordefiniert.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom @@ -693,6 +657,65 @@ Partial Class frmNewData Me.btnAddLeistungVordefiniert.UseVisualStyleBackColor = True Me.btnAddLeistungVordefiniert.Visible = False ' + 'FlatButton1 + ' + Me.FlatButton1.allowBorder = False + Me.FlatButton1.BackColor = System.Drawing.Color.Red + Me.FlatButton1.FlatAppearance.BorderSize = 0 + Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.FlatButton1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.FlatButton1.ForeColor = System.Drawing.Color.White + Me.FlatButton1.Location = New System.Drawing.Point(689, -1) + Me.FlatButton1.Margin = New System.Windows.Forms.Padding(0) + Me.FlatButton1.Name = "FlatButton1" + Me.FlatButton1.Size = New System.Drawing.Size(63, 23) + Me.FlatButton1.TabIndex = 0 + Me.FlatButton1.Text = "X" + Me.FlatButton1.UseVisualStyleBackColor = False + ' + 'MyFlowLayoutPanel1 + ' + Me.MyFlowLayoutPanel1.AutoScroll = True + Me.MyFlowLayoutPanel1.AutoSize = True + Me.MyFlowLayoutPanel1.BackColor = System.Drawing.Color.White + Me.MyFlowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown + Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 70) + Me.MyFlowLayoutPanel1.Margin = New System.Windows.Forms.Padding(0) + Me.MyFlowLayoutPanel1.MaximumSize = New System.Drawing.Size(657, 5000) + Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1" + Me.MyFlowLayoutPanel1.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0) + Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(657, 46) + Me.MyFlowLayoutPanel1.TabIndex = 57 + ' + '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 = False + Me.KdSearchBox1.dgvpos = "LEFT" + Me.KdSearchBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.KdSearchBox1.KdName = "" + Me.KdSearchBox1.KdNr = "-1" + Me.KdSearchBox1.kdNrField = Nothing + Me.KdSearchBox1.KdNrNullInt = Nothing + Me.KdSearchBox1.Location = New System.Drawing.Point(67, 44) + Me.KdSearchBox1.Name = "KdSearchBox1" + Me.KdSearchBox1.nurAktive = True + Me.KdSearchBox1.searchActive = True + Me.KdSearchBox1.Size = New System.Drawing.Size(312, 23) + Me.KdSearchBox1.TabIndex = 1 + Me.KdSearchBox1.TIMER_SEARCH = True + Me.KdSearchBox1.usrcntl = Nothing + ' 'frmNewData ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -748,4 +771,5 @@ Partial Class frmNewData Friend WithEvents btnSDL_PLOSE_IT As Button Friend WithEvents btnSDL_PLOSE_CZ As Button Friend WithEvents btnSDL_PLOSE_MEDPASS As Button + Friend WithEvents btnVeragParkplatzNEU As Button End Class diff --git a/SDL/mdm/frmNewData.vb b/SDL/mdm/frmNewData.vb index 58fa37cd..dd5a1fb9 100644 --- a/SDL/mdm/frmNewData.vb +++ b/SDL/mdm/frmNewData.vb @@ -215,6 +215,7 @@ Public Class frmNewData Case 206 : btnAddLeistungVordefiniert.Image = Nothing : btnAddLeistungVordefiniert.Text = "DouBox" & vbNewLine & "hinzufügen" Case 500 : btnAddLeistungVordefiniert.Image = My.Resources.Plakette1 : btnAddLeistungVordefiniert.Text = "MAN Abgas" & vbNewLine & "hinzufügen" Case 501 : btnAddLeistungVordefiniert.Image = My.Resources.verag_Card1 : btnAddLeistungVordefiniert.Text = "Parkplatz" & vbNewLine & "hinzufügen" + Case 502 : btnAddLeistungVordefiniert.Image = My.Resources.verag_Card1 : btnAddLeistungVordefiniert.Text = "Parkplatz" & vbNewLine & "hinzufügen" End Select .Visible = True .Tag = LeistungVordefiniert @@ -255,7 +256,7 @@ Public Class frmNewData Private Sub btnSDL_Woelfl_Click(sender As Object, e As EventArgs) Handles btnSDL_Woelfl.Click, btnSDL_IDS.Click, btnSDL_MautAT.Click, btnSDL_MautDE.Click, btnSDL_MautMSE.Click, btnSDL_UTA.Click, btnSDL_MautPL.Click, btnSDL_MautIT.Click, btnSDL_MautSI.Click, btnSDL_MautCZ.Click, btnSDL_ECOTAX.Click, btnSDL_FREJUS.Click, btnSDL_Hugo.Click, btnSDL_DouBox.Click, btnSDL_MotorWay.Click, btnSDL_MautFR.Click, btnAddLeistungVordefiniert.Click, btnSDL_MANAbgas.Click, - btnVeragParkplatz.Click, btnSDL_PLOSE.Click, btnSDL_PLOSE_IT.Click, btnSDL_PLOSE_CZ.Click, btnSDL_PLOSE_MEDPASS.Click + btnVeragParkplatz.Click, btnSDL_PLOSE.Click, btnSDL_PLOSE_IT.Click, btnSDL_PLOSE_CZ.Click, btnSDL_PLOSE_MEDPASS.Click, btnVeragParkplatzNEU.Click If KdSearchBox1.KdNr <= 0 Then MsgBox("Kunde auswählen!") : Exit Sub @@ -272,10 +273,11 @@ Public Class frmNewData - If sender.tag = "501" Then + If sender.tag = "501" Or sender.tag = "502" Then Dim kdnr_tmp = KdSearchBox1.KdNr Dim kfz_tmp = cbo.Text Dim history = PF.newEntryVERAG_Card(KdSearchBox1.KdNr, cbo.Text, sender.tag) + If history = -1 Then Exit Sub Me.SDLLeistung = sender.tag Me.kdnr = kdnr_tmp diff --git a/SDL/mdm/usrCntlDatenDetails.vb b/SDL/mdm/usrCntlDatenDetails.vb index 138f8952..d38b2047 100644 --- a/SDL/mdm/usrCntlDatenDetails.vb +++ b/SDL/mdm/usrCntlDatenDetails.vb @@ -254,7 +254,7 @@ Public Class usrCntlDatenDetails RaiseEvent DataChanged(kdNr, Kfz, SDLNr, History) End Sub - ElseIf SDLLeistung = 217 Then ' PLOSE cz + ElseIf SDLLeistung = 217 Then ' PLOSE MEDPASS pic.Image = Nothing Dim usrcntl As New usrCntlSDLLeistungenPLOSE_MEDPASS(kdnr, KfzKennzeichen, SDLLeistung, history) usrcntl.Dock = DockStyle.Fill @@ -289,6 +289,17 @@ Public Class usrCntlDatenDetails AddHandler usrcntl.CHANGED, Sub(kdNr, Kfz, SDLNr, History) RaiseEvent DataChanged(kdNr, Kfz, SDLNr, History) End Sub + ElseIf SDLLeistung = 502 Then ' Parkplatz + pic.Image = Nothing + Dim usrcntl As New usrCntlSDLLeistungVERAGCardNEU(kdnr, KfzKennzeichen, SDLLeistung, history) + usrcntl.Dock = DockStyle.Fill + pnlSDLLeistungenDetails.Controls.Add(usrcntl) + AddHandler usrcntl.LKWChanged, Sub(kdNr, newKfz, SDLNr, History) + RaiseEvent Changed(kdNr, newKfz, SDLNr, History) + End Sub + AddHandler usrcntl.CHANGED, Sub(kdNr, Kfz, SDLNr, History) + RaiseEvent DataChanged(kdNr, Kfz, SDLNr, History) + End Sub End If diff --git a/SDL/mdm/usrCntlKartenDaten.Designer.vb b/SDL/mdm/usrCntlKartenDaten.Designer.vb index 23bb6800..3d5d2889 100644 --- a/SDL/mdm/usrCntlKartenDaten.Designer.vb +++ b/SDL/mdm/usrCntlKartenDaten.Designer.vb @@ -48,6 +48,7 @@ Partial Class usrCntlKartenDaten Me.btnSDL_PLOSE = New System.Windows.Forms.Button() Me.btnSDL_PLOSE_IT = New System.Windows.Forms.Button() Me.btnSDL_PLOSE_CZ = New System.Windows.Forms.Button() + Me.btnSDL_PLOSE_MEDPASS = New System.Windows.Forms.Button() Me.btnFilter = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.KundenblattAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -81,7 +82,7 @@ Partial Class usrCntlKartenDaten Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() - Me.btnSDL_PLOSE_MEDPASS = New System.Windows.Forms.Button() + Me.btnVERAGCardNew = New System.Windows.Forms.Button() Me.FlowLayoutPanel.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() @@ -126,6 +127,7 @@ Partial Class usrCntlKartenDaten Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_Woelfl) Me.FlowLayoutPanel.Controls.Add(Me.btnMANAbgasplakette) Me.FlowLayoutPanel.Controls.Add(Me.btnVERAGParkplatz) + Me.FlowLayoutPanel.Controls.Add(Me.btnVERAGCardNew) Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_PLOSE) Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_PLOSE_IT) Me.FlowLayoutPanel.Controls.Add(Me.btnSDL_PLOSE_CZ) @@ -467,7 +469,7 @@ Partial Class usrCntlKartenDaten Me.btnVERAGParkplatz.Name = "btnVERAGParkplatz" Me.btnVERAGParkplatz.Size = New System.Drawing.Size(78, 64) Me.btnVERAGParkplatz.TabIndex = 40 - Me.btnVERAGParkplatz.Text = "Parkplatz" + Me.btnVERAGParkplatz.Text = "Parkp. ALT" Me.btnVERAGParkplatz.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.btnVERAGParkplatz.UseVisualStyleBackColor = True ' @@ -479,7 +481,7 @@ Partial Class usrCntlKartenDaten Me.btnSDL_PLOSE.ForeColor = System.Drawing.Color.Black Me.btnSDL_PLOSE.Image = Global.SDL.My.Resources.Resources.plose_1 Me.btnSDL_PLOSE.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnSDL_PLOSE.Location = New System.Drawing.Point(156, 64) + Me.btnSDL_PLOSE.Location = New System.Drawing.Point(234, 64) Me.btnSDL_PLOSE.Margin = New System.Windows.Forms.Padding(0) Me.btnSDL_PLOSE.Name = "btnSDL_PLOSE" Me.btnSDL_PLOSE.Size = New System.Drawing.Size(92, 64) @@ -496,7 +498,7 @@ Partial Class usrCntlKartenDaten Me.btnSDL_PLOSE_IT.ForeColor = System.Drawing.Color.Black Me.btnSDL_PLOSE_IT.Image = Global.SDL.My.Resources.Resources.plose_it Me.btnSDL_PLOSE_IT.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnSDL_PLOSE_IT.Location = New System.Drawing.Point(248, 64) + Me.btnSDL_PLOSE_IT.Location = New System.Drawing.Point(326, 64) Me.btnSDL_PLOSE_IT.Margin = New System.Windows.Forms.Padding(0) Me.btnSDL_PLOSE_IT.Name = "btnSDL_PLOSE_IT" Me.btnSDL_PLOSE_IT.Size = New System.Drawing.Size(78, 64) @@ -513,7 +515,7 @@ Partial Class usrCntlKartenDaten Me.btnSDL_PLOSE_CZ.ForeColor = System.Drawing.Color.Black Me.btnSDL_PLOSE_CZ.Image = Global.SDL.My.Resources.Resources.plose_cz Me.btnSDL_PLOSE_CZ.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnSDL_PLOSE_CZ.Location = New System.Drawing.Point(326, 64) + Me.btnSDL_PLOSE_CZ.Location = New System.Drawing.Point(404, 64) Me.btnSDL_PLOSE_CZ.Margin = New System.Windows.Forms.Padding(0) Me.btnSDL_PLOSE_CZ.Name = "btnSDL_PLOSE_CZ" Me.btnSDL_PLOSE_CZ.Size = New System.Drawing.Size(78, 64) @@ -522,6 +524,23 @@ Partial Class usrCntlKartenDaten Me.btnSDL_PLOSE_CZ.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.btnSDL_PLOSE_CZ.UseVisualStyleBackColor = True ' + 'btnSDL_PLOSE_MEDPASS + ' + Me.btnSDL_PLOSE_MEDPASS.Cursor = System.Windows.Forms.Cursors.Default + Me.btnSDL_PLOSE_MEDPASS.FlatAppearance.BorderSize = 0 + Me.btnSDL_PLOSE_MEDPASS.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSDL_PLOSE_MEDPASS.ForeColor = System.Drawing.Color.Black + Me.btnSDL_PLOSE_MEDPASS.Image = Global.SDL.My.Resources.Resources.plose_medpass + Me.btnSDL_PLOSE_MEDPASS.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnSDL_PLOSE_MEDPASS.Location = New System.Drawing.Point(482, 64) + Me.btnSDL_PLOSE_MEDPASS.Margin = New System.Windows.Forms.Padding(0) + Me.btnSDL_PLOSE_MEDPASS.Name = "btnSDL_PLOSE_MEDPASS" + Me.btnSDL_PLOSE_MEDPASS.Size = New System.Drawing.Size(78, 64) + Me.btnSDL_PLOSE_MEDPASS.TabIndex = 44 + Me.btnSDL_PLOSE_MEDPASS.Text = "MEDPASS" + Me.btnSDL_PLOSE_MEDPASS.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnSDL_PLOSE_MEDPASS.UseVisualStyleBackColor = True + ' 'btnFilter ' Me.btnFilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -926,22 +945,22 @@ Partial Class usrCntlKartenDaten Me.ToolStripMenuItem6.Size = New System.Drawing.Size(210, 22) Me.ToolStripMenuItem6.Text = "Formatiert (dauert länger)" ' - 'btnSDL_PLOSE_MEDPASS + 'btnVERAGCardNew ' - Me.btnSDL_PLOSE_MEDPASS.Cursor = System.Windows.Forms.Cursors.Default - Me.btnSDL_PLOSE_MEDPASS.FlatAppearance.BorderSize = 0 - Me.btnSDL_PLOSE_MEDPASS.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnSDL_PLOSE_MEDPASS.ForeColor = System.Drawing.Color.Black - Me.btnSDL_PLOSE_MEDPASS.Image = Global.SDL.My.Resources.Resources.plose_medpass - Me.btnSDL_PLOSE_MEDPASS.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnSDL_PLOSE_MEDPASS.Location = New System.Drawing.Point(404, 64) - Me.btnSDL_PLOSE_MEDPASS.Margin = New System.Windows.Forms.Padding(0) - Me.btnSDL_PLOSE_MEDPASS.Name = "btnSDL_PLOSE_MEDPASS" - Me.btnSDL_PLOSE_MEDPASS.Size = New System.Drawing.Size(78, 64) - Me.btnSDL_PLOSE_MEDPASS.TabIndex = 44 - Me.btnSDL_PLOSE_MEDPASS.Text = "MEDPASS" - Me.btnSDL_PLOSE_MEDPASS.TextAlign = System.Drawing.ContentAlignment.BottomCenter - Me.btnSDL_PLOSE_MEDPASS.UseVisualStyleBackColor = True + Me.btnVERAGCardNew.Cursor = System.Windows.Forms.Cursors.Default + Me.btnVERAGCardNew.FlatAppearance.BorderSize = 0 + Me.btnVERAGCardNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnVERAGCardNew.ForeColor = System.Drawing.Color.Black + Me.btnVERAGCardNew.Image = Global.SDL.My.Resources.Resources.verag_Card1 + Me.btnVERAGCardNew.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnVERAGCardNew.Location = New System.Drawing.Point(156, 64) + Me.btnVERAGCardNew.Margin = New System.Windows.Forms.Padding(0) + Me.btnVERAGCardNew.Name = "btnVERAGCardNew" + Me.btnVERAGCardNew.Size = New System.Drawing.Size(78, 64) + Me.btnVERAGCardNew.TabIndex = 45 + Me.btnVERAGCardNew.Text = "Parkplatz" + Me.btnVERAGCardNew.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnVERAGCardNew.UseVisualStyleBackColor = True ' 'usrCntlKartenDaten ' @@ -1027,4 +1046,5 @@ Partial Class usrCntlKartenDaten Friend WithEvents btnSDL_PLOSE_IT As Button Friend WithEvents btnSDL_PLOSE_CZ As Button Friend WithEvents btnSDL_PLOSE_MEDPASS As Button + Friend WithEvents btnVERAGCardNew As Button End Class diff --git a/SDL/mdm/usrCntlKartenDaten.vb b/SDL/mdm/usrCntlKartenDaten.vb index 1d6fcd03..f0f34bc5 100644 --- a/SDL/mdm/usrCntlKartenDaten.vb +++ b/SDL/mdm/usrCntlKartenDaten.vb @@ -97,6 +97,7 @@ Public Class usrCntlKartenDaten btnSDL_PLOSE_MEDPASS.Visible = dt.Select("SDLNr=217").Count > 0 btnMANAbgasplakette.Visible = dt.Select("SDLNr=500").Count > 0 btnVERAGParkplatz.Visible = dt.Select("SDLNr=501").Count > 0 + btnVERAGCardNew.Visible = dt.Select("SDLNr=502").Count > 0 btnSDL_MautPL.Visible = dt.Select("SDLNr=209").Count > 0 btnSDL_MautSI.Visible = dt.Select("SDLNr=210").Count > 0 @@ -127,6 +128,7 @@ Public Class usrCntlKartenDaten btnSDL_PLOSE_MEDPASS.Visible = dt.Select("SDLNr=217").Count > 0 btnMANAbgasplakette.Visible = dt.Select("SDLNr=500").Count > 0 btnVERAGParkplatz.Visible = dt.Select("SDLNr=501").Count > 0 + btnVERAGCardNew.Visible = dt.Select("SDLNr=502").Count > 0 btnSDL_MautPL.Visible = dt.Select("SDLNr=209").Count > 0 btnSDL_MautSI.Visible = dt.Select("SDLNr=210").Count > 0 @@ -447,6 +449,7 @@ Public Class usrCntlKartenDaten btnSDL_PLOSE_IT.BackColor = defaufl_color : btnSDL_PLOSE_IT.ForeColor = defaufl_forecolor : btnSDL_PLOSE_IT.FlatAppearance.BorderSize = 0 btnSDL_PLOSE_CZ.BackColor = defaufl_color : btnSDL_PLOSE_CZ.ForeColor = defaufl_forecolor : btnSDL_PLOSE_CZ.FlatAppearance.BorderSize = 0 btnVERAGParkplatz.BackColor = defaufl_color : btnVERAGParkplatz.ForeColor = defaufl_forecolor : btnVERAGParkplatz.FlatAppearance.BorderSize = 0 + btnVERAGCardNew.BackColor = defaufl_color : btnVERAGCardNew.ForeColor = defaufl_forecolor : btnVERAGCardNew.FlatAppearance.BorderSize = 0 b.FlatAppearance.BorderSize = 1 @@ -523,6 +526,7 @@ Public Class usrCntlKartenDaten Case 206 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, [MSE-Kd-Nr], [PAN-Nr], [SERIE-Nr], GültigBis,Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=206" Case 500 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte,SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=500" Case 501 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr,Fahrer,Kaution, Vermerk,Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=501" + Case 502 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr, KfzKennzeichen, History, Bestelldatum, Lieferdatum, KartenNr,Fahrer,Kaution, Vermerk,Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL WHERE SDLNr=502" Case Else SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " KundenNr, SDL.SDLNr,SDLBez, KfzKennzeichen, History, Vermerk, Gesperrt, Defekt, Verloren, Gestohlen, Ersatzkarte, SDL.Erfassungsdatum, SDL.Änderungsdatum, SDL.Sachbearbeiter FROM SDL INNER JOIN Speditionsdienstleistungen ON Speditionsdienstleistungen.SDLNr=SDL.SDLNr" SQL_STR &= " AND Speditionsdienstleistungen.SDLTypNr IN (1,2) " @@ -576,6 +580,7 @@ Public Class usrCntlKartenDaten Case 206 : Return btnSDL_DouBox Case 500 : Return btnMANAbgasplakette Case 501 : Return btnVERAGParkplatz + Case 502 : Return btnVERAGCardNew Case Else : Return btnSDL_Alle End Select End Function @@ -654,6 +659,9 @@ Public Class usrCntlKartenDaten Private Sub btnVERAGParkplatz_Click(sender As Object, e As EventArgs) Handles btnVERAGParkplatz.Click SET_SDL(501) End Sub + Private Sub btnVERAGCardNew_Click(sender As Object, e As EventArgs) Handles btnVERAGCardNew.Click + SET_SDL(502) + End Sub Private Sub dgvSDL_ColumnWidthChanged(sender As Object, e As DataGridViewColumnEventArgs) Handles dgvSDL.ColumnWidthChanged 'initSDLBinding() @@ -747,6 +755,7 @@ Public Class usrCntlKartenDaten If sdlNr = 101 Then btnBenachrichtigungKartenboxen.Enabled = True If sdlNr = 500 Then btnBenachrichtigungKartenboxen.Enabled = True If sdlNr = 501 Then btnBenachrichtigungKartenboxen.Enabled = True + If sdlNr = 502 Then btnBenachrichtigungKartenboxen.Enabled = True If sdlNr = 203 Then btnBenachrichtigungKartenboxen.Enabled = True 'CZ @@ -1025,7 +1034,7 @@ Public Class usrCntlKartenDaten Dim sdlTMP = r.Cells("SDLNr").Value Dim kfzKzTMP = r.Cells("KfzKennzeichen").Value Dim hisTMP = r.Cells("History").Value - If sdlTMP = 501 Then + If sdlTMP = 501 Or sdlTMP = 502 Then donotdel = True Else SQL.doSQL("DELETE TOP (1) FROM SDL WHERE KundenNr='" & kdTMP & "' AND KfzKennzeichen='" & kfzKzTMP & "' AND SDLNr='" & sdlTMP & "' AND History='" & hisTMP & "'", "SDL", True) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenBesonderheiten.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenBesonderheiten.vb index a65a6b3a..ae3924c2 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenBesonderheiten.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenBesonderheiten.vb @@ -1,6 +1,42 @@ Imports System.Data.SqlClient Imports System.Reflection +Public Class cKundenBesonderheiten_LIST + Sub New(KundenNr, Optional hervorheben = Nothing, Optional kdb_kategorie_in = Nothing) + LOAD(KundenNr, hervorheben, kdb_kategorie_in) + End Sub + Public LIST As New List(Of cKundenBesonderheiten) + Public Sub LOAD(KundenNr, Optional hervorheben = Nothing, Optional kdb_kategorie_in = Nothing) + LIST.Clear() + Try + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM tblKundenBesonderheiten WHERE kdb_KundenNr=@kdb_KundenNr " & If(hervorheben IsNot Nothing, " AND [kdb_hervorheben]=@kdb_hervorheben ", "") & If(kdb_kategorie_in IsNot Nothing, " AND [kdb_kategorie] IN (" & kdb_kategorie_in & ") ", ""), conn) + cmd.Parameters.AddWithValue("@kdb_KundenNr", KundenNr) + If hervorheben IsNot Nothing Then cmd.Parameters.AddWithValue("@kdb_hervorheben", CBool(hervorheben)) + Dim dr = cmd.ExecuteReader() + While dr.Read + Dim BH As New cKundenBesonderheiten + For Each li In BH.getParameterList() + Dim propInfo As PropertyInfo = BH.GetType.GetProperty(li.Scalarvariable) + + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(BH, Nothing) + Else + propInfo.SetValue(BH, dr.Item(li.Text)) + End If + + Next + LIST.Add(BH) + End While + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + End Sub + +End Class Public Class cKundenBesonderheiten Property kdb_id As Integer Property kdb_KundenNr As Integer diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.Designer.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.Designer.vb index 9fb9c688..bd1f8f51 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.Designer.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/frmVorlagenUpload.Designer.vb @@ -41,12 +41,15 @@ Partial Class frmVorlagenUpload Me.txtOrdner._DateTimeOnly = False Me.txtOrdner._numbersOnly = False Me.txtOrdner._numbersOnlyKommastellen = "" + Me.txtOrdner._numbersOnlyTrennzeichen = True Me.txtOrdner._Prozent = False Me.txtOrdner._ShortDateNew = False Me.txtOrdner._ShortDateOnly = False Me.txtOrdner._TimeOnly = False + Me.txtOrdner._TimeOnly_Seconds = False Me.txtOrdner._value = "VORLAGEN" Me.txtOrdner._Waehrung = False + Me.txtOrdner._WaehrungZeichen = True Me.txtOrdner.Enabled = False Me.txtOrdner.ForeColor = System.Drawing.Color.Black Me.txtOrdner.Location = New System.Drawing.Point(89, 38) @@ -55,7 +58,7 @@ Partial Class frmVorlagenUpload Me.txtOrdner.MaxLines_Warning_Label = Nothing Me.txtOrdner.Name = "txtOrdner" Me.txtOrdner.Size = New System.Drawing.Size(357, 20) - Me.txtOrdner.TabIndex = 3 + Me.txtOrdner.TabIndex = 2 Me.txtOrdner.Text = "VORLAGEN" ' 'lbl @@ -82,12 +85,15 @@ Partial Class frmVorlagenUpload Me.tzxtKategorie._DateTimeOnly = False Me.tzxtKategorie._numbersOnly = False Me.tzxtKategorie._numbersOnlyKommastellen = "" + Me.tzxtKategorie._numbersOnlyTrennzeichen = True Me.tzxtKategorie._Prozent = False Me.tzxtKategorie._ShortDateNew = False Me.tzxtKategorie._ShortDateOnly = False Me.tzxtKategorie._TimeOnly = False + Me.tzxtKategorie._TimeOnly_Seconds = False Me.tzxtKategorie._value = "DOKUMENTE" Me.tzxtKategorie._Waehrung = False + Me.tzxtKategorie._WaehrungZeichen = True Me.tzxtKategorie.Enabled = False Me.tzxtKategorie.ForeColor = System.Drawing.Color.Black Me.tzxtKategorie.Location = New System.Drawing.Point(89, 12) @@ -122,12 +128,15 @@ Partial Class frmVorlagenUpload Me.txtName._DateTimeOnly = False Me.txtName._numbersOnly = False Me.txtName._numbersOnlyKommastellen = "" + Me.txtName._numbersOnlyTrennzeichen = True Me.txtName._Prozent = False Me.txtName._ShortDateNew = False Me.txtName._ShortDateOnly = False Me.txtName._TimeOnly = False + Me.txtName._TimeOnly_Seconds = False Me.txtName._value = Nothing Me.txtName._Waehrung = False + Me.txtName._WaehrungZeichen = True Me.txtName.ForeColor = System.Drawing.Color.Black Me.txtName.Location = New System.Drawing.Point(89, 132) Me.txtName.MaxLineLength = -1 @@ -135,7 +144,7 @@ Partial Class frmVorlagenUpload Me.txtName.MaxLines_Warning_Label = Nothing Me.txtName.Name = "txtName" Me.txtName.Size = New System.Drawing.Size(357, 20) - Me.txtName.TabIndex = 7 + Me.txtName.TabIndex = 5 ' 'btnUpload ' @@ -143,7 +152,7 @@ Partial Class frmVorlagenUpload Me.btnUpload.Location = New System.Drawing.Point(221, 158) Me.btnUpload.Name = "btnUpload" Me.btnUpload.Size = New System.Drawing.Size(225, 44) - Me.btnUpload.TabIndex = 8 + Me.btnUpload.TabIndex = 6 Me.btnUpload.Text = "Datei Auswählen + Upload" Me.btnUpload.UseVisualStyleBackColor = True ' @@ -156,7 +165,7 @@ Partial Class frmVorlagenUpload Me.txtUnterordner1.Location = New System.Drawing.Point(89, 63) Me.txtUnterordner1.Name = "txtUnterordner1" Me.txtUnterordner1.Size = New System.Drawing.Size(357, 21) - Me.txtUnterordner1.TabIndex = 5 + Me.txtUnterordner1.TabIndex = 3 ' 'txtUnterordner2 ' @@ -167,7 +176,7 @@ Partial Class frmVorlagenUpload Me.txtUnterordner2.Location = New System.Drawing.Point(89, 90) Me.txtUnterordner2.Name = "txtUnterordner2" Me.txtUnterordner2.Size = New System.Drawing.Size(357, 21) - Me.txtUnterordner2.TabIndex = 10 + Me.txtUnterordner2.TabIndex = 4 ' 'Label4 ' diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb index 2f8990cd..983f7491 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb @@ -92,7 +92,9 @@ Public Class cFinanzOnlineWebService Function Call_Web_Service_MethodUID_Abfrage_NEU2020(ba_KundenNr, Optional AskIfDouble = False, Optional SaveErgInAdressen = True, Optional showErr = True, Optional Stufe = 1, Optional ByRef errorCode = 0) As VERAG_PROG_ALLGEMEIN.cUIDPruefung Dim AD As New cAdressen(ba_KundenNr) If AD IsNot Nothing Then + If AD.UstIdKz IsNot Nothing AndAlso AD.UstIdNr IsNot Nothing Then + Try If AskIfDouble Then If IsDate(AD.UstIdGeprüft) AndAlso CDate(AD.UstIdGeprüft).ToShortDateString = Now.ToShortDateString Then @@ -126,6 +128,7 @@ Public Class cFinanzOnlineWebService Dim returnInt As Integer = CallWebService.uidAbfrage(tid, benid, SESSION_ID, uid, countryCode & vatNumber, StufeAbf, msg, name, adrz1, adrz2, adrz3, adrz4, adrz5, adrz6) errorCode = returnInt + If returnInt = 0 Or returnInt = 1 Then Dim UID_TMP As New VERAG_PROG_ALLGEMEIN.cUIDPruefung @@ -164,6 +167,8 @@ Public Class cFinanzOnlineWebService End If Return UID_TMP + Else + If showErr Then MsgBox(GetCodeText(returnInt)) End If Catch ex As Exception If showErr Then MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) @@ -195,6 +200,83 @@ Public Class cFinanzOnlineWebService ' Call_Web_Service_MethodUID_Logout_NEU2020() + Return Nothing + End Function + + Function Call_Web_Service_MethodUID_Abfrage_WO_KDNR(UID_Nr, Optional showErr = True, Optional Stufe = 1, Optional ByRef errorCode = 0) As VERAG_PROG_ALLGEMEIN.cUIDPruefung + + Try + If UID_Nr.Length > 6 Then + + + Dim tmp_SESSION_ID = SESSION_ID + Dim CallWebService As New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageService + + Dim msg As String = "" + Dim name As String = "" + Dim adrz1 As String = "" + Dim adrz2 As String = "" + Dim adrz3 As String = "" + Dim adrz4 As String = "" + Dim adrz5 As String = "" + Dim adrz6 As String = "" + Dim countryCode As String = UID_Nr.Substring(0, 2) + Dim vatNumber As String = UID_Nr.Substring(2, uid.Length) + + Dim StufeAbf = VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageServiceRequestStufe.Item1 + Select Case Stufe + Case 1 + StufeAbf = VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageServiceRequestStufe.Item1 + Case 2 + StufeAbf = VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageServiceRequestStufe.Item2 + End Select + + Dim returnInt As Integer = CallWebService.uidAbfrage(tid, benid, SESSION_ID, uid, countryCode & vatNumber, StufeAbf, msg, name, adrz1, adrz2, adrz3, adrz4, adrz5, adrz6) + errorCode = returnInt + If returnInt = 0 Or returnInt = 1 Then + + Dim UID_TMP As New VERAG_PROG_ALLGEMEIN.cUIDPruefung + + UID_TMP.uid_Datum = Now + UID_TMP.uid_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + If If(UID_TMP.uid_Sachbearbeiter, "") = "" Then UID_TMP.uid_Sachbearbeiter = "AUTO" + UID_TMP.uid_MaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID + UID_TMP.uid_valid = (returnInt = 0) + UID_TMP.uid_KundenNr = -1 + + + UID_TMP.uid_UstIdKz = countryCode + UID_TMP.uid_UstIdNr = vatNumber + + UID_TMP.Firma = If(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, "VERAG") + UID_TMP.uid_abfrageUid = uid + UID_TMP.uid_sessionId = tmp_SESSION_ID + + UID_TMP.uid_firma = name + UID_TMP.uid_adr1 = adrz1 + UID_TMP.uid_adr2 = adrz2 + UID_TMP.uid_adr3 = adrz3 + UID_TMP.uid_adr4 = adrz4 + UID_TMP.uid_adr5 = adrz5 + UID_TMP.uid_adr6 = adrz6 + + UID_TMP.uid_stufe = Stufe + + UID_TMP.SAVE() + If (returnInt = 0) Then 'OK + End If + Return UID_TMP + End If + End If + Catch ex As Exception + If showErr Then MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + ' Call_Web_Service_MethodUID_Logout_NEU2020() + + + End Try + + + Return Nothing End Function @@ -258,6 +340,8 @@ Public Class cFinanzOnlineWebService Finanzamt." Case 105 : Return "Die UID-Nummer ist über FinanzOnline einzeln abzufragen." Case 1511 : Return "Der angegebene Mitgliedstaat ist derzeit nicht erreichbar" + Case 1512 : Return "Die UID-Abfrage ist auf Grund der hohen Anzahl an Abfragen derzeit nicht möglich." + Case 1513 : Return "Die UID-Abfrage für die angegebene UID-Nummer des Erwerbers wurde an diesem Tag bereits zweimal durchgeführt. Eine häufigere Abfrage mittels Webservice ist nicht möglich." Case Else : Return "Unbekannter Fehler: " & rc End Select End Function