diff --git a/SDL/Classes/cFiskaltrustClient.vb b/SDL/Classes/cFiskaltrustClient.vb index b0bcb3c6..6eabb565 100644 --- a/SDL/Classes/cFiskaltrustClient.vb +++ b/SDL/Classes/cFiskaltrustClient.vb @@ -2,6 +2,7 @@ Imports System.Net.Http Imports System.Reflection Imports System.Text +Imports System.Threading Imports Newtonsoft.Json Public Class cFiskaltrustClient @@ -251,7 +252,7 @@ Public Class cFiskaltrustClient End Function - Public Async Function CancelReceiptAsync_test(reference As String, amount As Decimal, kindOfPayment As String) As Task(Of String) + Public Async Function CancelReceiptAsync_test(reference As String, amount As Decimal, kindOfPayment As String, posSystemId As String) As Task(Of String) Dim LIST = New List(Of EABelegPositionen) @@ -273,8 +274,8 @@ Public Class cFiskaltrustClient Dim payload = New With { .ftCashBoxID = _cashboxId, - .ftPosSystemId = "POS-1", - .cbTerminalID = "T1", + .ftPosSystemId = getVersion(posSystemId), + .cbTerminalID = posSystemId, .cbReceiptReference = reference, .cbReceiptMoment = DateTime.UtcNow.ToString("o"), .ftReceiptCase = 4919338172267102210, @@ -335,7 +336,9 @@ Public Class cFiskaltrustClient request.Content = requestContent End If - Dim response = Await _httpClient.SendAsync(request) + + Dim cts As New CancellationTokenSource(TimeSpan.FromSeconds(30)) + Dim response = Await _httpClient.SendAsync(request, cts.Token) Dim result = Await response.Content.ReadAsStringAsync() Log($"[{DateTime.Now}] Response ({CInt(response.StatusCode)}): {result}") @@ -409,8 +412,8 @@ Public Class cFiskaltrustClient ' Payload Objekt erstellen Dim payload = New With { .ftCashBoxID = _cashboxId, - .ftPosSystemId = posSystemId, - .cbTerminalID = "T1", + .ftPosSystemId = getVersion(posSystemId), + .cbTerminalID = posSystemId, .cbReceiptReference = Guid.NewGuid().ToString(), .cbReceiptMoment = DateTime.UtcNow.ToString("o"), .cbChargeItems = chargeItems, @@ -447,8 +450,8 @@ Public Class cFiskaltrustClient Dim payload = New With { .ftCashBoxID = _cashboxId, - .ftPosSystemId = posSystemId, - .cbTerminalID = "T1", + .ftPosSystemId = getVersion(posSystemId), + .cbTerminalID = posSystemId, .cbReceiptReference = cbReceiptReference_, .cbReceiptMoment = DateTime.UtcNow.ToString("o"), .cbChargeItems = New Object() {}, @@ -476,8 +479,8 @@ Public Class cFiskaltrustClient Dim payload = New With { .ftCashBoxID = _cashboxId, - .ftPosSystemId = posSystemId, - .cbTerminalID = "T1", + .ftPosSystemId = getVersion(posSystemId), + .cbTerminalID = posSystemId, .cbReceiptReference = type & "-closing-" & DateTime.UtcNow.ToString("o"), .cbReceiptMoment = DateTime.UtcNow.ToString("o"), .cbChargeItems = New Object() {}, @@ -545,6 +548,9 @@ Public Class cFiskaltrustClient Return False End If + + Dim saved As Boolean = False + Dim ftSig As New cFiskaltrustSignatures() Dim ftReceiptMoment As New Chilkat.CkDateTime @@ -568,7 +574,7 @@ Public Class cFiskaltrustClient .ftReceiptIdentification = json.StringOf("ftReceiptIdentification") .ftReceiptMoment = ftReceiptMoment.GetAsTimestamp(getAsLocal) .ftState = json.StringOf("ftState") - ftID = .SAVE() + saved = .SAVE() End With @@ -596,8 +602,8 @@ Public Class cFiskaltrustClient .ftData = SignObj.StringOf("Data") .ftSignatureFormat = SignObj.StringOf("ftSignatureFormat") .ftSignatureType = SignObj.StringOf("ftSignatureType") - .SAVE() - If IsNumeric(.ftSignatureType) AndAlso CInt(.ftSignatureType) = 3 Then + saved = .SAVE() + If IsNumeric(.ftSignatureType) AndAlso CInt(.ftSignatureType) = 3 Then QR_CodeString = .ftData End If @@ -606,6 +612,7 @@ Public Class cFiskaltrustClient Next + Return saved @@ -681,6 +688,13 @@ Public Class cFiskaltrustClient + End Function + + Public Function getVersion(Terminal_ID) As String + + Return Terminal_ID & "_" & Application.ProductVersion + + End Function @@ -936,4 +950,6 @@ Public Class cFiskaltrustSignaturPositions Return "" End Function + + End Class \ No newline at end of file diff --git a/SDL/Classes/cRKSV.vb b/SDL/Classes/cRKSV.vb index f4ced71a..3dd2e9d6 100644 --- a/SDL/Classes/cRKSV.vb +++ b/SDL/Classes/cRKSV.vb @@ -130,13 +130,14 @@ Public Class cRKSV Dim result = Await client.SignReceiptAsync(summeBRUTTO, steuersatz, POS, "Cash", kasse.rksv_id) - client.saveRKSV_FT(result, QR_CodeString) + Return client.saveRKSV_FT(result, QR_CodeString) Catch ex As Exception MsgBox("Es ist ein Fehler bei der Signatur aufgetreten (insertRKSV): " & vbNewLine & ex.Message & ex.StackTrace) + Return False End Try - Return False + End Function diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 96e3fc82..d8db3648 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -1873,6 +1873,7 @@ Public Class cFakturierung If PrinterName <> "" Then rpt.Document.Printer.PrinterName = PrinterName End If + rpt.Document.Printer.PaperSize = rpt.Document.Printer.PrinterSettings.DefaultPageSettings.PaperSize 'Immer Exportieren, da in Therefore speichern diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb index fcc48cfd..0c3c7a8e 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 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 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 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() @@ -82,6 +82,7 @@ Partial Class usrCntlFaktAbrechnung Me.lblRechnungsDatum = New System.Windows.Forms.Label() Me.lblRechnungsNummer = New System.Windows.Forms.Label() Me.Panel1 = New System.Windows.Forms.Panel() + Me.cbxAUTOMailversand = New System.Windows.Forms.CheckBox() Me.Button17 = New System.Windows.Forms.Button() Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.AbsenderToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() @@ -245,7 +246,6 @@ Partial Class usrCntlFaktAbrechnung Me.lblEUR_4 = New System.Windows.Forms.Label() Me.Label55 = New System.Windows.Forms.Label() Me.cboSteuerschlüssel = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.rtbAbf_Besonderheiten = New SDL.usrCntlKundenBesonderheiten() Me.cbxOriginalPrint = New System.Windows.Forms.CheckBox() Me.Label46 = New System.Windows.Forms.Label() Me.Button9 = New System.Windows.Forms.Button() @@ -288,7 +288,8 @@ Partial Class usrCntlFaktAbrechnung Me.GutschriftAnVeragToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VeragAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VeragCSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.cbxAUTOMailversand = New System.Windows.Forms.CheckBox() + Me.Button18 = New System.Windows.Forms.Button() + Me.rtbAbf_Besonderheiten = New SDL.usrCntlKundenBesonderheiten() Me.pnlTop.SuspendLayout() Me.Panel3.SuspendLayout() Me.Panel1.SuspendLayout() @@ -861,6 +862,17 @@ Partial Class usrCntlFaktAbrechnung Me.Panel1.Size = New System.Drawing.Size(830, 1142) Me.Panel1.TabIndex = 1 ' + 'cbxAUTOMailversand + ' + Me.cbxAUTOMailversand.AutoSize = True + Me.cbxAUTOMailversand.Location = New System.Drawing.Point(697, 142) + Me.cbxAUTOMailversand.Name = "cbxAUTOMailversand" + Me.cbxAUTOMailversand.Size = New System.Drawing.Size(116, 17) + Me.cbxAUTOMailversand.TabIndex = 241 + Me.cbxAUTOMailversand.Text = "AUTO Mailversand" + Me.cbxAUTOMailversand.UseVisualStyleBackColor = True + Me.cbxAUTOMailversand.Visible = False + ' 'Button17 ' Me.Button17.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None @@ -926,36 +938,36 @@ Partial Class usrCntlFaktAbrechnung Me.dgvAnhaenge.AllowUserToResizeColumns = False Me.dgvAnhaenge.AllowUserToResizeRows = False Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White - 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 + 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 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}) - 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 + 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 Me.dgvAnhaenge.Location = New System.Drawing.Point(493, 911) Me.dgvAnhaenge.MultiSelect = False Me.dgvAnhaenge.Name = "dgvAnhaenge" Me.dgvAnhaenge.ReadOnly = True - 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 + 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 Me.dgvAnhaenge.RowHeadersVisible = False Me.dgvAnhaenge.RowHeadersWidth = 62 Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -977,10 +989,10 @@ Partial Class usrCntlFaktAbrechnung ' 'DataGridViewTextBoxColumn2 ' - DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle23.Format = "N0" - DataGridViewCellStyle23.NullValue = Nothing - Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle23 + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle2.Format = "N0" + DataGridViewCellStyle2.NullValue = Nothing + Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle2 Me.DataGridViewTextBoxColumn2.HeaderText = "Art" Me.DataGridViewTextBoxColumn2.MinimumWidth = 8 Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" @@ -990,9 +1002,9 @@ Partial Class usrCntlFaktAbrechnung 'clmnBezeichnung ' Me.clmnBezeichnung.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle24.Format = "c2" - Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle24 + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.Format = "c2" + Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle3 Me.clmnBezeichnung.FillWeight = 121.2598! Me.clmnBezeichnung.HeaderText = "Bezeichnung" Me.clmnBezeichnung.MinimumWidth = 8 @@ -2024,6 +2036,7 @@ Partial Class usrCntlFaktAbrechnung ' Me.pnlRechnungAn.BackColor = System.Drawing.Color.PapayaWhip Me.pnlRechnungAn.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlRechnungAn.Controls.Add(Me.Button18) Me.pnlRechnungAn.Controls.Add(Me.cboRgArt) Me.pnlRechnungAn.Controls.Add(Me.Label57) Me.pnlRechnungAn.Controls.Add(Me.cboVorauskasse) @@ -2131,9 +2144,9 @@ Partial Class usrCntlFaktAbrechnung ' Me.Button15.Enabled = False Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button15.Location = New System.Drawing.Point(518, 85) + Me.Button15.Location = New System.Drawing.Point(494, 85) Me.Button15.Name = "Button15" - Me.Button15.Size = New System.Drawing.Size(57, 23) + Me.Button15.Size = New System.Drawing.Size(45, 23) Me.Button15.TabIndex = 241 Me.Button15.Text = "Post" Me.Button15.UseVisualStyleBackColor = True @@ -2227,9 +2240,9 @@ Partial Class usrCntlFaktAbrechnung ' Me.Button6.Enabled = False Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button6.Location = New System.Drawing.Point(434, 85) + Me.Button6.Location = New System.Drawing.Point(421, 85) Me.Button6.Name = "Button6" - Me.Button6.Size = New System.Drawing.Size(85, 23) + Me.Button6.Size = New System.Drawing.Size(72, 23) Me.Button6.TabIndex = 15 Me.Button6.Text = "UID prüfen" Me.Button6.UseVisualStyleBackColor = True @@ -2997,35 +3010,35 @@ Partial Class usrCntlFaktAbrechnung Me.dgvRechnungenPositionen.AllowUserToResizeColumns = False Me.dgvRechnungenPositionen.AllowUserToResizeRows = False Me.dgvRechnungenPositionen.BackgroundColor = System.Drawing.Color.White - 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 + 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 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}) - 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 + 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 Me.dgvRechnungenPositionen.Location = New System.Drawing.Point(10, 258) Me.dgvRechnungenPositionen.Name = "dgvRechnungenPositionen" Me.dgvRechnungenPositionen.ReadOnly = True - 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 + 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 Me.dgvRechnungenPositionen.RowHeadersVisible = False Me.dgvRechnungenPositionen.RowHeadersWidth = 62 Me.dgvRechnungenPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -3043,10 +3056,10 @@ Partial Class usrCntlFaktAbrechnung ' 'Anzahl ' - DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle28.Format = "N0" - DataGridViewCellStyle28.NullValue = Nothing - Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle28 + DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle7.Format = "N0" + DataGridViewCellStyle7.NullValue = Nothing + Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle7 Me.Anzahl.HeaderText = "Anzahl" Me.Anzahl.MinimumWidth = 8 Me.Anzahl.Name = "Anzahl" @@ -3055,9 +3068,9 @@ Partial Class usrCntlFaktAbrechnung ' 'Preis ' - DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle29.Format = "c2" - Me.Preis.DefaultCellStyle = DataGridViewCellStyle29 + DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle8.Format = "c2" + Me.Preis.DefaultCellStyle = DataGridViewCellStyle8 Me.Preis.HeaderText = "Preis" Me.Preis.MinimumWidth = 8 Me.Preis.Name = "Preis" @@ -3066,9 +3079,9 @@ Partial Class usrCntlFaktAbrechnung ' 'SteuerpflichtigerBetrag ' - DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle30.Format = "c2" - Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle30 + DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle9.Format = "c2" + Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle9 Me.SteuerpflichtigerBetrag.HeaderText = "Steuerpfl." Me.SteuerpflichtigerBetrag.MinimumWidth = 8 Me.SteuerpflichtigerBetrag.Name = "SteuerpflichtigerBetrag" @@ -3077,10 +3090,10 @@ Partial Class usrCntlFaktAbrechnung ' 'SteuerfreierBetrag ' - DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight - DataGridViewCellStyle31.Format = "C2" - DataGridViewCellStyle31.NullValue = Nothing - Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle31 + DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight + DataGridViewCellStyle10.Format = "C2" + DataGridViewCellStyle10.NullValue = Nothing + Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle10 Me.SteuerfreierBetrag.HeaderText = "Steuerfrei" Me.SteuerfreierBetrag.MinimumWidth = 8 Me.SteuerfreierBetrag.Name = "SteuerfreierBetrag" @@ -3103,41 +3116,41 @@ Partial Class usrCntlFaktAbrechnung Me.dgvOffertenSperrliste.AllowUserToResizeRows = False Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - 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 + 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 Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - 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 + 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 Me.dgvOffertenSperrliste.Location = New System.Drawing.Point(11, 29) Me.dgvOffertenSperrliste.MultiSelect = False Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste" Me.dgvOffertenSperrliste.ReadOnly = True - 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 + 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 Me.dgvOffertenSperrliste.RowHeadersVisible = False Me.dgvOffertenSperrliste.RowHeadersWidth = 62 - 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 + 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 Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(204, 201) Me.dgvOffertenSperrliste.TabIndex = 2 @@ -3150,44 +3163,44 @@ Partial Class usrCntlFaktAbrechnung Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False - 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 + 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 Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D - 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 + 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 Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - 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 + 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 Me.dgvOfferteDetailsUebersicht.Location = New System.Drawing.Point(220, 29) Me.dgvOfferteDetailsUebersicht.MultiSelect = False Me.dgvOfferteDetailsUebersicht.Name = "dgvOfferteDetailsUebersicht" - 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 + 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 Me.dgvOfferteDetailsUebersicht.RowHeadersVisible = False Me.dgvOfferteDetailsUebersicht.RowHeadersWidth = 62 - 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 + 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 Me.dgvOfferteDetailsUebersicht.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvOfferteDetailsUebersicht.Size = New System.Drawing.Size(601, 201) Me.dgvOfferteDetailsUebersicht.TabIndex = 3 @@ -3574,17 +3587,6 @@ Partial Class usrCntlFaktAbrechnung Me.cboSteuerschlüssel.Size = New System.Drawing.Size(145, 21) Me.cboSteuerschlüssel.TabIndex = 3 ' - 'rtbAbf_Besonderheiten - ' - Me.rtbAbf_Besonderheiten.BackColor = System.Drawing.Color.White - Me.rtbAbf_Besonderheiten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.rtbAbf_Besonderheiten.Location = New System.Drawing.Point(10, 19) - Me.rtbAbf_Besonderheiten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.rtbAbf_Besonderheiten.Name = "rtbAbf_Besonderheiten" - Me.rtbAbf_Besonderheiten.Size = New System.Drawing.Size(107, 133) - Me.rtbAbf_Besonderheiten.TabIndex = 235 - Me.rtbAbf_Besonderheiten.Visible = False - ' 'cbxOriginalPrint ' Me.cbxOriginalPrint.AutoSize = True @@ -4059,16 +4061,26 @@ Partial Class usrCntlFaktAbrechnung Me.VeragCSToolStripMenuItem.Size = New System.Drawing.Size(122, 22) Me.VeragCSToolStripMenuItem.Text = "Verag CS" ' - 'cbxAUTOMailversand + 'Button18 ' - Me.cbxAUTOMailversand.AutoSize = True - Me.cbxAUTOMailversand.Location = New System.Drawing.Point(697, 142) - Me.cbxAUTOMailversand.Name = "cbxAUTOMailversand" - Me.cbxAUTOMailversand.Size = New System.Drawing.Size(116, 17) - Me.cbxAUTOMailversand.TabIndex = 241 - Me.cbxAUTOMailversand.Text = "AUTO Mailversand" - Me.cbxAUTOMailversand.UseVisualStyleBackColor = True - Me.cbxAUTOMailversand.Visible = False + Me.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button18.Location = New System.Drawing.Point(540, 85) + Me.Button18.Name = "Button18" + Me.Button18.Size = New System.Drawing.Size(32, 23) + Me.Button18.TabIndex = 247 + Me.Button18.Text = "AT" + Me.Button18.UseVisualStyleBackColor = True + ' + 'rtbAbf_Besonderheiten + ' + Me.rtbAbf_Besonderheiten.BackColor = System.Drawing.Color.White + Me.rtbAbf_Besonderheiten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.rtbAbf_Besonderheiten.Location = New System.Drawing.Point(10, 19) + Me.rtbAbf_Besonderheiten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.rtbAbf_Besonderheiten.Name = "rtbAbf_Besonderheiten" + Me.rtbAbf_Besonderheiten.Size = New System.Drawing.Size(107, 133) + Me.rtbAbf_Besonderheiten.TabIndex = 235 + Me.rtbAbf_Besonderheiten.Visible = False ' 'usrCntlFaktAbrechnung ' @@ -4365,4 +4377,5 @@ Partial Class usrCntlFaktAbrechnung Friend WithEvents cboRgArt As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label57 As Label Friend WithEvents cbxAUTOMailversand As CheckBox + Friend WithEvents Button18 As Button End Class diff --git a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb index 805345f5..f9acb49a 100644 --- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb +++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb @@ -24,6 +24,7 @@ Public Class usrCntlFaktAbrechnung Dim nachstehende_RK_ID = 0 Dim veragKunde As Integer = -1 Public isVZ As Boolean = False + Dim FormularArt = "" ' Public VALUE_CHANGED = True ' Eigenschaft, ob das Formular gespeichert ist oder verändert wurde @@ -1624,7 +1625,7 @@ Public Class usrCntlFaktAbrechnung Catch ex As Exception : End Try 'End If - RECHNUNG.POSITIONEN.Add(POS) 'ALLE HINENLADEN! --> Sonst Proglem mit SVS/VP/KA + RECHNUNG.POSITIONEN.Add(POS) 'ALLE HINENLADEN! --> Sonst Problem mit SVS/VP/KA Next Catch ex As Exception @@ -4660,6 +4661,14 @@ Nächste_Textzeile_lesen: End Sub Private Sub Button15_Click(sender As Object, e As EventArgs) Handles Button15.Click + + FormularArt = SDL.FormularManagerArten.Verzollungsunterlagen + ContextMenuStrip1.Show(Cursor.Position) + End Sub + + Private Sub Button18_Click(sender As Object, e As EventArgs) Handles Button18.Click + + FormularArt = SDL.FormularManagerArten.VerzollungsunterlagenBAR ContextMenuStrip1.Show(Cursor.Position) End Sub @@ -4692,15 +4701,31 @@ Nächste_Textzeile_lesen: FirmaFrm = (RECHNUNG.Avisierer) kdnrFrm = RECHNUNG.AvisiererKundenNr End Select + If SPEDBUCH IsNot Nothing Then Dim SENDUNG As New VERAG_PROG_ALLGEMEIN.cSendungen(SPEDBUCH.SendungID) Dim AVISODAL As New VERAG_PROG_ALLGEMEIN.cAvisoDAL Dim AVISO = AVISODAL.LesenAviso(SPEDBUCH.AvisoID, "") - SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Verzollungsunterlagen, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG, AVISO, ROLLE, -1, True}) + + Select Case FormularArt + + Case SDL.FormularManagerArten.Verzollungsunterlagen + + SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.Verzollungsunterlagen, kdnrFrm, {kdnrFrm, FirmaFrm, SENDUNG, AVISO, ROLLE, -1, True}) + + Case SDL.FormularManagerArten.VerzollungsunterlagenBAR + SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.VerzollungsunterlagenBAR, kdnrFrm, {kdnrFrm, SPEDBUCH, AVISO, sender.text.ToString.Substring(0, 1)}) + + End Select Else MsgBox("Speditionsbuch Eintrag nicht gefunden.") End If + + + + + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try @@ -5655,5 +5680,4 @@ mwst: End Function - End Class \ No newline at end of file diff --git a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen_BAR.vb b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen_BAR.vb index a336336c..d53b998a 100644 --- a/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen_BAR.vb +++ b/SDL/Formulare/KDFormulare/FormulareBaukasten/usrcntlVerzollungsunterlagen_BAR.vb @@ -7,6 +7,11 @@ Public Event MOVE_UP(c As Control) Public Event MOVE_DOWN(c As Control) + + Public AVISO As VERAG_PROG_ALLGEMEIN.cAviso = Nothing + Public RechnungAn As String + + Public KdNR As Integer = -1 Public Sub ChangeKDNr(kdnr As Integer) _ Implements FormualrInterface.ChangeKDNr @@ -35,6 +40,25 @@ End Sub + Sub New() + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + End Sub + + Sub New(param() As Object) + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + If param.Length > 0 AndAlso param(0) IsNot Nothing Then KdNR = param(0) + If param.Length > 1 AndAlso param(1) IsNot Nothing Then SPEDBUCH = param(1) + If param.Length > 2 AndAlso param(2) IsNot Nothing Then AVISO = param(2) + If param.Length > 3 AndAlso param(3) IsNot Nothing Then RechnungAn = param(3) + + End Sub + @@ -104,6 +128,28 @@ End If End If + If AVISO IsNot Nothing Then + txtLKWContainer.Text = If(AVISO.LKW_Nr, "") + End If + + If SPEDBUCH IsNot Nothing Then + cboFiliale.changeItem(SPEDBUCH.FilialenNr) + txtAbfertigungsnummer.Text = SPEDBUCH.AbfertigungsNr + cboSpedBuchUnterNr.changeItem(SPEDBUCH.UnterNr) + End If + + + If RechnungAn <> "" Then + cboRechnungAn.changeItem(RechnungAn) + End If + + + If cboFiliale._value <> "" AndAlso txtAbfertigungsnummer.Text <> "" AndAlso cboSpedBuchUnterNr._value <> "" Then + Button1.PerformClick() + End If + + + loaded = True End Sub diff --git a/SDL/Formulare/KDFormulare/frmFormulare.vb b/SDL/Formulare/KDFormulare/frmFormulare.vb index 922cc118..bd4764a4 100644 --- a/SDL/Formulare/KDFormulare/frmFormulare.vb +++ b/SDL/Formulare/KDFormulare/frmFormulare.vb @@ -823,8 +823,14 @@ Public Class frmFormulare AddHandler c.MOVE_DOWN, AddressOf ControlMoveDown MyFlowLayoutPanel1.Controls.Add(c) Case FormularManagerArten.VerzollungsunterlagenBAR - ' If param Is Nothing Then Exit Sub + Dim c As New usrcntlVerzollungsunterlagen_BAR() + If param Is Nothing Then + c = New usrcntlVerzollungsunterlagen_BAR() + Else + c = New usrcntlVerzollungsunterlagen_BAR(param) + End If + c.Width = MyFlowLayoutPanel1.Width - 6 c.KdNR = KdNr AddHandler c.DELETE, AddressOf ControlDELETE diff --git a/SDL/kassenbuch/frmBelegNeu.vb b/SDL/kassenbuch/frmBelegNeu.vb index b17b04eb..8a7f6e1f 100644 --- a/SDL/kassenbuch/frmBelegNeu.vb +++ b/SDL/kassenbuch/frmBelegNeu.vb @@ -1705,6 +1705,7 @@ Public Class frmBelegNeu Dim verarbeitet As Boolean = False If KASSE.rksv_FT_RestServiceURL <> "" Then Dim result = cRKSV.insertRKSVFiskaltrustAsync(KASSE, KASSE.rksv_CompanyGUID, KASSE.rksv_Umsatzzaehler, BELEG.BelegDat, BELEG.Steuerschlüssel, RKSV_Beleg_Id, If(EA = "E", summeBRUTTO, summeBRUTTO * -1), TESTBUCHUNG, BELEG.POS, QR_CodeString, LastJWS) + result.Wait() verarbeitet = result.Result Else verarbeitet = cRKSV.insertRKSV(KASSE, KASSE.rksv_CompanyGUID, KASSE.rksv_Umsatzzaehler, BELEG.BelegDat, BELEG.Steuerschlüssel, RKSV_Beleg_Id, If(EA = "E", summeBRUTTO, summeBRUTTO * -1), QR_CodeString, LastJWS, TESTBUCHUNG, answer) 'Digitale Signierung und Erfassung in die RKSV-Datenbank mittels ITG-Service @@ -1976,7 +1977,7 @@ Public Class frmBelegNeu ElseIf item.Name = "storno" Then 'beide - Dim result As String = Await client.CancelReceiptAsync_test("-1", 100, "Cash") + Dim result As String = Await client.CancelReceiptAsync_test("-1", 100, "Cash", KASSE.rksv_id) MsgBox(result) ElseIf item.Name = "bar" Then diff --git a/SDL/kunden/frmKundenKontakteDetails.vb b/SDL/kunden/frmKundenKontakteDetails.vb index 8b316341..2ff2c3b1 100644 --- a/SDL/kunden/frmKundenKontakteDetails.vb +++ b/SDL/kunden/frmKundenKontakteDetails.vb @@ -68,13 +68,13 @@ txtPLZ.Text = If(KD_KONTAKT.kkd_PLZ, "") txtKorrAdd.Text = If(KD_KONTAKT.kkd_Firmenname, "") - Dim mailfalse = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(lblEmail.Text) + Dim mailfalse = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK_better(lblEmail.Text) If mailfalse <> "" Then lblEmail.ForeColor = Color.Red - Dim mailfalsecc = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(lblEmailCC.Text) + Dim mailfalsecc = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK_better(lblEmailCC.Text) If mailfalsecc <> "" Then lblEmail.ForeColor = Color.Red - Dim mailfalsebcc = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(lblEmailBCC.Text) + Dim mailfalsebcc = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK_better(lblEmailBCC.Text) If mailfalsebcc <> "" Then lblEmail.ForeColor = Color.Red txtGebDatum.Text = IIf(Not IsDBNull(KD_KONTAKT.kkd_GebDatum) AndAlso IsDate(KD_KONTAKT.kkd_GebDatum), CDate(KD_KONTAKT.kkd_GebDatum), "") @@ -125,7 +125,7 @@ - Dim mailfalse = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(KD_KONTAKT.kkd_Email) + Dim mailfalse = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK_better(KD_KONTAKT.kkd_Email) If mailfalse <> "" Then lblEmail.ForeColor = Color.Red MsgBox("Mailadresse: " & mailfalse & " fehlerhaft!") @@ -136,7 +136,7 @@ lblEmail.ForeColor = Color.Black End If - Dim mailfalsecc = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(KD_KONTAKT.kkd_EmailCC) + Dim mailfalsecc = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK_better(KD_KONTAKT.kkd_EmailCC) If mailfalsecc <> "" Then lblEmailCC.ForeColor = Color.Red MsgBox("Mailadresse: " & mailfalsecc & " fehlerhaft!") @@ -146,7 +146,7 @@ lblEmailCC.ForeColor = Color.Black End If - Dim mailfalsebcc = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(KD_KONTAKT.kkd_EmailBCC) + Dim mailfalsebcc = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK_better(KD_KONTAKT.kkd_EmailBCC) If mailfalsebcc <> "" Then lblEmailBCC.ForeColor = Color.Red MsgBox("Mailadresse: " & mailfalsebcc & " fehlerhaft!") diff --git a/SDL/kunden/usrCntlKundenKontakte.vb b/SDL/kunden/usrCntlKundenKontakte.vb index c5b739d0..1e16347a 100644 --- a/SDL/kunden/usrCntlKundenKontakte.vb +++ b/SDL/kunden/usrCntlKundenKontakte.vb @@ -45,9 +45,9 @@ Dim rowIndex As Integer = dgvAufschub.Rows.Add(r("kkd_id"), r("kkd_kkaBez"), r("kkd_Tel"), r("kkd_Email"), anspr, r("kkd_Fax")) - Dim mail As String = IIf(Not IsDBNull(r("kkd_email")), VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(r("kkd_email")), "") - Dim mailcc As String = IIf(Not IsDBNull(r("kkd_emailcc")), VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(r("kkd_emailcc")), "") - Dim mailbcc As String = IIf(Not IsDBNull(r("kkd_emailbcc")), VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(r("kkd_emailbcc")), "") + Dim mail As String = IIf(Not IsDBNull(r("kkd_email")), VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK_better(r("kkd_email")), "") + Dim mailcc As String = IIf(Not IsDBNull(r("kkd_emailcc")), VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK_better(r("kkd_emailcc")), "") + Dim mailbcc As String = IIf(Not IsDBNull(r("kkd_emailbcc")), VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK_better(r("kkd_emailbcc")), "") If mail <> "" Or mailcc <> "" Or mailbcc <> "" Then Dim dgvRow As DataGridViewRow = dgvAufschub.Rows(rowIndex) diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index d70a6b9e..afd1c611 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -1691,7 +1691,7 @@ Public Class usrCntlKundenuebersicht ' AUFSCHUB = VERAG_PROG_ALLGEMEIN.cKundenAufschubkonten.LOAD_ListAufschubKTOByKdNr(kdNr) dgvAufschub.Rows.Clear() - If AUFSCHUB IsNot Nothing Then + If AUFSCHUB IsNot Nothing AndAlso AUFSCHUB.Count > 0 Then For Each AB In AUFSCHUB Dim art = "" Select Case AB.kdAkto_art diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index acb6e345..9937fd44 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -902,12 +902,12 @@ Public Class usrcntlKundeBearbeitenFull txtERROR.Text = err : Exit Sub End If - Dim Email1 As String = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(txtEmail.Text) + Dim Email1 As String = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK_better(txtEmail.Text) If Email1 <> "" Then txtERROR.Text = Email1 & " ist keine gültige Email!" : Exit Sub End If - Dim Email2 As String = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK(txtEmail2.Text) + Dim Email2 As String = VERAG_PROG_ALLGEMEIN.cProgramFunctions.checkifMailisOK_better(txtEmail2.Text) If Email2 <> "" Then txtERROR.Text = Email2 & " ist keine gültige Email!" : Exit Sub End If diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index 64a40e0f..76000e23 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -1,4 +1,5 @@ Imports System.Drawing +Imports System.Globalization Imports System.IO Imports System.IO.Pipes Imports System.Net.Mail @@ -1120,6 +1121,106 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( End Function + Shared Function checkifMailisOK_better(emailList As String) As String + + + If String.IsNullOrWhiteSpace(emailList) Then Return "" + + Dim invalid As New List(Of String) + Dim idn As New IdnMapping() + + For Each email As String In emailList.Split(";"c, ","c) + + Dim e As String = email.Trim() + + If e = "" Then Continue For + + Try + + ' Genau ein @ + Dim atPos As Integer = e.LastIndexOf("@"c) + + If atPos <= 0 OrElse atPos <> e.IndexOf("@"c) Then + invalid.Add(e) + Continue For + End If + + Dim localPart As String = e.Substring(0, atPos) + Dim domainPart As String = e.Substring(atPos + 1) + + ' RFC-Grenzen + If localPart.Length = 0 OrElse localPart.Length > 64 Then + invalid.Add(e) + Continue For + End If + + If localPart.Any(Function(c) AscW(c) > 127) Then + invalid.Add(e) + Continue For + End If + + If e.Length > 320 Then + invalid.Add(e) + Continue For + End If + + ' Keine führenden/abschließenden Punkte + If localPart.StartsWith(".") OrElse localPart.EndsWith(".") Then + invalid.Add(e) + Continue For + End If + + ' Keine doppelten Punkte + If localPart.Contains("..") Then + invalid.Add(e) + Continue For + End If + + ' Internationale Domain nach ASCII wandeln + Dim domainAscii As String = idn.GetAscii(domainPart) + + ' Domain muss einen Punkt enthalten + If Not domainAscii.Contains("."c) Then + invalid.Add(e) + Continue For + End If + + ' Domainlabels prüfen + For Each label As String In domainAscii.Split("."c) + + If label.Length = 0 OrElse label.Length > 63 Then + invalid.Add(e) + GoTo NextMail + End If + + If label.StartsWith("-") OrElse label.EndsWith("-") Then + invalid.Add(e) + GoTo NextMail + End If + + Next + + ' .NET-Prüfung + Dim normalizedEmail As String = localPart & "@" & domainAscii + Dim addr As New MailAddress(normalizedEmail) + + If addr.Address <> normalizedEmail Then + invalid.Add(e) + End If + + Catch + invalid.Add(e) + End Try + +NextMail: + Next + + Return String.Join(";", invalid) + + + End Function + + Shared Function checkLKWNr(lkwNr As String) As List(Of String) Dim ListOfLKWNr As New List(Of String)