From 8e0c20bcd48eb891d764871c60f55cb0e435c8f9 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 7 Apr 2025 14:03:30 +0200 Subject: [PATCH 01/10] UTA Leistung, cFakt, MDM Datenverarbeitung, etc. --- SDL/Fakturierung/cFakturierung.vb | 5 + SDL/My Project/AssemblyInfo.vb | 4 +- .../usrCntlSDLLeistungenUTA.Designer.vb | 71 +- .../usrCntlSDLLeistungenUTA.vb | 4 +- SDL/mdm/frmMDMDatenverarbetiung.vb | 2 +- VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb | 2 + VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb | 645 +++++++++--------- 7 files changed, 405 insertions(+), 328 deletions(-) diff --git a/SDL/Fakturierung/cFakturierung.vb b/SDL/Fakturierung/cFakturierung.vb index 9157650f..444cc58b 100644 --- a/SDL/Fakturierung/cFakturierung.vb +++ b/SDL/Fakturierung/cFakturierung.vb @@ -2521,6 +2521,11 @@ Public Class cFakturierung If displayFirmenmane Then getSignature &= "
Unisped Speditions GmbH
" getSignature &= "
A 4975 Suben, Nr. 15
T +43 7711 2677-0 | F +43 7711 2677-27 | @ " & If(individuell, emailindividuell, "office@unisped.at") & " | www.unisped.at | FN 375838d
" If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine + Case 19 'VERAG360 + getSignature &= "" + If displayFirmenmane Then getSignature &= "
VERAG 360 GmbH
" + getSignature &= "
A 4975 Suben, Nr. 100
T +43 7711 2777-0 | F +43 7711 31 073 | @ " & If(individuell, emailindividuell, "mmd@verag.ag") & " | www.verag.ag | FN 544732b
" + If additionalLine <> "" Then getSignature &= vbNewLine & additionalLine & vbNewLine Case 26 'VERAG-UNISPED getSignature &= "" If displayFirmenmane Then getSignature &= "
VERAG-UNISPED LTD
" diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index c1befa57..4606346b 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/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.Designer.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.Designer.vb index cffa23bb..3a72e0a0 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.Designer.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.Designer.vb @@ -53,6 +53,8 @@ Partial Class usrCntlSDLLeistungenUTA Me.scanPIN = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.cbxArchiviert = New VERAG_PROG_ALLGEMEIN.MyCheckBoxValue(Me.components) + Me.txtCVCNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label5 = New System.Windows.Forms.Label() Me.Panel2.SuspendLayout() Me.tbcntr.SuspendLayout() Me.TabPage1.SuspendLayout() @@ -64,10 +66,12 @@ Partial Class usrCntlSDLLeistungenUTA Me.txtClientNr._DateTimeOnly = False Me.txtClientNr._numbersOnly = True Me.txtClientNr._numbersOnlyKommastellen = "" + Me.txtClientNr._numbersOnlyTrennzeichen = True Me.txtClientNr._Prozent = False Me.txtClientNr._ShortDateNew = False Me.txtClientNr._ShortDateOnly = False Me.txtClientNr._TimeOnly = False + Me.txtClientNr._TimeOnly_Seconds = False Me.txtClientNr._value = "" Me.txtClientNr._Waehrung = False Me.txtClientNr._WaehrungZeichen = True @@ -94,14 +98,16 @@ Partial Class usrCntlSDLLeistungenUTA Me.txtCardNr._DateTimeOnly = False Me.txtCardNr._numbersOnly = False Me.txtCardNr._numbersOnlyKommastellen = "" + Me.txtCardNr._numbersOnlyTrennzeichen = True Me.txtCardNr._Prozent = False Me.txtCardNr._ShortDateNew = False Me.txtCardNr._ShortDateOnly = False Me.txtCardNr._TimeOnly = False + Me.txtCardNr._TimeOnly_Seconds = False Me.txtCardNr._value = Nothing Me.txtCardNr._Waehrung = False Me.txtCardNr._WaehrungZeichen = True - Me.txtCardNr.Location = New System.Drawing.Point(106, 122) + Me.txtCardNr.Location = New System.Drawing.Point(106, 113) Me.txtCardNr.MaxLength = 3 Me.txtCardNr.MaxLineLength = -1 Me.txtCardNr.MaxLines_Warning = "" @@ -115,14 +121,16 @@ Partial Class usrCntlSDLLeistungenUTA Me.txtKartenNr._DateTimeOnly = False Me.txtKartenNr._numbersOnly = False Me.txtKartenNr._numbersOnlyKommastellen = "" + Me.txtKartenNr._numbersOnlyTrennzeichen = True Me.txtKartenNr._Prozent = False Me.txtKartenNr._ShortDateNew = False Me.txtKartenNr._ShortDateOnly = False Me.txtKartenNr._TimeOnly = False + Me.txtKartenNr._TimeOnly_Seconds = False Me.txtKartenNr._value = Nothing Me.txtKartenNr._Waehrung = False Me.txtKartenNr._WaehrungZeichen = True - Me.txtKartenNr.Location = New System.Drawing.Point(106, 97) + Me.txtKartenNr.Location = New System.Drawing.Point(106, 88) Me.txtKartenNr.MaxLength = 22 Me.txtKartenNr.MaxLineLength = -1 Me.txtKartenNr.MaxLines_Warning = "" @@ -135,7 +143,7 @@ Partial Class usrCntlSDLLeistungenUTA ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(3, 125) + Me.Label1.Location = New System.Drawing.Point(3, 116) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(58, 13) Me.Label1.TabIndex = 12 @@ -145,7 +153,7 @@ Partial Class usrCntlSDLLeistungenUTA ' Me.Label9.AutoSize = True Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label9.Location = New System.Drawing.Point(3, 100) + Me.Label9.Location = New System.Drawing.Point(3, 91) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(69, 13) Me.Label9.TabIndex = 9 @@ -155,7 +163,7 @@ Partial Class usrCntlSDLLeistungenUTA ' Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(207, 126) + Me.Label3.Location = New System.Drawing.Point(207, 117) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(32, 13) Me.Label3.TabIndex = 16 @@ -166,14 +174,16 @@ Partial Class usrCntlSDLLeistungenUTA Me.txtPIN._DateTimeOnly = False Me.txtPIN._numbersOnly = False Me.txtPIN._numbersOnlyKommastellen = "" + Me.txtPIN._numbersOnlyTrennzeichen = True Me.txtPIN._Prozent = False Me.txtPIN._ShortDateNew = False Me.txtPIN._ShortDateOnly = False Me.txtPIN._TimeOnly = False + Me.txtPIN._TimeOnly_Seconds = False Me.txtPIN._value = Nothing Me.txtPIN._Waehrung = False Me.txtPIN._WaehrungZeichen = True - Me.txtPIN.Location = New System.Drawing.Point(245, 123) + Me.txtPIN.Location = New System.Drawing.Point(245, 114) Me.txtPIN.MaxLength = 4 Me.txtPIN.MaxLineLength = -1 Me.txtPIN.MaxLines_Warning = "" @@ -187,10 +197,12 @@ Partial Class usrCntlSDLLeistungenUTA Me.txtVermerk._DateTimeOnly = False Me.txtVermerk._numbersOnly = False Me.txtVermerk._numbersOnlyKommastellen = "" + Me.txtVermerk._numbersOnlyTrennzeichen = True Me.txtVermerk._Prozent = False Me.txtVermerk._ShortDateNew = False Me.txtVermerk._ShortDateOnly = False Me.txtVermerk._TimeOnly = False + Me.txtVermerk._TimeOnly_Seconds = False Me.txtVermerk._value = Nothing Me.txtVermerk._Waehrung = False Me.txtVermerk._WaehrungZeichen = True @@ -306,10 +318,12 @@ Partial Class usrCntlSDLLeistungenUTA Me.txtLieferung._DateTimeOnly = False Me.txtLieferung._numbersOnly = False Me.txtLieferung._numbersOnlyKommastellen = "" + Me.txtLieferung._numbersOnlyTrennzeichen = True Me.txtLieferung._Prozent = False Me.txtLieferung._ShortDateNew = True Me.txtLieferung._ShortDateOnly = False Me.txtLieferung._TimeOnly = False + Me.txtLieferung._TimeOnly_Seconds = False Me.txtLieferung._value = "" Me.txtLieferung._Waehrung = False Me.txtLieferung._WaehrungZeichen = True @@ -328,10 +342,12 @@ Partial Class usrCntlSDLLeistungenUTA Me.txtBestellung._DateTimeOnly = False Me.txtBestellung._numbersOnly = False Me.txtBestellung._numbersOnlyKommastellen = "" + Me.txtBestellung._numbersOnlyTrennzeichen = True Me.txtBestellung._Prozent = False Me.txtBestellung._ShortDateNew = True Me.txtBestellung._ShortDateOnly = False Me.txtBestellung._TimeOnly = False + Me.txtBestellung._TimeOnly_Seconds = False Me.txtBestellung._value = "" Me.txtBestellung._Waehrung = False Me.txtBestellung._WaehrungZeichen = True @@ -350,10 +366,12 @@ Partial Class usrCntlSDLLeistungenUTA Me.txtGueltigkeit2._DateTimeOnly = False Me.txtGueltigkeit2._numbersOnly = False Me.txtGueltigkeit2._numbersOnlyKommastellen = "" + Me.txtGueltigkeit2._numbersOnlyTrennzeichen = True Me.txtGueltigkeit2._Prozent = False Me.txtGueltigkeit2._ShortDateNew = True Me.txtGueltigkeit2._ShortDateOnly = False Me.txtGueltigkeit2._TimeOnly = False + Me.txtGueltigkeit2._TimeOnly_Seconds = False Me.txtGueltigkeit2._value = "" Me.txtGueltigkeit2._Waehrung = False Me.txtGueltigkeit2._WaehrungZeichen = True @@ -465,6 +483,9 @@ Partial Class usrCntlSDLLeistungenUTA Me.scanSonstiges._DATENSERVER_UOrdner1 = "" Me.scanSonstiges._DATENSERVER_UOrdner2 = "" Me.scanSonstiges._DATENSERVER_UOrdner3 = "" + Me.scanSonstiges._OPEN_ORIGINAL = False + Me.scanSonstiges._TYPE = "PDF" + Me.scanSonstiges.AllowDrop = True Me.scanSonstiges.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.scanSonstiges.BackColor = System.Drawing.Color.White Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -488,11 +509,46 @@ Partial Class usrCntlSDLLeistungenUTA Me.cbxArchiviert.Text = "ARCHIVIERT" Me.cbxArchiviert.UseVisualStyleBackColor = True ' + 'txtCVCNr + ' + Me.txtCVCNr._DateTimeOnly = False + Me.txtCVCNr._numbersOnly = False + Me.txtCVCNr._numbersOnlyKommastellen = "" + Me.txtCVCNr._numbersOnlyTrennzeichen = True + Me.txtCVCNr._Prozent = False + Me.txtCVCNr._ShortDateNew = False + Me.txtCVCNr._ShortDateOnly = False + Me.txtCVCNr._TimeOnly = False + Me.txtCVCNr._TimeOnly_Seconds = False + Me.txtCVCNr._value = Nothing + Me.txtCVCNr._Waehrung = False + Me.txtCVCNr._WaehrungZeichen = True + Me.txtCVCNr.Location = New System.Drawing.Point(106, 138) + Me.txtCVCNr.MaxLength = 22 + Me.txtCVCNr.MaxLineLength = -1 + Me.txtCVCNr.MaxLines_Warning = "" + Me.txtCVCNr.MaxLines_Warning_Label = Nothing + Me.txtCVCNr.Name = "txtCVCNr" + Me.txtCVCNr.Size = New System.Drawing.Size(183, 20) + Me.txtCVCNr.TabIndex = 102 + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label5.Location = New System.Drawing.Point(3, 141) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(48, 13) + Me.Label5.TabIndex = 103 + Me.Label5.Text = "CVC-Nr.:" + ' 'usrCntlSDLLeistungenUTA ' 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.txtCVCNr) + Me.Controls.Add(Me.Label5) Me.Controls.Add(Me.cbxArchiviert) Me.Controls.Add(Me.tbcntr) Me.Controls.Add(Me.txtLieferung) @@ -556,5 +612,6 @@ Partial Class usrCntlSDLLeistungenUTA Friend WithEvents scanPIN As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan Friend WithEvents scanSonstiges As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList Friend WithEvents cbxArchiviert As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue - + Friend WithEvents txtCVCNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label5 As Label End Class diff --git a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.vb b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.vb index aed947f3..c1ebbbbd 100644 --- a/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.vb +++ b/SDL/mdm/SDLLeistungenDetails/usrCntlSDLLeistungenUTA.vb @@ -109,6 +109,7 @@ Public Class usrCntlSDLLeistungenUTA txtKartenNr.Text = SDL.KartenNr txtClientNr.Text = SDL.CLIENT_Nr txtCardNr.Text = SDL.CARD_Nr + txtCVCNr.Text = If(SDL.CVCNr, "") 'Me.Enabled = s.bindingSource.Count > 0 'AddHandler s.bindingSource.PositionChanged, Sub() @@ -168,6 +169,7 @@ Public Class usrCntlSDLLeistungenUTA SDL.KartenNr = txtKartenNr.Text SDL.CLIENT_Nr = txtClientNr.Text SDL.CARD_Nr = txtCardNr.Text + SDL.CVCNr = txtCVCNr.Text SDL.ErsatzkarteAm = cbxErsatzkarte._date SDL.VerlorenAm = cbxVerloren._date @@ -185,7 +187,7 @@ Public Class usrCntlSDLLeistungenUTA End Function - Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtBestellung.PropertyChanged, txtLieferung.PropertyChanged, txtPIN.TextChanged, txtKartenNr.TextChanged, txtClientNr.TextChanged, txtCardNr.TextChanged, txtVermerk.TextChanged, txtGueltigkeit2.PropertyChanged, cbxErsatzkarte.CheckedChanged, cbxDefekt.CheckedChanged, cbxVerloren.CheckedChanged, cbxGestohlen.CheckedChanged, cbxGesperrt.CheckedChanged, cbxArchiviert.CheckedChanged + Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtBestellung.PropertyChanged, txtLieferung.PropertyChanged, txtPIN.TextChanged, txtKartenNr.TextChanged, txtClientNr.TextChanged, txtCardNr.TextChanged, txtVermerk.TextChanged, txtGueltigkeit2.PropertyChanged, cbxErsatzkarte.CheckedChanged, cbxDefekt.CheckedChanged, cbxVerloren.CheckedChanged, cbxGestohlen.CheckedChanged, cbxGesperrt.CheckedChanged, cbxArchiviert.CheckedChanged, txtCVCNr.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 diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index e6324fae..26eb2e14 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -3905,7 +3905,7 @@ Public Class frmMDMDatenverarbetiung Try Dim dtUTAKundennummern As DataTable = SQL.loadDgvBySql("SELECT Distinct(tblUTAImportNew.Kundennummer) - FROM tblUTAImportNew LEFT JOIN Adressen ON tblUTAImportNew.Kundennummer = Adressen.UTAKundenNr + FROM tblUTAImportNew LEFT JOIN Adressen ON tblUTAImportNew.Kundennummer = Adressen.UTAKundenNr WHERE cast(tblUTAImportNew.Rechnungsdatum as Date) = '" & DateTimePicker2.Text & "' GROUP BY tblUTAImportNew.Kundennummer, Adressen.UTAKundenNr HAVING (((Adressen.UTAKundenNr) Is Null))", "FMZOLL") diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb b/VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb index 4e5cba49..65deeeeb 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb @@ -66,6 +66,7 @@ Public Class cSDL Property BelegNr As Object = Nothing Property Nationalitaet As Object = Nothing Property CO2Kategorie As Object = Nothing + Property CVCNr As Object = Nothing Public hasentry Dim SQL As New SQL @@ -156,6 +157,7 @@ Public Class cSDL list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BelegNr", BelegNr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Nationalitaet", Nationalitaet)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("CO2Kategorie", CO2Kategorie)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("CVCNr", CVCNr)) Return list End Function diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb index 648c314e..6f4d4c61 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb @@ -970,342 +970,353 @@ Public Class cUTA Dim curChecksumme As Double Dim lngRecordCount As Long - - 'Datei auf Fehler prüfen! - Do While (objFileRead.Peek() > -1) - Dim strZeile = objFileRead.ReadLine() + Try - Select Case Mid(strZeile, 1, 2) - Case "10" - booHeaderVorhanden = True - lngRecordCount = lngRecordCount + 1 - Case "20" - ' Meldung bei nicht vorhandenen Haeder. - If Not booHeaderVorhanden Then - MsgBox("Datei kann wegen fehlenden Header nicht verarbeitet werden.") - objFileRead.Close() - Return False - End If - - lngRecordCount = lngRecordCount + 1 - - Case "90" - ' Meldung bei nicht vorhandenen Haeder. - If Not booHeaderVorhanden Then - MsgBox("Datei kann wegen fehlenden Header nicht verarbeitet werden.") - objFileRead.Close() - Return False - End If + 'Datei auf Fehler prüfen! + Do While (objFileRead.Peek() > -1) + Dim strZeile = objFileRead.ReadLine() - booTrailerVorhanden = True - lngRecordCount = lngRecordCount + 1 + Select Case Mid(strZeile, 1, 2) + Case "10" + booHeaderVorhanden = True + lngRecordCount = lngRecordCount + 1 + Case "20" + ' Meldung bei nicht vorhandenen Haeder. + If Not booHeaderVorhanden Then + MsgBox("Datei kann wegen fehlenden Header nicht verarbeitet werden.") + objFileRead.Close() + Return False + End If - ' Prüfsumme Anzahl der Sätze im File ohne Header und Trailer. - If Trim(Mid(strZeile, 3, 13)) <> (lngRecordCount) Then - MsgBox("Fehler: " & vbNewLine & "Prüfsumme in der Datei stimmt nicht mit der Zeilenanzahl der Datei überein! " & vbNewLine & "Record Count: " & Trim(Mid(strZeile, 3, 13)) & vbCrLf & "Prüfsumme: " & (lngRecordCount) & vbCrLf) - objFileRead.Close() - Return False - End If + lngRecordCount = lngRecordCount + 1 - ' Meldung bei Prüfsummenfehler. - If booPrüfziffernfehler Then - MsgBox("Datei kann wegen Prüfsummenfehler nicht verarbeitet werden.") - objFileRead.Close() - - End If - Case Else - booPrüfziffernfehler = True - End Select - - Loop - - - Dim lngPKLine As Long = 0 - lngRecordCount = 0 - - 'gleicher PKFileName wird nun aus CLFHeader gelöscht. CASCADE löscht dann zugehörige CLFBody und CLFTrailer. - 'If Not SQL.doSQL("DELETE tblUTAHeaderNew.ErstellDatumUhrzeit, tblUTAHeaderNew.Übertragungsnummer FROM tblUTAHeaderNew WHERE (((tblUTAHeaderNew.ErstellDatumUhrzeit)=" & Format$(dtmErstellDatumUhrzeit, "\#mm\/dd\/yyyy hh\:nn\:ss AM/PM\#") & ") AND ((tblUTAHeaderNew.Übertragungsnummer)=" & lngÜbertragungsnummer, "FMZOLL") Then - ' MsgBox("Fehler beim Löschen des CLF-Headers") - ' objFileRead.Close() - ' Return False - 'End If - - 'If Not SQL.doSQL("UPDATE CLF SET PKFileName = '" & fi.Name.ToString & "'", "FMZOLL") Then - ' MsgBox("Fehler beim Update der CLF-Nr") - ' objFileRead.Close() - ' Return False - 'End If - objFileRead.DiscardBufferedData() - objFileRead.BaseStream.Seek(0, System.IO.SeekOrigin.Begin) - - Do While (objFileRead.Peek() > -1) - Dim strZeile = objFileRead.ReadLine() - - Select Case Mid(strZeile, 1, 2) - Case "10" - booHeaderVorhanden = True - lngRecordCount = lngRecordCount + 1 - dtmErstellDatumUhrzeit = DateSerial(Mid(strZeile, 35, 4), Mid(strZeile, 32, 2), Mid(strZeile, 29, 2)) & " " & TimeSerial(Mid(strZeile, 40, 2), Mid(strZeile, 43, 2), Mid(strZeile, 46, 2)) - lngÜbertragungsnummer = Mid(strZeile, 61, 6) - 'Dim ext = CInt(fi.Extension.Remove(0, 1)) - Dim clfHeader As New cUTA.UTAHeader(lngÜbertragungsnummer, dtmErstellDatumUhrzeit) - With clfHeader - .Absender_ID = Mid(strZeile, 10, 6) - .Empfänger_ID = Mid(strZeile, 23, 6) - .Filler_Feld_5 = IIf(Trim(Mid(strZeile, 39, 1)) = "", Nothing, Trim(Mid(strZeile, 39, 1))) - .Abrechnungsnummer = IIf(Trim(Mid(strZeile, 48, 13)) = Nothing, "", Trim(Mid(strZeile, 48, 13))) - .DTF_Format = IIf(Trim(Mid(strZeile, 67, 6)) = Nothing, "", Trim(Mid(strZeile, 67, 6))) - .SAVE() - End With - - Case "20" - lngRecordCount = lngRecordCount + 1 - lngÜbertragungsposition = lngÜbertragungsposition + 1 - Dim clfBody As New cUTA.UTABody(lngÜbertragungsnummer, lngÜbertragungsposition, dtmErstellDatumUhrzeit) - With clfBody - .Übertragungsnummer = lngÜbertragungsnummer - .Übertragungsposition = lngÜbertragungsposition - .Abrechnungsnummer = Mid(strZeile, 3, 13) - .[Datum_für_Lieferungen_und_Leistungen_bis] = DateSerial(Mid(strZeile, 20, 4), Mid(strZeile, 18, 2), Mid(strZeile, 16, 2)) - .[Rechnungsempfänger_Kundennummer] = Mid(strZeile, 24, 13) - .[Abrechnungsdatum] = DateSerial(Mid(strZeile, 41, 4), Mid(strZeile, 39, 2), Mid(strZeile, 37, 2)) - .[Kundennummer] = Mid(strZeile, 45, 13) - .[Kartennummer] = IIf(Trim(Mid(strZeile, 58, 19)) = "", Nothing, Trim(Mid(strZeile, 58, 19))) - .[Belegdatum] = DateSerial(Mid(strZeile, 81, 4), Mid(strZeile, 79, 2), Mid(strZeile, 77, 2)) - .[Akzeptanzstellennummer] = Mid(strZeile, 85, 13) - .[Standort_der_Akzeptanzstelle] = IIf(Trim(Mid(strZeile, 98, 25)) = "", Nothing, Trim(Mid(strZeile, 98, 25))) - .[Lieferland] = IIf(Trim(Mid(strZeile, 123, 3)) = "", Nothing, Trim(Mid(strZeile, 123, 3))) - .[Belegnummer_des_Lieferanten] = IIf(Trim(Mid(strZeile, 126, 13)) = "", Nothing, Trim(Mid(strZeile, 126, 13))) - .[Kilometerstand] = Mid(strZeile, 139, 8) - .[Fakturierwarenart] = IIf(Trim(Mid(strZeile, 147, 5)) = "", Nothing, Trim(Mid(strZeile, 147, 5))) - .[Vorzeichen_Statusfeld_für_alle_Beträge_und_Mengen] = IIf(Trim(Mid(strZeile, 152, 1)) = "", Nothing, Trim(Mid(strZeile, 152, 1))) - .[Menge] = Mid(strZeile, 153, 10) / 100 - .[SB_BT] = IIf(Trim(Mid(strZeile, 163, 1)) = "", Nothing, Trim(Mid(strZeile, 163, 1))) - .[Umsatzsteuerprozentsatz] = Mid(strZeile, 164, 5) / 10000 - .[Lieferlandwährung_ISO] = IIf(Trim(Mid(strZeile, 169, 3)) = "", Nothing, Trim(Mid(strZeile, 169, 3))) - .[Einzelpreis_Brutto_in_Lieferlandwährung] = Mid(strZeile, 172, 11) / 100 - .[Einzelpreis_Netto_in_Lieferlandwährung] = Mid(strZeile, 183, 11) / 100 - .[Betrag_Service_in_Lieferlandwährung] = Mid(strZeile, 194, 11) / 100 - .[Betrag_Nachlass_in_Lieferlandwährung] = Mid(strZeile, 205, 11) / 100 - .[Gesamtbetrag_Netto_in_Lieferlandwährung] = Mid(strZeile, 216, 11) / 100 - .[Gesamtbetrag_Brutto_in_Lieferlandwährung] = Mid(strZeile, 227, 11) / 100 - .[Darstellwährung_ISO] = IIf(Trim(Mid(strZeile, 238, 3)) = "", Nothing, Trim(Mid(strZeile, 238, 3))) - .[Betrag_Service_in_Darstellwährung] = Mid(strZeile, 241, 11) / 100 - .[Betrag_Nachlass_in_Darstellwährung] = Mid(strZeile, 252, 11) / 100 - .[Gesamtbetrag_Netto_in_Darstellwährung] = Mid(strZeile, 263, 11) / 100 - .[Gesamtbetrag_Umsatzsteuer_in_Darstellwährung] = Mid(strZeile, 274, 11) / 100 - .[Gesamtbetrag_Brutto_in_Darstellwährung] = Mid(strZeile, 285, 11) / 100 - .[Prägetext_i_d_R_KFZ_Kennzeichen] = IIf(Trim(Mid(strZeile, 296, 16)) = "", Nothing, Trim(Mid(strZeile, 296, 16))) - .[Kunden_Kostenstelle_1] = IIf(Trim(Mid(strZeile, 312, 20)) = "", Nothing, Trim(Mid(strZeile, 312, 20))) - .[Kartentyp] = IIf(Trim(Mid(strZeile, 332, 8)) = "", Nothing, Trim(Mid(strZeile, 332, 8))) - .[Filler_Feld_35] = IIf(Trim(Mid(strZeile, 340, 1)) = "", Nothing, Trim(Mid(strZeile, 340, 1))) - .[Filler_Feld_36] = IIf(Trim(Mid(strZeile, 341, 3)) = "", Nothing, Trim(Mid(strZeile, 341, 3))) - .[KZ_Autobahn] = IIf(Trim(Mid(strZeile, 344, 1)) = "", Nothing, Trim(Mid(strZeile, 344, 1))) - .[INFO_Feld] = IIf(Trim(Mid(strZeile, 345, 18)) = "", Nothing, Trim(Mid(strZeile, 345, 18))) - .[KFZ_Kennzeichen] = IIf(Trim(Mid(strZeile, 363, 16)) = "", Nothing, Trim(Mid(strZeile, 363, 16))) - .[Filler_Feld_40] = IIf(Trim(Mid(strZeile, 379, 1)) = "", Nothing, Trim(Mid(strZeile, 379, 1))) - .[Buchungsart] = IIf(Trim(Mid(strZeile, 380, 1)) = "", Nothing, Trim(Mid(strZeile, 380, 1))) - .[Buchungsgrund] = IIf(Trim(Mid(strZeile, 381, 1)) = "", Nothing, Trim(Mid(strZeile, 381, 1))) - .[Filler_Feld_43] = IIf(Trim(Mid(strZeile, 382, 1)) = "", Nothing, Trim(Mid(strZeile, 382, 1))) - .[Informationsbeleg] = IIf(Trim(Mid(strZeile, 383, 1)) = "", Nothing, Trim(Mid(strZeile, 383, 1))) - .[Belegherkunft] = IIf(Trim(Mid(strZeile, 384, 1)) = "", Nothing, Trim(Mid(strZeile, 384, 1))) - .[Filler_Feld_46] = IIf(Trim(Mid(strZeile, 385, 14)) = "", Nothing, Trim(Mid(strZeile, 385, 14))) - .[Einzelpreis_Brutto_in_Lieferlandwährung_mit_4_Nachkommastellen] = Mid(strZeile, 399, 13) / 10000 - .[Einzelpreis_Netto_in_Lieferlandwährung_mit_4_Nachkommastellen] = Mid(strZeile, 412, 13) / 10000 - .[Rechnungsdatum] = DateSerial(Mid(strZeile, 429, 4), Mid(strZeile, 427, 2), Mid(strZeile, 425, 2)) - .[Umsatzsteuerprozentsatz_informativ] = Mid(strZeile, 433, 5) / 10000 - .[Betrag_Nachlass_in_Lieferlandwährung_Umsatzsteuer_informativ] = Mid(strZeile, 438, 11) / 100 - .[Betrag_Service_in_Lieferlandwährung_Umsatzsteuer_informativ] = Mid(strZeile, 449, 11) / 100 - .[Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ] = Mid(strZeile, 460, 11) / 100 - .[Fälligkeitsdatum] = DateSerial(Mid(strZeile, 475, 4), Mid(strZeile, 473, 2), Mid(strZeile, 471, 2)) - .[Zahlungsziel_in_Tagen] = Mid(strZeile, 479, 3) - .[Zahlungsart] = IIf(Trim(Mid(strZeile, 482, 8)) = "", Nothing, Trim(Mid(strZeile, 482, 8))) - .[TC_Rechnungsnummer_gegenüber_dem_Nutzer] = IIf(Trim(Mid(strZeile, 490, 20)) = "", Nothing, Trim(Mid(strZeile, 490, 20))) - .[TC_Rechnungsdatum] = DateSerial(Mid(strZeile, 514, 4), Mid(strZeile, 512, 2), Mid(strZeile, 510, 2)) - .[Zahlungszielgruppe] = IIf(Trim(Mid(strZeile, 518, 7)) = "", Nothing, Trim(Mid(strZeile, 518, 7))) - .[Kunden_Kostenstelle_2] = IIf(Trim(Mid(strZeile, 525, 20)) = "", Nothing, Trim(Mid(strZeile, 525, 20))) - .[Lieferzeit] = IIf(Trim(Mid(strZeile, 545, 6)) = "", Nothing, Trim(Mid(strZeile, 545, 6))) - .[Fremdkartennummer] = IIf(Trim(Mid(strZeile, 551, 20)) = "", Nothing, Trim(Mid(strZeile, 551, 20))) - .[OnBoardUnitID] = IIf(Trim(Mid(strZeile, 571, 20)) = "", Nothing, Trim(Mid(strZeile, 571, 20))) - .[KFZ_Kennzeichen_komprimiert] = IIf(Trim(Mid(strZeile, 591, 16)) = "", Nothing, Trim(Mid(strZeile, 591, 16))) - .[Kartenkategorie] = IIf(Trim(Mid(strZeile, 607, 8)) = "", Nothing, Trim(Mid(strZeile, 607, 8))) - .[Rechnungsnummer_pro_Lieferland] = Mid(strZeile, 615, 13) - .[Autobahnauffahrt] = IIf(Trim(Mid(strZeile, 628, 40)) = "", Nothing, Trim(Mid(strZeile, 628, 40))) - .[Autobahnausfahrt] = IIf(Trim(Mid(strZeile, 668, 40)) = "", Nothing, Trim(Mid(strZeile, 668, 40))) - .[Rabattschlüssel_der_französischen_Autobahngesellschaften] = IIf(Trim(Mid(strZeile, 708, 1)) = "", Nothing, Trim(Mid(strZeile, 708, 1))) - .[Nummer_Belastungsanzeige] = Mid(strZeile, 709, 13) - .[Betreuungsstelle] = IIf(Trim(Mid(strZeile, 722, 20)) = "", Nothing, Trim(Mid(strZeile, 722, 20))) - .[Filler_Feld_72] = IIf(Trim(Mid(strZeile, 742, 20)) = "", Nothing, Trim(Mid(strZeile, 742, 20))) - .[Akzeptanz_Medium] = IIf(Trim(Mid(strZeile, 762, 20)) = "", Nothing, Trim(Mid(strZeile, 762, 20))) - .[Steuerkategorie] = IIf(Trim(Mid(strZeile, 782, 8)) = "", Nothing, Trim(Mid(strZeile, 782, 8))) - .[UTA_Beleg_ID] = Mid(strZeile, 790, 11) - .[UTA_Normalbeleg_ID] = Mid(strZeile, 801, 11) - .[Gebühren_Bescheinigung_von] = DateSerial(Mid(strZeile, 816, 4), Mid(strZeile, 814, 2), Mid(strZeile, 812, 2)) - .[Gebühren_Bescheinigung_bis] = DateSerial(Mid(strZeile, 824, 4), Mid(strZeile, 822, 2), Mid(strZeile, 820, 2)) - .[Herausgeber_Nutzer_Nummer] = IIf(Trim(Mid(strZeile, 828, 20)) = "", Nothing, Trim(Mid(strZeile, 828, 20))) - .[Maßeinheit] = IIf(Trim(Mid(strZeile, 848, 8)) = "", Nothing, Trim(Mid(strZeile, 848, 8))) - .[Land_der_Akzeptanzstelle] = IIf(Trim(Mid(strZeile, 856, 3)) = "", Nothing, Trim(Mid(strZeile, 856, 3))) - .[Postleitzahl_der_Akzeptanzstelle] = IIf(Trim(Mid(strZeile, 859, 7)) = "", Nothing, Trim(Mid(strZeile, 859, 7))) - .[Steuerliches_Lieferland] = IIf(Trim(Mid(strZeile, 866, 3)) = "", Nothing, Trim(Mid(strZeile, 866, 3))) - .[Steuerliche_Produktgruppe] = IIf(Trim(Mid(strZeile, 869, 5)) = "", Nothing, Trim(Mid(strZeile, 869, 5))) - .[Leistungsort_verlagerbar] = IIf(Trim(Mid(strZeile, 874, 1)) = "", Nothing, Trim(Mid(strZeile, 874, 1))) - - Select Case .[Vorzeichen_Statusfeld_für_alle_Beträge_und_Mengen] - Case "0" 'positiv - curChecksumme = curChecksumme + .[Gesamtbetrag_Brutto_in_Darstellwährung] - Case "1" 'negativ - curChecksumme = curChecksumme - .[Gesamtbetrag_Brutto_in_Darstellwährung] - .[Menge] = 0 - .[Menge] - .[Einzelpreis_Brutto_in_Lieferlandwährung] = 0 - .[Einzelpreis_Brutto_in_Lieferlandwährung] - .[Einzelpreis_Netto_in_Lieferlandwährung] = 0 - .[Einzelpreis_Netto_in_Lieferlandwährung] - .[Betrag_Service_in_Lieferlandwährung] = 0 - .[Betrag_Service_in_Lieferlandwährung] - .[Betrag_Nachlass_in_Lieferlandwährung] = 0 - .[Betrag_Nachlass_in_Lieferlandwährung] - .[Gesamtbetrag_Netto_in_Lieferlandwährung] = 0 - .[Gesamtbetrag_Netto_in_Lieferlandwährung] - .[Gesamtbetrag_Brutto_in_Lieferlandwährung] = 0 - .[Gesamtbetrag_Brutto_in_Lieferlandwährung] - .[Betrag_Service_in_Darstellwährung] = 0 - .[Betrag_Service_in_Darstellwährung] - .[Betrag_Nachlass_in_Darstellwährung] = 0 - .[Betrag_Nachlass_in_Darstellwährung] - .[Gesamtbetrag_Netto_in_Darstellwährung] = 0 - .[Gesamtbetrag_Netto_in_Darstellwährung] - .[Gesamtbetrag_Umsatzsteuer_in_Darstellwährung] = 0 - .[Gesamtbetrag_Umsatzsteuer_in_Darstellwährung] - .[Gesamtbetrag_Brutto_in_Darstellwährung] = 0 - .[Gesamtbetrag_Brutto_in_Darstellwährung] - .[Einzelpreis_Brutto_in_Lieferlandwährung_mit_4_Nachkommastellen] = 0 - .[Einzelpreis_Brutto_in_Lieferlandwährung_mit_4_Nachkommastellen] - .[Einzelpreis_Netto_in_Lieferlandwährung_mit_4_Nachkommastellen] = 0 - .[Einzelpreis_Netto_in_Lieferlandwährung_mit_4_Nachkommastellen] - .[Betrag_Nachlass_in_Lieferlandwährung_Umsatzsteuer_informativ] = 0 - .[Betrag_Nachlass_in_Lieferlandwährung_Umsatzsteuer_informativ] - .[Betrag_Service_in_Lieferlandwährung_Umsatzsteuer_informativ] = 0 - .[Betrag_Service_in_Lieferlandwährung_Umsatzsteuer_informativ] - .[Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ] = 0 - .[Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ] - End Select - - If onlyTestkunedn Then - 'nur KundenNr 100964 und 825040 speichern: - If .[Kundennummer] = 100964 Or .[Kundennummer] = 825040 Then - .SAVE() - End If - Else - .SAVE() + Case "90" + ' Meldung bei nicht vorhandenen Haeder. + If Not booHeaderVorhanden Then + MsgBox("Datei kann wegen fehlenden Header nicht verarbeitet werden.") + objFileRead.Close() + Return False End If + booTrailerVorhanden = True + lngRecordCount = lngRecordCount + 1 - 'Dim clfArchiv As New cUTA.UTAArchiv(.Belegdatum, .UTA_Beleg_ID) - 'clfArchiv.Übertragungsnummer = .Übertragungsnummer - 'clfArchiv.ErstellDatumUhrzeit = .ErstellDatumUhrzeit - 'clfArchiv.Übertragungsposition = .Übertragungsposition - 'clfArchiv.Abrechnungsnummer = .Abrechnungsnummer - 'clfArchiv.Datum_für_Lieferungen_und_Leistungen_bis = .Datum_für_Lieferungen_und_Leistungen_bis - 'clfArchiv.Rechnungsempfänger_Kundennummer = .Rechnungsempfänger_Kundennummer - 'clfArchiv.Abrechnungsdatum = .Abrechnungsdatum - 'clfArchiv.Kundennummer = .Kundennummer - 'clfArchiv.Kartennummer = .Kartennummer - 'clfArchiv.Akzeptanzstellennummer = .Akzeptanzstellennummer - 'clfArchiv.Standort_der_Akzeptanzstelle = .Standort_der_Akzeptanzstelle - 'clfArchiv.Lieferland = .Lieferland - 'clfArchiv.Belegnummer_des_Lieferanten = .Belegnummer_des_Lieferanten - 'clfArchiv.Kilometerstand = .Kilometerstand - 'clfArchiv.Fakturierwarenart = .Fakturierwarenart - 'clfArchiv.Vorzeichen_Statusfeld_für_alle_Beträge_und_Mengen = .Vorzeichen_Statusfeld_für_alle_Beträge_und_Mengen - 'clfArchiv.Menge = .Menge - 'clfArchiv.SB_BT = .SB_BT - 'clfArchiv.Umsatzsteuerprozentsatz = .Umsatzsteuerprozentsatz - 'clfArchiv.Lieferlandwährung_ISO = .Lieferlandwährung_ISO - 'clfArchiv.Einzelpreis_Netto_in_Lieferlandwährung = .Einzelpreis_Netto_in_Lieferlandwährung - 'clfArchiv.Einzelpreis_Brutto_in_Lieferlandwährung = .Einzelpreis_Brutto_in_Lieferlandwährung - 'clfArchiv.Einzelpreis_Netto_in_Lieferlandwährung = .Einzelpreis_Netto_in_Lieferlandwährung - 'clfArchiv.Betrag_Service_in_Lieferlandwährung = .Betrag_Service_in_Lieferlandwährung - 'clfArchiv.Betrag_Nachlass_in_Lieferlandwährung = .Betrag_Nachlass_in_Lieferlandwährung - 'clfArchiv.Gesamtbetrag_Netto_in_Lieferlandwährung = .Gesamtbetrag_Netto_in_Lieferlandwährung - 'clfArchiv.Gesamtbetrag_Brutto_in_Lieferlandwährung = .Gesamtbetrag_Brutto_in_Lieferlandwährung - 'clfArchiv.Darstellwährung_ISO = .Darstellwährung_ISO - 'clfArchiv.Betrag_Service_in_Darstellwährung = .Betrag_Service_in_Darstellwährung - 'clfArchiv.Betrag_Nachlass_in_Darstellwährung = .Betrag_Nachlass_in_Darstellwährung - 'clfArchiv.Gesamtbetrag_Netto_in_Darstellwährung = .Gesamtbetrag_Netto_in_Darstellwährung - 'clfArchiv.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung = .Gesamtbetrag_Umsatzsteuer_in_Darstellwährung - 'clfArchiv.Gesamtbetrag_Brutto_in_Darstellwährung = .Gesamtbetrag_Brutto_in_Darstellwährung - 'clfArchiv.Prägetext_i_d_R_KFZ_Kennzeichen = .Prägetext_i_d_R_KFZ_Kennzeichen - 'clfArchiv.Kunden_Kostenstelle_1 = .Kunden_Kostenstelle_1 - 'clfArchiv.Kartentyp = .Kartentyp - 'clfArchiv.Filler_Feld_35 = .Filler_Feld_35 - 'clfArchiv.Filler_Feld_36 = .Filler_Feld_36 - 'clfArchiv.KZ_Autobahn = .KZ_Autobahn - 'clfArchiv.INFO_Feld = .INFO_Feld - 'clfArchiv.KFZ_Kennzeichen = .KFZ_Kennzeichen - 'clfArchiv.Filler_Feld_40 = .Filler_Feld_40 - 'clfArchiv.Buchungsart = .Buchungsart - 'clfArchiv.Buchungsgrund = .Buchungsgrund - 'clfArchiv.Filler_Feld_43 = .Filler_Feld_43 - 'clfArchiv.Informationsbeleg = .Informationsbeleg - 'clfArchiv.Belegherkunft = .Belegherkunft - 'clfArchiv.Filler_Feld_46 = .Filler_Feld_46 - 'clfArchiv.Einzelpreis_Brutto_in_Lieferlandwährung_mit_4_Nachkommastellen = .Einzelpreis_Brutto_in_Lieferlandwährung_mit_4_Nachkommastellen - 'clfArchiv.Einzelpreis_Netto_in_Lieferlandwährung_mit_4_Nachkommastellen = .Einzelpreis_Netto_in_Lieferlandwährung_mit_4_Nachkommastellen - 'clfArchiv.Rechnungsdatum = .Rechnungsdatum - 'clfArchiv.Umsatzsteuerprozentsatz_informativ = .Umsatzsteuerprozentsatz_informativ - 'clfArchiv.Betrag_Nachlass_in_Lieferlandwährung = .Betrag_Nachlass_in_Lieferlandwährung - 'clfArchiv.Betrag_Service_in_Lieferlandwährung_Umsatzsteuer_informativ = .Betrag_Service_in_Lieferlandwährung_Umsatzsteuer_informativ - 'clfArchiv.Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ = .Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ - 'clfArchiv.Fälligkeitsdatum = .Fälligkeitsdatum - 'clfArchiv.Zahlungsziel_in_Tagen = .Zahlungsziel_in_Tagen - 'clfArchiv.Zahlungsart = .Zahlungsart - 'clfArchiv.TC_Rechnungsnummer_gegenüber_dem_Nutzer = .TC_Rechnungsnummer_gegenüber_dem_Nutzer - 'clfArchiv.TC_Rechnungsdatum = .TC_Rechnungsdatum - 'clfArchiv.Zahlungszielgruppe = .Zahlungszielgruppe - 'clfArchiv.Kunden_Kostenstelle_2 = .Kunden_Kostenstelle_2 - 'clfArchiv.Lieferzeit = .Lieferzeit - 'clfArchiv.Fremdkartennummer = .Fremdkartennummer - 'clfArchiv.OnBoardUnitID = .OnBoardUnitID - 'clfArchiv.KFZ_Kennzeichen_komprimiert = .KFZ_Kennzeichen_komprimiert - 'clfArchiv.Kartenkategorie = .Kartenkategorie - 'clfArchiv.Rechnungsnummer_pro_Lieferland = .Rechnungsnummer_pro_Lieferland - 'clfArchiv.Autobahnauffahrt = .Autobahnauffahrt - 'clfArchiv.Autobahnausfahrt = .Autobahnausfahrt - 'clfArchiv.Rabattschlüssel_der_französischen_Autobahngesellschaften = .Rabattschlüssel_der_französischen_Autobahngesellschaften - 'clfArchiv.Nummer_Belastungsanzeige = .Nummer_Belastungsanzeige - 'clfArchiv.Betreuungsstelle = .Betreuungsstelle - 'clfArchiv.Filler_Feld_72 = .Filler_Feld_72 - 'clfArchiv.Akzeptanz_Medium = .Akzeptanz_Medium - 'clfArchiv.Steuerkategorie = .Steuerkategorie - 'clfArchiv.UTA_Normalbeleg_ID = .UTA_Normalbeleg_ID - 'clfArchiv.Gebühren_Bescheinigung_von = .Gebühren_Bescheinigung_von - 'clfArchiv.Gebühren_Bescheinigung_bis = .Gebühren_Bescheinigung_bis - 'clfArchiv.Herausgeber_Nutzer_Nummer = .Herausgeber_Nutzer_Nummer - 'clfArchiv.Maßeinheit = .Maßeinheit - 'clfArchiv.Land_der_Akzeptanzstelle = .Land_der_Akzeptanzstelle - 'clfArchiv.Postleitzahl_der_Akzeptanzstelle = .Postleitzahl_der_Akzeptanzstelle - 'clfArchiv.Steuerliches_Lieferland = .Steuerliches_Lieferland - 'clfArchiv.Steuerliche_Produktgruppe = .Steuerliche_Produktgruppe - 'clfArchiv.Leistungsort_verlagerbar = .Leistungsort_verlagerbar - 'clfArchiv.SAVE() + ' Prüfsumme Anzahl der Sätze im File ohne Header und Trailer. + If Trim(Mid(strZeile, 3, 13)) <> (lngRecordCount) Then + MsgBox("Fehler: " & vbNewLine & "Prüfsumme in der Datei stimmt nicht mit der Zeilenanzahl der Datei überein! " & vbNewLine & "Record Count: " & Trim(Mid(strZeile, 3, 13)) & vbCrLf & "Prüfsumme: " & (lngRecordCount) & vbCrLf) + objFileRead.Close() + Return False + End If - End With + ' Meldung bei Prüfsummenfehler. + If booPrüfziffernfehler Then + MsgBox("Datei kann wegen Prüfsummenfehler nicht verarbeitet werden.") + objFileRead.Close() - Case "90" + End If + Case Else + booPrüfziffernfehler = True + End Select - If curChecksumme < 0 Then - curChecksumme = 0 - curChecksumme - End If - If Trim(Mid(strZeile, 16, 18) / 100) <> Math.Round(curChecksumme, 2) Then - MsgBox("Checksumme: " & Trim(Mid(strZeile, 16, 18) / 100) & vbCrLf & "Prüfsumme: " & curChecksumme & vbCrLf & "Datei kann wegen Prüfsummenfehler nicht verarbeitet werden") - 'Return False - End If + Loop - lngRecordCount = lngRecordCount + 1 - Dim clfTrailer As New cUTA.UTATrailer(lngÜbertragungsnummer, dtmErstellDatumUhrzeit) - With clfTrailer - .ErstellDatumUhrzeit = dtmErstellDatumUhrzeit - .Übertragungsnummer = lngÜbertragungsnummer - .Anzahl_Sätze = Mid(strZeile, 3, 13) - .Checksumme = Mid(strZeile, 16, 18) / 100 - .SAVE() - End With + Dim lngPKLine As Long = 0 + lngRecordCount = 0 + + 'gleicher PKFileName wird nun aus CLFHeader gelöscht. CASCADE löscht dann zugehörige CLFBody und CLFTrailer. + 'If Not SQL.doSQL("DELETE tblUTAHeaderNew.ErstellDatumUhrzeit, tblUTAHeaderNew.Übertragungsnummer FROM tblUTAHeaderNew WHERE (((tblUTAHeaderNew.ErstellDatumUhrzeit)=" & Format$(dtmErstellDatumUhrzeit, "\#mm\/dd\/yyyy hh\:nn\:ss AM/PM\#") & ") AND ((tblUTAHeaderNew.Übertragungsnummer)=" & lngÜbertragungsnummer, "FMZOLL") Then + ' MsgBox("Fehler beim Löschen des CLF-Headers") + ' objFileRead.Close() + ' Return False + 'End If + + 'If Not SQL.doSQL("UPDATE CLF SET PKFileName = '" & fi.Name.ToString & "'", "FMZOLL") Then + ' MsgBox("Fehler beim Update der CLF-Nr") + ' objFileRead.Close() + ' Return False + 'End If + objFileRead.DiscardBufferedData() + objFileRead.BaseStream.Seek(0, System.IO.SeekOrigin.Begin) + + Do While (objFileRead.Peek() > -1) + Dim strZeile = objFileRead.ReadLine() + + Select Case Mid(strZeile, 1, 2) + Case "10" + booHeaderVorhanden = True + lngRecordCount = lngRecordCount + 1 + dtmErstellDatumUhrzeit = DateSerial(Mid(strZeile, 35, 4), Mid(strZeile, 32, 2), Mid(strZeile, 29, 2)) & " " & TimeSerial(Mid(strZeile, 40, 2), Mid(strZeile, 43, 2), Mid(strZeile, 46, 2)) + lngÜbertragungsnummer = Mid(strZeile, 61, 6) + 'Dim ext = CInt(fi.Extension.Remove(0, 1)) + Dim clfHeader As New cUTA.UTAHeader(lngÜbertragungsnummer, dtmErstellDatumUhrzeit) + With clfHeader + .Absender_ID = Mid(strZeile, 10, 6) + .Empfänger_ID = Mid(strZeile, 23, 6) + .Filler_Feld_5 = IIf(Trim(Mid(strZeile, 39, 1)) = "", Nothing, Trim(Mid(strZeile, 39, 1))) + .Abrechnungsnummer = IIf(Trim(Mid(strZeile, 48, 13)) = Nothing, "", Trim(Mid(strZeile, 48, 13))) + .DTF_Format = IIf(Trim(Mid(strZeile, 67, 6)) = Nothing, "", Trim(Mid(strZeile, 67, 6))) + .SAVE() + End With + + Case "20" + + lngÜbertragungsposition = 6616 - Case Else - ' Andere RecordNumber überlesen. - End Select + lngRecordCount = lngRecordCount + 1 + lngÜbertragungsposition = lngÜbertragungsposition + 1 + Dim clfBody As New cUTA.UTABody(lngÜbertragungsnummer, lngÜbertragungsposition, dtmErstellDatumUhrzeit) + With clfBody + .Übertragungsnummer = lngÜbertragungsnummer + .Übertragungsposition = lngÜbertragungsposition + .Abrechnungsnummer = Mid(strZeile, 3, 13) + .[Datum_für_Lieferungen_und_Leistungen_bis] = DateSerial(Mid(strZeile, 20, 4), Mid(strZeile, 18, 2), Mid(strZeile, 16, 2)) + .[Rechnungsempfänger_Kundennummer] = Mid(strZeile, 24, 13) + .[Abrechnungsdatum] = DateSerial(Mid(strZeile, 41, 4), Mid(strZeile, 39, 2), Mid(strZeile, 37, 2)) + .[Kundennummer] = Mid(strZeile, 45, 13) + .[Kartennummer] = IIf(Trim(Mid(strZeile, 58, 19)) = "", Nothing, Trim(Mid(strZeile, 58, 19))) + .[Belegdatum] = DateSerial(Mid(strZeile, 81, 4), Mid(strZeile, 79, 2), Mid(strZeile, 77, 2)) + .[Akzeptanzstellennummer] = Mid(strZeile, 85, 13) + .[Standort_der_Akzeptanzstelle] = IIf(Trim(Mid(strZeile, 98, 25)) = "", Nothing, Trim(Mid(strZeile, 98, 25))) + .[Lieferland] = IIf(Trim(Mid(strZeile, 123, 3)) = "", Nothing, Trim(Mid(strZeile, 123, 3))) + .[Belegnummer_des_Lieferanten] = IIf(Trim(Mid(strZeile, 126, 13)) = "", Nothing, Trim(Mid(strZeile, 126, 13))) + .[Kilometerstand] = Mid(strZeile, 139, 8) + .[Fakturierwarenart] = IIf(Trim(Mid(strZeile, 147, 5)) = "", Nothing, Trim(Mid(strZeile, 147, 5))) + .[Vorzeichen_Statusfeld_für_alle_Beträge_und_Mengen] = IIf(Trim(Mid(strZeile, 152, 1)) = "", Nothing, Trim(Mid(strZeile, 152, 1))) + .[Menge] = Mid(strZeile, 153, 10) / 100 + .[SB_BT] = IIf(Trim(Mid(strZeile, 163, 1)) = "", Nothing, Trim(Mid(strZeile, 163, 1))) + .[Umsatzsteuerprozentsatz] = Mid(strZeile, 164, 5) / 10000 + .[Lieferlandwährung_ISO] = IIf(Trim(Mid(strZeile, 169, 3)) = "", Nothing, Trim(Mid(strZeile, 169, 3))) + .[Einzelpreis_Brutto_in_Lieferlandwährung] = Mid(strZeile, 172, 11) / 100 + .[Einzelpreis_Netto_in_Lieferlandwährung] = Mid(strZeile, 183, 11) / 100 + .[Betrag_Service_in_Lieferlandwährung] = Mid(strZeile, 194, 11) / 100 + .[Betrag_Nachlass_in_Lieferlandwährung] = Mid(strZeile, 205, 11) / 100 + .[Gesamtbetrag_Netto_in_Lieferlandwährung] = Mid(strZeile, 216, 11) / 100 + .[Gesamtbetrag_Brutto_in_Lieferlandwährung] = Mid(strZeile, 227, 11) / 100 + .[Darstellwährung_ISO] = IIf(Trim(Mid(strZeile, 238, 3)) = "", Nothing, Trim(Mid(strZeile, 238, 3))) + .[Betrag_Service_in_Darstellwährung] = Mid(strZeile, 241, 11) / 100 + .[Betrag_Nachlass_in_Darstellwährung] = Mid(strZeile, 252, 11) / 100 + .[Gesamtbetrag_Netto_in_Darstellwährung] = Mid(strZeile, 263, 11) / 100 + .[Gesamtbetrag_Umsatzsteuer_in_Darstellwährung] = Mid(strZeile, 274, 11) / 100 + .[Gesamtbetrag_Brutto_in_Darstellwährung] = Mid(strZeile, 285, 11) / 100 + .[Prägetext_i_d_R_KFZ_Kennzeichen] = IIf(Trim(Mid(strZeile, 296, 16)) = "", Nothing, Trim(Mid(strZeile, 296, 16))) + .[Kunden_Kostenstelle_1] = IIf(Trim(Mid(strZeile, 312, 20)) = "", Nothing, Trim(Mid(strZeile, 312, 20))) + .[Kartentyp] = IIf(Trim(Mid(strZeile, 332, 8)) = "", Nothing, Trim(Mid(strZeile, 332, 8))) + .[Filler_Feld_35] = IIf(Trim(Mid(strZeile, 340, 1)) = "", Nothing, Trim(Mid(strZeile, 340, 1))) + .[Filler_Feld_36] = IIf(Trim(Mid(strZeile, 341, 3)) = "", Nothing, Trim(Mid(strZeile, 341, 3))) + .[KZ_Autobahn] = IIf(Trim(Mid(strZeile, 344, 1)) = "", Nothing, Trim(Mid(strZeile, 344, 1))) + .[INFO_Feld] = IIf(Trim(Mid(strZeile, 345, 18)) = "", Nothing, Trim(Mid(strZeile, 345, 18))) + .[KFZ_Kennzeichen] = IIf(Trim(Mid(strZeile, 363, 16)) = "", Nothing, Trim(Mid(strZeile, 363, 16))) + .[Filler_Feld_40] = IIf(Trim(Mid(strZeile, 379, 1)) = "", Nothing, Trim(Mid(strZeile, 379, 1))) + .[Buchungsart] = IIf(Trim(Mid(strZeile, 380, 1)) = "", Nothing, Trim(Mid(strZeile, 380, 1))) + .[Buchungsgrund] = IIf(Trim(Mid(strZeile, 381, 1)) = "", Nothing, Trim(Mid(strZeile, 381, 1))) + .[Filler_Feld_43] = IIf(Trim(Mid(strZeile, 382, 1)) = "", Nothing, Trim(Mid(strZeile, 382, 1))) + .[Informationsbeleg] = IIf(Trim(Mid(strZeile, 383, 1)) = "", Nothing, Trim(Mid(strZeile, 383, 1))) + .[Belegherkunft] = IIf(Trim(Mid(strZeile, 384, 1)) = "", Nothing, Trim(Mid(strZeile, 384, 1))) + .[Filler_Feld_46] = IIf(Trim(Mid(strZeile, 385, 14)) = "", Nothing, Trim(Mid(strZeile, 385, 14))) + .[Einzelpreis_Brutto_in_Lieferlandwährung_mit_4_Nachkommastellen] = Mid(strZeile, 399, 13) / 10000 + .[Einzelpreis_Netto_in_Lieferlandwährung_mit_4_Nachkommastellen] = Mid(strZeile, 412, 13) / 10000 + .[Rechnungsdatum] = DateSerial(Mid(strZeile, 429, 4), Mid(strZeile, 427, 2), Mid(strZeile, 425, 2)) + .[Umsatzsteuerprozentsatz_informativ] = Mid(strZeile, 433, 5) / 10000 + .[Betrag_Nachlass_in_Lieferlandwährung_Umsatzsteuer_informativ] = Mid(strZeile, 438, 11) / 100 + .[Betrag_Service_in_Lieferlandwährung_Umsatzsteuer_informativ] = Mid(strZeile, 449, 11) / 100 + .[Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ] = Mid(strZeile, 460, 11) / 100 + .[Fälligkeitsdatum] = DateSerial(Mid(strZeile, 475, 4), Mid(strZeile, 473, 2), Mid(strZeile, 471, 2)) + .[Zahlungsziel_in_Tagen] = Mid(strZeile, 479, 3) + .[Zahlungsart] = IIf(Trim(Mid(strZeile, 482, 8)) = "", Nothing, Trim(Mid(strZeile, 482, 8))) + .[TC_Rechnungsnummer_gegenüber_dem_Nutzer] = IIf(Trim(Mid(strZeile, 490, 20)) = "", Nothing, Trim(Mid(strZeile, 490, 20))) + .[TC_Rechnungsdatum] = DateSerial(Mid(strZeile, 514, 4), Mid(strZeile, 512, 2), Mid(strZeile, 510, 2)) + .[Zahlungszielgruppe] = IIf(Trim(Mid(strZeile, 518, 7)) = "", Nothing, Trim(Mid(strZeile, 518, 7))) + .[Kunden_Kostenstelle_2] = IIf(Trim(Mid(strZeile, 525, 20)) = "", Nothing, Trim(Mid(strZeile, 525, 20))) + .[Lieferzeit] = IIf(Trim(Mid(strZeile, 545, 6)) = "", Nothing, Trim(Mid(strZeile, 545, 6))) + .[Fremdkartennummer] = IIf(Trim(Mid(strZeile, 551, 20)) = "", Nothing, Trim(Mid(strZeile, 551, 20))) + .[OnBoardUnitID] = IIf(Trim(Mid(strZeile, 571, 20)) = "", Nothing, Trim(Mid(strZeile, 571, 20))) + .[KFZ_Kennzeichen_komprimiert] = IIf(Trim(Mid(strZeile, 591, 16)) = "", Nothing, Trim(Mid(strZeile, 591, 16))) + .[Kartenkategorie] = IIf(Trim(Mid(strZeile, 607, 8)) = "", Nothing, Trim(Mid(strZeile, 607, 8))) + .[Rechnungsnummer_pro_Lieferland] = Mid(strZeile, 615, 13) + .[Autobahnauffahrt] = IIf(Trim(Mid(strZeile, 628, 40)) = "", Nothing, Trim(Mid(strZeile, 628, 40))) + .[Autobahnausfahrt] = IIf(Trim(Mid(strZeile, 668, 40)) = "", Nothing, Trim(Mid(strZeile, 668, 40))) + .[Rabattschlüssel_der_französischen_Autobahngesellschaften] = IIf(Trim(Mid(strZeile, 708, 1)) = "", Nothing, Trim(Mid(strZeile, 708, 1))) + .[Nummer_Belastungsanzeige] = Mid(strZeile, 709, 13) + .[Betreuungsstelle] = IIf(Trim(Mid(strZeile, 722, 20)) = "", Nothing, Trim(Mid(strZeile, 722, 20))) + .[Filler_Feld_72] = IIf(Trim(Mid(strZeile, 742, 20)) = "", Nothing, Trim(Mid(strZeile, 742, 20))) + .[Akzeptanz_Medium] = IIf(Trim(Mid(strZeile, 762, 20)) = "", Nothing, Trim(Mid(strZeile, 762, 20))) + .[Steuerkategorie] = IIf(Trim(Mid(strZeile, 782, 8)) = "", Nothing, Trim(Mid(strZeile, 782, 8))) + .[UTA_Beleg_ID] = Mid(strZeile, 790, 11) + .[UTA_Normalbeleg_ID] = Mid(strZeile, 801, 11) + .[Gebühren_Bescheinigung_von] = DateSerial(Mid(strZeile, 816, 4), Mid(strZeile, 814, 2), Mid(strZeile, 812, 2)) + .[Gebühren_Bescheinigung_bis] = DateSerial(Mid(strZeile, 824, 4), Mid(strZeile, 822, 2), Mid(strZeile, 820, 2)) + .[Herausgeber_Nutzer_Nummer] = IIf(Trim(Mid(strZeile, 828, 20)) = "", Nothing, Trim(Mid(strZeile, 828, 20))) + .[Maßeinheit] = IIf(Trim(Mid(strZeile, 848, 8)) = "", Nothing, Trim(Mid(strZeile, 848, 8))) + .[Land_der_Akzeptanzstelle] = IIf(Trim(Mid(strZeile, 856, 3)) = "", Nothing, Trim(Mid(strZeile, 856, 3))) + .[Postleitzahl_der_Akzeptanzstelle] = IIf(Trim(Mid(strZeile, 859, 7)) = "", Nothing, Trim(Mid(strZeile, 859, 7))) + .[Steuerliches_Lieferland] = IIf(Trim(Mid(strZeile, 866, 3)) = "", Nothing, Trim(Mid(strZeile, 866, 3))) + .[Steuerliche_Produktgruppe] = IIf(Trim(Mid(strZeile, 869, 5)) = "", Nothing, Trim(Mid(strZeile, 869, 5))) + .[Leistungsort_verlagerbar] = IIf(Trim(Mid(strZeile, 874, 1)) = "", Nothing, Trim(Mid(strZeile, 874, 1))) - Loop + Select Case .[Vorzeichen_Statusfeld_für_alle_Beträge_und_Mengen] + Case "0" 'positiv + curChecksumme = curChecksumme + .[Gesamtbetrag_Brutto_in_Darstellwährung] + Case "1" 'negativ + curChecksumme = curChecksumme - .[Gesamtbetrag_Brutto_in_Darstellwährung] + .[Menge] = 0 - .[Menge] + .[Einzelpreis_Brutto_in_Lieferlandwährung] = 0 - .[Einzelpreis_Brutto_in_Lieferlandwährung] + .[Einzelpreis_Netto_in_Lieferlandwährung] = 0 - .[Einzelpreis_Netto_in_Lieferlandwährung] + .[Betrag_Service_in_Lieferlandwährung] = 0 - .[Betrag_Service_in_Lieferlandwährung] + .[Betrag_Nachlass_in_Lieferlandwährung] = 0 - .[Betrag_Nachlass_in_Lieferlandwährung] + .[Gesamtbetrag_Netto_in_Lieferlandwährung] = 0 - .[Gesamtbetrag_Netto_in_Lieferlandwährung] + .[Gesamtbetrag_Brutto_in_Lieferlandwährung] = 0 - .[Gesamtbetrag_Brutto_in_Lieferlandwährung] + .[Betrag_Service_in_Darstellwährung] = 0 - .[Betrag_Service_in_Darstellwährung] + .[Betrag_Nachlass_in_Darstellwährung] = 0 - .[Betrag_Nachlass_in_Darstellwährung] + .[Gesamtbetrag_Netto_in_Darstellwährung] = 0 - .[Gesamtbetrag_Netto_in_Darstellwährung] + .[Gesamtbetrag_Umsatzsteuer_in_Darstellwährung] = 0 - .[Gesamtbetrag_Umsatzsteuer_in_Darstellwährung] + .[Gesamtbetrag_Brutto_in_Darstellwährung] = 0 - .[Gesamtbetrag_Brutto_in_Darstellwährung] + .[Einzelpreis_Brutto_in_Lieferlandwährung_mit_4_Nachkommastellen] = 0 - .[Einzelpreis_Brutto_in_Lieferlandwährung_mit_4_Nachkommastellen] + .[Einzelpreis_Netto_in_Lieferlandwährung_mit_4_Nachkommastellen] = 0 - .[Einzelpreis_Netto_in_Lieferlandwährung_mit_4_Nachkommastellen] + .[Betrag_Nachlass_in_Lieferlandwährung_Umsatzsteuer_informativ] = 0 - .[Betrag_Nachlass_in_Lieferlandwährung_Umsatzsteuer_informativ] + .[Betrag_Service_in_Lieferlandwährung_Umsatzsteuer_informativ] = 0 - .[Betrag_Service_in_Lieferlandwährung_Umsatzsteuer_informativ] + .[Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ] = 0 - .[Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ] + End Select + + If onlyTestkunedn Then + 'nur KundenNr 100964 und 825040 speichern: + If .[Kundennummer] = 100964 Or .[Kundennummer] = 825040 Then + .SAVE() + End If + Else + .SAVE() + End If + + + + 'Dim clfArchiv As New cUTA.UTAArchiv(.Belegdatum, .UTA_Beleg_ID) + 'clfArchiv.Übertragungsnummer = .Übertragungsnummer + 'clfArchiv.ErstellDatumUhrzeit = .ErstellDatumUhrzeit + 'clfArchiv.Übertragungsposition = .Übertragungsposition + 'clfArchiv.Abrechnungsnummer = .Abrechnungsnummer + 'clfArchiv.Datum_für_Lieferungen_und_Leistungen_bis = .Datum_für_Lieferungen_und_Leistungen_bis + 'clfArchiv.Rechnungsempfänger_Kundennummer = .Rechnungsempfänger_Kundennummer + 'clfArchiv.Abrechnungsdatum = .Abrechnungsdatum + 'clfArchiv.Kundennummer = .Kundennummer + 'clfArchiv.Kartennummer = .Kartennummer + 'clfArchiv.Akzeptanzstellennummer = .Akzeptanzstellennummer + 'clfArchiv.Standort_der_Akzeptanzstelle = .Standort_der_Akzeptanzstelle + 'clfArchiv.Lieferland = .Lieferland + 'clfArchiv.Belegnummer_des_Lieferanten = .Belegnummer_des_Lieferanten + 'clfArchiv.Kilometerstand = .Kilometerstand + 'clfArchiv.Fakturierwarenart = .Fakturierwarenart + 'clfArchiv.Vorzeichen_Statusfeld_für_alle_Beträge_und_Mengen = .Vorzeichen_Statusfeld_für_alle_Beträge_und_Mengen + 'clfArchiv.Menge = .Menge + 'clfArchiv.SB_BT = .SB_BT + 'clfArchiv.Umsatzsteuerprozentsatz = .Umsatzsteuerprozentsatz + 'clfArchiv.Lieferlandwährung_ISO = .Lieferlandwährung_ISO + 'clfArchiv.Einzelpreis_Netto_in_Lieferlandwährung = .Einzelpreis_Netto_in_Lieferlandwährung + 'clfArchiv.Einzelpreis_Brutto_in_Lieferlandwährung = .Einzelpreis_Brutto_in_Lieferlandwährung + 'clfArchiv.Einzelpreis_Netto_in_Lieferlandwährung = .Einzelpreis_Netto_in_Lieferlandwährung + 'clfArchiv.Betrag_Service_in_Lieferlandwährung = .Betrag_Service_in_Lieferlandwährung + 'clfArchiv.Betrag_Nachlass_in_Lieferlandwährung = .Betrag_Nachlass_in_Lieferlandwährung + 'clfArchiv.Gesamtbetrag_Netto_in_Lieferlandwährung = .Gesamtbetrag_Netto_in_Lieferlandwährung + 'clfArchiv.Gesamtbetrag_Brutto_in_Lieferlandwährung = .Gesamtbetrag_Brutto_in_Lieferlandwährung + 'clfArchiv.Darstellwährung_ISO = .Darstellwährung_ISO + 'clfArchiv.Betrag_Service_in_Darstellwährung = .Betrag_Service_in_Darstellwährung + 'clfArchiv.Betrag_Nachlass_in_Darstellwährung = .Betrag_Nachlass_in_Darstellwährung + 'clfArchiv.Gesamtbetrag_Netto_in_Darstellwährung = .Gesamtbetrag_Netto_in_Darstellwährung + 'clfArchiv.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung = .Gesamtbetrag_Umsatzsteuer_in_Darstellwährung + 'clfArchiv.Gesamtbetrag_Brutto_in_Darstellwährung = .Gesamtbetrag_Brutto_in_Darstellwährung + 'clfArchiv.Prägetext_i_d_R_KFZ_Kennzeichen = .Prägetext_i_d_R_KFZ_Kennzeichen + 'clfArchiv.Kunden_Kostenstelle_1 = .Kunden_Kostenstelle_1 + 'clfArchiv.Kartentyp = .Kartentyp + 'clfArchiv.Filler_Feld_35 = .Filler_Feld_35 + 'clfArchiv.Filler_Feld_36 = .Filler_Feld_36 + 'clfArchiv.KZ_Autobahn = .KZ_Autobahn + 'clfArchiv.INFO_Feld = .INFO_Feld + 'clfArchiv.KFZ_Kennzeichen = .KFZ_Kennzeichen + 'clfArchiv.Filler_Feld_40 = .Filler_Feld_40 + 'clfArchiv.Buchungsart = .Buchungsart + 'clfArchiv.Buchungsgrund = .Buchungsgrund + 'clfArchiv.Filler_Feld_43 = .Filler_Feld_43 + 'clfArchiv.Informationsbeleg = .Informationsbeleg + 'clfArchiv.Belegherkunft = .Belegherkunft + 'clfArchiv.Filler_Feld_46 = .Filler_Feld_46 + 'clfArchiv.Einzelpreis_Brutto_in_Lieferlandwährung_mit_4_Nachkommastellen = .Einzelpreis_Brutto_in_Lieferlandwährung_mit_4_Nachkommastellen + 'clfArchiv.Einzelpreis_Netto_in_Lieferlandwährung_mit_4_Nachkommastellen = .Einzelpreis_Netto_in_Lieferlandwährung_mit_4_Nachkommastellen + 'clfArchiv.Rechnungsdatum = .Rechnungsdatum + 'clfArchiv.Umsatzsteuerprozentsatz_informativ = .Umsatzsteuerprozentsatz_informativ + 'clfArchiv.Betrag_Nachlass_in_Lieferlandwährung = .Betrag_Nachlass_in_Lieferlandwährung + 'clfArchiv.Betrag_Service_in_Lieferlandwährung_Umsatzsteuer_informativ = .Betrag_Service_in_Lieferlandwährung_Umsatzsteuer_informativ + 'clfArchiv.Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ = .Gesamtbetrag_in_Lieferlandwährung_Umsatzsteuer_informativ + 'clfArchiv.Fälligkeitsdatum = .Fälligkeitsdatum + 'clfArchiv.Zahlungsziel_in_Tagen = .Zahlungsziel_in_Tagen + 'clfArchiv.Zahlungsart = .Zahlungsart + 'clfArchiv.TC_Rechnungsnummer_gegenüber_dem_Nutzer = .TC_Rechnungsnummer_gegenüber_dem_Nutzer + 'clfArchiv.TC_Rechnungsdatum = .TC_Rechnungsdatum + 'clfArchiv.Zahlungszielgruppe = .Zahlungszielgruppe + 'clfArchiv.Kunden_Kostenstelle_2 = .Kunden_Kostenstelle_2 + 'clfArchiv.Lieferzeit = .Lieferzeit + 'clfArchiv.Fremdkartennummer = .Fremdkartennummer + 'clfArchiv.OnBoardUnitID = .OnBoardUnitID + 'clfArchiv.KFZ_Kennzeichen_komprimiert = .KFZ_Kennzeichen_komprimiert + 'clfArchiv.Kartenkategorie = .Kartenkategorie + 'clfArchiv.Rechnungsnummer_pro_Lieferland = .Rechnungsnummer_pro_Lieferland + 'clfArchiv.Autobahnauffahrt = .Autobahnauffahrt + 'clfArchiv.Autobahnausfahrt = .Autobahnausfahrt + 'clfArchiv.Rabattschlüssel_der_französischen_Autobahngesellschaften = .Rabattschlüssel_der_französischen_Autobahngesellschaften + 'clfArchiv.Nummer_Belastungsanzeige = .Nummer_Belastungsanzeige + 'clfArchiv.Betreuungsstelle = .Betreuungsstelle + 'clfArchiv.Filler_Feld_72 = .Filler_Feld_72 + 'clfArchiv.Akzeptanz_Medium = .Akzeptanz_Medium + 'clfArchiv.Steuerkategorie = .Steuerkategorie + 'clfArchiv.UTA_Normalbeleg_ID = .UTA_Normalbeleg_ID + 'clfArchiv.Gebühren_Bescheinigung_von = .Gebühren_Bescheinigung_von + 'clfArchiv.Gebühren_Bescheinigung_bis = .Gebühren_Bescheinigung_bis + 'clfArchiv.Herausgeber_Nutzer_Nummer = .Herausgeber_Nutzer_Nummer + 'clfArchiv.Maßeinheit = .Maßeinheit + 'clfArchiv.Land_der_Akzeptanzstelle = .Land_der_Akzeptanzstelle + 'clfArchiv.Postleitzahl_der_Akzeptanzstelle = .Postleitzahl_der_Akzeptanzstelle + 'clfArchiv.Steuerliches_Lieferland = .Steuerliches_Lieferland + 'clfArchiv.Steuerliche_Produktgruppe = .Steuerliche_Produktgruppe + 'clfArchiv.Leistungsort_verlagerbar = .Leistungsort_verlagerbar + 'clfArchiv.SAVE() + + End With + + Case "90" + + If curChecksumme < 0 Then + curChecksumme = 0 - curChecksumme + End If + If Trim(Mid(strZeile, 16, 18) / 100) <> Math.Round(curChecksumme, 2) Then + MsgBox("Checksumme: " & Trim(Mid(strZeile, 16, 18) / 100) & vbCrLf & "Prüfsumme: " & curChecksumme & vbCrLf & "Datei kann wegen Prüfsummenfehler nicht verarbeitet werden") + 'Return False + End If + + + lngRecordCount = lngRecordCount + 1 + Dim clfTrailer As New cUTA.UTATrailer(lngÜbertragungsnummer, dtmErstellDatumUhrzeit) + With clfTrailer + .ErstellDatumUhrzeit = dtmErstellDatumUhrzeit + .Übertragungsnummer = lngÜbertragungsnummer + .Anzahl_Sätze = Mid(strZeile, 3, 13) + .Checksumme = Mid(strZeile, 16, 18) / 100 + .SAVE() + End With + + + + Case Else + ' Andere RecordNumber überlesen. + End Select + + Loop + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try cnt = CInt(lngRecordCount) objFileRead.Close() Return True From 792c57f3ecc62207777f9c9dc7f25d31ef30043d Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 7 Apr 2025 17:55:20 +0200 Subject: [PATCH 02/10] BU, Faktsammelrechnungdruck, etc. --- SDL/Fakturierung/frmFaktSammelRgDrucken.vb | 2 +- ...ptSammelRechnungAnlagenDruck_Leistungen.vb | 6 +- SDL/SDL.vbproj | 4 +- SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb | 81 +++++++++- SDL/buchhaltung/frmBU_Mahnlauf.vb | 152 +++++++++++++++--- SDL/cProgramFunctions.vb | 4 +- 6 files changed, 218 insertions(+), 31 deletions(-) diff --git a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb index 95f48c9b..21bab2da 100644 --- a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb +++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb @@ -311,7 +311,7 @@ Public Class frmFaktSammelRgDrucken If Sammelrechung = 6 Then 'MDMSammelrechnung 'AKTUELL IMMER MIT KOPIE MDMKopiedrucken = True - Dim reLandKZ As String = MyDatagridview1.Rows(0).Cells("RechnungsLandKz").Value + Dim reLandKZ As String = MyDatagridview1.SelectedRows(0).Cells("RechnungsLandKz").Value Dim isEU As Boolean = dTLANDEU.AsEnumerable().Where(Function(res) res.Field(Of String)("LandKz") = reLandKZ).Select(Function(res) res.Field(Of Boolean)("MitgliedslandEU")).FirstOrDefault() If isEU Then diff --git a/SDL/Fakturierung/rptSammelRechnungAnlagenDruck_Leistungen.vb b/SDL/Fakturierung/rptSammelRechnungAnlagenDruck_Leistungen.vb index 606a7f9d..aeb6c57f 100644 --- a/SDL/Fakturierung/rptSammelRechnungAnlagenDruck_Leistungen.vb +++ b/SDL/Fakturierung/rptSammelRechnungAnlagenDruck_Leistungen.vb @@ -24,14 +24,16 @@ Public Class rptSammelRechnungAnlagenDruck_Leistungen txtAbfertigungsart.Text = "" lblSteuerfrei.Text = "" lblSteuerpflichtig.Text = "" + Dim vorzeichen = If(If(RECHNUNG.Vorzeichen, "") = "-", -1, 1) + If Me.Fields.Item("clmnAnzahl") IsNot Nothing AndAlso Me.Fields.Item("clmnAnzahl").Value IsNot Nothing Then txtAbfertigungsart.Text &= Me.Fields.Item("clmnAnzahl").Value.ToString & "x " If Me.Fields.Item("clmnLeistung") IsNot Nothing AndAlso Me.Fields.Item("clmnLeistung").Value IsNot Nothing Then txtAbfertigungsart.Text &= Me.Fields.Item("clmnLeistung").Value.ToString If Me.Fields.Item("clmnLeistungsNr") IsNot Nothing AndAlso Me.Fields.Item("clmnLeistungsNr").Value IsNot Nothing Then txtAbfertigungsart.Text &= " (" & Me.Fields.Item("clmnLeistungsNr").Value.ToString & ") " If Me.Fields.Item("clmnSteuerfreierBetrag") IsNot Nothing AndAlso Me.Fields.Item("clmnSteuerfreierBetrag").Value IsNot Nothing AndAlso CDbl(Me.Fields.Item("clmnSteuerfreierBetrag").Value) <> 0 Then - lblSteuerfrei.Text = CDbl(Me.Fields.Item("clmnSteuerfreierBetrag").Value.ToString).ToString("N2") + lblSteuerfrei.Text = CDbl(Me.Fields.Item("clmnSteuerfreierBetrag").Value.ToString * vorzeichen).ToString("N2") End If If Me.Fields.Item("clmnSteuerpflichtigerBetrag") IsNot Nothing AndAlso Me.Fields.Item("clmnSteuerpflichtigerBetrag").Value IsNot Nothing AndAlso CDbl(Me.Fields.Item("clmnSteuerpflichtigerBetrag").Value) <> 0 Then - lblSteuerpflichtig.Text = CDbl(Me.Fields.Item("clmnSteuerpflichtigerBetrag").Value.ToString).ToString("N2") + lblSteuerpflichtig.Text = CDbl(Me.Fields.Item("clmnSteuerpflichtigerBetrag").Value.ToString * vorzeichen).ToString("N2") End If End If End Sub diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 4ad06591..7ea41133 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -4991,7 +4991,9 @@ - + + Always + Always diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb index 80eafb25..b05bca20 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.Designer.vb @@ -56,6 +56,10 @@ Partial Class frmBU_Mahnlauf Me.Button2 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtZahlEingaenge = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Button7 = New System.Windows.Forms.Button() + Me.btnMail_Intern = New System.Windows.Forms.Button() + Me.cbxKontotyp = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Panel1.SuspendLayout() Me.pnlTop.SuspendLayout() Me.Panel2.SuspendLayout() @@ -65,6 +69,8 @@ Partial Class frmBU_Mahnlauf ' 'Panel1 ' + Me.Panel1.Controls.Add(Me.cbxKontotyp) + Me.Panel1.Controls.Add(Me.txtZahlEingaenge) Me.Panel1.Controls.Add(Me.cbxZahlungseingaenge) Me.Panel1.Controls.Add(Me.cbxNurFaellig) Me.Panel1.Controls.Add(Me.MyComboBox1) @@ -89,9 +95,9 @@ Partial Class frmBU_Mahnlauf Me.cbxZahlungseingaenge.AutoSize = True Me.cbxZahlungseingaenge.Location = New System.Drawing.Point(568, 87) Me.cbxZahlungseingaenge.Name = "cbxZahlungseingaenge" - Me.cbxZahlungseingaenge.Size = New System.Drawing.Size(114, 17) + Me.cbxZahlungseingaenge.Size = New System.Drawing.Size(140, 17) Me.cbxZahlungseingaenge.TabIndex = 39 - Me.cbxZahlungseingaenge.Text = "Zahlungseingänge" + Me.cbxZahlungseingaenge.Text = "Zahlungseingänge vom:" Me.cbxZahlungseingaenge.UseVisualStyleBackColor = True ' 'cbxNurFaellig @@ -280,6 +286,8 @@ Partial Class frmBU_Mahnlauf ' 'Panel3 ' + Me.Panel3.Controls.Add(Me.btnMail_Intern) + Me.Panel3.Controls.Add(Me.Button7) Me.Panel3.Controls.Add(Me.btnKunde) Me.Panel3.Controls.Add(Me.cbxMahnstufeErh) Me.Panel3.Controls.Add(Me.Label8) @@ -307,7 +315,7 @@ Partial Class frmBU_Mahnlauf Me.btnKunde.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnKunde.Image = Global.SDL.My.Resources.Resources.person1 Me.btnKunde.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnKunde.Location = New System.Drawing.Point(38, 87) + Me.btnKunde.Location = New System.Drawing.Point(38, 78) Me.btnKunde.Name = "btnKunde" Me.btnKunde.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) Me.btnKunde.Size = New System.Drawing.Size(123, 32) @@ -501,6 +509,69 @@ Partial Class frmBU_Mahnlauf Me.MyTextBox2.TabIndex = 39 Me.MyTextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' + 'txtZahlEingaenge + ' + Me.txtZahlEingaenge._DateTimeOnly = False + Me.txtZahlEingaenge._numbersOnly = False + Me.txtZahlEingaenge._numbersOnlyKommastellen = "" + Me.txtZahlEingaenge._numbersOnlyTrennzeichen = True + Me.txtZahlEingaenge._Prozent = False + Me.txtZahlEingaenge._ShortDateNew = True + Me.txtZahlEingaenge._ShortDateOnly = False + Me.txtZahlEingaenge._TimeOnly = False + Me.txtZahlEingaenge._TimeOnly_Seconds = False + Me.txtZahlEingaenge._value = "" + Me.txtZahlEingaenge._Waehrung = False + Me.txtZahlEingaenge._WaehrungZeichen = False + Me.txtZahlEingaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtZahlEingaenge.ForeColor = System.Drawing.Color.Black + Me.txtZahlEingaenge.Location = New System.Drawing.Point(714, 85) + Me.txtZahlEingaenge.MaxLength = 10 + Me.txtZahlEingaenge.MaxLineLength = -1 + Me.txtZahlEingaenge.MaxLines_Warning = "" + Me.txtZahlEingaenge.MaxLines_Warning_Label = Nothing + Me.txtZahlEingaenge.Name = "txtZahlEingaenge" + Me.txtZahlEingaenge.Size = New System.Drawing.Size(88, 20) + Me.txtZahlEingaenge.TabIndex = 47 + Me.txtZahlEingaenge.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + Me.txtZahlEingaenge.Visible = False + ' + 'Button7 + ' + Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button7.Location = New System.Drawing.Point(38, 113) + Me.Button7.Name = "Button7" + Me.Button7.Size = New System.Drawing.Size(123, 23) + Me.Button7.TabIndex = 47 + Me.Button7.Text = "OP-Liste aktualisieren" + Me.Button7.UseVisualStyleBackColor = True + ' + 'btnMail_Intern + ' + Me.btnMail_Intern.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnMail_Intern.BackgroundImage = Global.SDL.My.Resources.Resources.email_big1 + Me.btnMail_Intern.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnMail_Intern.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnMail_Intern.Location = New System.Drawing.Point(1213, 83) + Me.btnMail_Intern.Name = "btnMail_Intern" + Me.btnMail_Intern.Size = New System.Drawing.Size(41, 34) + Me.btnMail_Intern.TabIndex = 48 + Me.btnMail_Intern.UseVisualStyleBackColor = True + ' + 'cbxKontotyp + ' + Me.cbxKontotyp._allowedValuesFreiText = Nothing + Me.cbxKontotyp._allowFreiText = False + Me.cbxKontotyp._value = "" + Me.cbxKontotyp.FormattingEnabled = True + Me.cbxKontotyp.Location = New System.Drawing.Point(568, 103) + Me.cbxKontotyp.Name = "cbxKontotyp" + Me.cbxKontotyp.Size = New System.Drawing.Size(97, 21) + Me.cbxKontotyp.TabIndex = 48 + Me.cbxKontotyp.Visible = False + ' 'frmBU_Mahnlauf ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -558,4 +629,8 @@ Partial Class frmBU_Mahnlauf Friend WithEvents cbxMahnstufeErh As CheckBox Friend WithEvents btnKunde As Button Friend WithEvents cbxZahlungseingaenge As CheckBox + Friend WithEvents txtZahlEingaenge As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Button7 As Button + Friend WithEvents btnMail_Intern As Button + Friend WithEvents cbxKontotyp As VERAG_PROG_ALLGEMEIN.MyComboBox End Class diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index d9cc606c..703e2254 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -1,8 +1,6 @@ Imports System.Globalization -Imports System.Windows Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN -Imports VERAG_PROG_ALLGEMEIN.TESTJSON Public Class frmBU_Mahnlauf @@ -70,14 +68,20 @@ Public Class frmBU_Mahnlauf ORDER BY KTO.c_name" + Dim SQLWhere = " and (c_kennung = 'KE' or BU.i_konto in (5827, 5829) or LEFT(BU.i_konto,1) = 0 or c_kennung = 'DE')" + + Select Case cbxKontotyp._value + Case "DE", "KE", "KO" : SQLWhere &= " and c_kennung = '" & cbxKontotyp._value & "'" + End Select Dim sqlStringVerag360Zahlungseingaenge = " SELECT cast(d_beleg as Date) as d_beleg ,c_urbelegid, c_buchtext, case when c_sollhabenkz = 'H' then eur_betrag else eur_betrag * -1 end as eur_betrag , BU.i_konto,KTO.c_landid FROM [FIBU2].[dbo].[fibu_belegzeile] as BU RIGHT join fibu_konto KTO on KTO.i_konto=BU.i_konto AND BU.i_firm_refid=KTO.i_firm_refid - where cast(d_beleg as date) = '03.04.2025' and BU.i_firm_refid=" & Firma_ID & " and (c_kennung = 'KE' or BU.i_konto in (5827, 5829) or LEFT(BU.i_konto,1) = 0 or c_kennung = 'DE') + where cast(d_beleg as date) = '" & txtZahlEingaenge._value & "' and BU.i_firm_refid=" & Firma_ID & SQLWhere & " and (BU.i_konto in (2800, 2801, 2802, 2803, 2811, 2812, 2813, 2814, 2817, 2818, 2822 ,2826, 2827, 2828, 2831, 2832, 2833, 2837, 2845) or i_gegenkonto in (2800, 2801, 2802, 2803, 2811, 2812, 2813, 2814, 2817, 2818, 2822 ,2826, 2827, 2828, 2831, 2832, 2833, 2837, 2845)) - order by i_beleg_refid, i_zeilen_refid" + order by i_konto, i_beleg_refid, i_zeilen_refid" + 'MsgBox(sqlStr) @@ -188,6 +192,13 @@ Public Class frmBU_Mahnlauf MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("12. Mahnung", "12")) MyComboBox2.changeItem("") + cbxKontotyp.Items.Clear() + cbxKontotyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Alle", "A")) + cbxKontotyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Debitoren", "DE")) + cbxKontotyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Kreditoren", "KE")) + cbxKontotyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sachkonten", "KO")) + cbxKontotyp.changeItem("Alle") + MyTextBox2._value = Now.ToShortDateString End Sub @@ -478,10 +489,10 @@ Public Class frmBU_Mahnlauf Else 'über Übersetzung geregelt, alle anderen über getMahnstufe (sollte in Zukunft noch abgeändert werden!) getMahnstufetext("DE", MAHNSTUFE, MahnTEXT_VOR, MahnTEXT_NACH, MAHNTEXT) - rpt.lblUeberschriftRG_GS.Text = MAHNTEXT - rpt.txtMahnungstextVOR.Text = MahnTEXT_VOR - rpt.txtVermerk.Text = MahnTEXT_NACH - End If + rpt.lblUeberschriftRG_GS.Text = MAHNTEXT + rpt.txtMahnungstextVOR.Text = MahnTEXT_VOR + rpt.txtVermerk.Text = MahnTEXT_NACH + End If @@ -725,22 +736,22 @@ Public Class frmBU_Mahnlauf Dim outl As New Outlook.Application - Dim Mail As Microsoft.Office.Interop.Outlook.MailItem - Mail = outl.CreateItem(0) - Mail.Subject = Mail_Subject - Mail.HTMLBody = Mail_HTMLBody + Dim Mail As Microsoft.Office.Interop.Outlook.MailItem + Mail = outl.CreateItem(0) + Mail.Subject = Mail_Subject + Mail.HTMLBody = Mail_HTMLBody - Mail.To = Mail_To - Mail.CC = Mail_CC - Mail.BCC = Mail_BCC + Mail.To = Mail_To + Mail.CC = Mail_CC + Mail.BCC = Mail_BCC Mail.Attachments.Add(tmpPath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , pdfBezeichnung) Try 'Mail.SentOnBehalfOfName = SDL.cFakturierung.getDefaultMail("AMBAR") ',"buchhaltung@verag.ag" Catch ex2 As Exception MsgBox(ex2.Message) - End Try - Mail.Display() + End Try + Mail.Display() End Select @@ -1234,7 +1245,7 @@ Public Class frmBU_Mahnlauf Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, , "WiedergestellungsDatum Fehler") Finally - fProgBar.Close + fProgBar.Close() End Try Me.Cursor = Cursors.Default End Sub @@ -1247,10 +1258,14 @@ Public Class frmBU_Mahnlauf Private Sub btnExcel_Click(sender As Object, e As EventArgs) Handles btnExcel.Click Me.Cursor = Cursors.WaitCursor btnSuche.PerformClick() - ' cProgramFunctions.genExcelFromDGV_NEW(MyDatagridview1, False) - 'cProgramFunctions.genExcelFromDGV_NEW(MyDatagridview1, False) + Dim dt = MyDatagridview1.DataSource - cProgramFunctions.genExcelFromDT_NEW(dt, {"G1:G" & (dt.Rows.Count + 1), "J1:J" & (dt.Rows.Count + 1)}) + If cbxZahlungseingaenge.Checked Then + cProgramFunctions.genExcelFromDT_NEW(dt, {"E1:E" & (dt.Rows.Count + 1)},,, "Zahlungseingänge vom " & txtZahlEingaenge._value,, True) + Else + cProgramFunctions.genExcelFromDT_NEW(dt, {"G1:G" & (dt.Rows.Count + 1), "J1:J" & (dt.Rows.Count + 1)}) + End If + Me.Cursor = Cursors.Default End Sub @@ -1287,15 +1302,108 @@ Public Class frmBU_Mahnlauf End Sub Private Sub cbxZahlungseingaenge_CheckedChanged(sender As Object, e As EventArgs) Handles cbxZahlungseingaenge.CheckedChanged - 'initDGV(cbxZahlungseingaenge.Checked) + + If cbxZahlungseingaenge.Checked Then + txtZahlEingaenge.Visible = True + cbxKontotyp.Visible = True + btnMail_Intern.Visible = True + Select Case Now.DayOfWeek + Case 1 : txtZahlEingaenge._value = Today().AddDays(-3) 'Am Montag Daten von Freitag + Case Else : txtZahlEingaenge._value = Today().AddDays(-1) ' Sonst daten von gestern. + End Select + Else + txtZahlEingaenge.Visible = False + cbxKontotyp.Visible = False + btnMail_Intern.Visible = False + End If + End Sub Private Sub cboFirma_SelectedValueChanged(sender As Object, e As EventArgs) Handles cboFirma.SelectedValueChanged If cboFirma._value <> "" AndAlso cboFirma._value = 19 Then cbxZahlungseingaenge.Visible = True + Else cbxZahlungseingaenge.Visible = False cbxZahlungseingaenge.Checked = False + End If End Sub + + Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click + If cboFirma._value <> "" Then + If vbYes = MsgBox("Sollen die OPs aus Syska für die Firma " & cboFirma.Text.Replace(cboFirma._value, "") & " aktualisiert werden?" & vbNewLine & "Dieser Vorgang dauert unter Umständen etwas!", vbYesNoCancel) Then + + If Not VERAG_PROG_ALLGEMEIN.cSyska_Interface.OP_Einlesen(cboFirma._value) Then + MsgBox("Fehler beim aktualisieren der OPs aus Syska!") + Else + initDGV(cbxZahlungseingaenge.Checked) + End If + + + + End If + End If + + + End Sub + + Private Sub btnMail_Intern_Click(sender As Object, e As EventArgs) Handles btnMail_Intern.Click + Try + + Me.Cursor = Cursors.WaitCursor + btnSuche.PerformClick() + + + Dim dt = MyDatagridview1.DataSource + Dim desc = "Zahlungseingänge vom " & txtZahlEingaenge._value + Dim attachment = cProgramFunctions.genExcelFromDT_NEW(dt, {"E1:E" & (dt.Rows.Count + 1)},,, desc,, True,,,, False) + + Dim outl As New Outlook.Application + + Dim Mail As Microsoft.Office.Interop.Outlook.MailItem + Mail = outl.CreateItem(0) + Mail.Subject = desc & " (" & cbxKontotyp.Text & ")" + + If cboFirma._value = 19 Then + Dim accountToSent = "fibu360@verag.ag " + + + If accountToSent <> "" Then + If outl.Session.Accounts.Count > 0 Then + For Each oAccount In outl.Session.Accounts + If oAccount.SmtpAddress = accountToSent Then + Mail.SendUsingAccount = oAccount + Exit For + End If + Next + End If + End If + End If + + 'noch keine unterscheidung der Abteilungen bei MDM, daher hardcodiert. + Dim MautVertrMail = "z.batinic@verag.ag;alex@verag.ag;maut.ro@verag.ag;ma@verag.ag;n.ljubas@verag.ag;s.vidovic@verag.ag;" + Dim MautFaktMail = "s.kriegner@verag.ag;" + + Select Case cbxKontotyp._value + Case "A" : Mail.To = MautVertrMail & MautFaktMail + Case "DE" : Mail.To = MautVertrMail + Case "KE" : Mail.To = MautFaktMail + Case "KO" : Mail.To = "" + End Select + + Mail.Attachments.Add(attachment) + + Mail.Display() + + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("Fehler beim Ermitteln des Mail-Accounts." & ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + + + Me.Cursor = Cursors.Default + + End Sub End Class \ No newline at end of file diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb index 0f64113d..98cc23a5 100644 --- a/SDL/cProgramFunctions.vb +++ b/SDL/cProgramFunctions.vb @@ -1124,7 +1124,7 @@ Public Class cProgramFunctions Return "" End Function - Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "€", Optional fitCellsToContent As Boolean = False, Optional mergeHeadersToCell As Char = "", Optional Landscape As Boolean = False, Optional fitToOnePage As Boolean = False) As String + Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "€", Optional fitCellsToContent As Boolean = False, Optional mergeHeadersToCell As Char = "", Optional Landscape As Boolean = False, Optional fitToOnePage As Boolean = False, Optional openFile As Boolean = True) As String Try Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SDL\tmp\" ' My.Computer.FileSystem.GetTempFileName @@ -1200,7 +1200,7 @@ Public Class cProgramFunctions wb.SaveAs(filename) - Process.Start(filename) + If openFile Then Process.Start(filename) Return filename Catch ex As Exception From 80f9563bf6af0a206311bd2bb320d3a640946f89 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 8 Apr 2025 07:54:46 +0200 Subject: [PATCH 03/10] Sachkonten --- SDL/buchhaltung/frmBU_Mahnlauf.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDL/buchhaltung/frmBU_Mahnlauf.vb b/SDL/buchhaltung/frmBU_Mahnlauf.vb index 703e2254..739822c5 100644 --- a/SDL/buchhaltung/frmBU_Mahnlauf.vb +++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb @@ -196,7 +196,7 @@ Public Class frmBU_Mahnlauf cbxKontotyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Alle", "A")) cbxKontotyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Debitoren", "DE")) cbxKontotyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Kreditoren", "KE")) - cbxKontotyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sachkonten", "KO")) + 'cbxKontotyp.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sachkonten", "KO")) cbxKontotyp.changeItem("Alle") MyTextBox2._value = Now.ToShortDateString From b00baa6486841e59c492defc4fdc9e0b7f7cf01e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 8 Apr 2025 13:12:39 +0200 Subject: [PATCH 04/10] ATEZ, USTV, etc. --- SDL/SDL.vbproj | 4 +- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 835 +++++++++--------- SDL/USTV/frmMDM_USTVAntrag.vb | 15 +- .../ustCntlUSTV_AntragPosition.Designer.vb | 15 + SDL/USTV/ustCntlUSTV_AntragPosition.vb | 86 +- .../usrCntlFakturierung.Designer.vb | 254 +++--- SDL/seriendruck/usrCntlFakturierung.vb | 38 +- .../Classes/USTV/cUStVLeistender.vb | 20 +- .../ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb | 75 +- 9 files changed, 731 insertions(+), 611 deletions(-) diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 7ea41133..0eb1efe1 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -4991,15 +4991,13 @@ - - Always - Always Always + Always diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 93c83c52..b91b740e 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -27,6 +27,7 @@ Partial Class frmMDM_USTVAntrag Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDM_USTVAntrag)) Me.pnlBottom = New System.Windows.Forms.Panel() + Me.Label27 = New System.Windows.Forms.Label() Me.picExcel = New System.Windows.Forms.PictureBox() Me.Button4 = New System.Windows.Forms.Button() Me.picPDF = New System.Windows.Forms.PictureBox() @@ -39,36 +40,22 @@ Partial Class frmMDM_USTVAntrag Me.lblGesamtUSteuer = New System.Windows.Forms.Label() Me.lblDiffernezbetrag = New System.Windows.Forms.Label() Me.lblGesamtErstattung = New System.Windows.Forms.Label() - Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() - Me.cboAntragArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblKdNr = New System.Windows.Forms.Label() Me.Panel9 = New System.Windows.Forms.Panel() - Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblLand = New System.Windows.Forms.Label() Me.Panel8 = New System.Windows.Forms.Panel() Me.Label14 = New System.Windows.Forms.Label() - Me.txtEingereichtAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblMWSTAntrag = New System.Windows.Forms.Label() Me.Label13 = New System.Windows.Forms.Label() - Me.txtGueltig = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label11 = New System.Windows.Forms.Label() - Me.txtStNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label9 = New System.Windows.Forms.Label() - Me.txtVZ = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtAbfNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label8 = New System.Windows.Forms.Label() - Me.cbxFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label4 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() - Me.txtBezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cbxWahrung = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblWahrung = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.txt3470 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label3 = New System.Windows.Forms.Label() Me.lblZeitraum = New System.Windows.Forms.Label() - Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Panel6 = New System.Windows.Forms.Panel() Me.lblGesamtUSteuerFW = New System.Windows.Forms.Label() Me.Label12 = New System.Windows.Forms.Label() @@ -91,31 +78,45 @@ Partial Class frmMDM_USTVAntrag Me.btnStorno = New System.Windows.Forms.Button() Me.lblAntragAbgeschlossen = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() - Me.cboStatus = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblFirma = New System.Windows.Forms.Label() Me.lblWarnung = New System.Windows.Forms.Label() Me.pnlBody = New System.Windows.Forms.Panel() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() - Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlAntragsPosDetails = New System.Windows.Forms.Panel() Me.Panel2 = New System.Windows.Forms.Panel() - Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() Me.Panel4 = New System.Windows.Forms.Panel() Me.btnEintragloeschen = New System.Windows.Forms.Button() Me.btnNeuerEintrag = New System.Windows.Forms.Button() Me.TabPage2 = New System.Windows.Forms.TabPage() Me.Panel3 = New System.Windows.Forms.Panel() - Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlErstattungsdetails = New System.Windows.Forms.Panel() - Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() Me.Panel1 = New System.Windows.Forms.Panel() Me.Button2 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() + Me.cboAntragArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtEingereichtAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtGueltig = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtStNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtVZ = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtAbfNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtBezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxWahrung = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txt3470 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cboStatus = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() + Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label27 = New System.Windows.Forms.Label() + Me.btnAPI = New System.Windows.Forms.Button() Me.pnlBottom.SuspendLayout() CType(Me.picExcel, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit() @@ -128,15 +129,15 @@ Partial Class frmMDM_USTVAntrag Me.pnlBody.SuspendLayout() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() - CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlAntragsPosDetails.SuspendLayout() Me.Panel2.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabPage2.SuspendLayout() Me.Panel3.SuspendLayout() - CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlErstattungsdetails.SuspendLayout() Me.Panel1.SuspendLayout() + CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnlBottom @@ -159,6 +160,16 @@ Partial Class frmMDM_USTVAntrag Me.pnlBottom.Size = New System.Drawing.Size(1454, 100) Me.pnlBottom.TabIndex = 3 ' + 'Label27 + ' + Me.Label27.AutoSize = True + Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label27.Location = New System.Drawing.Point(975, 66) + Me.Label27.Name = "Label27" + Me.Label27.Size = New System.Drawing.Size(45, 13) + Me.Label27.TabIndex = 48 + Me.Label27.Text = "Summe:" + ' 'picExcel ' Me.picExcel.Image = Global.SDL.My.Resources.Resources.Excel_logo @@ -322,48 +333,6 @@ Partial Class frmMDM_USTVAntrag Me.lblGesamtErstattung.Text = "000.000,00" Me.lblGesamtErstattung.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'KdSearchBox1 - ' - Me.KdSearchBox1._AlleFirmenCLUSTER = False - Me.KdSearchBox1._AllowSetValue = False - Me.KdSearchBox1._autoSizeGross = False - Me.KdSearchBox1._display_Name1 = False - Me.KdSearchBox1._displayAVISO_Email = False - Me.KdSearchBox1._displayFullName = False - Me.KdSearchBox1._displayWoelflKd = False - Me.KdSearchBox1._hideIfListEmpty = True - Me.KdSearchBox1._loadKdData = False - Me.KdSearchBox1._searchName1 = True - Me.KdSearchBox1._UseFIRMA = "" - Me.KdSearchBox1._ValueKdAndName = True - Me.KdSearchBox1.dgvpos = "LEFT" - Me.KdSearchBox1.KdName = Nothing - Me.KdSearchBox1.KdNr = "-1" - Me.KdSearchBox1.kdNrField = Nothing - Me.KdSearchBox1.KdNrNullInt = Nothing - Me.KdSearchBox1.Location = New System.Drawing.Point(298, 10) - Me.KdSearchBox1.Name = "KdSearchBox1" - Me.KdSearchBox1.nurAktive = True - Me.KdSearchBox1.searchActive = True - Me.KdSearchBox1.Size = New System.Drawing.Size(171, 20) - Me.KdSearchBox1.TabIndex = 22 - Me.KdSearchBox1.TIMER_SEARCH = True - Me.KdSearchBox1.usrcntl = Nothing - ' - 'cboAntragArt - ' - Me.cboAntragArt._allowedValuesFreiText = Nothing - Me.cboAntragArt._allowFreiText = False - Me.cboAntragArt._value = "" - Me.cboAntragArt.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) - Me.cboAntragArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) - Me.cboAntragArt.FormattingEnabled = True - Me.cboAntragArt.Location = New System.Drawing.Point(83, 10) - Me.cboAntragArt.Name = "cboAntragArt" - Me.cboAntragArt.Size = New System.Drawing.Size(191, 28) - Me.cboAntragArt.TabIndex = 21 - Me.cboAntragArt.Text = "USTV-Antrag" - ' 'lblKdNr ' Me.lblKdNr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ @@ -388,21 +357,6 @@ Partial Class frmMDM_USTVAntrag Me.Panel9.Size = New System.Drawing.Size(65, 90) Me.Panel9.TabIndex = 20 ' - 'cbxLand - ' - Me.cbxLand._allowedValuesFreiText = Nothing - Me.cbxLand._allowFreiText = False - Me.cbxLand._value = "" - Me.cbxLand.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) - Me.cbxLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) - Me.cbxLand.FormattingEnabled = True - Me.cbxLand.Location = New System.Drawing.Point(0, 0) - Me.cbxLand.Name = "cbxLand" - Me.cbxLand.Size = New System.Drawing.Size(65, 28) - Me.cbxLand.TabIndex = 23 - Me.cbxLand.Text = "USTV-Antrag" - Me.cbxLand.Visible = False - ' 'lblLand ' Me.lblLand.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) @@ -463,31 +417,6 @@ Partial Class frmMDM_USTVAntrag Me.Label14.TabIndex = 27 Me.Label14.Text = "eingereicht am" ' - 'txtEingereichtAm - ' - Me.txtEingereichtAm._DateTimeOnly = False - Me.txtEingereichtAm._numbersOnly = False - Me.txtEingereichtAm._numbersOnlyKommastellen = "" - Me.txtEingereichtAm._numbersOnlyTrennzeichen = False - Me.txtEingereichtAm._Prozent = False - Me.txtEingereichtAm._ShortDateNew = False - Me.txtEingereichtAm._ShortDateOnly = True - Me.txtEingereichtAm._TimeOnly = False - Me.txtEingereichtAm._TimeOnly_Seconds = False - Me.txtEingereichtAm._value = "" - Me.txtEingereichtAm._Waehrung = False - Me.txtEingereichtAm._WaehrungZeichen = False - Me.txtEingereichtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtEingereichtAm.ForeColor = System.Drawing.Color.Black - Me.txtEingereichtAm.Location = New System.Drawing.Point(654, 60) - Me.txtEingereichtAm.MaxLength = 10 - Me.txtEingereichtAm.MaxLineLength = -1 - Me.txtEingereichtAm.MaxLines_Warning = "" - Me.txtEingereichtAm.MaxLines_Warning_Label = Nothing - Me.txtEingereichtAm.Name = "txtEingereichtAm" - Me.txtEingereichtAm.Size = New System.Drawing.Size(100, 23) - Me.txtEingereichtAm.TabIndex = 26 - ' 'lblMWSTAntrag ' Me.lblMWSTAntrag.AutoSize = True @@ -513,31 +442,6 @@ Partial Class frmMDM_USTVAntrag Me.Label13.TabIndex = 24 Me.Label13.Text = "gültig bis" ' - 'txtGueltig - ' - Me.txtGueltig._DateTimeOnly = False - Me.txtGueltig._numbersOnly = False - Me.txtGueltig._numbersOnlyKommastellen = "" - Me.txtGueltig._numbersOnlyTrennzeichen = False - Me.txtGueltig._Prozent = False - Me.txtGueltig._ShortDateNew = False - Me.txtGueltig._ShortDateOnly = True - Me.txtGueltig._TimeOnly = False - Me.txtGueltig._TimeOnly_Seconds = False - Me.txtGueltig._value = "" - Me.txtGueltig._Waehrung = False - Me.txtGueltig._WaehrungZeichen = False - Me.txtGueltig.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtGueltig.ForeColor = System.Drawing.Color.Black - Me.txtGueltig.Location = New System.Drawing.Point(101, 61) - Me.txtGueltig.MaxLength = 10 - Me.txtGueltig.MaxLineLength = -1 - Me.txtGueltig.MaxLines_Warning = "" - Me.txtGueltig.MaxLines_Warning_Label = Nothing - Me.txtGueltig.Name = "txtGueltig" - Me.txtGueltig.Size = New System.Drawing.Size(100, 23) - Me.txtGueltig.TabIndex = 23 - ' 'Label11 ' Me.Label11.AutoSize = True @@ -551,31 +455,6 @@ Partial Class frmMDM_USTVAntrag Me.Label11.TabIndex = 21 Me.Label11.Text = "Steuer-Nr:" ' - 'txtStNr - ' - Me.txtStNr._DateTimeOnly = False - Me.txtStNr._numbersOnly = False - Me.txtStNr._numbersOnlyKommastellen = "" - Me.txtStNr._numbersOnlyTrennzeichen = False - Me.txtStNr._Prozent = False - Me.txtStNr._ShortDateNew = False - Me.txtStNr._ShortDateOnly = False - Me.txtStNr._TimeOnly = False - Me.txtStNr._TimeOnly_Seconds = False - Me.txtStNr._value = "" - Me.txtStNr._Waehrung = False - Me.txtStNr._WaehrungZeichen = False - Me.txtStNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtStNr.ForeColor = System.Drawing.Color.Black - Me.txtStNr.Location = New System.Drawing.Point(101, 36) - Me.txtStNr.MaxLength = 10 - Me.txtStNr.MaxLineLength = -1 - Me.txtStNr.MaxLines_Warning = "" - Me.txtStNr.MaxLines_Warning_Label = Nothing - Me.txtStNr.Name = "txtStNr" - Me.txtStNr.Size = New System.Drawing.Size(100, 23) - Me.txtStNr.TabIndex = 22 - ' 'Label9 ' Me.Label9.AutoSize = True @@ -589,56 +468,6 @@ Partial Class frmMDM_USTVAntrag Me.Label9.TabIndex = 19 Me.Label9.Text = "VZ:" ' - 'txtVZ - ' - Me.txtVZ._DateTimeOnly = False - Me.txtVZ._numbersOnly = True - Me.txtVZ._numbersOnlyKommastellen = "" - Me.txtVZ._numbersOnlyTrennzeichen = True - Me.txtVZ._Prozent = False - Me.txtVZ._ShortDateNew = False - Me.txtVZ._ShortDateOnly = False - Me.txtVZ._TimeOnly = False - Me.txtVZ._TimeOnly_Seconds = False - Me.txtVZ._value = "" - Me.txtVZ._Waehrung = True - Me.txtVZ._WaehrungZeichen = True - Me.txtVZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtVZ.ForeColor = System.Drawing.Color.Black - Me.txtVZ.Location = New System.Drawing.Point(865, 31) - Me.txtVZ.MaxLength = 10 - Me.txtVZ.MaxLineLength = -1 - Me.txtVZ.MaxLines_Warning = "" - Me.txtVZ.MaxLines_Warning_Label = Nothing - Me.txtVZ.Name = "txtVZ" - Me.txtVZ.Size = New System.Drawing.Size(100, 23) - Me.txtVZ.TabIndex = 20 - ' - 'txtAbfNr - ' - Me.txtAbfNr._DateTimeOnly = False - Me.txtAbfNr._numbersOnly = True - Me.txtAbfNr._numbersOnlyKommastellen = "" - Me.txtAbfNr._numbersOnlyTrennzeichen = False - Me.txtAbfNr._Prozent = False - Me.txtAbfNr._ShortDateNew = False - Me.txtAbfNr._ShortDateOnly = False - Me.txtAbfNr._TimeOnly = False - Me.txtAbfNr._TimeOnly_Seconds = False - Me.txtAbfNr._value = "" - Me.txtAbfNr._Waehrung = False - Me.txtAbfNr._WaehrungZeichen = False - Me.txtAbfNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtAbfNr.ForeColor = System.Drawing.Color.Black - Me.txtAbfNr.Location = New System.Drawing.Point(654, 33) - Me.txtAbfNr.MaxLength = 10 - Me.txtAbfNr.MaxLineLength = -1 - Me.txtAbfNr.MaxLines_Warning = "" - Me.txtAbfNr.MaxLines_Warning_Label = Nothing - Me.txtAbfNr.Name = "txtAbfNr" - Me.txtAbfNr.Size = New System.Drawing.Size(146, 23) - Me.txtAbfNr.TabIndex = 18 - ' 'Label8 ' Me.Label8.AutoSize = True @@ -652,19 +481,6 @@ Partial Class frmMDM_USTVAntrag Me.Label8.TabIndex = 17 Me.Label8.Text = "Abfertigungs-Nr:" ' - 'cbxFiliale - ' - Me.cbxFiliale._allowedValuesFreiText = Nothing - Me.cbxFiliale._allowFreiText = False - Me.cbxFiliale._value = "" - Me.cbxFiliale.DropDownWidth = 150 - Me.cbxFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxFiliale.FormattingEnabled = True - Me.cbxFiliale.Location = New System.Drawing.Point(413, 32) - Me.cbxFiliale.Name = "cbxFiliale" - Me.cbxFiliale.Size = New System.Drawing.Size(105, 24) - Me.cbxFiliale.TabIndex = 16 - ' 'Label4 ' Me.Label4.AutoSize = True @@ -691,43 +507,6 @@ Partial Class frmMDM_USTVAntrag Me.Label2.TabIndex = 13 Me.Label2.Text = "Bezugs/Pos-Nr.:" ' - 'txtBezugsNr - ' - Me.txtBezugsNr._DateTimeOnly = False - Me.txtBezugsNr._numbersOnly = True - Me.txtBezugsNr._numbersOnlyKommastellen = "" - Me.txtBezugsNr._numbersOnlyTrennzeichen = False - Me.txtBezugsNr._Prozent = False - Me.txtBezugsNr._ShortDateNew = False - Me.txtBezugsNr._ShortDateOnly = False - Me.txtBezugsNr._TimeOnly = False - Me.txtBezugsNr._TimeOnly_Seconds = False - Me.txtBezugsNr._value = "" - Me.txtBezugsNr._Waehrung = False - Me.txtBezugsNr._WaehrungZeichen = False - Me.txtBezugsNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtBezugsNr.ForeColor = System.Drawing.Color.Black - Me.txtBezugsNr.Location = New System.Drawing.Point(654, 4) - Me.txtBezugsNr.MaxLength = 10 - Me.txtBezugsNr.MaxLineLength = -1 - Me.txtBezugsNr.MaxLines_Warning = "" - Me.txtBezugsNr.MaxLines_Warning_Label = Nothing - Me.txtBezugsNr.Name = "txtBezugsNr" - Me.txtBezugsNr.Size = New System.Drawing.Size(146, 23) - Me.txtBezugsNr.TabIndex = 14 - ' - 'cbxWahrung - ' - Me.cbxWahrung._allowedValuesFreiText = Nothing - Me.cbxWahrung._allowFreiText = False - Me.cbxWahrung._value = "" - Me.cbxWahrung.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxWahrung.FormattingEnabled = True - Me.cbxWahrung.Location = New System.Drawing.Point(431, 4) - Me.cbxWahrung.Name = "cbxWahrung" - Me.cbxWahrung.Size = New System.Drawing.Size(87, 24) - Me.cbxWahrung.TabIndex = 12 - ' 'lblWahrung ' Me.lblWahrung.AutoSize = True @@ -754,31 +533,6 @@ Partial Class frmMDM_USTVAntrag Me.Label1.TabIndex = 10 Me.Label1.Text = "3470:" ' - 'txt3470 - ' - Me.txt3470._DateTimeOnly = False - Me.txt3470._numbersOnly = True - Me.txt3470._numbersOnlyKommastellen = "" - Me.txt3470._numbersOnlyTrennzeichen = True - Me.txt3470._Prozent = False - Me.txt3470._ShortDateNew = False - Me.txt3470._ShortDateOnly = False - Me.txt3470._TimeOnly = False - Me.txt3470._TimeOnly_Seconds = False - Me.txt3470._value = "" - Me.txt3470._Waehrung = True - Me.txt3470._WaehrungZeichen = True - Me.txt3470.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txt3470.ForeColor = System.Drawing.Color.Black - Me.txt3470.Location = New System.Drawing.Point(865, 2) - Me.txt3470.MaxLength = 10 - Me.txt3470.MaxLineLength = -1 - Me.txt3470.MaxLines_Warning = "" - Me.txt3470.MaxLines_Warning_Label = Nothing - Me.txt3470.Name = "txt3470" - Me.txt3470.Size = New System.Drawing.Size(100, 23) - Me.txt3470.TabIndex = 10 - ' 'Label3 ' Me.Label3.AutoSize = True @@ -805,56 +559,6 @@ Partial Class frmMDM_USTVAntrag Me.lblZeitraum.TabIndex = 7 Me.lblZeitraum.Text = "-" ' - 'txtVon - ' - Me.txtVon._DateTimeOnly = False - Me.txtVon._numbersOnly = False - Me.txtVon._numbersOnlyKommastellen = "" - Me.txtVon._numbersOnlyTrennzeichen = False - Me.txtVon._Prozent = False - Me.txtVon._ShortDateNew = True - Me.txtVon._ShortDateOnly = False - Me.txtVon._TimeOnly = False - Me.txtVon._TimeOnly_Seconds = False - Me.txtVon._value = "" - Me.txtVon._Waehrung = False - Me.txtVon._WaehrungZeichen = False - Me.txtVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtVon.ForeColor = System.Drawing.Color.Black - Me.txtVon.Location = New System.Drawing.Point(101, 9) - Me.txtVon.MaxLength = 10 - Me.txtVon.MaxLineLength = -1 - Me.txtVon.MaxLines_Warning = "" - Me.txtVon.MaxLines_Warning_Label = Nothing - Me.txtVon.Name = "txtVon" - Me.txtVon.Size = New System.Drawing.Size(100, 23) - Me.txtVon.TabIndex = 6 - ' - 'txtBis - ' - Me.txtBis._DateTimeOnly = False - Me.txtBis._numbersOnly = False - Me.txtBis._numbersOnlyKommastellen = "" - Me.txtBis._numbersOnlyTrennzeichen = False - Me.txtBis._Prozent = False - Me.txtBis._ShortDateNew = True - Me.txtBis._ShortDateOnly = False - Me.txtBis._TimeOnly = False - Me.txtBis._TimeOnly_Seconds = False - Me.txtBis._value = "" - Me.txtBis._Waehrung = False - Me.txtBis._WaehrungZeichen = False - Me.txtBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtBis.ForeColor = System.Drawing.Color.Black - Me.txtBis.Location = New System.Drawing.Point(227, 9) - Me.txtBis.MaxLength = 10 - Me.txtBis.MaxLineLength = -1 - Me.txtBis.MaxLines_Warning = "" - Me.txtBis.MaxLines_Warning_Label = Nothing - Me.txtBis.Name = "txtBis" - Me.txtBis.Size = New System.Drawing.Size(100, 23) - Me.txtBis.TabIndex = 8 - ' 'Panel6 ' Me.Panel6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -1150,19 +854,6 @@ Partial Class frmMDM_USTVAntrag Me.Label5.TabIndex = 0 Me.Label5.Text = "Status:" ' - 'cboStatus - ' - Me.cboStatus._allowedValuesFreiText = Nothing - Me.cboStatus._allowFreiText = False - Me.cboStatus._value = "" - Me.cboStatus.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) - Me.cboStatus.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) - Me.cboStatus.FormattingEnabled = True - Me.cboStatus.Location = New System.Drawing.Point(76, 16) - Me.cboStatus.Name = "cboStatus" - Me.cboStatus.Size = New System.Drawing.Size(394, 28) - Me.cboStatus.TabIndex = 1 - ' 'lblFirma ' Me.lblFirma.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ @@ -1226,27 +917,6 @@ Partial Class frmMDM_USTVAntrag Me.TabPage1.Text = "Antragspositionen" Me.TabPage1.UseVisualStyleBackColor = True ' - 'dgvUSTVPositionen - ' - Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500 - Me.dgvUSTVPositionen.AllowUserToAddRows = False - Me.dgvUSTVPositionen.AllowUserToDeleteRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvUSTVPositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.dgvUSTVPositionen.BackgroundColor = System.Drawing.Color.White - Me.dgvUSTVPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvUSTVPositionen.Location = New System.Drawing.Point(3, 3) - Me.dgvUSTVPositionen.Name = "dgvUSTVPositionen" - Me.dgvUSTVPositionen.ReadOnly = True - Me.dgvUSTVPositionen.RowHeadersVisible = False - Me.dgvUSTVPositionen.RowHeadersWidth = 62 - Me.dgvUSTVPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1438, 169) - Me.dgvUSTVPositionen.TabIndex = 0 - ' 'pnlAntragsPosDetails ' Me.pnlAntragsPosDetails.Controls.Add(Me.Panel2) @@ -1268,18 +938,11 @@ Partial Class frmMDM_USTVAntrag Me.Panel2.Size = New System.Drawing.Size(1438, 263) Me.Panel2.TabIndex = 1 ' - 'UstCntlUSTV_AntragPosition1 - ' - Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) - Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" - Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261) - Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 - ' 'Panel4 ' Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel4.Controls.Add(Me.btnAPI) Me.Panel4.Controls.Add(Me.btnEintragloeschen) Me.Panel4.Controls.Add(Me.btnNeuerEintrag) Me.Panel4.Dock = System.Windows.Forms.DockStyle.Left @@ -1339,27 +1002,6 @@ Partial Class frmMDM_USTVAntrag Me.Panel3.Size = New System.Drawing.Size(1438, 438) Me.Panel3.TabIndex = 3 ' - 'dgvErstattungspositionen - ' - Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500 - Me.dgvErstattungspositionen.AllowUserToAddRows = False - Me.dgvErstattungspositionen.AllowUserToDeleteRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 - Me.dgvErstattungspositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.dgvErstattungspositionen.BackgroundColor = System.Drawing.Color.White - Me.dgvErstattungspositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvErstattungspositionen.Location = New System.Drawing.Point(3, 3) - Me.dgvErstattungspositionen.Name = "dgvErstattungspositionen" - Me.dgvErstattungspositionen.ReadOnly = True - Me.dgvErstattungspositionen.RowHeadersVisible = False - Me.dgvErstattungspositionen.RowHeadersWidth = 62 - Me.dgvErstattungspositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1438, 172) - Me.dgvErstattungspositionen.TabIndex = 1 - ' 'pnlErstattungsdetails ' Me.pnlErstattungsdetails.BackColor = System.Drawing.Color.WhiteSmoke @@ -1372,14 +1014,6 @@ Partial Class frmMDM_USTVAntrag Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1436, 261) Me.pnlErstattungsdetails.TabIndex = 0 ' - 'UstCntlUSTV_AntragErstattungen1 - ' - Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) - Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" - Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259) - Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 - ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke @@ -1430,6 +1064,384 @@ Partial Class frmMDM_USTVAntrag Me.ContextMenuStrip2.Name = "ContextMenuStrip1" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' + 'KdSearchBox1 + ' + Me.KdSearchBox1._AlleFirmenCLUSTER = False + Me.KdSearchBox1._AllowSetValue = False + Me.KdSearchBox1._autoSizeGross = False + Me.KdSearchBox1._display_Name1 = False + Me.KdSearchBox1._displayAVISO_Email = False + Me.KdSearchBox1._displayFullName = False + Me.KdSearchBox1._displayWoelflKd = False + Me.KdSearchBox1._hideIfListEmpty = True + Me.KdSearchBox1._loadKdData = False + Me.KdSearchBox1._searchName1 = True + Me.KdSearchBox1._UseFIRMA = "" + Me.KdSearchBox1._ValueKdAndName = True + Me.KdSearchBox1.dgvpos = "LEFT" + Me.KdSearchBox1.KdName = Nothing + Me.KdSearchBox1.KdNr = "-1" + Me.KdSearchBox1.kdNrField = Nothing + Me.KdSearchBox1.KdNrNullInt = Nothing + Me.KdSearchBox1.Location = New System.Drawing.Point(298, 10) + Me.KdSearchBox1.Name = "KdSearchBox1" + Me.KdSearchBox1.nurAktive = True + Me.KdSearchBox1.searchActive = True + Me.KdSearchBox1.Size = New System.Drawing.Size(171, 20) + Me.KdSearchBox1.TabIndex = 22 + Me.KdSearchBox1.TIMER_SEARCH = True + Me.KdSearchBox1.usrcntl = Nothing + ' + 'cboAntragArt + ' + Me.cboAntragArt._allowedValuesFreiText = Nothing + Me.cboAntragArt._allowFreiText = False + Me.cboAntragArt._value = "" + Me.cboAntragArt.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) + Me.cboAntragArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) + Me.cboAntragArt.FormattingEnabled = True + Me.cboAntragArt.Location = New System.Drawing.Point(83, 10) + Me.cboAntragArt.Name = "cboAntragArt" + Me.cboAntragArt.Size = New System.Drawing.Size(191, 28) + Me.cboAntragArt.TabIndex = 21 + Me.cboAntragArt.Text = "USTV-Antrag" + ' + 'cbxLand + ' + Me.cbxLand._allowedValuesFreiText = Nothing + Me.cbxLand._allowFreiText = False + Me.cbxLand._value = "" + Me.cbxLand.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) + Me.cbxLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) + Me.cbxLand.FormattingEnabled = True + Me.cbxLand.Location = New System.Drawing.Point(0, 0) + Me.cbxLand.Name = "cbxLand" + Me.cbxLand.Size = New System.Drawing.Size(65, 28) + Me.cbxLand.TabIndex = 23 + Me.cbxLand.Text = "USTV-Antrag" + Me.cbxLand.Visible = False + ' + 'txtEingereichtAm + ' + Me.txtEingereichtAm._DateTimeOnly = False + Me.txtEingereichtAm._numbersOnly = False + Me.txtEingereichtAm._numbersOnlyKommastellen = "" + Me.txtEingereichtAm._numbersOnlyTrennzeichen = False + Me.txtEingereichtAm._Prozent = False + Me.txtEingereichtAm._ShortDateNew = False + Me.txtEingereichtAm._ShortDateOnly = True + Me.txtEingereichtAm._TimeOnly = False + Me.txtEingereichtAm._TimeOnly_Seconds = False + Me.txtEingereichtAm._value = "" + Me.txtEingereichtAm._Waehrung = False + Me.txtEingereichtAm._WaehrungZeichen = False + Me.txtEingereichtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtEingereichtAm.ForeColor = System.Drawing.Color.Black + Me.txtEingereichtAm.Location = New System.Drawing.Point(654, 60) + Me.txtEingereichtAm.MaxLength = 10 + Me.txtEingereichtAm.MaxLineLength = -1 + Me.txtEingereichtAm.MaxLines_Warning = "" + Me.txtEingereichtAm.MaxLines_Warning_Label = Nothing + Me.txtEingereichtAm.Name = "txtEingereichtAm" + Me.txtEingereichtAm.Size = New System.Drawing.Size(100, 23) + Me.txtEingereichtAm.TabIndex = 26 + ' + 'txtGueltig + ' + Me.txtGueltig._DateTimeOnly = False + Me.txtGueltig._numbersOnly = False + Me.txtGueltig._numbersOnlyKommastellen = "" + Me.txtGueltig._numbersOnlyTrennzeichen = False + Me.txtGueltig._Prozent = False + Me.txtGueltig._ShortDateNew = False + Me.txtGueltig._ShortDateOnly = True + Me.txtGueltig._TimeOnly = False + Me.txtGueltig._TimeOnly_Seconds = False + Me.txtGueltig._value = "" + Me.txtGueltig._Waehrung = False + Me.txtGueltig._WaehrungZeichen = False + Me.txtGueltig.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtGueltig.ForeColor = System.Drawing.Color.Black + Me.txtGueltig.Location = New System.Drawing.Point(101, 61) + Me.txtGueltig.MaxLength = 10 + Me.txtGueltig.MaxLineLength = -1 + Me.txtGueltig.MaxLines_Warning = "" + Me.txtGueltig.MaxLines_Warning_Label = Nothing + Me.txtGueltig.Name = "txtGueltig" + Me.txtGueltig.Size = New System.Drawing.Size(100, 23) + Me.txtGueltig.TabIndex = 23 + ' + 'txtStNr + ' + Me.txtStNr._DateTimeOnly = False + Me.txtStNr._numbersOnly = False + Me.txtStNr._numbersOnlyKommastellen = "" + Me.txtStNr._numbersOnlyTrennzeichen = False + Me.txtStNr._Prozent = False + Me.txtStNr._ShortDateNew = False + Me.txtStNr._ShortDateOnly = False + Me.txtStNr._TimeOnly = False + Me.txtStNr._TimeOnly_Seconds = False + Me.txtStNr._value = "" + Me.txtStNr._Waehrung = False + Me.txtStNr._WaehrungZeichen = False + Me.txtStNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtStNr.ForeColor = System.Drawing.Color.Black + Me.txtStNr.Location = New System.Drawing.Point(101, 36) + Me.txtStNr.MaxLength = 10 + Me.txtStNr.MaxLineLength = -1 + Me.txtStNr.MaxLines_Warning = "" + Me.txtStNr.MaxLines_Warning_Label = Nothing + Me.txtStNr.Name = "txtStNr" + Me.txtStNr.Size = New System.Drawing.Size(100, 23) + Me.txtStNr.TabIndex = 22 + ' + 'txtVZ + ' + Me.txtVZ._DateTimeOnly = False + Me.txtVZ._numbersOnly = True + Me.txtVZ._numbersOnlyKommastellen = "" + Me.txtVZ._numbersOnlyTrennzeichen = True + Me.txtVZ._Prozent = False + Me.txtVZ._ShortDateNew = False + Me.txtVZ._ShortDateOnly = False + Me.txtVZ._TimeOnly = False + Me.txtVZ._TimeOnly_Seconds = False + Me.txtVZ._value = "" + Me.txtVZ._Waehrung = True + Me.txtVZ._WaehrungZeichen = True + Me.txtVZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtVZ.ForeColor = System.Drawing.Color.Black + Me.txtVZ.Location = New System.Drawing.Point(865, 31) + Me.txtVZ.MaxLength = 10 + Me.txtVZ.MaxLineLength = -1 + Me.txtVZ.MaxLines_Warning = "" + Me.txtVZ.MaxLines_Warning_Label = Nothing + Me.txtVZ.Name = "txtVZ" + Me.txtVZ.Size = New System.Drawing.Size(100, 23) + Me.txtVZ.TabIndex = 20 + ' + 'txtAbfNr + ' + Me.txtAbfNr._DateTimeOnly = False + Me.txtAbfNr._numbersOnly = True + Me.txtAbfNr._numbersOnlyKommastellen = "" + Me.txtAbfNr._numbersOnlyTrennzeichen = False + Me.txtAbfNr._Prozent = False + Me.txtAbfNr._ShortDateNew = False + Me.txtAbfNr._ShortDateOnly = False + Me.txtAbfNr._TimeOnly = False + Me.txtAbfNr._TimeOnly_Seconds = False + Me.txtAbfNr._value = "" + Me.txtAbfNr._Waehrung = False + Me.txtAbfNr._WaehrungZeichen = False + Me.txtAbfNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtAbfNr.ForeColor = System.Drawing.Color.Black + Me.txtAbfNr.Location = New System.Drawing.Point(654, 33) + Me.txtAbfNr.MaxLength = 10 + Me.txtAbfNr.MaxLineLength = -1 + Me.txtAbfNr.MaxLines_Warning = "" + Me.txtAbfNr.MaxLines_Warning_Label = Nothing + Me.txtAbfNr.Name = "txtAbfNr" + Me.txtAbfNr.Size = New System.Drawing.Size(146, 23) + Me.txtAbfNr.TabIndex = 18 + ' + 'cbxFiliale + ' + Me.cbxFiliale._allowedValuesFreiText = Nothing + Me.cbxFiliale._allowFreiText = False + Me.cbxFiliale._value = "" + Me.cbxFiliale.DropDownWidth = 150 + Me.cbxFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxFiliale.FormattingEnabled = True + Me.cbxFiliale.Location = New System.Drawing.Point(413, 32) + Me.cbxFiliale.Name = "cbxFiliale" + Me.cbxFiliale.Size = New System.Drawing.Size(105, 24) + Me.cbxFiliale.TabIndex = 16 + ' + 'txtBezugsNr + ' + Me.txtBezugsNr._DateTimeOnly = False + Me.txtBezugsNr._numbersOnly = True + Me.txtBezugsNr._numbersOnlyKommastellen = "" + Me.txtBezugsNr._numbersOnlyTrennzeichen = False + Me.txtBezugsNr._Prozent = False + Me.txtBezugsNr._ShortDateNew = False + Me.txtBezugsNr._ShortDateOnly = False + Me.txtBezugsNr._TimeOnly = False + Me.txtBezugsNr._TimeOnly_Seconds = False + Me.txtBezugsNr._value = "" + Me.txtBezugsNr._Waehrung = False + Me.txtBezugsNr._WaehrungZeichen = False + Me.txtBezugsNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtBezugsNr.ForeColor = System.Drawing.Color.Black + Me.txtBezugsNr.Location = New System.Drawing.Point(654, 4) + Me.txtBezugsNr.MaxLength = 10 + Me.txtBezugsNr.MaxLineLength = -1 + Me.txtBezugsNr.MaxLines_Warning = "" + Me.txtBezugsNr.MaxLines_Warning_Label = Nothing + Me.txtBezugsNr.Name = "txtBezugsNr" + Me.txtBezugsNr.Size = New System.Drawing.Size(146, 23) + Me.txtBezugsNr.TabIndex = 14 + ' + 'cbxWahrung + ' + Me.cbxWahrung._allowedValuesFreiText = Nothing + Me.cbxWahrung._allowFreiText = False + Me.cbxWahrung._value = "" + Me.cbxWahrung.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxWahrung.FormattingEnabled = True + Me.cbxWahrung.Location = New System.Drawing.Point(431, 4) + Me.cbxWahrung.Name = "cbxWahrung" + Me.cbxWahrung.Size = New System.Drawing.Size(87, 24) + Me.cbxWahrung.TabIndex = 12 + ' + 'txt3470 + ' + Me.txt3470._DateTimeOnly = False + Me.txt3470._numbersOnly = True + Me.txt3470._numbersOnlyKommastellen = "" + Me.txt3470._numbersOnlyTrennzeichen = True + Me.txt3470._Prozent = False + Me.txt3470._ShortDateNew = False + Me.txt3470._ShortDateOnly = False + Me.txt3470._TimeOnly = False + Me.txt3470._TimeOnly_Seconds = False + Me.txt3470._value = "" + Me.txt3470._Waehrung = True + Me.txt3470._WaehrungZeichen = True + Me.txt3470.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txt3470.ForeColor = System.Drawing.Color.Black + Me.txt3470.Location = New System.Drawing.Point(865, 2) + Me.txt3470.MaxLength = 10 + Me.txt3470.MaxLineLength = -1 + Me.txt3470.MaxLines_Warning = "" + Me.txt3470.MaxLines_Warning_Label = Nothing + Me.txt3470.Name = "txt3470" + Me.txt3470.Size = New System.Drawing.Size(100, 23) + Me.txt3470.TabIndex = 10 + ' + 'txtVon + ' + Me.txtVon._DateTimeOnly = False + Me.txtVon._numbersOnly = False + Me.txtVon._numbersOnlyKommastellen = "" + Me.txtVon._numbersOnlyTrennzeichen = False + Me.txtVon._Prozent = False + Me.txtVon._ShortDateNew = True + Me.txtVon._ShortDateOnly = False + Me.txtVon._TimeOnly = False + Me.txtVon._TimeOnly_Seconds = False + Me.txtVon._value = "" + Me.txtVon._Waehrung = False + Me.txtVon._WaehrungZeichen = False + Me.txtVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtVon.ForeColor = System.Drawing.Color.Black + Me.txtVon.Location = New System.Drawing.Point(101, 9) + Me.txtVon.MaxLength = 10 + Me.txtVon.MaxLineLength = -1 + Me.txtVon.MaxLines_Warning = "" + Me.txtVon.MaxLines_Warning_Label = Nothing + Me.txtVon.Name = "txtVon" + Me.txtVon.Size = New System.Drawing.Size(100, 23) + Me.txtVon.TabIndex = 6 + ' + 'txtBis + ' + Me.txtBis._DateTimeOnly = False + Me.txtBis._numbersOnly = False + Me.txtBis._numbersOnlyKommastellen = "" + Me.txtBis._numbersOnlyTrennzeichen = False + Me.txtBis._Prozent = False + Me.txtBis._ShortDateNew = True + Me.txtBis._ShortDateOnly = False + Me.txtBis._TimeOnly = False + Me.txtBis._TimeOnly_Seconds = False + Me.txtBis._value = "" + Me.txtBis._Waehrung = False + Me.txtBis._WaehrungZeichen = False + Me.txtBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtBis.ForeColor = System.Drawing.Color.Black + Me.txtBis.Location = New System.Drawing.Point(227, 9) + Me.txtBis.MaxLength = 10 + Me.txtBis.MaxLineLength = -1 + Me.txtBis.MaxLines_Warning = "" + Me.txtBis.MaxLines_Warning_Label = Nothing + Me.txtBis.Name = "txtBis" + Me.txtBis.Size = New System.Drawing.Size(100, 23) + Me.txtBis.TabIndex = 8 + ' + 'cboStatus + ' + Me.cboStatus._allowedValuesFreiText = Nothing + Me.cboStatus._allowFreiText = False + Me.cboStatus._value = "" + Me.cboStatus.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) + Me.cboStatus.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) + Me.cboStatus.FormattingEnabled = True + Me.cboStatus.Location = New System.Drawing.Point(76, 16) + Me.cboStatus.Name = "cboStatus" + Me.cboStatus.Size = New System.Drawing.Size(394, 28) + Me.cboStatus.TabIndex = 1 + ' + 'dgvUSTVPositionen + ' + Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500 + Me.dgvUSTVPositionen.AllowUserToAddRows = False + Me.dgvUSTVPositionen.AllowUserToDeleteRows = False + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvUSTVPositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.dgvUSTVPositionen.BackgroundColor = System.Drawing.Color.White + Me.dgvUSTVPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvUSTVPositionen.Location = New System.Drawing.Point(3, 3) + Me.dgvUSTVPositionen.Name = "dgvUSTVPositionen" + Me.dgvUSTVPositionen.ReadOnly = True + Me.dgvUSTVPositionen.RowHeadersVisible = False + Me.dgvUSTVPositionen.RowHeadersWidth = 62 + Me.dgvUSTVPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1438, 169) + Me.dgvUSTVPositionen.TabIndex = 0 + ' + 'UstCntlUSTV_AntragPosition1 + ' + Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" + Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261) + Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 + ' + 'dgvErstattungspositionen + ' + Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500 + Me.dgvErstattungspositionen.AllowUserToAddRows = False + Me.dgvErstattungspositionen.AllowUserToDeleteRows = False + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + Me.dgvErstattungspositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.dgvErstattungspositionen.BackgroundColor = System.Drawing.Color.White + Me.dgvErstattungspositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvErstattungspositionen.Location = New System.Drawing.Point(3, 3) + Me.dgvErstattungspositionen.Name = "dgvErstattungspositionen" + Me.dgvErstattungspositionen.ReadOnly = True + Me.dgvErstattungspositionen.RowHeadersVisible = False + Me.dgvErstattungspositionen.RowHeadersWidth = 62 + Me.dgvErstattungspositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1438, 172) + Me.dgvErstattungspositionen.TabIndex = 1 + ' + 'UstCntlUSTV_AntragErstattungen1 + ' + Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" + Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259) + Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 + ' 'txtSumme ' Me.txtSumme._DateTimeOnly = False @@ -1455,15 +1467,17 @@ Partial Class frmMDM_USTVAntrag Me.txtSumme.TabIndex = 49 Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' - 'Label27 + 'btnAPI ' - Me.Label27.AutoSize = True - Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label27.Location = New System.Drawing.Point(975, 66) - Me.Label27.Name = "Label27" - Me.Label27.Size = New System.Drawing.Size(45, 13) - Me.Label27.TabIndex = 48 - Me.Label27.Text = "Summe:" + Me.btnAPI.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAPI.ForeColor = System.Drawing.Color.Black + Me.btnAPI.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnAPI.Location = New System.Drawing.Point(6, 95) + Me.btnAPI.Name = "btnAPI" + Me.btnAPI.Size = New System.Drawing.Size(135, 39) + Me.btnAPI.TabIndex = 2 + Me.btnAPI.Text = "API Upload" + Me.btnAPI.UseVisualStyleBackColor = True ' 'frmMDM_USTVAntrag ' @@ -1496,15 +1510,15 @@ Partial Class frmMDM_USTVAntrag Me.pnlBody.ResumeLayout(False) Me.TabControl1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) - CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlAntragsPosDetails.ResumeLayout(False) Me.Panel2.ResumeLayout(False) Me.Panel4.ResumeLayout(False) Me.TabPage2.ResumeLayout(False) Me.Panel3.ResumeLayout(False) - CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlErstattungsdetails.ResumeLayout(False) Me.Panel1.ResumeLayout(False) + CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -1599,4 +1613,5 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents picExcel As PictureBox Friend WithEvents txtSumme As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label27 As Label + Friend WithEvents btnAPI As Button End Class diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 4c0f32a1..180db847 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -1,10 +1,6 @@ - -Imports System.ComponentModel -Imports System.IO +Imports System.IO Imports System.Reflection Imports System.Windows.Documents -Imports com.sun.org.apache.xml.internal.utils -Imports DAKOSY_Worker.InformationEXITDE Imports itextsharp.text.pdf Imports itextsharp.text.pdf.parser Imports Microsoft.Office.Interop @@ -18,6 +14,7 @@ Public Class frmMDM_USTVAntrag Dim Antrag_LandKz As String = "" Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim posTabisSelected As Boolean = True + Dim atez_api = New cATEZ_NCTS_IN("ATEZ_VAT") Dim von, bis As Date @@ -63,10 +60,8 @@ Public Class frmMDM_USTVAntrag btnEintragloeschen.Enabled = Not UStVAn_ID <= 0 btnNeuerEintrag.Enabled = Not UStVAn_ID <= 0 UstCntlUSTV_AntragPosition1.Enabled = Not UStVAn_ID <= 0 - cbxLand.Visible = UStVAn_ID <= 0 - With dgvUSTVPositionen .ClearSelection() @@ -528,6 +523,8 @@ Public Class frmMDM_USTVAntrag setinfofields() + + End Sub Private Sub Button14_Click(sender As Object, e As EventArgs) Handles btnAntrageeinarbeiten.Click @@ -1255,9 +1252,8 @@ Public Class frmMDM_USTVAntrag ANTR_Leistender = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(ANTR_POS.UStVPo_LeistenderId) End If - UstCntlUSTV_AntragPosition1.Enabled = True - UstCntlUSTV_AntragPosition1.setValues(USTV_ANTRAG.UStVAn_KuNr, ANTR_POS, Antrag_LandKz, ANTR_Leistender) + UstCntlUSTV_AntragPosition1.setValues(USTV_ANTRAG.UStVAn_KuNr, ANTR_POS, Antrag_LandKz, ANTR_Leistender, atez_api) Else UstCntlUSTV_AntragPosition1.reset() UstCntlUSTV_AntragPosition1.Enabled = False @@ -2392,6 +2388,7 @@ Public Class frmMDM_USTVAntrag End Sub + Private Sub calcSumme() Dim countSumme As Double = 0 diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb index 49692d00..f5e4be6a 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb @@ -74,6 +74,7 @@ Partial Class ustCntlUSTV_AntragPosition Me.txtUmrechnungskurs = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUSTBetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Panel1 = New System.Windows.Forms.Panel() + Me.btnAPIUbload = New System.Windows.Forms.Button() Me.Panel3 = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel() Me.TabControl1 = New System.Windows.Forms.TabControl() @@ -876,6 +877,7 @@ Partial Class ustCntlUSTV_AntragPosition ' 'Panel1 ' + Me.Panel1.Controls.Add(Me.btnAPIUbload) Me.Panel1.Controls.Add(Me.btnBildAuf) Me.Panel1.Controls.Add(Me.Button1) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Right @@ -884,6 +886,18 @@ Partial Class ustCntlUSTV_AntragPosition Me.Panel1.Size = New System.Drawing.Size(99, 239) Me.Panel1.TabIndex = 2 ' + 'btnAPIUbload + ' + Me.btnAPIUbload.BackgroundImage = Global.SDL.My.Resources.Resources.refresh + Me.btnAPIUbload.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnAPIUbload.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAPIUbload.Location = New System.Drawing.Point(36, 186) + Me.btnAPIUbload.Name = "btnAPIUbload" + Me.btnAPIUbload.Size = New System.Drawing.Size(35, 24) + Me.btnAPIUbload.TabIndex = 25 + Me.btnAPIUbload.TextAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnAPIUbload.UseVisualStyleBackColor = True + ' 'Panel3 ' Me.Panel3.Controls.Add(Me.tbcntr) @@ -1050,4 +1064,5 @@ Partial Class ustCntlUSTV_AntragPosition Friend WithEvents btnLeistenderSave As Button Friend WithEvents lblWarning As Label Friend WithEvents cbxAntragsfilter As VERAG_PROG_ALLGEMEIN.MyCheckBoxValue + Friend WithEvents btnAPIUbload As Button End Class diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index 5d2e9b71..ab7dce10 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb @@ -1,4 +1,5 @@ -Imports VERAG_PROG_ALLGEMEIN +Imports com.sun.net.httpserver.Authenticator +Imports VERAG_PROG_ALLGEMEIN Public Class ustCntlUSTV_AntragPosition Public UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen = Nothing @@ -12,6 +13,7 @@ Public Class ustCntlUSTV_AntragPosition Public Event CHANGED(UStVPo_ID) Dim gridAktiv = False Dim txtChanged As Boolean = False + Dim API As cATEZ_NCTS_IN Private Sub btnBildAuf_Click(sender As Object, e As EventArgs) Handles btnBildAuf.Click RaiseEvent EV_PREV() End Sub @@ -56,7 +58,7 @@ Public Class ustCntlUSTV_AntragPosition End Sub - Sub setValues(kdnr As Integer, UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen, Antrag_LandKz As String, UStV_Leitender As VERAG_PROG_ALLGEMEIN.cUStVLeistender) + Sub setValues(kdnr As Integer, UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen, Antrag_LandKz As String, UStV_Leitender As VERAG_PROG_ALLGEMEIN.cUStVLeistender, atez_api As cATEZ_NCTS_IN) initSchnittstellenNr() @@ -79,6 +81,7 @@ Public Class ustCntlUSTV_AntragPosition sbLeistender.Text = UStV_Leitender.UStV_Leistender loadChangedDSToPanel(UStV_Leitender, True) + API = atez_api Dim da_id = -1 @@ -104,12 +107,15 @@ Public Class ustCntlUSTV_AntragPosition If da_id > -1 Then scanSonstiges.INIT_daId(da_id) scanSonstiges.Enabled = UStV_POS.UStVPo_daId_loeschbar 'Not UStV_POS.UStVPo_SchnittstellenNr > 0 + btnAPIUbload.Enabled = UStV_POS.UStVPo_daId_loeschbar Else scanSonstiges.INIT(kdnr, "MDM", "MDM_DATEN", "USTVA_" & UStV_POS.UStVAn_ID & "_" & UStV_POS.UStVPo_ID) 'scanSonstiges.INIT_daId(da_id) scanSonstiges.Enabled = True + btnAPIUbload.Enabled = False End If + scanUSTVFABest.INIT(kdnr, "KUNDENDATEN", "FA_Bestaetigungen") scanUSTVVollmachten.INIT(kdnr, "KUNDENDATEN", "USTV_Vollmachten") @@ -240,7 +246,7 @@ Public Class ustCntlUSTV_AntragPosition Private Sub loadChangedDSToPanel(UStV_Leitender As VERAG_PROG_ALLGEMEIN.cUStVLeistender, Optional initial As Boolean = False) - + Dim adressLoadedByLeistender As Boolean = False UStV_Leist = UStV_Leitender 'If newLeistender <> "" Then UStV_Leist = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(newLeistender) @@ -252,7 +258,6 @@ Public Class ustCntlUSTV_AntragPosition txtOrt.Text = "" txtLand.Text = "" txtUIDNr.Text = "" - Else pnlAdresse.Enabled = True 'enablePanel 'immer änderbar! @@ -262,20 +267,26 @@ Public Class ustCntlUSTV_AntragPosition txtOrt.Text = If(UStV_Leist.UstV_Leistender_Stadt, "") txtLand.Text = If(UStV_Leist.UstV_Leistender_Land, "") txtUIDNr.Text = If(UStV_Leist.UstV_Leistender_UstNr, "") + adressLoadedByLeistender = True End If - btnLeistenderSave.Visible = True - If Not initial Then 'Listener für Änderungen im Detail-Panel - For Each c As Control In pnlAdresse.Controls - If TypeOf (c) Is TextBox Then - AddHandler CType(c, TextBox).TextChanged, AddressOf SomethingChanged - End If - If TypeOf (c) Is MyComboBox Then - AddHandler CType(c, MyComboBox).TextChanged, AddressOf SomethingChanged - End If - Next + If Not adressLoadedByLeistender Then + For Each c As Control In pnlAdresse.Controls + + If TypeOf (c) Is TextBox Then + AddHandler CType(c, TextBox).TextChanged, AddressOf SomethingChanged + End If + If TypeOf (c) Is MyComboBox Then + AddHandler CType(c, MyComboBox).TextChanged, AddressOf SomethingChanged + End If + + + Next + Else + btnLeistenderSave.Visible = False + End If Else btnLeistenderSave.Visible = False @@ -301,7 +312,7 @@ Public Class ustCntlUSTV_AntragPosition If Not UStV_Leist.hasEntry Then If vbYes = MsgBox("Dieser Leistende wurde noch nicht angelegt!" & vbNewLine & UStV_Leist.UStV_Leistender & " anlegen? ", vbYesNo) Then - + 'adresseChanged = True UStV_Leist.UstV_Leistender_Strasse = If(txtStrasse.Text, "") UStV_Leist.UstV_Leistender_StrasseNr = If(txtStrassenNr.Text, "") UStV_Leist.UstV_Leistender_PLZ = If(txtPLZ.Text, "") @@ -309,18 +320,18 @@ Public Class ustCntlUSTV_AntragPosition UStV_Leist.UstV_Leistender_Land = If(txtLand.Text, "") UStV_Leist.UstV_Leistender_UstNr = If(txtUIDNr.Text, "") - If UStV_Leist.SAVE() Then + Dim saveid = UStV_Leist.SAVEID + If saveid > 0 Then btnLeistenderSave.Visible = False UStV_POS.UStVPo_Leistender = UStV_Leist.UStV_Leistender - UStV_POS.UStVPo_LeistenderId = UStV_Leist.UStV_LeistenderId + UStV_POS.UStVPo_LeistenderId = saveid 'RaiseEvent CHANGED(UStV_POS.UStVPo_ID) values_changed() End If End If Else - Dim adresseChanged As Boolean = False If UStV_Leist.UstV_Leistender_Strasse <> If(txtStrasse.Text, "") Then adresseChanged = True @@ -405,7 +416,7 @@ Public Class ustCntlUSTV_AntragPosition loadChangedDSToPanel(UStV_Leist) Else - loadChangedDSToPanel(Nothing) + loadChangedDSToPanel(Nothing, True) End If @@ -457,11 +468,11 @@ Public Class ustCntlUSTV_AntragPosition txtUSTBetragEUR.Text = Math.Floor((txtUSTBetrag.Text / txtUmrechnungskurs.Text) * 100 + 0.5) / 100 - txtChanged = True - End If - + txtChanged = True End If + End If + ElseIf sender Is txtUSTBetragEUR Then @@ -559,5 +570,36 @@ Public Class ustCntlUSTV_AntragPosition If cbxAntragsfilter.Checked Then filter &= " and left(UstV_Leistender_UstNr,2)='" & Antrag_LandKz & "'" sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender] + ' ' + isnull([UstV_Leistender_UstNr],'')) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"}) End If + End Sub + + Private Sub btnAPIUbload_Click(sender As Object, e As EventArgs) Handles btnAPIUbload.Click + If API IsNot Nothing Then + If vbYes = MsgBox("Möchten Sie die Rechnungsdaten per ATEZ-API auslesen lassen?", vbYesNoCancel) Then + + Dim failreDesc As String + Dim authResp = API.authenticate("VAT", "client1", "password") + Dim resp + If authResp <> "200" Then + MsgBox("Authentifizierung fehlgeschlagen") + Exit Sub + Else + If API.SendRequestWithAuthHeader("application/json", failreDesc, "/health", "GET") = "200" Then + + 'document_type = vat_invoice or receipt + If API.setJsonVAT("vat_invoice", UStV_POS.UStVPo_daId) Then + resp = API.SendRequestWithAuthHeader("application/json", failreDesc, "/process", "POST") + End If + + Else + MsgBox("Service is not running!") + + End If + End If + End If + End If + + + + End Sub End Class diff --git a/SDL/seriendruck/usrCntlFakturierung.Designer.vb b/SDL/seriendruck/usrCntlFakturierung.Designer.vb index b26d8e8f..3026327a 100644 --- a/SDL/seriendruck/usrCntlFakturierung.Designer.vb +++ b/SDL/seriendruck/usrCntlFakturierung.Designer.vb @@ -33,12 +33,15 @@ Partial Class usrcntlFakturierung Me.Label61 = New System.Windows.Forms.Label() Me.GBMautberichte = New System.Windows.Forms.GroupBox() Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Label5 = New System.Windows.Forms.Label() Me.lblAnzahlMautberichte = New System.Windows.Forms.Label() Me.pbMautAnh_Proz = New System.Windows.Forms.ProgressBar() Me.lblMautAnh_Proz = New System.Windows.Forms.Label() + Me.cbxDateMautbericht = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label69 = New System.Windows.Forms.Label() Me.Label68 = New System.Windows.Forms.Label() + Me.cbxMautbericht = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label62 = New System.Windows.Forms.Label() Me.Button18 = New System.Windows.Forms.Button() Me.Label44 = New System.Windows.Forms.Label() @@ -52,7 +55,7 @@ Partial Class usrcntlFakturierung Me.Button3 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() Me.cbxMautanh = New System.Windows.Forms.CheckBox() - Me.Button1 = New System.Windows.Forms.Button() + Me.btnMautanh_pruefen = New System.Windows.Forms.Button() Me.PictureBox6 = New System.Windows.Forms.PictureBox() Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.PictureBox4 = New System.Windows.Forms.PictureBox() @@ -63,16 +66,18 @@ Partial Class usrcntlFakturierung Me.cbxVorschau = New System.Windows.Forms.CheckBox() Me.cbxAbfVerbotdrucken = New System.Windows.Forms.CheckBox() Me.cbxRechnungsjournaldrucken = New System.Windows.Forms.CheckBox() - Me.Button20 = New System.Windows.Forms.Button() + Me.btn_Mautanh_entfernen = New System.Windows.Forms.Button() Me.Label72 = New System.Windows.Forms.Label() + Me.KdSearchBox3 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.rbkunde = New System.Windows.Forms.RadioButton() Me.rbAlleKunden = New System.Windows.Forms.RadioButton() Me.txtPloseAnh_Einarbeitung = New System.Windows.Forms.TextBox() Me.Label71 = New System.Windows.Forms.Label() Me.pbPloseAnh_Proz = New System.Windows.Forms.ProgressBar() Me.lblPloseAnh_Proz = New System.Windows.Forms.Label() - Me.Button19 = New System.Windows.Forms.Button() + Me.btn_setRENr = New System.Windows.Forms.Button() Me.Label70 = New System.Windows.Forms.Label() + Me.cboSachbearbeiter = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label67 = New System.Windows.Forms.Label() Me.dtRechnungsdatum = New System.Windows.Forms.DateTimePicker() Me.Label66 = New System.Windows.Forms.Label() @@ -80,14 +85,10 @@ Partial Class usrcntlFakturierung Me.Label64 = New System.Windows.Forms.Label() Me.Label63 = New System.Windows.Forms.Label() Me.Label45 = New System.Windows.Forms.Label() - Me.Button14 = New System.Windows.Forms.Button() - Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.cbxDateMautbericht = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cbxMautbericht = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.KdSearchBox3 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() - Me.cboSachbearbeiter = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.btnRePos = New System.Windows.Forms.Button() Me.GroupBox1.SuspendLayout() Me.GBMautberichte.SuspendLayout() + CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GBSammelrechnung.SuspendLayout() CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() @@ -97,7 +98,6 @@ Partial Class usrcntlFakturierung CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GroupBox1 @@ -212,6 +212,16 @@ Partial Class usrcntlFakturierung Me.TextBox1.Size = New System.Drawing.Size(106, 13) Me.TextBox1.TabIndex = 105 ' + 'MyDatagridview1 + ' + Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1 + Me.MyDatagridview1.BackgroundColor = System.Drawing.SystemColors.Window + Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.MyDatagridview1.Location = New System.Drawing.Point(4, 71) + Me.MyDatagridview1.Name = "MyDatagridview1" + Me.MyDatagridview1.Size = New System.Drawing.Size(471, 135) + Me.MyDatagridview1.TabIndex = 34 + ' 'Label5 ' Me.Label5.AutoSize = True @@ -245,6 +255,17 @@ Partial Class usrcntlFakturierung Me.lblMautAnh_Proz.Text = "0%" Me.lblMautAnh_Proz.TextAlign = System.Drawing.ContentAlignment.TopRight ' + 'cbxDateMautbericht + ' + Me.cbxDateMautbericht._allowedValuesFreiText = Nothing + Me.cbxDateMautbericht._allowFreiText = False + Me.cbxDateMautbericht._value = "" + Me.cbxDateMautbericht.FormattingEnabled = True + Me.cbxDateMautbericht.Location = New System.Drawing.Point(265, 12) + Me.cbxDateMautbericht.Name = "cbxDateMautbericht" + Me.cbxDateMautbericht.Size = New System.Drawing.Size(87, 21) + Me.cbxDateMautbericht.TabIndex = 32 + ' 'Label69 ' Me.Label69.AutoSize = True @@ -262,6 +283,18 @@ Partial Class usrcntlFakturierung Me.Label68.TabIndex = 30 Me.Label68.Text = "Generiert Mautberichte" ' + 'cbxMautbericht + ' + Me.cbxMautbericht._allowedValuesFreiText = Nothing + Me.cbxMautbericht._allowFreiText = False + Me.cbxMautbericht._value = "" + Me.cbxMautbericht.DropDownWidth = 200 + Me.cbxMautbericht.FormattingEnabled = True + Me.cbxMautbericht.Location = New System.Drawing.Point(265, 33) + Me.cbxMautbericht.Name = "cbxMautbericht" + Me.cbxMautbericht.Size = New System.Drawing.Size(152, 21) + Me.cbxMautbericht.TabIndex = 30 + ' 'Label62 ' Me.Label62.AutoSize = True @@ -304,7 +337,7 @@ Partial Class usrcntlFakturierung Me.GBSammelrechnung.Controls.Add(Me.Button3) Me.GBSammelrechnung.Controls.Add(Me.Button2) Me.GBSammelrechnung.Controls.Add(Me.cbxMautanh) - Me.GBSammelrechnung.Controls.Add(Me.Button1) + Me.GBSammelrechnung.Controls.Add(Me.btnMautanh_pruefen) Me.GBSammelrechnung.Controls.Add(Me.PictureBox6) Me.GBSammelrechnung.Controls.Add(Me.PictureBox5) Me.GBSammelrechnung.Controls.Add(Me.PictureBox4) @@ -315,7 +348,7 @@ Partial Class usrcntlFakturierung Me.GBSammelrechnung.Controls.Add(Me.cbxVorschau) Me.GBSammelrechnung.Controls.Add(Me.cbxAbfVerbotdrucken) Me.GBSammelrechnung.Controls.Add(Me.cbxRechnungsjournaldrucken) - Me.GBSammelrechnung.Controls.Add(Me.Button20) + Me.GBSammelrechnung.Controls.Add(Me.btn_Mautanh_entfernen) Me.GBSammelrechnung.Controls.Add(Me.Label72) Me.GBSammelrechnung.Controls.Add(Me.KdSearchBox3) Me.GBSammelrechnung.Controls.Add(Me.rbkunde) @@ -324,7 +357,7 @@ Partial Class usrcntlFakturierung Me.GBSammelrechnung.Controls.Add(Me.Label71) Me.GBSammelrechnung.Controls.Add(Me.pbPloseAnh_Proz) Me.GBSammelrechnung.Controls.Add(Me.lblPloseAnh_Proz) - Me.GBSammelrechnung.Controls.Add(Me.Button19) + Me.GBSammelrechnung.Controls.Add(Me.btn_setRENr) Me.GBSammelrechnung.Controls.Add(Me.Label70) Me.GBSammelrechnung.Controls.Add(Me.cboSachbearbeiter) Me.GBSammelrechnung.Controls.Add(Me.Label67) @@ -334,7 +367,7 @@ Partial Class usrcntlFakturierung Me.GBSammelrechnung.Controls.Add(Me.Label64) Me.GBSammelrechnung.Controls.Add(Me.Label63) Me.GBSammelrechnung.Controls.Add(Me.Label45) - Me.GBSammelrechnung.Controls.Add(Me.Button14) + Me.GBSammelrechnung.Controls.Add(Me.btnRePos) Me.GBSammelrechnung.Enabled = False Me.GBSammelrechnung.Location = New System.Drawing.Point(10, 356) Me.GBSammelrechnung.Name = "GBSammelrechnung" @@ -438,16 +471,16 @@ Partial Class usrcntlFakturierung Me.cbxMautanh.Text = "Mautanhänge im PDF hinzufügen" Me.cbxMautanh.UseVisualStyleBackColor = True ' - 'Button1 + 'btnMautanh_pruefen ' - Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button1.Location = New System.Drawing.Point(10, 12) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(121, 49) - Me.Button1.TabIndex = 106 - Me.Button1.Text = "Mautanh. prüfen" - Me.Button1.UseVisualStyleBackColor = True + Me.btnMautanh_pruefen.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnMautanh_pruefen.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.btnMautanh_pruefen.Location = New System.Drawing.Point(10, 12) + Me.btnMautanh_pruefen.Name = "btnMautanh_pruefen" + Me.btnMautanh_pruefen.Size = New System.Drawing.Size(121, 49) + Me.btnMautanh_pruefen.TabIndex = 106 + Me.btnMautanh_pruefen.Text = "Mautanh. prüfen" + Me.btnMautanh_pruefen.UseVisualStyleBackColor = True ' 'PictureBox6 ' @@ -559,16 +592,16 @@ Partial Class usrcntlFakturierung Me.cbxRechnungsjournaldrucken.Text = "Rechnungsjournal drucken" Me.cbxRechnungsjournaldrucken.UseVisualStyleBackColor = True ' - 'Button20 + 'btn_Mautanh_entfernen ' - Me.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button20.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button20.Location = New System.Drawing.Point(147, 12) - Me.Button20.Name = "Button20" - Me.Button20.Size = New System.Drawing.Size(121, 49) - Me.Button20.TabIndex = 43 - Me.Button20.Text = "Mautanh. aus RE entfernen" - Me.Button20.UseVisualStyleBackColor = True + Me.btn_Mautanh_entfernen.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btn_Mautanh_entfernen.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.btn_Mautanh_entfernen.Location = New System.Drawing.Point(147, 12) + Me.btn_Mautanh_entfernen.Name = "btn_Mautanh_entfernen" + Me.btn_Mautanh_entfernen.Size = New System.Drawing.Size(121, 49) + Me.btn_Mautanh_entfernen.TabIndex = 43 + Me.btn_Mautanh_entfernen.Text = "Mautanh. aus RE entfernen" + Me.btn_Mautanh_entfernen.UseVisualStyleBackColor = True ' 'Label72 ' @@ -578,6 +611,34 @@ Partial Class usrcntlFakturierung Me.Label72.TabIndex = 42 Me.Label72.Text = "* hier wird eine RE-Nr erzeugt, die Rechnungen gelten dann als ""gedruckt"" und kön" & "nen somit nicht mehr geändert werden." + ' + 'KdSearchBox3 + ' + Me.KdSearchBox3._AlleFirmenCLUSTER = False + Me.KdSearchBox3._AllowSetValue = True + Me.KdSearchBox3._autoSizeGross = False + Me.KdSearchBox3._display_Name1 = False + Me.KdSearchBox3._displayAVISO_Email = False + Me.KdSearchBox3._displayFullName = False + Me.KdSearchBox3._displayWoelflKd = False + Me.KdSearchBox3._hideIfListEmpty = True + Me.KdSearchBox3._loadKdData = False + Me.KdSearchBox3._searchName1 = True + Me.KdSearchBox3._UseFIRMA = "" + Me.KdSearchBox3._ValueKdAndName = True + Me.KdSearchBox3.dgvpos = "LEFT" + Me.KdSearchBox3.KdName = "" + Me.KdSearchBox3.KdNr = "-1" + Me.KdSearchBox3.kdNrField = Nothing + Me.KdSearchBox3.KdNrNullInt = Nothing + Me.KdSearchBox3.Location = New System.Drawing.Point(87, 308) + Me.KdSearchBox3.Name = "KdSearchBox3" + Me.KdSearchBox3.nurAktive = True + Me.KdSearchBox3.searchActive = True + Me.KdSearchBox3.Size = New System.Drawing.Size(350, 20) + Me.KdSearchBox3.TabIndex = 41 + Me.KdSearchBox3.TIMER_SEARCH = True + Me.KdSearchBox3.usrcntl = Nothing ' 'rbkunde ' @@ -635,16 +696,16 @@ Partial Class usrcntlFakturierung Me.lblPloseAnh_Proz.Text = "0%" Me.lblPloseAnh_Proz.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'Button19 + 'btn_setRENr ' - Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button19.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button19.Location = New System.Drawing.Point(10, 182) - Me.Button19.Name = "Button19" - Me.Button19.Size = New System.Drawing.Size(121, 49) - Me.Button19.TabIndex = 32 - Me.Button19.Text = "RE.Nr setzen*" - Me.Button19.UseVisualStyleBackColor = True + Me.btn_setRENr.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btn_setRENr.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.btn_setRENr.Location = New System.Drawing.Point(10, 182) + Me.btn_setRENr.Name = "btn_setRENr" + Me.btn_setRENr.Size = New System.Drawing.Size(121, 49) + Me.btn_setRENr.TabIndex = 32 + Me.btn_setRENr.Text = "RE.Nr setzen*" + Me.btn_setRENr.UseVisualStyleBackColor = True ' 'Label70 ' @@ -654,6 +715,17 @@ Partial Class usrcntlFakturierung Me.Label70.TabIndex = 30 Me.Label70.Text = "6. Hängt Mautgesamtbericht an Sammenrechnungen an." ' + 'cboSachbearbeiter + ' + Me.cboSachbearbeiter._allowedValuesFreiText = Nothing + Me.cboSachbearbeiter._allowFreiText = False + Me.cboSachbearbeiter._value = "" + Me.cboSachbearbeiter.FormattingEnabled = True + Me.cboSachbearbeiter.Location = New System.Drawing.Point(529, 38) + Me.cboSachbearbeiter.Name = "cboSachbearbeiter" + Me.cboSachbearbeiter.Size = New System.Drawing.Size(152, 21) + Me.cboSachbearbeiter.TabIndex = 29 + ' 'Label67 ' Me.Label67.AutoSize = True @@ -713,88 +785,16 @@ Partial Class usrcntlFakturierung Me.Label45.TabIndex = 5 Me.Label45.Text = "1. Einträge auf Sachbearbeiter ändern." ' - 'Button14 + 'btnRePos ' - Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button14.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button14.Location = New System.Drawing.Point(10, 81) - Me.Button14.Name = "Button14" - Me.Button14.Size = New System.Drawing.Size(121, 49) - Me.Button14.TabIndex = 4 - Me.Button14.Text = "Rechnungspos. berechnen" - Me.Button14.UseVisualStyleBackColor = True - ' - 'MyDatagridview1 - ' - Me.MyDatagridview1.AKTUALISIERUNGS_INTERVALL = -1 - Me.MyDatagridview1.BackgroundColor = System.Drawing.SystemColors.Window - Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.MyDatagridview1.Location = New System.Drawing.Point(4, 71) - Me.MyDatagridview1.Name = "MyDatagridview1" - Me.MyDatagridview1.Size = New System.Drawing.Size(471, 135) - Me.MyDatagridview1.TabIndex = 34 - ' - 'cbxDateMautbericht - ' - Me.cbxDateMautbericht._allowedValuesFreiText = Nothing - Me.cbxDateMautbericht._allowFreiText = False - Me.cbxDateMautbericht._value = "" - Me.cbxDateMautbericht.FormattingEnabled = True - Me.cbxDateMautbericht.Location = New System.Drawing.Point(265, 12) - Me.cbxDateMautbericht.Name = "cbxDateMautbericht" - Me.cbxDateMautbericht.Size = New System.Drawing.Size(87, 21) - Me.cbxDateMautbericht.TabIndex = 32 - ' - 'cbxMautbericht - ' - Me.cbxMautbericht._allowedValuesFreiText = Nothing - Me.cbxMautbericht._allowFreiText = False - Me.cbxMautbericht._value = "" - Me.cbxMautbericht.DropDownWidth = 200 - Me.cbxMautbericht.FormattingEnabled = True - Me.cbxMautbericht.Location = New System.Drawing.Point(265, 33) - Me.cbxMautbericht.Name = "cbxMautbericht" - Me.cbxMautbericht.Size = New System.Drawing.Size(152, 21) - Me.cbxMautbericht.TabIndex = 30 - ' - 'KdSearchBox3 - ' - Me.KdSearchBox3._AlleFirmenCLUSTER = False - Me.KdSearchBox3._AllowSetValue = True - Me.KdSearchBox3._autoSizeGross = False - Me.KdSearchBox3._display_Name1 = False - Me.KdSearchBox3._displayAVISO_Email = False - Me.KdSearchBox3._displayFullName = False - Me.KdSearchBox3._displayWoelflKd = False - Me.KdSearchBox3._hideIfListEmpty = True - Me.KdSearchBox3._loadKdData = False - Me.KdSearchBox3._searchName1 = True - Me.KdSearchBox3._UseFIRMA = "" - Me.KdSearchBox3._ValueKdAndName = True - Me.KdSearchBox3.dgvpos = "LEFT" - Me.KdSearchBox3.KdName = "" - Me.KdSearchBox3.KdNr = "-1" - Me.KdSearchBox3.kdNrField = Nothing - Me.KdSearchBox3.KdNrNullInt = Nothing - Me.KdSearchBox3.Location = New System.Drawing.Point(87, 308) - Me.KdSearchBox3.Name = "KdSearchBox3" - Me.KdSearchBox3.nurAktive = True - Me.KdSearchBox3.searchActive = True - Me.KdSearchBox3.Size = New System.Drawing.Size(350, 20) - Me.KdSearchBox3.TabIndex = 41 - Me.KdSearchBox3.TIMER_SEARCH = True - Me.KdSearchBox3.usrcntl = Nothing - ' - 'cboSachbearbeiter - ' - Me.cboSachbearbeiter._allowedValuesFreiText = Nothing - Me.cboSachbearbeiter._allowFreiText = False - Me.cboSachbearbeiter._value = "" - Me.cboSachbearbeiter.FormattingEnabled = True - Me.cboSachbearbeiter.Location = New System.Drawing.Point(529, 38) - Me.cboSachbearbeiter.Name = "cboSachbearbeiter" - Me.cboSachbearbeiter.Size = New System.Drawing.Size(152, 21) - Me.cboSachbearbeiter.TabIndex = 29 + Me.btnRePos.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnRePos.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.btnRePos.Location = New System.Drawing.Point(10, 81) + Me.btnRePos.Name = "btnRePos" + Me.btnRePos.Size = New System.Drawing.Size(121, 49) + Me.btnRePos.TabIndex = 4 + Me.btnRePos.Text = "Rechnungspos. berechnen" + Me.btnRePos.UseVisualStyleBackColor = True ' 'usrcntlFakturierung ' @@ -812,6 +812,7 @@ Partial Class usrcntlFakturierung Me.GroupBox1.ResumeLayout(False) Me.GBMautberichte.ResumeLayout(False) Me.GBMautberichte.PerformLayout() + CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit() Me.GBSammelrechnung.ResumeLayout(False) Me.GBSammelrechnung.PerformLayout() CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).EndInit() @@ -822,7 +823,6 @@ Partial Class usrcntlFakturierung CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -846,7 +846,7 @@ Partial Class usrcntlFakturierung Friend WithEvents cbxVorschau As CheckBox Friend WithEvents cbxAbfVerbotdrucken As CheckBox Friend WithEvents cbxRechnungsjournaldrucken As CheckBox - Friend WithEvents Button20 As Button + Friend WithEvents btn_Mautanh_entfernen As Button Friend WithEvents Label72 As Label Friend WithEvents KdSearchBox3 As VERAG_PROG_ALLGEMEIN.KdSearchBox Friend WithEvents rbkunde As RadioButton @@ -855,7 +855,7 @@ Partial Class usrcntlFakturierung Friend WithEvents Label71 As Label Friend WithEvents pbPloseAnh_Proz As ProgressBar Friend WithEvents lblPloseAnh_Proz As Label - Friend WithEvents Button19 As Button + Friend WithEvents btn_setRENr As Button Friend WithEvents Label70 As Label Friend WithEvents cboSachbearbeiter As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label67 As Label @@ -865,7 +865,7 @@ Partial Class usrcntlFakturierung Friend WithEvents Label64 As Label Friend WithEvents Label63 As Label Friend WithEvents Label45 As Label - Friend WithEvents Button14 As Button + Friend WithEvents btnRePos As Button Friend WithEvents btnMDMSammelrechnung As Button Friend WithEvents PictureBox1 As PictureBox Friend WithEvents Label4 As Label @@ -878,7 +878,7 @@ Partial Class usrcntlFakturierung Friend WithEvents PictureBox4 As PictureBox Friend WithEvents PictureBox3 As PictureBox Friend WithEvents PictureBox2 As PictureBox - Friend WithEvents Button1 As Button + Friend WithEvents btnMautanh_pruefen As Button Friend WithEvents cbxMautanh As CheckBox Friend WithEvents Button3 As Button Friend WithEvents Button2 As Button diff --git a/SDL/seriendruck/usrCntlFakturierung.vb b/SDL/seriendruck/usrCntlFakturierung.vb index 7bd825ae..5a206bb9 100644 --- a/SDL/seriendruck/usrCntlFakturierung.vb +++ b/SDL/seriendruck/usrCntlFakturierung.vb @@ -89,7 +89,7 @@ Public Class usrcntlFakturierung End Sub - Private Sub Button20_Click(sender As Object, e As EventArgs) Handles Button20.Click + Private Sub Button20_Click(sender As Object, e As EventArgs) Handles btn_Mautanh_entfernen.Click Dim Sachbearbeiter = cboSachbearbeiter._value Dim rechnungsdatum As Date = CDate(dtRechnungsdatum.Text) @@ -133,7 +133,7 @@ Public Class usrcntlFakturierung End Sub - Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click + Private Sub Button14_Click(sender As Object, e As EventArgs) Handles btnRePos.Click Label70.Text = "6. Hängt Mautgesamtbericht an Sammelrechnungen an." @@ -190,7 +190,7 @@ Public Class usrcntlFakturierung If rechnungenMitAbwAbfDat > 0 Then Dim res As MsgBoxResult - res = MsgBox("Es gibt noch " & rechnungenMitAbwAbfDat & " Rechnungen mit abweichenden Abfertigungsdatum (Abfertigungsdatum ist nicht " & rechnungsdatum & ")" & vbNewLine & "Möchten Sie fortfahren (Abfertigungsdatum wird autoamtisch auf " & rechnungsdatum & " gesetzt) ?", vbYesNoCancel) + res = MsgBox("Es gibt noch " & rechnungenMitAbwAbfDat & " Rechnungen mit abweichenden Abfertigungsdatum (Abfertigungsdatum ist nicht " & rechnungsdatum & ")" & vbNewLine & "Möchten Sie fortfahren (Abfertigungsdatum wird automatisch auf " & rechnungsdatum & " gesetzt) ?", vbYesNoCancel) Select Case res Case MsgBoxResult.Yes : SQL.doSQL("update [Rechnungsausgang] set Abfertigungsdatum = '" & rechnungsdatum & "' WHERE [Status] = 0 AND [Sammelrechnung] = 6 AND UPPER([Sachbearbeiter]) = '" & Sachbearbeiter & "' AND ([SteuerpflichtigerGesamtbetrag] <> 0 OR [SteuerfreierGesamtbetrag] <> 0) AND cast(Abfertigungsdatum as Date) <> '" & rechnungsdatum & "'", "FMZOLL") Case MsgBoxResult.No @@ -234,6 +234,10 @@ Public Class usrcntlFakturierung GROUP BY [Firma_ID], [Status], [Sammelrechnung], [Sachbearbeiter], [RechnungsKundenNr], [Währungscode], [Steuersatz %], [Lastschrift]", "FMZOLL") + If Not vbYes = MsgBox("Möchten Sie mit der Erstellung der " & dtREGU.Rows.Count & " Sammelrechnungen vorfahren?", vbYesNoCancel) Then + Exit Sub + End If + 'RECHNUNG ODER GUTSCHRIFT 'Rechnung oder Gutschrift im RK eintragen, abhängig vom Sammelrechnungsbetrag (+/-) @@ -912,7 +916,7 @@ Public Class usrcntlFakturierung End Function - Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click + Private Sub Button19_Click(sender As Object, e As EventArgs) Handles btn_setRENr.Click Dim Sachbearbeiter = cboSachbearbeiter._value Dim rechnungsdatum As Date = CDate(dtRechnungsdatum.Text) Dim rechnungsstatus As Integer = 0 @@ -1521,21 +1525,21 @@ Public Class usrcntlFakturierung group by [Datenquelle]", "FMZOLL") Dim sumNetto As Double = 0 - Dim sumVAT As Double = 0 - Dim sumBrutto As Double = 0 + Dim sumVAT As Double = 0 + Dim sumBrutto As Double = 0 - For Each row As DataRow In dtSummen.Rows + For Each row As DataRow In dtSummen.Rows If Not IsDBNull(row("Netto")) AndAlso IsNumeric(row("Netto")) Then sumNetto += CDbl(row("Netto")) If Not IsDBNull(row("VAT")) AndAlso IsNumeric(row("VAT")) Then sumVAT += CDbl(row("VAT")) If Not IsDBNull(row("Brutto")) AndAlso IsNumeric(row("Brutto")) Then sumBrutto += CDbl(row("Brutto")) Next - Dim drLast = dtSummen.NewRow + Dim drLast = dtSummen.NewRow - If dtSummen.Columns.Contains("Lieferant") Then drLast.Item("Lieferant") = "SUMME" - If dtSummen.Columns.Contains("Netto") Then drLast.Item("Netto") = sumNetto - If dtSummen.Columns.Contains("VAT") Then drLast.Item("VAT") = sumVAT - If dtSummen.Columns.Contains("Brutto") Then drLast.Item("Brutto") = sumBrutto + If dtSummen.Columns.Contains("Lieferant") Then drLast.Item("Lieferant") = "SUMME" + If dtSummen.Columns.Contains("Netto") Then drLast.Item("Netto") = sumNetto + If dtSummen.Columns.Contains("VAT") Then drLast.Item("VAT") = sumVAT + If dtSummen.Columns.Contains("Brutto") Then drLast.Item("Brutto") = sumBrutto dtSummen.Rows.InsertAt(drLast, dtSummen.Rows.Count) @@ -1597,7 +1601,7 @@ Public Class usrcntlFakturierung f.Show(Me) End Sub - Private Sub Button1_Click_2(sender As Object, e As EventArgs) Handles Button1.Click + Private Sub Button1_Click_2(sender As Object, e As EventArgs) Handles btnMautanh_pruefen.Click Dim Sachbearbeiter = cboSachbearbeiter._value Dim rechnungsdatum As Date = CDate(dtRechnungsdatum.Text) @@ -1701,9 +1705,9 @@ Public Class usrcntlFakturierung Dim sammelrechnung0vorhanden As Boolean = True sammelrechnung0vorhanden = checkIfStatus0Sammelrechnugnenvorhanden(cboSachbearbeiter._value, CDate(dtRechnungsdatum.Text)) - Button14.Enabled = sammelrechnung0vorhanden + btnRePos.Enabled = sammelrechnung0vorhanden 'Button19.Enabled = sammelrechnung0vorhanden wenn RE bereits Status 2 wird sie nur gedruckt!!!! - Button20.Enabled = sammelrechnung0vorhanden + btn_Mautanh_entfernen.Enabled = sammelrechnung0vorhanden End Sub @@ -1728,8 +1732,8 @@ Public Class usrcntlFakturierung sammelrechnung0vorhanden = checkIfStatus0Sammelrechnugnenvorhanden(cboSachbearbeiter._value, CDate(dtRechnungsdatum.Text)) 'Button19.Enabled = sammelrechnung0vorhanden wenn RE bereits Status 2 wird sie nur gedruckt!!!! - Button14.Enabled = True 'sammelrechnung0vorhanden - Button20.Enabled = sammelrechnung0vorhanden + btnRePos.Enabled = True 'sammelrechnung0vorhanden + btn_Mautanh_entfernen.Enabled = sammelrechnung0vorhanden End Sub diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUStVLeistender.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUStVLeistender.vb index ae212e43..8bc96dfb 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUStVLeistender.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUStVLeistender.vb @@ -13,7 +13,6 @@ Public Class cUStVLeistender Property UstV_Leistender_Adresse As Boolean Property UStV_LeistenderId As Integer - Public hasEntry = False Dim SQL As New SQL @@ -59,10 +58,29 @@ Public Class cUStVLeistender " BEGIN " & getInsertCmd() & " END " & " commit tran " + Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list) End Function + Public Function SAVEID() As Integer + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblUStVLeistender WHERE UStV_Leistender=@UStV_Leistender) " & + " BEGIN " & getUpdateCmd() & " END " & + " Else " & + " BEGIN " & getInsertCmd() & " END " & + " commit tran " + + + UStV_LeistenderId = SQL.doSQLVarListID(UStV_LeistenderId, sqlstr, "FMZOLL", , list) + + Return UStV_LeistenderId + End Function + + + + Public Function INSERT() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb index 1eb1d352..ccb20c0f 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb @@ -1,14 +1,10 @@ Imports System.Data.SqlClient Imports System.Net Imports System.Reflection -Imports System.ServiceModel.Configuration -Imports System.ServiceModel.Security Imports System.Threading -Imports System.Web.Routing Imports System.Windows.Forms -Imports System.Windows.Forms.VisualStyles.VisualStyleElement Imports Chilkat -Imports Newtonsoft.Json.Linq +Imports VERAG_PROG_ALLGEMEIN.VERAG_OUT_NCTS Public Class cATEZ_NCTS_Sessions @@ -17,6 +13,7 @@ Public Class cATEZ_NCTS_Sessions Public Property datetime As DateTime = Now() Public Property refresh_token As String Public Property token_validuntil As DateTime + Public Property program As String Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -30,18 +27,24 @@ Public Class cATEZ_NCTS_Sessions list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("datetime", datetime)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("refresh_token", refresh_token)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("token_validuntil", token_validuntil)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("program", program)) Return list End Function Sub New() - LOAD() + LOAD("") End Sub - Sub New(token As String, refreshtoken As String, timestamp As DateTime) + Sub New(Program As String) + LOAD(Program) + End Sub + + Sub New(token As String, refreshtoken As String, timestamp As DateTime, program As String) Me.token = token Me.refresh_token = refreshtoken token_validuntil = timestamp + program = program SAVE() End Sub @@ -80,11 +83,11 @@ Public Class cATEZ_NCTS_Sessions End Function - Public Sub LOAD() + Public Sub LOAD(Program As String) Try hasEntry = False Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() - Using cmd As New SqlCommand("SELECT TOP(1) * FROM tblATEZ_NCTS_Sessions where token_validuntil >= dateadd(minute,-10,getdate()) order by datetime desc ", conn) + Using cmd As New SqlCommand("SELECT TOP(1) * FROM tblATEZ_NCTS_Sessions where token_validuntil >= dateadd(minute,-10,getdate()) " & IIf(Program <> "", " AND program = '" & Program & "' ", "") & " order by datetime desc ", conn) Dim dr = cmd.ExecuteReader() If dr.Read Then @@ -630,17 +633,17 @@ Public Class cATEZ_NCTS_IN API_STRING = API.Rows(0).Item("api_url") If Not IsDBNull(API.Rows(0).Item("api_debugpath")) AndAlso API.Rows(0).Item("api_debugpath") <> "" Then - Rest.VerboseLogging = True - Rest.DebugLogFilePath = API.Rows(0).Item("api_debugpath") & program & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_Test", "") & ".txt" + rest.VerboseLogging = True + rest.DebugLogFilePath = API.Rows(0).Item("api_debugpath") & program & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_Test", "") & ".txt" Else - Rest.VerboseLogging = False + rest.VerboseLogging = False End If End If - API_STRING = API.Rows(0).Item("api_url") + End Sub - Shared Function SendRequestAuthentificationToken(ByVal myuri As String, ByVal contentType As String, ByVal method As String, ByRef Itoken As String) As String + Shared Function SendRequestAuthentificationToken(ByVal myuri As String, ByVal contentType As String, ByVal method As String, ByRef Itoken As String, ByVal program As String, Optional client_id As String = "", Optional grant_type As String = "") As String Try Dim session = New cATEZ_NCTS_Sessions() @@ -675,6 +678,8 @@ Public Class cATEZ_NCTS_IN Dim json As New Chilkat.JsonObject json.UpdateString("password", API.Rows(0).Item("api_password")) json.UpdateString("username", API.Rows(0).Item("api_user")) + If client_id <> "" Then json.UpdateString("client_id", client_id) + If grant_type <> "" Then json.UpdateString("grant_type", grant_type) rest.AddHeader("Content-Type", contentType) @@ -697,10 +702,10 @@ Public Class cATEZ_NCTS_IN jsonResp.LoadSb(sbResponseBody) Itoken = jsonResp.StringOf("access_token") token = Itoken - refresh_token = jsonResp.StringOf("refresh_token") + refresh_token = If(jsonResp.StringOf("refresh_token"), "") Dim now As DateTime = DateTime.Now() now = now.AddSeconds(jsonResp.IntOf("expires_in")) - session = New cATEZ_NCTS_Sessions(Itoken, refresh_token, now.ToString("yyyy-MM-dd HH:mm:ss")) + session = New cATEZ_NCTS_Sessions(Itoken, refresh_token, now.ToString("yyyy-MM-dd HH:mm:ss"), program) sessionID = session.session_Id Return rest.ResponseStatusCode @@ -710,17 +715,25 @@ Public Class cATEZ_NCTS_IN End Function - Shared Function authenticate() As String + Shared Function authenticate(program As String, Optional client_id As String = "", Optional grant_type As String = "") As String - Dim myUri As String = API_STRING & "/api/tds/auth/" - Dim response = SendRequestAuthentificationToken(myUri, "application/json", "POST", token) + Dim myUri As String = API_STRING + Dim contentType = "application/json" + + Select Case program + Case "NCTS" : myUri &= "/api/tds/auth/" + Case "VAT" : myUri &= "/token" : contentType = "application/x-www-form-urlencoded" + + End Select + + Dim response = SendRequestAuthentificationToken(myUri, contentType, "POST", token, program, client_id, grant_type) Return response End Function - Shared Function SendRequestWithAuthHeader(acceptContentType As String, ByRef failureDesc As String) As String + Shared Function SendRequestWithAuthHeader(acceptContentType As String, ByRef failureDesc As String, myUrl As String, Method As String) As String Try VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat() @@ -755,7 +768,7 @@ Public Class cATEZ_NCTS_IN 'rest.PercentDoneOnSend = True rest.IdleTimeoutMs = 5000 * 31 - success = rest.SendReqSb("POST", "/api/integrations/verag", sbRequestBody) + success = rest.SendReqSb(Method, myUrl, sbRequestBody) Dim responseStatusCode = rest.ReadResponseHeader() If (responseStatusCode < 0) Then @@ -816,7 +829,7 @@ Public Class cATEZ_NCTS_IN End Try End Function - Shared Function setJson(ncts As cATEZ_NCTS_DATA) + Shared Function setJsonNCTS(ncts As cATEZ_NCTS_DATA) jsonData.Clear() ncts.json = "" @@ -868,6 +881,21 @@ Public Class cATEZ_NCTS_IN End Function + + Shared Function setJsonVAT(documentType As String, docID As Integer) + + jsonData.Clear() + + Dim success As Boolean + success = jsonData.UpdateString("document_type", documentType) + Dim base64 As Chilkat.BinData + success = base64.LoadFile(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(docID)) + success = jsonData.UpdateString("document_base64", base64.GetEncoded("base64")) + + Return success + + End Function + Public Function setJsonPDF(ncts As cATEZ_NCTS_DATA, dgv As DataGridView) Dim success As Boolean @@ -894,4 +922,7 @@ Public Class cATEZ_NCTS_IN End Function + + + End Class From 669cbcade66cd6a77a0642129fd3c453f244d600 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 8 Apr 2025 15:10:27 +0200 Subject: [PATCH 05/10] fremdrechnungen, ustva, ustv. --- SDL/USTV/frmUSTVoffeneAntraege.vb | 29 ++++++++++++++++------------- SDL/USTV/usrCntlUSTV.vb | 18 +++++++++++++++--- SDL/mdm/usrcntlFremdrechnungen.vb | 4 ++-- 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/SDL/USTV/frmUSTVoffeneAntraege.vb b/SDL/USTV/frmUSTVoffeneAntraege.vb index 88a583b9..0626d74d 100644 --- a/SDL/USTV/frmUSTVoffeneAntraege.vb +++ b/SDL/USTV/frmUSTVoffeneAntraege.vb @@ -937,25 +937,28 @@ Public Class frmUSTVoffeneAntraege Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click Dim SQLQuery As String = "" - Select Case LIEFERANT.ToString.ToLower - Case "plose" : SQLQuery = "select count(distinct([plInv_SupplierRechnungsNr])) from [tblPLOSE_Inv_Data] where [plInv_daId] is null and cast([plInv_SupplierRechnungsDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'" - Case "rmc" : SQLQuery = "select count(distinct(rmc_reNr)) as Anzahl from [tblRMCImport] where rmc_daId is null and cast([rmc_reDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'" - Case "mse" : SQLQuery = "select count(distinct(invoice_id)) as Anzahl from tblMSEInvoices where daId is null and cast(invoice_date as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'" - Case "uta" : SQLQuery = "select count(distinct(tblUTAImportNew.Abrechnungsnummer)) as Anzahl from tblUTAImportNew where daId is null and cast([Rechnungsdatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' and Lieferland <> 'ROM' and Steuerliches_Lieferland <> 'ROM'" - Case "ids" : SQLQuery = "select count(distinct(Invoicenumber)) as Anzahl from tblIDSInvoicesNew where DocumentName is null and cast(YearMonthDay as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "'" - Case Else - SQLQuery = "" - + Case "plose" : SQLQuery = "select [plInv_SupplierRechnungsNr] as RechnungsNr,plInv_SupplierRechnungsDatum as Rechnungsdatum,Adressen.AdressenNr,Adressen.[Name 1] as Kunde from [tblPLOSE_Inv_Data] INNER JOIN Adressen on [plInv_PLOSEKundennummer]=Adressen.PLOSEKundenNr where [plInv_daId] is null and cast([plInv_SupplierRechnungsDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by plInv_SupplierRechnungsNr, Adressen.AdressenNr, Adressen.[Name 1], plInv_SupplierRechnungsDatum" + Case "rmc" : SQLQuery = "select rmc_reNr as RechnungsNr,rmc_reDatum AS Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from [tblRMCImport] INNER JOIN Adressen on WölflKundenNr= [rmc_kdNr] where rmc_daId is null and cast([rmc_reDatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by rmc_reNr, Adressen.AdressenNr, Adressen.[Name 1],rmc_reDatum " + Case "mse" : SQLQuery = "select invoice_id as RechnungsNr,[invoice_date] as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from tblMSEInvoices inner join [tblMSECustomers] on [customer_number] = [customer_id] INNER JOIN Adressen on Adressen.MSEKundenNr = [customer_number] where daId is null and cast(invoice_date as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by invoice_id, Adressen.AdressenNr, Adressen.[Name 1], invoice_date" + Case "uta" : SQLQuery = "select tblUTAImportNew.Abrechnungsnummer as RechnungNr,[Rechnungsdatum] AS Rechnungsdatum ,Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from tblUTAImportNew INNER JOIN Adressen on Adressen.UTAKundenNr = tblUTAImportNew.Kundennummer where daId is null and cast([Rechnungsdatum] as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' and Lieferland <> 'ROM' and Steuerliches_Lieferland <> 'ROM' group by tblUTAImportNew.Abrechnungsnummer, Rechnungsdatum,Adressen.AdressenNr, Adressen.[Name 1] " + Case "ids" : SQLQuery = "select Invoicenumber as RechnungsNr,YearMonthDay as Rechnungsdatum, Adressen.AdressenNr as KundenNr,Adressen.[Name 1] as Kunde from tblIDSInvoicesNew Inner join [tbl_IDS_Kunden] on [tbl_IDS_Kunden].CustomerCode =tblIDSInvoicesNew.CustomerCode and isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0 Inner join Adressen on Adressen.AdressenNr = [tbl_IDS_Kunden].KdNrVERAG where DocumentName is null and cast(YearMonthDay as Date) between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' group by Invoicenumber, Adressen.AdressenNr, Adressen.[Name 1], YearMonthDay" + Case Else : SQLQuery = "" End Select Dim fehlendePDFs As Integer = 0 If SQLQuery <> "" Then - fehlendePDFs = CInt((New SQL).getValueTxtBySql(SQLQuery, "FMZOLL")) - MsgBox("Anzahl fehlende PDFs: " & fehlendePDFs) - Else - MsgBox("Funktion nur pro Lieferant möglich!") + Dim dtfehlendePDF As DataTable = (New SQL).loadDgvBySql(SQLQuery, "FMZOLL") + MsgBox("Anzahl fehlende PDFs: " & dtfehlendePDF.Rows.Count & IIf(CDate(dat_Sum_Von.Value).Year <= 2024 OrElse CDate(dat_Sum_Bis.Value).Year <= 2024, vbNewLine & "PDF-Rechnungen vor 2025 wurden tlw. nicht importiert!", "")) + + If dtfehlendePDF.Rows.Count > 0 Then + If vbYes = MsgBox("Details der fehlenden PDF-Rechnungen anzeigen?", vbYesNo) Then + cProgramFunctions.genExcelFromDT_NEW(dtfehlendePDF,,, "Fehlende PDF-Rechnungen: " & dat_Sum_Von.Value.ToShortDateString & " - " & dat_Sum_Bis.Value.ToShortDateString) + End If + End if + Else + MsgBox("Funktion nur pro Lieferant möglich!") End If diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 2752b80c..4f33f152 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -618,10 +618,22 @@ Public Class usrCntlUSTV ElseIf item.Name = "offeneAntraege" Then If dgvUSTV.SelectedRows(0) IsNot Nothing AndAlso IsDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatVon").Value) AndAlso IsDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatBis").Value) Then - Dim frm As New frmUSTVoffeneAntraege(CDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatVon").Value), CDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatBis").Value), dgvUSTV.SelectedRows(0).Cells("UStVAn_KuNr").Value, dgvUSTV.SelectedRows(0).Cells("UStVAn_Name").Value) - frm.Show() + + If dgvUSTV.SelectedRows(0).Cells("UStVAn_KuNr").Value IsNot Nothing AndAlso dgvUSTV.SelectedRows(0).Cells("UStVAn_Name").Value IsNot Nothing Then + Dim frm As New frmUSTVoffeneAntraege(CDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatVon").Value), CDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatBis").Value), dgvUSTV.SelectedRows(0).Cells("UStVAn_KuNr").Value, IIf(IsDBNull(dgvUSTV.SelectedRows(0).Cells("UStVAn_Name").Value), "", dgvUSTV.SelectedRows(0).Cells("UStVAn_Name").Value)) + frm.Show() + + Else + Dim frm As New frmUSTVoffeneAntraege(CDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatVon").Value), CDate(dgvUSTV.SelectedRows(0).Cells("UStVAn_ReDatBis").Value)) + frm.cbxAlleoffenen.Checked = True + frm.Show() + + End If + + + Else - Dim frm As New frmUSTVoffeneAntraege() + Dim frm As New frmUSTVoffeneAntraege() frm.Show() End If diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index 5e6358c0..36c8514f 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -214,7 +214,7 @@ Public Class usrcntlFremdrechnungen 'IDS Case "IDS" : SQL_STR = "SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") & - " invoice_id, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer, CustomerCode as Kundennummer,[daId],[TransactionVolume] as Transaktionsmenge,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblIDSInvoicesNew WHERE [CustomerCode] in (SELECT distinct([CustomerCode]) FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE 1 = 1 " & IIf(kdNr > 0, " AND [KdNrVERAG]=" & kdNr, "") & ") and [YearMonthDay] " & setSQLWhere(SDLNrTmp, "") & " order by [YearMonthDay] desc, [Invoicenumber]" + " invoice_id, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer, CustomerCode as Kundennummer,[daId],[TransactionVolume] as Transaktionsmenge,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt, cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblIDSInvoicesNew WHERE [CustomerCode] in (SELECT distinct([CustomerCode]) FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE 1 = 1 AND isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0 " & IIf(kdNr > 0, " AND [KdNrVERAG]=" & kdNr, "") & ") and [YearMonthDay] " & setSQLWhere(SDLNrTmp, "") & " order by [YearMonthDay] desc, [Invoicenumber]" 'UTA Case "UTA" : SQL_STR = "SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") & @@ -240,7 +240,7 @@ Public Class usrcntlFremdrechnungen Case "ALLE" : Dim anzahl As Integer = anzahlTop / 6 : SQL_STR = " select * from (SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " --IDS - 'IDS' as Lieferant,invoice_id, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer,CustomerCode as Kundennummer,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt,'' as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblIDSInvoicesNew WHERE [CustomerCode] in (SELECT [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE 1 = 1 " & IIf(kdNr > 0, " AND [KdNrVERAG]=" & kdNr, "") & " ) and [YearMonthDay] " & setSQLWhere("IDS", "") & " -- order by [YearMonthDay], [Invoicenumber] + 'IDS' as Lieferant,invoice_id, [YearMonthDay] as Rechnungsdatum,[Invoicenumber] as Rechnungsnummer,CustomerCode as Kundennummer,[AmminclVAT] as Bruttobetrag,[TotalNetAmount] as Nettobetrag,[VATAmount] as MWSt,'' as Land, 'RE' as Art,[daId], cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden FROM tblIDSInvoicesNew WHERE [CustomerCode] in (SELECT [CustomerCode] FROM [VERAG].[dbo].[tbl_IDS_Kunden] WHERE 1 = 1 and isnull([tbl_IDS_Kunden].KdNrAlt, 1) = 0 " & IIf(kdNr > 0, " AND [KdNrVERAG]=" & kdNr, "") & " ) and [YearMonthDay] " & setSQLWhere("IDS", "") & " -- order by [YearMonthDay], [Invoicenumber] UNION ALL From 35c6c6ccea9a9449ed4bc8379b4c321dbd30302c Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 8 Apr 2025 17:29:27 +0200 Subject: [PATCH 06/10] ustva_antrag, Kundenbatt Umsatzbericht, etc. --- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 869 +++++++++--------- SDL/USTV/frmMDM_USTVAntrag.vb | 2 +- .../ustCntlUSTV_AntragPosition.Designer.vb | 8 +- SDL/USTV/ustCntlUSTV_AntragPosition.vb | 36 +- SDL/kunden/frmKundenblatt.Designer.vb | 457 +++++---- SDL/kunden/frmKundenblatt.vb | 61 ++ .../ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb | 8 +- 7 files changed, 819 insertions(+), 622 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index b91b740e..abc560e1 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -27,6 +27,7 @@ Partial Class frmMDM_USTVAntrag Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDM_USTVAntrag)) Me.pnlBottom = New System.Windows.Forms.Panel() + Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label27 = New System.Windows.Forms.Label() Me.picExcel = New System.Windows.Forms.PictureBox() Me.Button4 = New System.Windows.Forms.Button() @@ -40,22 +41,36 @@ Partial Class frmMDM_USTVAntrag Me.lblGesamtUSteuer = New System.Windows.Forms.Label() Me.lblDiffernezbetrag = New System.Windows.Forms.Label() Me.lblGesamtErstattung = New System.Windows.Forms.Label() + Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() + Me.cboAntragArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblKdNr = New System.Windows.Forms.Label() Me.Panel9 = New System.Windows.Forms.Panel() + Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblLand = New System.Windows.Forms.Label() Me.Panel8 = New System.Windows.Forms.Panel() Me.Label14 = New System.Windows.Forms.Label() + Me.txtEingereichtAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblMWSTAntrag = New System.Windows.Forms.Label() Me.Label13 = New System.Windows.Forms.Label() + Me.txtGueltig = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label11 = New System.Windows.Forms.Label() + Me.txtStNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label9 = New System.Windows.Forms.Label() + Me.txtVZ = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtAbfNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label8 = New System.Windows.Forms.Label() + Me.cbxFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label4 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() + Me.txtBezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxWahrung = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblWahrung = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() + Me.txt3470 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label3 = New System.Windows.Forms.Label() Me.lblZeitraum = New System.Windows.Forms.Label() + Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Panel6 = New System.Windows.Forms.Panel() Me.lblGesamtUSteuerFW = New System.Windows.Forms.Label() Me.Label12 = New System.Windows.Forms.Label() @@ -78,45 +93,29 @@ Partial Class frmMDM_USTVAntrag Me.btnStorno = New System.Windows.Forms.Button() Me.lblAntragAbgeschlossen = New System.Windows.Forms.Label() Me.Label5 = New System.Windows.Forms.Label() + Me.cboStatus = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblFirma = New System.Windows.Forms.Label() Me.lblWarnung = New System.Windows.Forms.Label() Me.pnlBody = New System.Windows.Forms.Panel() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlAntragsPosDetails = New System.Windows.Forms.Panel() Me.Panel2 = New System.Windows.Forms.Panel() + Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() Me.Panel4 = New System.Windows.Forms.Panel() Me.btnEintragloeschen = New System.Windows.Forms.Button() Me.btnNeuerEintrag = New System.Windows.Forms.Button() Me.TabPage2 = New System.Windows.Forms.TabPage() Me.Panel3 = New System.Windows.Forms.Panel() + Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.pnlErstattungsdetails = New System.Windows.Forms.Panel() + Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() Me.Panel1 = New System.Windows.Forms.Panel() Me.Button2 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() - Me.cboAntragArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtEingereichtAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtGueltig = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtStNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtVZ = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtAbfNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cbxFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtBezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cbxWahrung = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txt3470 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cboStatus = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() - Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() - Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.btnAPI = New System.Windows.Forms.Button() Me.pnlBottom.SuspendLayout() CType(Me.picExcel, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit() @@ -129,15 +128,15 @@ Partial Class frmMDM_USTVAntrag Me.pnlBody.SuspendLayout() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() + CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlAntragsPosDetails.SuspendLayout() Me.Panel2.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabPage2.SuspendLayout() Me.Panel3.SuspendLayout() + CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlErstattungsdetails.SuspendLayout() Me.Panel1.SuspendLayout() - CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnlBottom @@ -160,6 +159,31 @@ Partial Class frmMDM_USTVAntrag Me.pnlBottom.Size = New System.Drawing.Size(1454, 100) Me.pnlBottom.TabIndex = 3 ' + 'txtSumme + ' + Me.txtSumme._DateTimeOnly = False + Me.txtSumme._numbersOnly = False + Me.txtSumme._numbersOnlyKommastellen = "" + Me.txtSumme._numbersOnlyTrennzeichen = False + Me.txtSumme._Prozent = False + Me.txtSumme._ShortDateNew = False + Me.txtSumme._ShortDateOnly = False + Me.txtSumme._TimeOnly = False + Me.txtSumme._TimeOnly_Seconds = False + Me.txtSumme._value = "" + Me.txtSumme._Waehrung = True + Me.txtSumme._WaehrungZeichen = True + Me.txtSumme.ForeColor = System.Drawing.Color.Black + Me.txtSumme.Location = New System.Drawing.Point(1026, 63) + Me.txtSumme.MaxLineLength = -1 + Me.txtSumme.MaxLines_Warning = "" + Me.txtSumme.MaxLines_Warning_Label = Nothing + Me.txtSumme.Name = "txtSumme" + Me.txtSumme.ReadOnly = True + Me.txtSumme.Size = New System.Drawing.Size(88, 20) + Me.txtSumme.TabIndex = 49 + Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'Label27 ' Me.Label27.AutoSize = True @@ -333,6 +357,48 @@ Partial Class frmMDM_USTVAntrag Me.lblGesamtErstattung.Text = "000.000,00" Me.lblGesamtErstattung.TextAlign = System.Drawing.ContentAlignment.TopRight ' + 'KdSearchBox1 + ' + Me.KdSearchBox1._AlleFirmenCLUSTER = False + Me.KdSearchBox1._AllowSetValue = False + Me.KdSearchBox1._autoSizeGross = False + Me.KdSearchBox1._display_Name1 = False + Me.KdSearchBox1._displayAVISO_Email = False + Me.KdSearchBox1._displayFullName = False + Me.KdSearchBox1._displayWoelflKd = False + Me.KdSearchBox1._hideIfListEmpty = True + Me.KdSearchBox1._loadKdData = False + Me.KdSearchBox1._searchName1 = True + Me.KdSearchBox1._UseFIRMA = "" + Me.KdSearchBox1._ValueKdAndName = True + Me.KdSearchBox1.dgvpos = "LEFT" + Me.KdSearchBox1.KdName = Nothing + Me.KdSearchBox1.KdNr = "-1" + Me.KdSearchBox1.kdNrField = Nothing + Me.KdSearchBox1.KdNrNullInt = Nothing + Me.KdSearchBox1.Location = New System.Drawing.Point(298, 10) + Me.KdSearchBox1.Name = "KdSearchBox1" + Me.KdSearchBox1.nurAktive = True + Me.KdSearchBox1.searchActive = True + Me.KdSearchBox1.Size = New System.Drawing.Size(171, 20) + Me.KdSearchBox1.TabIndex = 22 + Me.KdSearchBox1.TIMER_SEARCH = True + Me.KdSearchBox1.usrcntl = Nothing + ' + 'cboAntragArt + ' + Me.cboAntragArt._allowedValuesFreiText = Nothing + Me.cboAntragArt._allowFreiText = False + Me.cboAntragArt._value = "" + Me.cboAntragArt.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) + Me.cboAntragArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) + Me.cboAntragArt.FormattingEnabled = True + Me.cboAntragArt.Location = New System.Drawing.Point(83, 10) + Me.cboAntragArt.Name = "cboAntragArt" + Me.cboAntragArt.Size = New System.Drawing.Size(191, 28) + Me.cboAntragArt.TabIndex = 21 + Me.cboAntragArt.Text = "USTV-Antrag" + ' 'lblKdNr ' Me.lblKdNr.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ @@ -357,6 +423,21 @@ Partial Class frmMDM_USTVAntrag Me.Panel9.Size = New System.Drawing.Size(65, 90) Me.Panel9.TabIndex = 20 ' + 'cbxLand + ' + Me.cbxLand._allowedValuesFreiText = Nothing + Me.cbxLand._allowFreiText = False + Me.cbxLand._value = "" + Me.cbxLand.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) + Me.cbxLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) + Me.cbxLand.FormattingEnabled = True + Me.cbxLand.Location = New System.Drawing.Point(0, 0) + Me.cbxLand.Name = "cbxLand" + Me.cbxLand.Size = New System.Drawing.Size(65, 28) + Me.cbxLand.TabIndex = 23 + Me.cbxLand.Text = "USTV-Antrag" + Me.cbxLand.Visible = False + ' 'lblLand ' Me.lblLand.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) @@ -417,6 +498,31 @@ Partial Class frmMDM_USTVAntrag Me.Label14.TabIndex = 27 Me.Label14.Text = "eingereicht am" ' + 'txtEingereichtAm + ' + Me.txtEingereichtAm._DateTimeOnly = False + Me.txtEingereichtAm._numbersOnly = False + Me.txtEingereichtAm._numbersOnlyKommastellen = "" + Me.txtEingereichtAm._numbersOnlyTrennzeichen = False + Me.txtEingereichtAm._Prozent = False + Me.txtEingereichtAm._ShortDateNew = False + Me.txtEingereichtAm._ShortDateOnly = True + Me.txtEingereichtAm._TimeOnly = False + Me.txtEingereichtAm._TimeOnly_Seconds = False + Me.txtEingereichtAm._value = "" + Me.txtEingereichtAm._Waehrung = False + Me.txtEingereichtAm._WaehrungZeichen = False + Me.txtEingereichtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtEingereichtAm.ForeColor = System.Drawing.Color.Black + Me.txtEingereichtAm.Location = New System.Drawing.Point(654, 60) + Me.txtEingereichtAm.MaxLength = 10 + Me.txtEingereichtAm.MaxLineLength = -1 + Me.txtEingereichtAm.MaxLines_Warning = "" + Me.txtEingereichtAm.MaxLines_Warning_Label = Nothing + Me.txtEingereichtAm.Name = "txtEingereichtAm" + Me.txtEingereichtAm.Size = New System.Drawing.Size(100, 23) + Me.txtEingereichtAm.TabIndex = 26 + ' 'lblMWSTAntrag ' Me.lblMWSTAntrag.AutoSize = True @@ -442,6 +548,31 @@ Partial Class frmMDM_USTVAntrag Me.Label13.TabIndex = 24 Me.Label13.Text = "gültig bis" ' + 'txtGueltig + ' + Me.txtGueltig._DateTimeOnly = False + Me.txtGueltig._numbersOnly = False + Me.txtGueltig._numbersOnlyKommastellen = "" + Me.txtGueltig._numbersOnlyTrennzeichen = False + Me.txtGueltig._Prozent = False + Me.txtGueltig._ShortDateNew = False + Me.txtGueltig._ShortDateOnly = True + Me.txtGueltig._TimeOnly = False + Me.txtGueltig._TimeOnly_Seconds = False + Me.txtGueltig._value = "" + Me.txtGueltig._Waehrung = False + Me.txtGueltig._WaehrungZeichen = False + Me.txtGueltig.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtGueltig.ForeColor = System.Drawing.Color.Black + Me.txtGueltig.Location = New System.Drawing.Point(101, 61) + Me.txtGueltig.MaxLength = 10 + Me.txtGueltig.MaxLineLength = -1 + Me.txtGueltig.MaxLines_Warning = "" + Me.txtGueltig.MaxLines_Warning_Label = Nothing + Me.txtGueltig.Name = "txtGueltig" + Me.txtGueltig.Size = New System.Drawing.Size(100, 23) + Me.txtGueltig.TabIndex = 23 + ' 'Label11 ' Me.Label11.AutoSize = True @@ -455,6 +586,31 @@ Partial Class frmMDM_USTVAntrag Me.Label11.TabIndex = 21 Me.Label11.Text = "Steuer-Nr:" ' + 'txtStNr + ' + Me.txtStNr._DateTimeOnly = False + Me.txtStNr._numbersOnly = False + Me.txtStNr._numbersOnlyKommastellen = "" + Me.txtStNr._numbersOnlyTrennzeichen = False + Me.txtStNr._Prozent = False + Me.txtStNr._ShortDateNew = False + Me.txtStNr._ShortDateOnly = False + Me.txtStNr._TimeOnly = False + Me.txtStNr._TimeOnly_Seconds = False + Me.txtStNr._value = "" + Me.txtStNr._Waehrung = False + Me.txtStNr._WaehrungZeichen = False + Me.txtStNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtStNr.ForeColor = System.Drawing.Color.Black + Me.txtStNr.Location = New System.Drawing.Point(101, 36) + Me.txtStNr.MaxLength = 10 + Me.txtStNr.MaxLineLength = -1 + Me.txtStNr.MaxLines_Warning = "" + Me.txtStNr.MaxLines_Warning_Label = Nothing + Me.txtStNr.Name = "txtStNr" + Me.txtStNr.Size = New System.Drawing.Size(100, 23) + Me.txtStNr.TabIndex = 22 + ' 'Label9 ' Me.Label9.AutoSize = True @@ -468,6 +624,56 @@ Partial Class frmMDM_USTVAntrag Me.Label9.TabIndex = 19 Me.Label9.Text = "VZ:" ' + 'txtVZ + ' + Me.txtVZ._DateTimeOnly = False + Me.txtVZ._numbersOnly = True + Me.txtVZ._numbersOnlyKommastellen = "" + Me.txtVZ._numbersOnlyTrennzeichen = True + Me.txtVZ._Prozent = False + Me.txtVZ._ShortDateNew = False + Me.txtVZ._ShortDateOnly = False + Me.txtVZ._TimeOnly = False + Me.txtVZ._TimeOnly_Seconds = False + Me.txtVZ._value = "" + Me.txtVZ._Waehrung = True + Me.txtVZ._WaehrungZeichen = True + Me.txtVZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtVZ.ForeColor = System.Drawing.Color.Black + Me.txtVZ.Location = New System.Drawing.Point(865, 31) + Me.txtVZ.MaxLength = 10 + Me.txtVZ.MaxLineLength = -1 + Me.txtVZ.MaxLines_Warning = "" + Me.txtVZ.MaxLines_Warning_Label = Nothing + Me.txtVZ.Name = "txtVZ" + Me.txtVZ.Size = New System.Drawing.Size(100, 23) + Me.txtVZ.TabIndex = 20 + ' + 'txtAbfNr + ' + Me.txtAbfNr._DateTimeOnly = False + Me.txtAbfNr._numbersOnly = True + Me.txtAbfNr._numbersOnlyKommastellen = "" + Me.txtAbfNr._numbersOnlyTrennzeichen = False + Me.txtAbfNr._Prozent = False + Me.txtAbfNr._ShortDateNew = False + Me.txtAbfNr._ShortDateOnly = False + Me.txtAbfNr._TimeOnly = False + Me.txtAbfNr._TimeOnly_Seconds = False + Me.txtAbfNr._value = "" + Me.txtAbfNr._Waehrung = False + Me.txtAbfNr._WaehrungZeichen = False + Me.txtAbfNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtAbfNr.ForeColor = System.Drawing.Color.Black + Me.txtAbfNr.Location = New System.Drawing.Point(654, 33) + Me.txtAbfNr.MaxLength = 10 + Me.txtAbfNr.MaxLineLength = -1 + Me.txtAbfNr.MaxLines_Warning = "" + Me.txtAbfNr.MaxLines_Warning_Label = Nothing + Me.txtAbfNr.Name = "txtAbfNr" + Me.txtAbfNr.Size = New System.Drawing.Size(146, 23) + Me.txtAbfNr.TabIndex = 18 + ' 'Label8 ' Me.Label8.AutoSize = True @@ -481,6 +687,19 @@ Partial Class frmMDM_USTVAntrag Me.Label8.TabIndex = 17 Me.Label8.Text = "Abfertigungs-Nr:" ' + 'cbxFiliale + ' + Me.cbxFiliale._allowedValuesFreiText = Nothing + Me.cbxFiliale._allowFreiText = False + Me.cbxFiliale._value = "" + Me.cbxFiliale.DropDownWidth = 150 + Me.cbxFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxFiliale.FormattingEnabled = True + Me.cbxFiliale.Location = New System.Drawing.Point(413, 32) + Me.cbxFiliale.Name = "cbxFiliale" + Me.cbxFiliale.Size = New System.Drawing.Size(105, 24) + Me.cbxFiliale.TabIndex = 16 + ' 'Label4 ' Me.Label4.AutoSize = True @@ -507,6 +726,43 @@ Partial Class frmMDM_USTVAntrag Me.Label2.TabIndex = 13 Me.Label2.Text = "Bezugs/Pos-Nr.:" ' + 'txtBezugsNr + ' + Me.txtBezugsNr._DateTimeOnly = False + Me.txtBezugsNr._numbersOnly = True + Me.txtBezugsNr._numbersOnlyKommastellen = "" + Me.txtBezugsNr._numbersOnlyTrennzeichen = False + Me.txtBezugsNr._Prozent = False + Me.txtBezugsNr._ShortDateNew = False + Me.txtBezugsNr._ShortDateOnly = False + Me.txtBezugsNr._TimeOnly = False + Me.txtBezugsNr._TimeOnly_Seconds = False + Me.txtBezugsNr._value = "" + Me.txtBezugsNr._Waehrung = False + Me.txtBezugsNr._WaehrungZeichen = False + Me.txtBezugsNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtBezugsNr.ForeColor = System.Drawing.Color.Black + Me.txtBezugsNr.Location = New System.Drawing.Point(654, 4) + Me.txtBezugsNr.MaxLength = 10 + Me.txtBezugsNr.MaxLineLength = -1 + Me.txtBezugsNr.MaxLines_Warning = "" + Me.txtBezugsNr.MaxLines_Warning_Label = Nothing + Me.txtBezugsNr.Name = "txtBezugsNr" + Me.txtBezugsNr.Size = New System.Drawing.Size(146, 23) + Me.txtBezugsNr.TabIndex = 14 + ' + 'cbxWahrung + ' + Me.cbxWahrung._allowedValuesFreiText = Nothing + Me.cbxWahrung._allowFreiText = False + Me.cbxWahrung._value = "" + Me.cbxWahrung.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxWahrung.FormattingEnabled = True + Me.cbxWahrung.Location = New System.Drawing.Point(431, 4) + Me.cbxWahrung.Name = "cbxWahrung" + Me.cbxWahrung.Size = New System.Drawing.Size(87, 24) + Me.cbxWahrung.TabIndex = 12 + ' 'lblWahrung ' Me.lblWahrung.AutoSize = True @@ -533,6 +789,31 @@ Partial Class frmMDM_USTVAntrag Me.Label1.TabIndex = 10 Me.Label1.Text = "3470:" ' + 'txt3470 + ' + Me.txt3470._DateTimeOnly = False + Me.txt3470._numbersOnly = True + Me.txt3470._numbersOnlyKommastellen = "" + Me.txt3470._numbersOnlyTrennzeichen = True + Me.txt3470._Prozent = False + Me.txt3470._ShortDateNew = False + Me.txt3470._ShortDateOnly = False + Me.txt3470._TimeOnly = False + Me.txt3470._TimeOnly_Seconds = False + Me.txt3470._value = "" + Me.txt3470._Waehrung = True + Me.txt3470._WaehrungZeichen = True + Me.txt3470.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txt3470.ForeColor = System.Drawing.Color.Black + Me.txt3470.Location = New System.Drawing.Point(865, 2) + Me.txt3470.MaxLength = 10 + Me.txt3470.MaxLineLength = -1 + Me.txt3470.MaxLines_Warning = "" + Me.txt3470.MaxLines_Warning_Label = Nothing + Me.txt3470.Name = "txt3470" + Me.txt3470.Size = New System.Drawing.Size(100, 23) + Me.txt3470.TabIndex = 10 + ' 'Label3 ' Me.Label3.AutoSize = True @@ -559,6 +840,56 @@ Partial Class frmMDM_USTVAntrag Me.lblZeitraum.TabIndex = 7 Me.lblZeitraum.Text = "-" ' + 'txtVon + ' + Me.txtVon._DateTimeOnly = False + Me.txtVon._numbersOnly = False + Me.txtVon._numbersOnlyKommastellen = "" + Me.txtVon._numbersOnlyTrennzeichen = False + Me.txtVon._Prozent = False + Me.txtVon._ShortDateNew = True + Me.txtVon._ShortDateOnly = False + Me.txtVon._TimeOnly = False + Me.txtVon._TimeOnly_Seconds = False + Me.txtVon._value = "" + Me.txtVon._Waehrung = False + Me.txtVon._WaehrungZeichen = False + Me.txtVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtVon.ForeColor = System.Drawing.Color.Black + Me.txtVon.Location = New System.Drawing.Point(101, 9) + Me.txtVon.MaxLength = 10 + Me.txtVon.MaxLineLength = -1 + Me.txtVon.MaxLines_Warning = "" + Me.txtVon.MaxLines_Warning_Label = Nothing + Me.txtVon.Name = "txtVon" + Me.txtVon.Size = New System.Drawing.Size(100, 23) + Me.txtVon.TabIndex = 6 + ' + 'txtBis + ' + Me.txtBis._DateTimeOnly = False + Me.txtBis._numbersOnly = False + Me.txtBis._numbersOnlyKommastellen = "" + Me.txtBis._numbersOnlyTrennzeichen = False + Me.txtBis._Prozent = False + Me.txtBis._ShortDateNew = True + Me.txtBis._ShortDateOnly = False + Me.txtBis._TimeOnly = False + Me.txtBis._TimeOnly_Seconds = False + Me.txtBis._value = "" + Me.txtBis._Waehrung = False + Me.txtBis._WaehrungZeichen = False + Me.txtBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtBis.ForeColor = System.Drawing.Color.Black + Me.txtBis.Location = New System.Drawing.Point(227, 9) + Me.txtBis.MaxLength = 10 + Me.txtBis.MaxLineLength = -1 + Me.txtBis.MaxLines_Warning = "" + Me.txtBis.MaxLines_Warning_Label = Nothing + Me.txtBis.Name = "txtBis" + Me.txtBis.Size = New System.Drawing.Size(100, 23) + Me.txtBis.TabIndex = 8 + ' 'Panel6 ' Me.Panel6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -854,6 +1185,19 @@ Partial Class frmMDM_USTVAntrag Me.Label5.TabIndex = 0 Me.Label5.Text = "Status:" ' + 'cboStatus + ' + Me.cboStatus._allowedValuesFreiText = Nothing + Me.cboStatus._allowFreiText = False + Me.cboStatus._value = "" + Me.cboStatus.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) + Me.cboStatus.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) + Me.cboStatus.FormattingEnabled = True + Me.cboStatus.Location = New System.Drawing.Point(76, 16) + Me.cboStatus.Name = "cboStatus" + Me.cboStatus.Size = New System.Drawing.Size(394, 28) + Me.cboStatus.TabIndex = 1 + ' 'lblFirma ' Me.lblFirma.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ @@ -917,6 +1261,27 @@ Partial Class frmMDM_USTVAntrag Me.TabPage1.Text = "Antragspositionen" Me.TabPage1.UseVisualStyleBackColor = True ' + 'dgvUSTVPositionen + ' + Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500 + Me.dgvUSTVPositionen.AllowUserToAddRows = False + Me.dgvUSTVPositionen.AllowUserToDeleteRows = False + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvUSTVPositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.dgvUSTVPositionen.BackgroundColor = System.Drawing.Color.White + Me.dgvUSTVPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvUSTVPositionen.Location = New System.Drawing.Point(3, 3) + Me.dgvUSTVPositionen.Name = "dgvUSTVPositionen" + Me.dgvUSTVPositionen.ReadOnly = True + Me.dgvUSTVPositionen.RowHeadersVisible = False + Me.dgvUSTVPositionen.RowHeadersWidth = 62 + Me.dgvUSTVPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1438, 169) + Me.dgvUSTVPositionen.TabIndex = 0 + ' 'pnlAntragsPosDetails ' Me.pnlAntragsPosDetails.Controls.Add(Me.Panel2) @@ -938,11 +1303,18 @@ Partial Class frmMDM_USTVAntrag Me.Panel2.Size = New System.Drawing.Size(1438, 263) Me.Panel2.TabIndex = 1 ' + 'UstCntlUSTV_AntragPosition1 + ' + Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" + Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261) + Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 + ' 'Panel4 ' Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel4.Controls.Add(Me.btnAPI) Me.Panel4.Controls.Add(Me.btnEintragloeschen) Me.Panel4.Controls.Add(Me.btnNeuerEintrag) Me.Panel4.Dock = System.Windows.Forms.DockStyle.Left @@ -1002,6 +1374,27 @@ Partial Class frmMDM_USTVAntrag Me.Panel3.Size = New System.Drawing.Size(1438, 438) Me.Panel3.TabIndex = 3 ' + 'dgvErstattungspositionen + ' + Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500 + Me.dgvErstattungspositionen.AllowUserToAddRows = False + Me.dgvErstattungspositionen.AllowUserToDeleteRows = False + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + Me.dgvErstattungspositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.dgvErstattungspositionen.BackgroundColor = System.Drawing.Color.White + Me.dgvErstattungspositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvErstattungspositionen.Location = New System.Drawing.Point(3, 3) + Me.dgvErstattungspositionen.Name = "dgvErstattungspositionen" + Me.dgvErstattungspositionen.ReadOnly = True + Me.dgvErstattungspositionen.RowHeadersVisible = False + Me.dgvErstattungspositionen.RowHeadersWidth = 62 + Me.dgvErstattungspositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1438, 172) + Me.dgvErstattungspositionen.TabIndex = 1 + ' 'pnlErstattungsdetails ' Me.pnlErstattungsdetails.BackColor = System.Drawing.Color.WhiteSmoke @@ -1014,6 +1407,14 @@ Partial Class frmMDM_USTVAntrag Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1436, 261) Me.pnlErstattungsdetails.TabIndex = 0 ' + 'UstCntlUSTV_AntragErstattungen1 + ' + Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" + Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259) + Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 + ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke @@ -1064,421 +1465,6 @@ Partial Class frmMDM_USTVAntrag Me.ContextMenuStrip2.Name = "ContextMenuStrip1" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' - 'KdSearchBox1 - ' - Me.KdSearchBox1._AlleFirmenCLUSTER = False - Me.KdSearchBox1._AllowSetValue = False - Me.KdSearchBox1._autoSizeGross = False - Me.KdSearchBox1._display_Name1 = False - Me.KdSearchBox1._displayAVISO_Email = False - Me.KdSearchBox1._displayFullName = False - Me.KdSearchBox1._displayWoelflKd = False - Me.KdSearchBox1._hideIfListEmpty = True - Me.KdSearchBox1._loadKdData = False - Me.KdSearchBox1._searchName1 = True - Me.KdSearchBox1._UseFIRMA = "" - Me.KdSearchBox1._ValueKdAndName = True - Me.KdSearchBox1.dgvpos = "LEFT" - Me.KdSearchBox1.KdName = Nothing - Me.KdSearchBox1.KdNr = "-1" - Me.KdSearchBox1.kdNrField = Nothing - Me.KdSearchBox1.KdNrNullInt = Nothing - Me.KdSearchBox1.Location = New System.Drawing.Point(298, 10) - Me.KdSearchBox1.Name = "KdSearchBox1" - Me.KdSearchBox1.nurAktive = True - Me.KdSearchBox1.searchActive = True - Me.KdSearchBox1.Size = New System.Drawing.Size(171, 20) - Me.KdSearchBox1.TabIndex = 22 - Me.KdSearchBox1.TIMER_SEARCH = True - Me.KdSearchBox1.usrcntl = Nothing - ' - 'cboAntragArt - ' - Me.cboAntragArt._allowedValuesFreiText = Nothing - Me.cboAntragArt._allowFreiText = False - Me.cboAntragArt._value = "" - Me.cboAntragArt.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) - Me.cboAntragArt.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) - Me.cboAntragArt.FormattingEnabled = True - Me.cboAntragArt.Location = New System.Drawing.Point(83, 10) - Me.cboAntragArt.Name = "cboAntragArt" - Me.cboAntragArt.Size = New System.Drawing.Size(191, 28) - Me.cboAntragArt.TabIndex = 21 - Me.cboAntragArt.Text = "USTV-Antrag" - ' - 'cbxLand - ' - Me.cbxLand._allowedValuesFreiText = Nothing - Me.cbxLand._allowFreiText = False - Me.cbxLand._value = "" - Me.cbxLand.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) - Me.cbxLand.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) - Me.cbxLand.FormattingEnabled = True - Me.cbxLand.Location = New System.Drawing.Point(0, 0) - Me.cbxLand.Name = "cbxLand" - Me.cbxLand.Size = New System.Drawing.Size(65, 28) - Me.cbxLand.TabIndex = 23 - Me.cbxLand.Text = "USTV-Antrag" - Me.cbxLand.Visible = False - ' - 'txtEingereichtAm - ' - Me.txtEingereichtAm._DateTimeOnly = False - Me.txtEingereichtAm._numbersOnly = False - Me.txtEingereichtAm._numbersOnlyKommastellen = "" - Me.txtEingereichtAm._numbersOnlyTrennzeichen = False - Me.txtEingereichtAm._Prozent = False - Me.txtEingereichtAm._ShortDateNew = False - Me.txtEingereichtAm._ShortDateOnly = True - Me.txtEingereichtAm._TimeOnly = False - Me.txtEingereichtAm._TimeOnly_Seconds = False - Me.txtEingereichtAm._value = "" - Me.txtEingereichtAm._Waehrung = False - Me.txtEingereichtAm._WaehrungZeichen = False - Me.txtEingereichtAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtEingereichtAm.ForeColor = System.Drawing.Color.Black - Me.txtEingereichtAm.Location = New System.Drawing.Point(654, 60) - Me.txtEingereichtAm.MaxLength = 10 - Me.txtEingereichtAm.MaxLineLength = -1 - Me.txtEingereichtAm.MaxLines_Warning = "" - Me.txtEingereichtAm.MaxLines_Warning_Label = Nothing - Me.txtEingereichtAm.Name = "txtEingereichtAm" - Me.txtEingereichtAm.Size = New System.Drawing.Size(100, 23) - Me.txtEingereichtAm.TabIndex = 26 - ' - 'txtGueltig - ' - Me.txtGueltig._DateTimeOnly = False - Me.txtGueltig._numbersOnly = False - Me.txtGueltig._numbersOnlyKommastellen = "" - Me.txtGueltig._numbersOnlyTrennzeichen = False - Me.txtGueltig._Prozent = False - Me.txtGueltig._ShortDateNew = False - Me.txtGueltig._ShortDateOnly = True - Me.txtGueltig._TimeOnly = False - Me.txtGueltig._TimeOnly_Seconds = False - Me.txtGueltig._value = "" - Me.txtGueltig._Waehrung = False - Me.txtGueltig._WaehrungZeichen = False - Me.txtGueltig.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtGueltig.ForeColor = System.Drawing.Color.Black - Me.txtGueltig.Location = New System.Drawing.Point(101, 61) - Me.txtGueltig.MaxLength = 10 - Me.txtGueltig.MaxLineLength = -1 - Me.txtGueltig.MaxLines_Warning = "" - Me.txtGueltig.MaxLines_Warning_Label = Nothing - Me.txtGueltig.Name = "txtGueltig" - Me.txtGueltig.Size = New System.Drawing.Size(100, 23) - Me.txtGueltig.TabIndex = 23 - ' - 'txtStNr - ' - Me.txtStNr._DateTimeOnly = False - Me.txtStNr._numbersOnly = False - Me.txtStNr._numbersOnlyKommastellen = "" - Me.txtStNr._numbersOnlyTrennzeichen = False - Me.txtStNr._Prozent = False - Me.txtStNr._ShortDateNew = False - Me.txtStNr._ShortDateOnly = False - Me.txtStNr._TimeOnly = False - Me.txtStNr._TimeOnly_Seconds = False - Me.txtStNr._value = "" - Me.txtStNr._Waehrung = False - Me.txtStNr._WaehrungZeichen = False - Me.txtStNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtStNr.ForeColor = System.Drawing.Color.Black - Me.txtStNr.Location = New System.Drawing.Point(101, 36) - Me.txtStNr.MaxLength = 10 - Me.txtStNr.MaxLineLength = -1 - Me.txtStNr.MaxLines_Warning = "" - Me.txtStNr.MaxLines_Warning_Label = Nothing - Me.txtStNr.Name = "txtStNr" - Me.txtStNr.Size = New System.Drawing.Size(100, 23) - Me.txtStNr.TabIndex = 22 - ' - 'txtVZ - ' - Me.txtVZ._DateTimeOnly = False - Me.txtVZ._numbersOnly = True - Me.txtVZ._numbersOnlyKommastellen = "" - Me.txtVZ._numbersOnlyTrennzeichen = True - Me.txtVZ._Prozent = False - Me.txtVZ._ShortDateNew = False - Me.txtVZ._ShortDateOnly = False - Me.txtVZ._TimeOnly = False - Me.txtVZ._TimeOnly_Seconds = False - Me.txtVZ._value = "" - Me.txtVZ._Waehrung = True - Me.txtVZ._WaehrungZeichen = True - Me.txtVZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtVZ.ForeColor = System.Drawing.Color.Black - Me.txtVZ.Location = New System.Drawing.Point(865, 31) - Me.txtVZ.MaxLength = 10 - Me.txtVZ.MaxLineLength = -1 - Me.txtVZ.MaxLines_Warning = "" - Me.txtVZ.MaxLines_Warning_Label = Nothing - Me.txtVZ.Name = "txtVZ" - Me.txtVZ.Size = New System.Drawing.Size(100, 23) - Me.txtVZ.TabIndex = 20 - ' - 'txtAbfNr - ' - Me.txtAbfNr._DateTimeOnly = False - Me.txtAbfNr._numbersOnly = True - Me.txtAbfNr._numbersOnlyKommastellen = "" - Me.txtAbfNr._numbersOnlyTrennzeichen = False - Me.txtAbfNr._Prozent = False - Me.txtAbfNr._ShortDateNew = False - Me.txtAbfNr._ShortDateOnly = False - Me.txtAbfNr._TimeOnly = False - Me.txtAbfNr._TimeOnly_Seconds = False - Me.txtAbfNr._value = "" - Me.txtAbfNr._Waehrung = False - Me.txtAbfNr._WaehrungZeichen = False - Me.txtAbfNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtAbfNr.ForeColor = System.Drawing.Color.Black - Me.txtAbfNr.Location = New System.Drawing.Point(654, 33) - Me.txtAbfNr.MaxLength = 10 - Me.txtAbfNr.MaxLineLength = -1 - Me.txtAbfNr.MaxLines_Warning = "" - Me.txtAbfNr.MaxLines_Warning_Label = Nothing - Me.txtAbfNr.Name = "txtAbfNr" - Me.txtAbfNr.Size = New System.Drawing.Size(146, 23) - Me.txtAbfNr.TabIndex = 18 - ' - 'cbxFiliale - ' - Me.cbxFiliale._allowedValuesFreiText = Nothing - Me.cbxFiliale._allowFreiText = False - Me.cbxFiliale._value = "" - Me.cbxFiliale.DropDownWidth = 150 - Me.cbxFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxFiliale.FormattingEnabled = True - Me.cbxFiliale.Location = New System.Drawing.Point(413, 32) - Me.cbxFiliale.Name = "cbxFiliale" - Me.cbxFiliale.Size = New System.Drawing.Size(105, 24) - Me.cbxFiliale.TabIndex = 16 - ' - 'txtBezugsNr - ' - Me.txtBezugsNr._DateTimeOnly = False - Me.txtBezugsNr._numbersOnly = True - Me.txtBezugsNr._numbersOnlyKommastellen = "" - Me.txtBezugsNr._numbersOnlyTrennzeichen = False - Me.txtBezugsNr._Prozent = False - Me.txtBezugsNr._ShortDateNew = False - Me.txtBezugsNr._ShortDateOnly = False - Me.txtBezugsNr._TimeOnly = False - Me.txtBezugsNr._TimeOnly_Seconds = False - Me.txtBezugsNr._value = "" - Me.txtBezugsNr._Waehrung = False - Me.txtBezugsNr._WaehrungZeichen = False - Me.txtBezugsNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtBezugsNr.ForeColor = System.Drawing.Color.Black - Me.txtBezugsNr.Location = New System.Drawing.Point(654, 4) - Me.txtBezugsNr.MaxLength = 10 - Me.txtBezugsNr.MaxLineLength = -1 - Me.txtBezugsNr.MaxLines_Warning = "" - Me.txtBezugsNr.MaxLines_Warning_Label = Nothing - Me.txtBezugsNr.Name = "txtBezugsNr" - Me.txtBezugsNr.Size = New System.Drawing.Size(146, 23) - Me.txtBezugsNr.TabIndex = 14 - ' - 'cbxWahrung - ' - Me.cbxWahrung._allowedValuesFreiText = Nothing - Me.cbxWahrung._allowFreiText = False - Me.cbxWahrung._value = "" - Me.cbxWahrung.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxWahrung.FormattingEnabled = True - Me.cbxWahrung.Location = New System.Drawing.Point(431, 4) - Me.cbxWahrung.Name = "cbxWahrung" - Me.cbxWahrung.Size = New System.Drawing.Size(87, 24) - Me.cbxWahrung.TabIndex = 12 - ' - 'txt3470 - ' - Me.txt3470._DateTimeOnly = False - Me.txt3470._numbersOnly = True - Me.txt3470._numbersOnlyKommastellen = "" - Me.txt3470._numbersOnlyTrennzeichen = True - Me.txt3470._Prozent = False - Me.txt3470._ShortDateNew = False - Me.txt3470._ShortDateOnly = False - Me.txt3470._TimeOnly = False - Me.txt3470._TimeOnly_Seconds = False - Me.txt3470._value = "" - Me.txt3470._Waehrung = True - Me.txt3470._WaehrungZeichen = True - Me.txt3470.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txt3470.ForeColor = System.Drawing.Color.Black - Me.txt3470.Location = New System.Drawing.Point(865, 2) - Me.txt3470.MaxLength = 10 - Me.txt3470.MaxLineLength = -1 - Me.txt3470.MaxLines_Warning = "" - Me.txt3470.MaxLines_Warning_Label = Nothing - Me.txt3470.Name = "txt3470" - Me.txt3470.Size = New System.Drawing.Size(100, 23) - Me.txt3470.TabIndex = 10 - ' - 'txtVon - ' - Me.txtVon._DateTimeOnly = False - Me.txtVon._numbersOnly = False - Me.txtVon._numbersOnlyKommastellen = "" - Me.txtVon._numbersOnlyTrennzeichen = False - Me.txtVon._Prozent = False - Me.txtVon._ShortDateNew = True - Me.txtVon._ShortDateOnly = False - Me.txtVon._TimeOnly = False - Me.txtVon._TimeOnly_Seconds = False - Me.txtVon._value = "" - Me.txtVon._Waehrung = False - Me.txtVon._WaehrungZeichen = False - Me.txtVon.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtVon.ForeColor = System.Drawing.Color.Black - Me.txtVon.Location = New System.Drawing.Point(101, 9) - Me.txtVon.MaxLength = 10 - Me.txtVon.MaxLineLength = -1 - Me.txtVon.MaxLines_Warning = "" - Me.txtVon.MaxLines_Warning_Label = Nothing - Me.txtVon.Name = "txtVon" - Me.txtVon.Size = New System.Drawing.Size(100, 23) - Me.txtVon.TabIndex = 6 - ' - 'txtBis - ' - Me.txtBis._DateTimeOnly = False - Me.txtBis._numbersOnly = False - Me.txtBis._numbersOnlyKommastellen = "" - Me.txtBis._numbersOnlyTrennzeichen = False - Me.txtBis._Prozent = False - Me.txtBis._ShortDateNew = True - Me.txtBis._ShortDateOnly = False - Me.txtBis._TimeOnly = False - Me.txtBis._TimeOnly_Seconds = False - Me.txtBis._value = "" - Me.txtBis._Waehrung = False - Me.txtBis._WaehrungZeichen = False - Me.txtBis.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.txtBis.ForeColor = System.Drawing.Color.Black - Me.txtBis.Location = New System.Drawing.Point(227, 9) - Me.txtBis.MaxLength = 10 - Me.txtBis.MaxLineLength = -1 - Me.txtBis.MaxLines_Warning = "" - Me.txtBis.MaxLines_Warning_Label = Nothing - Me.txtBis.Name = "txtBis" - Me.txtBis.Size = New System.Drawing.Size(100, 23) - Me.txtBis.TabIndex = 8 - ' - 'cboStatus - ' - Me.cboStatus._allowedValuesFreiText = Nothing - Me.cboStatus._allowFreiText = False - Me.cboStatus._value = "" - Me.cboStatus.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) - Me.cboStatus.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) - Me.cboStatus.FormattingEnabled = True - Me.cboStatus.Location = New System.Drawing.Point(76, 16) - Me.cboStatus.Name = "cboStatus" - Me.cboStatus.Size = New System.Drawing.Size(394, 28) - Me.cboStatus.TabIndex = 1 - ' - 'dgvUSTVPositionen - ' - Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500 - Me.dgvUSTVPositionen.AllowUserToAddRows = False - Me.dgvUSTVPositionen.AllowUserToDeleteRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvUSTVPositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.dgvUSTVPositionen.BackgroundColor = System.Drawing.Color.White - Me.dgvUSTVPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvUSTVPositionen.Location = New System.Drawing.Point(3, 3) - Me.dgvUSTVPositionen.Name = "dgvUSTVPositionen" - Me.dgvUSTVPositionen.ReadOnly = True - Me.dgvUSTVPositionen.RowHeadersVisible = False - Me.dgvUSTVPositionen.RowHeadersWidth = 62 - Me.dgvUSTVPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1438, 169) - Me.dgvUSTVPositionen.TabIndex = 0 - ' - 'UstCntlUSTV_AntragPosition1 - ' - Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) - Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" - Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261) - Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 - ' - 'dgvErstattungspositionen - ' - Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500 - Me.dgvErstattungspositionen.AllowUserToAddRows = False - Me.dgvErstattungspositionen.AllowUserToDeleteRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 - Me.dgvErstattungspositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.dgvErstattungspositionen.BackgroundColor = System.Drawing.Color.White - Me.dgvErstattungspositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvErstattungspositionen.Location = New System.Drawing.Point(3, 3) - Me.dgvErstattungspositionen.Name = "dgvErstattungspositionen" - Me.dgvErstattungspositionen.ReadOnly = True - Me.dgvErstattungspositionen.RowHeadersVisible = False - Me.dgvErstattungspositionen.RowHeadersWidth = 62 - Me.dgvErstattungspositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1438, 172) - Me.dgvErstattungspositionen.TabIndex = 1 - ' - 'UstCntlUSTV_AntragErstattungen1 - ' - Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) - Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" - Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259) - Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 - ' - 'txtSumme - ' - Me.txtSumme._DateTimeOnly = False - Me.txtSumme._numbersOnly = False - Me.txtSumme._numbersOnlyKommastellen = "" - Me.txtSumme._numbersOnlyTrennzeichen = False - Me.txtSumme._Prozent = False - Me.txtSumme._ShortDateNew = False - Me.txtSumme._ShortDateOnly = False - Me.txtSumme._TimeOnly = False - Me.txtSumme._TimeOnly_Seconds = False - Me.txtSumme._value = "" - Me.txtSumme._Waehrung = True - Me.txtSumme._WaehrungZeichen = True - Me.txtSumme.ForeColor = System.Drawing.Color.Black - Me.txtSumme.Location = New System.Drawing.Point(1026, 63) - Me.txtSumme.MaxLineLength = -1 - Me.txtSumme.MaxLines_Warning = "" - Me.txtSumme.MaxLines_Warning_Label = Nothing - Me.txtSumme.Name = "txtSumme" - Me.txtSumme.ReadOnly = True - Me.txtSumme.Size = New System.Drawing.Size(88, 20) - Me.txtSumme.TabIndex = 49 - Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'btnAPI - ' - Me.btnAPI.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAPI.ForeColor = System.Drawing.Color.Black - Me.btnAPI.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnAPI.Location = New System.Drawing.Point(6, 95) - Me.btnAPI.Name = "btnAPI" - Me.btnAPI.Size = New System.Drawing.Size(135, 39) - Me.btnAPI.TabIndex = 2 - Me.btnAPI.Text = "API Upload" - Me.btnAPI.UseVisualStyleBackColor = True - ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1510,15 +1496,15 @@ Partial Class frmMDM_USTVAntrag Me.pnlBody.ResumeLayout(False) Me.TabControl1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) + CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlAntragsPosDetails.ResumeLayout(False) Me.Panel2.ResumeLayout(False) Me.Panel4.ResumeLayout(False) Me.TabPage2.ResumeLayout(False) Me.Panel3.ResumeLayout(False) + CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlErstattungsdetails.ResumeLayout(False) Me.Panel1.ResumeLayout(False) - CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -1613,5 +1599,4 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents picExcel As PictureBox Friend WithEvents txtSumme As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label27 As Label - Friend WithEvents btnAPI As Button End Class diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 180db847..fb4ccf93 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -14,7 +14,7 @@ Public Class frmMDM_USTVAntrag Dim Antrag_LandKz As String = "" Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim posTabisSelected As Boolean = True - Dim atez_api = New cATEZ_NCTS_IN("ATEZ_VAT") + Dim atez_api = New cATEZ_NCTS_IN("ATEZ_VAT", False) Dim von, bis As Date diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb index f5e4be6a..2e362c0e 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb @@ -888,14 +888,14 @@ Partial Class ustCntlUSTV_AntragPosition ' 'btnAPIUbload ' - Me.btnAPIUbload.BackgroundImage = Global.SDL.My.Resources.Resources.refresh Me.btnAPIUbload.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.btnAPIUbload.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAPIUbload.Location = New System.Drawing.Point(36, 186) + Me.btnAPIUbload.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnAPIUbload.Location = New System.Drawing.Point(16, 186) Me.btnAPIUbload.Name = "btnAPIUbload" - Me.btnAPIUbload.Size = New System.Drawing.Size(35, 24) + Me.btnAPIUbload.Size = New System.Drawing.Size(71, 24) Me.btnAPIUbload.TabIndex = 25 - Me.btnAPIUbload.TextAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnAPIUbload.Text = "API-Upload" Me.btnAPIUbload.UseVisualStyleBackColor = True ' 'Panel3 diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb index ab7dce10..c9e18fd4 100644 --- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb +++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb @@ -267,7 +267,8 @@ Public Class ustCntlUSTV_AntragPosition txtOrt.Text = If(UStV_Leist.UstV_Leistender_Stadt, "") txtLand.Text = If(UStV_Leist.UstV_Leistender_Land, "") txtUIDNr.Text = If(UStV_Leist.UstV_Leistender_UstNr, "") - adressLoadedByLeistender = True + If UStV_Leist.hasEntry Then adressLoadedByLeistender = True + End If If Not initial Then @@ -423,7 +424,7 @@ Public Class ustCntlUSTV_AntragPosition End Sub - Private Sub txtUSTBetrag_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtUSTBetrag.PreviewKeyDown, txtUSTBetragEUR.PreviewKeyDown, txtRgDatum.PreviewKeyDown, txtRgNr.PreviewKeyDown, txtUmrechnungskurs.PreviewKeyDown + Private Sub txtUSTBetrag_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtUSTBetrag.PreviewKeyDown, txtUSTBetragEUR.PreviewKeyDown, txtRgDatum.PreviewKeyDown, txtRgNr.PreviewKeyDown, txtUmrechnungskurs.PreviewKeyDown, sbLeistender.PreviewKeyDown If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) Then Exit Sub If gridAktiv And Me.FindForm IsNot Nothing Then @@ -510,20 +511,18 @@ Public Class ustCntlUSTV_AntragPosition - ElseIf sender Is sbLeistender Then + 'ElseIf sender Is sbLeistender Then - If UStV_Leist.hasEntry Then + ' If UStV_Leist.hasEntry Then - UStV_POS.UStVPo_Leistender = UStV_Leist.UStV_Leistender - If UStV_Leist.UStV_LeistenderId > 0 Then UStV_POS.UStVPo_LeistenderId = UStV_Leist.UStV_LeistenderId + ' UStV_POS.UStVPo_Leistender = UStV_Leist.UStV_Leistender + ' If UStV_Leist.UStV_LeistenderId > 0 Then UStV_POS.UStVPo_LeistenderId = UStV_Leist.UStV_LeistenderId + ' txtChanged = True - txtChanged = True - 'UStV_POS.SAVE() - 'RaiseEvent CHANGED(UStV_POS.UStVPo_ID) - End If + ' End If @@ -535,6 +534,21 @@ Public Class ustCntlUSTV_AntragPosition End If + ElseIf sender Is sbLeistender Then + If sbLeistender.Text <> "" Then + If sbLeistender.Text IsNot Nothing AndAlso sbLeistender.Text <> "" Then + If IsNumeric(sbLeistender.Text) Then + UStV_Leist = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(CInt(sbLeistender.Text)) + Else + UStV_Leist = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(sbLeistender.Text) + End If + + loadChangedDSToPanel(UStV_Leist) + Else + loadChangedDSToPanel(Nothing, True) + End If + End If + 'MsgBox() End If @@ -580,7 +594,7 @@ Public Class ustCntlUSTV_AntragPosition Dim authResp = API.authenticate("VAT", "client1", "password") Dim resp If authResp <> "200" Then - MsgBox("Authentifizierung fehlgeschlagen") + MsgBox("Authentifizierung fehlgeschlagen" & vbNewLine & authResp) Exit Sub Else If API.SendRequestWithAuthHeader("application/json", failreDesc, "/health", "GET") = "200" Then diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index da6967ef..649c8cd8 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -40,6 +40,10 @@ Partial Class frmKundenblatt 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(frmKundenblatt)) Me.pnlInfo = New System.Windows.Forms.Panel() Me.txtInfotext = New System.Windows.Forms.Label() @@ -48,13 +52,18 @@ Partial Class frmKundenblatt Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull() Me.tbcntrMain = New System.Windows.Forms.TabControl() Me.tbAllgemein = New System.Windows.Forms.TabPage() + Me.TabControl1 = New System.Windows.Forms.TabControl() + Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.dgvUmsaetze = New System.Windows.Forms.DataGridView() + Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.dgvOffenePosten = New System.Windows.Forms.DataGridView() + Me.txtUmsatzJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label13 = New System.Windows.Forms.Label() Me.lblAdressenzusatz = New System.Windows.Forms.TextBox() Me.btnReloadOP = New System.Windows.Forms.Button() Me.Label11 = New System.Windows.Forms.Label() Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label10 = New System.Windows.Forms.Label() - Me.Label9 = New System.Windows.Forms.Label() - Me.dgvOffenePosten = New System.Windows.Forms.DataGridView() Me.btnOP = New System.Windows.Forms.Button() Me.Label17 = New System.Windows.Forms.Label() Me.dgvOfferte = New System.Windows.Forms.DataGridView() @@ -206,6 +215,10 @@ Partial Class frmKundenblatt Me.Panel4.SuspendLayout() Me.tbcntrMain.SuspendLayout() Me.tbAllgemein.SuspendLayout() + Me.TabControl1.SuspendLayout() + Me.TabPage1.SuspendLayout() + CType(Me.dgvUmsaetze, System.ComponentModel.ISupportInitialize).BeginInit() + Me.TabPage2.SuspendLayout() CType(Me.dgvOffenePosten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picLogo, System.ComponentModel.ISupportInitialize).BeginInit() @@ -321,14 +334,10 @@ Partial Class frmKundenblatt 'tbAllgemein ' Me.tbAllgemein.BackColor = System.Drawing.Color.White + Me.tbAllgemein.Controls.Add(Me.TabControl1) Me.tbAllgemein.Controls.Add(Me.lblAdressenzusatz) - Me.tbAllgemein.Controls.Add(Me.btnReloadOP) Me.tbAllgemein.Controls.Add(Me.Label11) Me.tbAllgemein.Controls.Add(Me.cboFirmaFMZOLL) - Me.tbAllgemein.Controls.Add(Me.Label10) - Me.tbAllgemein.Controls.Add(Me.Label9) - Me.tbAllgemein.Controls.Add(Me.dgvOffenePosten) - Me.tbAllgemein.Controls.Add(Me.btnOP) Me.tbAllgemein.Controls.Add(Me.Label17) Me.tbAllgemein.Controls.Add(Me.dgvOfferte) Me.tbAllgemein.Controls.Add(Me.picLogo) @@ -360,6 +369,167 @@ Partial Class frmKundenblatt Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' + 'TabControl1 + ' + Me.TabControl1.Controls.Add(Me.TabPage1) + Me.TabControl1.Controls.Add(Me.TabPage2) + Me.TabControl1.Location = New System.Drawing.Point(8, 582) + Me.TabControl1.Name = "TabControl1" + Me.TabControl1.SelectedIndex = 0 + Me.TabControl1.Size = New System.Drawing.Size(718, 550) + Me.TabControl1.TabIndex = 186 + ' + 'TabPage1 + ' + Me.TabPage1.Controls.Add(Me.dgvUmsaetze) + Me.TabPage1.Controls.Add(Me.btnReloadOP) + Me.TabPage1.Controls.Add(Me.Label10) + Me.TabPage1.Controls.Add(Me.btnOP) + 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(710, 524) + Me.TabPage1.TabIndex = 0 + Me.TabPage1.Text = "Offene Posten" + Me.TabPage1.UseVisualStyleBackColor = True + ' + 'dgvUmsaetze + ' + Me.dgvUmsaetze.AllowUserToAddRows = False + Me.dgvUmsaetze.AllowUserToDeleteRows = False + Me.dgvUmsaetze.AllowUserToResizeRows = False + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUmsaetze.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvUmsaetze.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.dgvUmsaetze.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvUmsaetze.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 + Me.dgvUmsaetze.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvUmsaetze.DefaultCellStyle = DataGridViewCellStyle3 + Me.dgvUmsaetze.Location = New System.Drawing.Point(0, 34) + Me.dgvUmsaetze.Name = "dgvUmsaetze" + Me.dgvUmsaetze.ReadOnly = True + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvUmsaetze.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 + Me.dgvUmsaetze.RowHeadersVisible = False + Me.dgvUmsaetze.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 484) + Me.dgvUmsaetze.TabIndex = 182 + ' + 'TabPage2 + ' + Me.TabPage2.Controls.Add(Me.dgvOffenePosten) + Me.TabPage2.Controls.Add(Me.txtUmsatzJahr) + Me.TabPage2.Controls.Add(Me.Label13) + 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(710, 524) + Me.TabPage2.TabIndex = 1 + Me.TabPage2.Text = "Umsatzbericht" + Me.TabPage2.UseVisualStyleBackColor = True + ' + 'dgvOffenePosten + ' + Me.dgvOffenePosten.AllowUserToAddRows = False + Me.dgvOffenePosten.AllowUserToDeleteRows = False + Me.dgvOffenePosten.AllowUserToResizeRows = False + DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 + Me.dgvOffenePosten.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.dgvOffenePosten.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.dgvOffenePosten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 + Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvOffenePosten.DefaultCellStyle = DataGridViewCellStyle7 + Me.dgvOffenePosten.Location = New System.Drawing.Point(0, 25) + Me.dgvOffenePosten.Name = "dgvOffenePosten" + Me.dgvOffenePosten.ReadOnly = True + DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 + Me.dgvOffenePosten.RowHeadersVisible = False + Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvOffenePosten.Size = New System.Drawing.Size(704, 496) + Me.dgvOffenePosten.TabIndex = 175 + ' + 'txtUmsatzJahr + ' + Me.txtUmsatzJahr._DateTimeOnly = False + Me.txtUmsatzJahr._numbersOnly = False + Me.txtUmsatzJahr._numbersOnlyKommastellen = "" + Me.txtUmsatzJahr._numbersOnlyTrennzeichen = True + Me.txtUmsatzJahr._Prozent = False + Me.txtUmsatzJahr._ShortDateNew = False + Me.txtUmsatzJahr._ShortDateOnly = False + Me.txtUmsatzJahr._TimeOnly = False + Me.txtUmsatzJahr._TimeOnly_Seconds = False + Me.txtUmsatzJahr._value = Nothing + Me.txtUmsatzJahr._Waehrung = False + Me.txtUmsatzJahr._WaehrungZeichen = True + Me.txtUmsatzJahr.BackColor = System.Drawing.Color.White + Me.txtUmsatzJahr.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtUmsatzJahr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtUmsatzJahr.ForeColor = System.Drawing.Color.Black + Me.txtUmsatzJahr.Location = New System.Drawing.Point(608, 6) + Me.txtUmsatzJahr.MaxLineLength = -1 + Me.txtUmsatzJahr.MaxLines_Warning = "" + Me.txtUmsatzJahr.MaxLines_Warning_Label = Nothing + Me.txtUmsatzJahr.Name = "txtUmsatzJahr" + Me.txtUmsatzJahr.ReadOnly = True + Me.txtUmsatzJahr.Size = New System.Drawing.Size(96, 13) + Me.txtUmsatzJahr.TabIndex = 185 + Me.txtUmsatzJahr.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label13 + ' + Me.Label13.AutoSize = True + Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label13.Location = New System.Drawing.Point(473, 6) + Me.Label13.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(68, 13) + Me.Label13.TabIndex = 184 + Me.Label13.Text = "Umsatz Jahr:" + ' 'lblAdressenzusatz ' Me.lblAdressenzusatz.BackColor = System.Drawing.Color.White @@ -379,7 +549,7 @@ Partial Class frmKundenblatt Me.btnReloadOP.Cursor = System.Windows.Forms.Cursors.Hand Me.btnReloadOP.FlatAppearance.BorderSize = 0 Me.btnReloadOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnReloadOP.Location = New System.Drawing.Point(240, 563) + Me.btnReloadOP.Location = New System.Drawing.Point(482, 5) Me.btnReloadOP.Name = "btnReloadOP" Me.btnReloadOP.Size = New System.Drawing.Size(25, 25) Me.btnReloadOP.TabIndex = 180 @@ -390,7 +560,7 @@ Partial Class frmKundenblatt ' Me.Label11.AutoSize = True Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label11.Location = New System.Drawing.Point(271, 570) + Me.Label11.Location = New System.Drawing.Point(17, 546) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(82, 13) Me.Label11.TabIndex = 178 @@ -403,7 +573,7 @@ Partial Class frmKundenblatt Me.cboFirmaFMZOLL._value = "" Me.cboFirmaFMZOLL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboFirmaFMZOLL.FormattingEnabled = True - Me.cboFirmaFMZOLL.Location = New System.Drawing.Point(354, 567) + Me.cboFirmaFMZOLL.Location = New System.Drawing.Point(100, 543) Me.cboFirmaFMZOLL.Name = "cboFirmaFMZOLL" Me.cboFirmaFMZOLL.Size = New System.Drawing.Size(184, 21) Me.cboFirmaFMZOLL.TabIndex = 179 @@ -411,64 +581,12 @@ Partial Class frmKundenblatt 'Label10 ' Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(544, 570) + Me.Label10.Location = New System.Drawing.Point(523, 11) Me.Label10.Name = "Label10" Me.Label10.Size = New System.Drawing.Size(149, 13) Me.Label10.TabIndex = 177 Me.Label10.Text = "Zahlungserinnerung/OP-Liste:" ' - 'Label9 - ' - Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(9, 575) - Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(78, 13) - Me.Label9.TabIndex = 176 - Me.Label9.Text = "Offene Posten:" - ' - 'dgvOffenePosten - ' - Me.dgvOffenePosten.AllowUserToAddRows = False - Me.dgvOffenePosten.AllowUserToDeleteRows = False - Me.dgvOffenePosten.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvOffenePosten.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvOffenePosten.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.dgvOffenePosten.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOffenePosten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 - Me.dgvOffenePosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvOffenePosten.DefaultCellStyle = DataGridViewCellStyle3 - Me.dgvOffenePosten.Location = New System.Drawing.Point(12, 591) - Me.dgvOffenePosten.Name = "dgvOffenePosten" - Me.dgvOffenePosten.ReadOnly = True - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - 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.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 - Me.dgvOffenePosten.RowHeadersVisible = False - Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 536) - Me.dgvOffenePosten.TabIndex = 175 - ' 'btnOP ' Me.btnOP.BackgroundImage = Global.SDL.My.Resources.Resources.mahn @@ -476,7 +594,7 @@ Partial Class frmKundenblatt Me.btnOP.Cursor = System.Windows.Forms.Cursors.Hand Me.btnOP.FlatAppearance.BorderSize = 0 Me.btnOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnOP.Location = New System.Drawing.Point(702, 564) + Me.btnOP.Location = New System.Drawing.Point(681, 5) Me.btnOP.Name = "btnOP" Me.btnOP.Size = New System.Drawing.Size(24, 24) Me.btnOP.TabIndex = 174 @@ -494,34 +612,34 @@ Partial Class frmKundenblatt 'dgvOfferte ' Me.dgvOfferte.BackgroundColor = System.Drawing.Color.White - 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.dgvOfferte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOfferte.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9 Me.dgvOfferte.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window - 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.ControlText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvOfferte.DefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvOfferte.DefaultCellStyle = DataGridViewCellStyle10 Me.dgvOfferte.Location = New System.Drawing.Point(433, 37) Me.dgvOfferte.Name = "dgvOfferte" Me.dgvOfferte.ReadOnly = True - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvOfferte.RowHeadersDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvOfferte.RowHeadersDefaultCellStyle = DataGridViewCellStyle11 Me.dgvOfferte.Size = New System.Drawing.Size(293, 320) Me.dgvOfferte.TabIndex = 12 ' @@ -785,28 +903,28 @@ Partial Class frmKundenblatt Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvSperrliste.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle8 + 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.dgvSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 Me.dgvSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.Color.Black - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSperrliste.DefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window + 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.Color.Black + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSperrliste.DefaultCellStyle = DataGridViewCellStyle13 Me.dgvSperrliste.Location = New System.Drawing.Point(732, 36) Me.dgvSperrliste.Name = "dgvSperrliste" Me.dgvSperrliste.ReadOnly = True - Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle7 - Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1091) + Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle11 + Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1092) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -931,38 +1049,38 @@ Partial Class frmKundenblatt ' Me.dgvSDLLeistungenFull.AllowUserToAddRows = False Me.dgvSDLLeistungenFull.AllowUserToResizeRows = False - DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvSDLLeistungenFull.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvSDLLeistungenFull.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 Me.dgvSDLLeistungenFull.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control - 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.WindowText - DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSDLLeistungenFull.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 + 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.dgvSDLLeistungenFull.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 Me.dgvSDLLeistungenFull.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window - 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.ControlText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSDLLeistungenFull.DefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSDLLeistungenFull.DefaultCellStyle = DataGridViewCellStyle16 Me.dgvSDLLeistungenFull.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvSDLLeistungenFull.Location = New System.Drawing.Point(3, 50) Me.dgvSDLLeistungenFull.Name = "dgvSDLLeistungenFull" Me.dgvSDLLeistungenFull.ReadOnly = True - 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.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle17 Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1624, 907) Me.dgvSDLLeistungenFull.TabIndex = 5 @@ -1274,6 +1392,7 @@ Partial Class frmKundenblatt Me.scanSDLSonst._DATENSERVER_UOrdner3 = "" Me.scanSDLSonst._OPEN_ORIGINAL = False Me.scanSDLSonst._TYPE = "PDF" + Me.scanSDLSonst.AllowDrop = True Me.scanSDLSonst.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.scanSDLSonst.BackColor = System.Drawing.Color.White Me.scanSDLSonst.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -1517,38 +1636,38 @@ Partial Class frmKundenblatt ' Me.dgvLKW.AllowUserToAddRows = False Me.dgvLKW.AllowUserToDeleteRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvLKW.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvLKW.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle18 Me.dgvLKW.BackgroundColor = System.Drawing.Color.White - 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.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle19 Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window + 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.ControlText + DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle20 Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvLKW.Location = New System.Drawing.Point(0, 62) Me.dgvLKW.Name = "dgvLKW" Me.dgvLKW.ReadOnly = True - DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle21 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvLKW.Size = New System.Drawing.Size(306, 0) @@ -1778,6 +1897,7 @@ Partial Class frmKundenblatt Me.scanUebernahmebestätigungen._DATENSERVER_UOrdner3 = "" Me.scanUebernahmebestätigungen._OPEN_ORIGINAL = False Me.scanUebernahmebestätigungen._TYPE = "PDF" + Me.scanUebernahmebestätigungen.AllowDrop = True Me.scanUebernahmebestätigungen.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.scanUebernahmebestätigungen.BackColor = System.Drawing.Color.White Me.scanUebernahmebestätigungen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -1817,6 +1937,7 @@ Partial Class frmKundenblatt Me.scanSonstiges._DATENSERVER_UOrdner3 = "" Me.scanSonstiges._OPEN_ORIGINAL = False Me.scanSonstiges._TYPE = "PDF" + Me.scanSonstiges.AllowDrop = True Me.scanSonstiges.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.scanSonstiges.BackColor = System.Drawing.Color.White Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -2023,6 +2144,7 @@ Partial Class frmKundenblatt Me.scanUSTVsonstigeDokumente._DATENSERVER_UOrdner3 = "" Me.scanUSTVsonstigeDokumente._OPEN_ORIGINAL = False Me.scanUSTVsonstigeDokumente._TYPE = "PDF" + Me.scanUSTVsonstigeDokumente.AllowDrop = True Me.scanUSTVsonstigeDokumente.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.scanUSTVsonstigeDokumente.BackColor = System.Drawing.Color.White Me.scanUSTVsonstigeDokumente.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -2062,6 +2184,7 @@ Partial Class frmKundenblatt Me.scanUSTVFABest._DATENSERVER_UOrdner3 = "" Me.scanUSTVFABest._OPEN_ORIGINAL = False Me.scanUSTVFABest._TYPE = "PDF" + Me.scanUSTVFABest.AllowDrop = True Me.scanUSTVFABest.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.scanUSTVFABest.BackColor = System.Drawing.Color.White Me.scanUSTVFABest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -2081,6 +2204,7 @@ Partial Class frmKundenblatt Me.scanUSTVVollmachten._DATENSERVER_UOrdner3 = "" Me.scanUSTVVollmachten._OPEN_ORIGINAL = False Me.scanUSTVVollmachten._TYPE = "PDF" + Me.scanUSTVVollmachten.AllowDrop = True Me.scanUSTVVollmachten.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.scanUSTVVollmachten.BackColor = System.Drawing.Color.White Me.scanUSTVVollmachten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -2252,8 +2376,8 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 - Me.cntxtCntxtMDM.Size = New System.Drawing.Size(181, 26) + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 + Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' 'ToolStripMenuItem8 @@ -2412,6 +2536,12 @@ Partial Class frmKundenblatt Me.tbcntrMain.ResumeLayout(False) Me.tbAllgemein.ResumeLayout(False) Me.tbAllgemein.PerformLayout() + Me.TabControl1.ResumeLayout(False) + Me.TabPage1.ResumeLayout(False) + Me.TabPage1.PerformLayout() + CType(Me.dgvUmsaetze, System.ComponentModel.ISupportInitialize).EndInit() + Me.TabPage2.ResumeLayout(False) + Me.TabPage2.PerformLayout() CType(Me.dgvOffenePosten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dgvOfferte, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.picLogo, System.ComponentModel.ISupportInitialize).EndInit() @@ -2621,7 +2751,6 @@ Partial Class frmKundenblatt Friend WithEvents scanUSTVsonstigeDokumente As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList Friend WithEvents btnOP As Button Friend WithEvents Label10 As Label - Friend WithEvents Label9 As Label Friend WithEvents dgvOffenePosten As DataGridView Friend WithEvents btnReloadOP As Button Friend WithEvents Label11 As Label @@ -2629,4 +2758,10 @@ Partial Class frmKundenblatt Friend WithEvents lblAdressenzusatz As TextBox Friend WithEvents Button7 As Button Friend WithEvents tbFremdrechnungen As TabPage + Friend WithEvents dgvUmsaetze As DataGridView + Friend WithEvents txtUmsatzJahr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents TabControl1 As TabControl + Friend WithEvents TabPage1 As TabPage + Friend WithEvents TabPage2 As TabPage + Friend WithEvents Label13 As Label End Class diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index 4a579447..71f5ef19 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -2010,6 +2010,7 @@ Public Class frmKundenblatt Private Sub cboFirmaFMZOLL_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboFirmaFMZOLL.SelectedIndexChanged If loaded Then initDGVOffenePosten() + initDGVUmsatz() End If End Sub @@ -2018,6 +2019,66 @@ Public Class frmKundenblatt f.ShowDialog() End Sub + Sub initDGVUmsatz() + With dgvUmsaetze + If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige Is Nothing Then Exit Sub + If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige = "" Then Exit Sub + Dim where = "" + If cboFirmaFMZOLL._value <> "" Then + where = " AND Firma_ID=" & cboFirmaFMZOLL._value + Else + where = If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige.contains("A"), "", " AND Firma_ID IN(" & VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige & ")") + End If + + .DataSource = SQL.loadDgvBySql("SELECT [KundenNr],[Jahr],[steuerpflichtig],[steuerfrei],[Nettoumsatz],[MwSt],[Bruttoumsatz],[Währung],[Rechnungen],[Gutschriften],[Datum],[Nummer]" & + " FROM [tblKundenumsatz] " & + " WHERE [KundenNr]='" & kdNr & "' " & where & " ORDER BY Jahr DESC", "FMZOLL") + If .DataSource Is Nothing Then Exit Sub + If .Columns.Count = 0 Then Exit Sub + .Columns(0).Visible = False + .Columns(11).Visible = False + .Columns(1).Width = 45 + .Columns(1).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + .Columns(2).Width = 75 + .Columns(2).DefaultCellStyle.Format = "N2" + .Columns(2).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + .Columns(3).Width = 75 + .Columns(3).DefaultCellStyle.Format = "N2" + .Columns(3).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + .Columns(4).Width = 75 + .Columns(4).DefaultCellStyle.Format = "N2" + .Columns(4).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + .Columns(5).Width = 55 + .Columns(5).DefaultCellStyle.Format = "N2" + .Columns(5).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + .Columns(6).Width = 75 + .Columns(6).DefaultCellStyle.Format = "N2" + .Columns(6).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + .Columns(7).Width = 60 + .Columns(7).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + .Columns(8).Width = 55 + .Columns(8).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + .Columns(8).HeaderText = "Rechng." + .Columns(9).Width = 53 + .Columns(9).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + .Columns(9).HeaderText = "Gutschr." + .Columns(10).MinimumWidth = 65 + .Columns(10).AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns(10).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + + If .RowCount > 0 Then + ' txtUmsatzJahr.Text = String.Format("{0:n}", .Rows(0).Cells("Nettoumsatz").Value) + 'txtUmsatzJahr.Text = String.Format("{0:n}", .Rows(0).Cells("Nettoumsatz").Value) + If IsNumeric(.Rows(0).Cells("Nettoumsatz").Value) Then + txtUmsatzJahr.Text = CDbl(.Rows(0).Cells("Nettoumsatz").Value).ToString("C") + End If + Label29.Text = "Umsatz " & .Rows(0).Cells("Jahr").Value & ":" + Else + txtUmsatzJahr.Text = "" + End If + End With + + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb index ccb20c0f..487864a9 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb @@ -624,10 +624,10 @@ Public Class cATEZ_NCTS_IN Dim SQl As New SQL Shared apiSettingsloaded As Boolean = False - Sub New(program As String) + Sub New(program As String, Optional errorMessage As Boolean = True) API = SQl.loadDgvBySql("SELECT top(1) * FROM tblAPIEinstellungen WHERE api_program='" & program & "' and api_productive ='" & If(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "0", "1") & "'", "ADMIN") If API.Rows.Count = 0 Then - MsgBox("keine gültigen API-Einstellungen für " & program & " gefunden!") + If errorMessage Then MsgBox("keine gültigen API-Einstellungen für " & program & " gefunden!") Else apiSettingsloaded = True API_STRING = API.Rows(0).Item("api_url") @@ -676,8 +676,8 @@ Public Class cATEZ_NCTS_IN Dim json As New Chilkat.JsonObject - json.UpdateString("password", API.Rows(0).Item("api_password")) json.UpdateString("username", API.Rows(0).Item("api_user")) + json.UpdateString("password", API.Rows(0).Item("api_password")) If client_id <> "" Then json.UpdateString("client_id", client_id) If grant_type <> "" Then json.UpdateString("grant_type", grant_type) @@ -724,6 +724,8 @@ Public Class cATEZ_NCTS_IN Case "NCTS" : myUri &= "/api/tds/auth/" Case "VAT" : myUri &= "/token" : contentType = "application/x-www-form-urlencoded" + + End Select Dim response = SendRequestAuthentificationToken(myUri, contentType, "POST", token, program, client_id, grant_type) From 09d7c6d5b690ba5dc6d201c9fcf5460360d7b171 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 10 Apr 2025 17:04:07 +0200 Subject: [PATCH 07/10] MDM, USTVA, etc. --- SDL/USTV/frmMDM_USTVAntrag.vb | 18 ++-- SDL/USTV/frmUSTVoffeneAntraege.vb | 22 +++++ SDL/USTV/usrCntlUSTV.vb | 73 +++++++++++++-- SDL/kunden/frmKundenblatt.Designer.vb | 88 +++++++++---------- SDL/mdm/frmMDMDatenverarbetiung.vb | 2 +- .../Classes/cMDMFunctionsAllgemein.vb | 64 +++++++++++--- VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb | 2 +- 7 files changed, 198 insertions(+), 71 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index fb4ccf93..e04cf71e 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -340,7 +340,7 @@ Public Class frmMDM_USTVAntrag If ADR IsNot Nothing Then USTV_ANTRAG.UStVAn_KuNr = ADR.AdressenNr - USTV_ANTRAG.UStVAn_Name = ADR.Name_1 + USTV_ANTRAG.UStVAn_Name = ADR.Name_1 & IIf(ADR.Name_2 <> "", " " & ADR.Name_2, "") USTV_ANTRAG.UStVAn_Straße = ADR.Straße USTV_ANTRAG.UStVAn_LandKz = ADR.LandKz USTV_ANTRAG.UStVAn_Ort = ADR.Ort @@ -692,7 +692,7 @@ Public Class frmMDM_USTVAntrag ' Berechnungen If Not MWSTSummenAusBeleg Then - USTV_POS.UStVPo_USteuerbetragEUR = ANTRAG.plose_MWSTBetragWaehrungAbbuchung + USTV_POS.UStVPo_USteuerbetragEUR = ANTRAG.plose_MWSTBetragWaehrungAbbuchung 'IMMER IN EUR USTV_POS.UStVPo_Umrechnungskurs = ANTRAG.plose_MWSTBetrag / ANTRAG.plose_MWSTBetragWaehrungAbbuchung USTV_POS.UStVPo_USteuerbetrag = ANTRAG.plose_MWSTBetrag @@ -1688,7 +1688,7 @@ Public Class frmMDM_USTVAntrag Private Function excelAuswertung(ByRef Optional filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean - Dim sqlStr = "Select [UStVPo_ReDat] As InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name As Company, 'FR' as CountryOfRefund ,'EUR' as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount + Dim sqlStr = "Select [UStVPo_ReDat] As InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name As Company, 'FR' as CountryOfRefund ,'EUR' as Currency ,replace([UStVPo_Leistender],'FR','') as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount From [tblUStVPositionen] inner Join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender] inner Join [tblUStVAntrag] as antr on antr.UStVAn_ID = [tblUStVPositionen].UStVAn_ID @@ -1811,7 +1811,7 @@ Public Class frmMDM_USTVAntrag For Each row As DataGridViewRow In dgvUSTVPositionen.SelectedRows.Cast(Of DataGridViewRow)().OrderBy(Function(dgvr) dgvr.Index) Dim pdf As String = "" - pdf = getPDF(row.Cells("UStVPo_SchnittstellenNr").Value, row.Cells("UStVPo_ReNr").Value, row.Cells("UStVPo_ReDat").Value, row.Cells("UStVPo_daId").Value, IIf(nummerierung, row.Cells("UStVPo_ID").Value, -1), IIf(row.Cells("UStVPo_Leistender").Value.ToString.ToLower.Contains("wag"), True, False)) + pdf = getPDF(row.Cells("UStVPo_SchnittstellenNr").Value, row.Cells("UStVPo_ReNr").Value, row.Cells("UStVPo_ReDat").Value, row.Cells("UStVPo_daId").Value, IIf(nummerierung, row.Cells("UStVPo_ID").Value, -1), IIf(row.Cells("UStVPo_Leistender").Value.ToString.ToLower.Contains("wag") OrElse row.Cells("UStVPo_Leistender").Value.ToString.ToLower.Contains("dkv"), True, False)) If pdf <> "" Then list.Add(pdf) @@ -2152,17 +2152,25 @@ Public Class frmMDM_USTVAntrag Private Sub setinfofields() + Dim dtSteuerNr As DataTable If Not USTV_ANTRAG Is Nothing AndAlso Not IsDBNull(USTV_ANTRAG.UStVAn_LandNr) Then - Dim dtSteuerNr As DataTable = SQL.loadDgvBySql("SELECT * FROM tblSteuernummern WHERE AdressenNr = " & USTV_ANTRAG.UStVAn_KuNr & " and tblSteuernummern.LandNr =" & USTV_ANTRAG.UStVAn_LandNr, "FMZOLL") + dtSteuerNr = SQL.loadDgvBySql("SELECT * FROM tblSteuernummern WHERE AdressenNr = " & USTV_ANTRAG.UStVAn_KuNr & " and tblSteuernummern.LandNr =" & IIf(USTV_ANTRAG.UStVAn_LandNr Is Nothing, "", USTV_ANTRAG.UStVAn_LandNr), "FMZOLL") If dtSteuerNr.Rows.Count > 0 Then txtStNr.Text = IIf(Not IsDBNull(dtSteuerNr.Rows(0).Item("StNrFürRückerstattungUSt")), dtSteuerNr.Rows(0).Item("StNrFürRückerstattungUSt"), "") txtGueltig.Text = IIf(Not IsDBNull(dtSteuerNr.Rows(0).Item("StNrGültigkeitsdatum")), dtSteuerNr.Rows(0).Item("StNrGültigkeitsdatum"), "") End If + Else + dtSteuerNr = SQL.loadDgvBySql("SELECT * FROM tblSteuernummern WHERE AdressenNr = " & KundenNr & " and tblSteuernummern.LandKz ='" & Antrag_LandKz & "'", "FMZOLL") + + If dtSteuerNr.Rows.Count > 0 Then + txtStNr.Text = IIf(Not IsDBNull(dtSteuerNr.Rows(0).Item("StNrFürRückerstattungUSt")), dtSteuerNr.Rows(0).Item("StNrFürRückerstattungUSt"), "") + txtGueltig.Text = IIf(Not IsDBNull(dtSteuerNr.Rows(0).Item("StNrGültigkeitsdatum")), dtSteuerNr.Rows(0).Item("StNrGültigkeitsdatum"), "") + End If End If diff --git a/SDL/USTV/frmUSTVoffeneAntraege.vb b/SDL/USTV/frmUSTVoffeneAntraege.vb index 0626d74d..0bfe2e1b 100644 --- a/SDL/USTV/frmUSTVoffeneAntraege.vb +++ b/SDL/USTV/frmUSTVoffeneAntraege.vb @@ -12,6 +12,7 @@ Public Class frmUSTVoffeneAntraege Dim kdNr As Integer = -1 Dim kdName As String Dim dtkeineMWST As DataTable + Dim dtKundeMWST As DataTable Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click initLieferant("PLOSE", sender) End Sub @@ -563,6 +564,20 @@ Public Class frmUSTVoffeneAntraege End If + + If dtKundeMWST.Rows.Count > 0 Then + Dim counter = 0 + Dim landBez As String = "" + For Each row As DataRow In dtKundeMWST.Rows + landBez &= "'" & row.Item("LandKz") & "'" + counter = counter + 1 + If (dtKundeMWST.Rows.Count <> 0 And counter <> dtKundeMWST.Rows.Count) Then landBez &= "," + Next + sqlwhereLand &= " AND Einreichland not in (" & landBez & ")" + End If + + + Dim year = CDate(dat_Sum_Von.Value).Year If year >= 2025 Then @@ -966,5 +981,12 @@ Public Class frmUSTVoffeneAntraege Private Sub frmUSTVoffeneAntraege_Load(sender As Object, e As EventArgs) Handles MyBase.Load dtkeineMWST = (New SQL).loadDgvBySql("select Land, Erstattungsland, Lieferant from tblKeineMWSTErstattung", "FMZOLL") + + + If kdNr > 0 Then + dtKundeMWST = (New SQL).loadDgvBySql("select LandKz from tblKundenMWST where KdNr = " & kdNr, "FMZOLL") + End If + + End Sub End Class \ No newline at end of file diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 4f33f152..26657eba 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -740,6 +740,19 @@ Public Class usrCntlUSTV Me.Cursor = Cursors.WaitCursor Try + VERAG_PROG_ALLGEMEIN.cMDMFunctionsAllgemein.setSchnittstellen( + VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("Schnittstelle_PLOSE"), + False, + VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("Schnittstelle_MSE_alt"), + VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("Schnittstelle_MSE_neu"), + VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("Schnittstelle_IDS_alt"), + VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("Schnittstelle_IDS_neu"), + VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("Schnittstelle_UTA_alt"), + VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("Schnittstelle_UTA_neu"), + VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("Schnittstelle_PLOSE_NEU") + ) + + If VERAG_PROG_ALLGEMEIN.cMDMFunctionsAllgemein.Update_UStVASummenNeuBerechnen(KdSearchBox1.KdNr) Then ok = VERAG_PROG_ALLGEMEIN.cMDMFunctionsAllgemein.UStVAKunden_SummenNeuBerechnen(KdSearchBox1.KdNr) End If @@ -822,6 +835,8 @@ Public Class usrCntlUSTV Dim sqlKundenMSENEU = "" Dim sqlKundenIDSALT = "" Dim sqlKundenIDSNEU = "" + Dim sqlKundenPLOSENEU = "" + If KdSearchBox1.KdNr > 0 Then sqlKunden = " AND Adressen.AdressenNr = " & KdSearchBox1.KdNr @@ -829,11 +844,15 @@ Public Class usrCntlUSTV sqlKundenMSENEU = " AND partner_customer_number = " & KdSearchBox1.KdNr sqlKundenIDSALT = " AND tblDieselArchiv.KdNrVERAG = " & KdSearchBox1.KdNr sqlKundenIDSNEU = " AND [tblIDSTransactionsNew].KdNrVERAG = " & KdSearchBox1.KdNr + sqlKundenPLOSENEU = " AND tblPLOSE_Inv_Data.plInv_PLOSEKundennummer = " & KdSearchBox1.KdNr + End If - Dim qryUStVVorschau_VERAG As String = "SELECT 'VERAG' as LF, tblTrdinInvoice.RechnungsKundenNr, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, YEAR(tblTrdinInvoice.Rechnungsdatum) AS Jahr, MONTH(tblTrdinInvoice.Rechnungsdatum) as Monat, SUm(tblTrdinInvoice.SteuerbetragLokal) AS SteuerbetragEUR FROM tblTrdinInvoice - INNER JOIN tblSteuernummern ON tblTrdinInvoice.RechnungsKundenNr = tblSteuernummern.AdressenNr INNER JOIN [Länderverzeichnis für die Außenhandelsstatistik] ON tblSteuernummern.LandNr = [Länderverzeichnis für die Außenhandelsstatistik].LandNr + Dim qryUStVVorschau_VERAG As String = "SELECT 'VERAG' as LF, tblTrdinInvoice.RechnungsKundenNr, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, YEAR(tblTrdinInvoice.Rechnungsdatum) AS Jahr, MONTH(tblTrdinInvoice.Rechnungsdatum) as Monat, SUm(tblTrdinInvoice.SteuerbetragLokal) AS Steuerbetrag, 'EUR' as Waehrung + FROM tblTrdinInvoice + INNER JOIN tblSteuernummern ON tblTrdinInvoice.RechnungsKundenNr = tblSteuernummern.AdressenNr + INNER JOIN [Länderverzeichnis für die Außenhandelsstatistik] ON tblSteuernummern.LandNr = [Länderverzeichnis für die Außenhandelsstatistik].LandNr WHERE tblSteuernummern.LandNr = 38 AND tblTrdinInvoice.Rechnungsdatum >= CASE WHEN GETDATE() > CAST(CAST(YEAR(GETDATE()) AS VARCHAR) + '-06-30' AS DATE) @@ -844,7 +863,7 @@ Public Class usrCntlUSTV GROUP BY tblTrdinInvoice.RechnungsKundenNr, tblSteuernummern.LandNr,[Länderverzeichnis für die Außenhandelsstatistik].LandKz, YEAR(tblTrdinInvoice.Rechnungsdatum), MONTH(tblTrdinInvoice.Rechnungsdatum) /*ORDER BY tblTrdinInvoice.RechnungsKundenNr, tblSteuernummern.LandNr, YEAR(tblTrdinInvoice.Rechnungsdatum), MONTH(tblTrdinInvoice.Rechnungsdatum)*/" - Dim qryUStVVorschau_IDS_ALT As String = "SELECT 'IDS' as LF, tblDieselArchiv.KdNrVERAG AS RechnungsKundenNr, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, year(tblDieselArchiv.[Year Month Day]) AS Jahr, Month(tblDieselArchiv.[Year Month Day]) AS Monat, SUM(tblDieselArchiv.[VAT Amount]) AS SteuerbetragEUR FROM tblDieselArchiv + Dim qryUStVVorschau_IDS_ALT As String = "SELECT 'IDS' as LF, tblDieselArchiv.KdNrVERAG AS RechnungsKundenNr, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, year(tblDieselArchiv.[Year Month Day]) AS Jahr, Month(tblDieselArchiv.[Year Month Day]) AS Monat, SUM(tblDieselArchiv.[VAT Amount]) AS Steuerbetrag, 'EUR' as Waehrung FROM tblDieselArchiv INNER JOIN tblSteuernummern ON tblDieselArchiv.KdNrVERAG = tblSteuernummern.AdressenNr INNER JOIN tbl_IDS_Länder ON tbl_IDS_Länder.LandNr = tblSteuernummern.LandNr AND tblDieselArchiv.[Outlet Country Code] = tbl_IDS_Länder.OutletCountryCode INNER JOIN [Länderverzeichnis für die Außenhandelsstatistik] ON tblSteuernummern.LandNr = [Länderverzeichnis für die Außenhandelsstatistik].LandNr @@ -860,7 +879,7 @@ Public Class usrCntlUSTV /*ORDER BY tblDieselArchiv.KdNrVERAG, tblSteuernummern.LandNr, Year(tblDieselArchiv.[Year Month Day]), Month(tblDieselArchiv.[Year Month Day])*/ " - Dim qryUStVVorschau_MSE_ALT As String = "SELECT 'MSE' as LF,tblSteuernummern.AdressenNr AS RechnungsKundenNr, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, Year(tblMSETransactionsArchiv.[Invoice Date]) AS Jahr, Month(tblMSETransactionsArchiv.[Invoice Date]) AS Monat, CAST(ROUND(SUM(tblMSETransactionsArchiv.[Original VAT Amount]) / dbo.fktEUROKurs(tblMSETransactionsArchiv.[Original Currency], tblMSETransactionsArchiv.[Invoice Date]), 2) AS DECIMAL(18, 2)) AS SteuerbetragEUR FROM tblSteuernummern + Dim qryUStVVorschau_MSE_ALT As String = "SELECT 'MSE' as LF,tblSteuernummern.AdressenNr AS RechnungsKundenNr, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, Year(tblMSETransactionsArchiv.[Invoice Date]) AS Jahr, Month(tblMSETransactionsArchiv.[Invoice Date]) AS Monat, CAST(ROUND(SUM(tblMSETransactionsArchiv.[Original VAT Amount]) / dbo.fktEUROKurs(tblMSETransactionsArchiv.[Original Currency], tblMSETransactionsArchiv.[Invoice Date]), 2) AS DECIMAL(18, 2)) AS Steuerbetrag, 'EUR' as Waehrung FROM tblSteuernummern INNER JOIN Adressen ON tblSteuernummern.AdressenNr = Adressen.AdressenNr INNER JOIN tblMSETransactionsArchiv ON Adressen.MSEKundenNr = tblMSETransactionsArchiv.[Customer ID] INNER JOIN [Länderverzeichnis für die Außenhandelsstatistik] ON tblMSETransactionsArchiv.[Transaction Country] = [Länderverzeichnis für die Außenhandelsstatistik].LandKz AND tblSteuernummern.LandNr = [Länderverzeichnis für die Außenhandelsstatistik].LandNr @@ -882,7 +901,7 @@ Public Class usrCntlUSTV AND SUM(tblMSETransactionsArchiv.[Original VAT Amount]) <> 0 /*ORDER BY tblSteuernummern.AdressenNr, tblSteuernummern.LandNr, tblMSETransactionsArchiv.[Invoice Date], tblMSETransactionsArchiv.[Invoice ID]*/" - Dim qryUStVVorschau_UTA_ALT As String = "SELECT 'UTA' as LF,tblSteuernummern.AdressenNr AS RechnungsKundenNr, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, Year(tblUTAArchiv.Rechnungsdatum) as Jahr,Month(tblUTAArchiv.Rechnungsdatum) as Monat , SUM(tblUTAArchiv.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) AS SteuerbetragEUR FROM tblSteuernummern + Dim qryUStVVorschau_UTA_ALT As String = "SELECT 'UTA' as LF,tblSteuernummern.AdressenNr AS RechnungsKundenNr, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, Year(tblUTAArchiv.Rechnungsdatum) as Jahr,Month(tblUTAArchiv.Rechnungsdatum) as Monat , SUM(tblUTAArchiv.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) AS Steuerbetrag, 'EUR' as Waehrung FROM tblSteuernummern INNER JOIN Adressen ON tblSteuernummern.AdressenNr = Adressen.AdressenNr INNER JOIN tblUTAArchiv ON Adressen.UTAKundenNr = tblUTAArchiv.Kundennummer INNER JOIN [Länderverzeichnis für die Außenhandelsstatistik] ON tblUTAArchiv.Lieferland = [Länderverzeichnis für die Außenhandelsstatistik].LandKz_ISO_3 AND tblSteuernummern.LandNr = [Länderverzeichnis für die Außenhandelsstatistik].LandNr @@ -903,7 +922,7 @@ Public Class usrCntlUSTV AND SUM(tblUTAArchiv.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) <> 0 /*ORDER BY tblSteuernummern.AdressenNr, tblSteuernummern.LandNr, tblUTAArchiv.Rechnungsdatum*/" - Dim qryUStVVorschau_IDS_NEU As String = "SELECT 'IDS_' as LF, [tblIDSTransactionsNew].KdNrVERAG AS RechnungsKundenNr,tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, year([tblIDSTransactionsNew].[YearMonthDay]) AS Jahr, Month([tblIDSTransactionsNew].[YearMonthDay]) AS Monat, SUM([tblIDSTransactionsNew].[VATAmount]) AS SteuerbetragEUR + Dim qryUStVVorschau_IDS_NEU As String = "SELECT 'IDS_' as LF, [tblIDSTransactionsNew].KdNrVERAG AS RechnungsKundenNr,tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, year([tblIDSTransactionsNew].[YearMonthDay]) AS Jahr, Month([tblIDSTransactionsNew].[YearMonthDay]) AS Monat, SUM([tblIDSTransactionsNew].[VATAmount]) AS Steuerbetrag, 'EUR' as Waehrung FROM tblIDSTransactionsNew INNER JOIN dbo.tblSteuernummern ON [tblIDSTransactionsNew].KdNrVERAG = dbo.tblSteuernummern.AdressenNr INNER JOIN dbo.tbl_IDS_Länder ON dbo.tblSteuernummern.LandNr = dbo.tbl_IDS_Länder.LandNr AND [tblIDSTransactionsNew].[OutletCountryCode] = dbo.tbl_IDS_Länder.OutletCountryCode @@ -919,7 +938,7 @@ Public Class usrCntlUSTV [tblIDSTransactionsNew].KdNrVERAG, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, Year([tblIDSTransactionsNew].[YearMonthDay]) , Month([tblIDSTransactionsNew].[YearMonthDay]) /* ORDER BY [tblIDSTransactionsNew].KdNrVERAG, tblSteuernummern.LandNr, Year([tblIDSTransactionsNew].[YearMonthDay]), Month([tblIDSTransactionsNew].[YearMonthDay])*/" - Dim qryUStVVorschau_MSE_NEU As String = " select 'MSE_' as LF,cust.[partner_customer_number] as RechnungsKundenNr,'' as LandNr ,trans.transaction_country as LandKZ ,Year(bills.invoice_date) as Jahr,Month(bills.invoice_date) as Monat, sum(USteuer_EUR) as SteuerbetragEUR + Dim qryUStVVorschau_MSE_NEU As String = " select 'MSE_' as LF,cust.[partner_customer_number] as RechnungsKundenNr,'' as LandNr ,trans.transaction_country as LandKZ ,Year(bills.invoice_date) as Jahr,Month(bills.invoice_date) as Monat, sum(USteuer_EUR) as Steuerbetrag, 'EUR' as Waehrung FROM [VERAG].[dbo].[tblMSESettlements] as bills left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id @@ -939,7 +958,7 @@ Public Class usrCntlUSTV - Dim qryUStVVorschau_UTA_NEU As String = "SELECT 'UTA_' as LF,tblSteuernummern.AdressenNr AS RechnungsKundenNr, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, Year(tblUTAImportNew.Rechnungsdatum) as Jahr,Month(tblUTAImportNew.Rechnungsdatum) as Monat , SUM(tblUTAImportNew.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) AS SteuerbetragEUR FROM tblSteuernummern + Dim qryUStVVorschau_UTA_NEU As String = "SELECT 'UTA_' as LF,tblSteuernummern.AdressenNr AS RechnungsKundenNr, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, Year(tblUTAImportNew.Rechnungsdatum) as Jahr,Month(tblUTAImportNew.Rechnungsdatum) as Monat , SUM(tblUTAImportNew.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung) AS Steuerbetrag, 'EUR' as Wahrung FROM tblSteuernummern INNER JOIN Adressen ON tblSteuernummern.AdressenNr = Adressen.AdressenNr INNER JOIN tblUTAImportNew ON Adressen.UTAKundenNr = tblUTAImportNew.Kundennummer INNER JOIN [Länderverzeichnis für die Außenhandelsstatistik] ON tblUTAImportNew.Lieferland = [Länderverzeichnis für die Außenhandelsstatistik].LandKz_ISO_3 AND tblSteuernummern.LandNr = [Länderverzeichnis für die Außenhandelsstatistik].LandNr @@ -961,9 +980,45 @@ Public Class usrCntlUSTV /*ORDER BY tblSteuernummern.AdressenNr, tblSteuernummern.LandNr, tblUTAImportNew.Rechnungsdatum*/" + Dim qryUStVVorschau_PLOSE_NEUE_LOGIK As String = "SELECT 'PLOSE_' as LF, tblPLOSE_Inv_Data.plInv_PLOSEKundennummer AS RechnungsKundenNr, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, year(tblPLOSE_Inv_Data.[plInv_SupplierRechnungsDatum]) AS Jahr, Month(tblPLOSE_Inv_Data.[plInv_SupplierRechnungsDatum]) AS Monat, SUM(tblPLOSE_Inv_Data.[plInv_MWSTBetrag]) AS Steuerbetrag, isnull(plInv_Currency,'') as Wahrung FROM tblPLOSE_Inv_Data + INNER JOIN Adressen ON tblPLOSE_Inv_Data.plInv_PLOSEKundennummer = Adressen.PLOSEKundenNr + INNER JOIN tblSteuernummern ON Adressen.AdressenNr = tblSteuernummern.AdressenNr + INNER JOIN [Länderverzeichnis für die Außenhandelsstatistik] ON tblSteuernummern.LandNr = [Länderverzeichnis für die Außenhandelsstatistik].LandNr + WHERE tblPLOSE_Inv_Data.plInv_SupplierRechnungsDatum >= + CASE + WHEN GETDATE() > CAST(CAST(YEAR(GETDATE()) AS VARCHAR) + '-06-30' AS DATE) + THEN CAST(CAST(YEAR(GETDATE()) AS VARCHAR) + '-01-01' AS DATE) + ELSE CAST(CAST(YEAR(GETDATE()) - 1 AS VARCHAR) + '-01-01' AS DATE) + END + AND tblPLOSE_Inv_Data.plInv_MWSTBetrag <> 0 AND tblPLOSE_Inv_Data.plInv_UStVAn_ID IS NULL AND tblSteuernummern.UStV = 1 " & sqlKunden & " + GROUP BY + tblPLOSE_Inv_Data.plInv_PLOSEKundennummer, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, Year(tblPLOSE_Inv_Data.plInv_SupplierRechnungsDatum), Month(tblPLOSE_Inv_Data.plInv_SupplierRechnungsDatum), plInv_Currency +" + + + 'plose_MWSTBetragWaehrungAbbuchung ist IMMER in EUR!!!! + Dim qryUStVVorschau_PLOSE_ALTE_LOGIK As String = " SELECT 'PLOSE' as LF, tblPLOSE_Details.plose_POLSEKundennummer AS RechnungsKundenNr, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, year(tblPLOSE_Details.plose_RechnungsDatum) AS Jahr, Month(tblPLOSE_Details.plose_RechnungsDatum) AS Monat, SUM(tblPLOSE_Details.plose_MWSTBetragWaehrungAbbuchung) AS Steuerbetrag, 'EUR' as Wahrung FROM tblPLOSE_Details + INNER JOIN tblPLOSE_Produktbeschreibung ON [plp_ProductCode]=[plose_ProduktCode] + INNER JOIN Adressen ON tblPLOSE_Details.plose_POLSEKundennummer = Adressen.PLOSEKundenNr + INNER JOIN tblSteuernummern ON Adressen.AdressenNr = tblSteuernummern.AdressenNr AND tblSteuernummern.LandKZ = tblPLOSE_Produktbeschreibung.plp_Land + INNER JOIN [Länderverzeichnis für die Außenhandelsstatistik] ON tblSteuernummern.LandNr = [Länderverzeichnis für die Außenhandelsstatistik].LandNr + WHERE tblPLOSE_Details.plose_RechnungsDatum >= + CASE + WHEN GETDATE() > CAST(CAST(YEAR(GETDATE()) AS VARCHAR) + '-06-30' AS DATE) + THEN CAST(CAST(YEAR(GETDATE()) AS VARCHAR) + '-01-01' AS DATE) + ELSE CAST(CAST(YEAR(GETDATE()) - 1 AS VARCHAR) + '-01-01' AS DATE) + END + AND tblPLOSE_Details.plose_MWSTBetragWaehrungAbbuchung <> 0 AND tblPLOSE_Details.UStVAn_ID IS NULL AND tblSteuernummern.UStV = 1 and plose_LieferantCode IN (1,7,9) " & sqlKunden & " + GROUP BY + tblPLOSE_Details.plose_POLSEKundennummer, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, Year(tblPLOSE_Details.plose_RechnungsDatum), Month(tblPLOSE_Details.plose_RechnungsDatum) + +" + + Dim union As String = " UNION ALL " - Dim sqlQery = qryUStVVorschau_VERAG & union & qryUStVVorschau_IDS_ALT & union & qryUStVVorschau_UTA_ALT & union & qryUStVVorschau_IDS_NEU & union & qryUStVVorschau_UTA_NEU & union & qryUStVVorschau_MSE_NEU & union & qryUStVVorschau_MSE_ALT + Dim sqlQery = qryUStVVorschau_VERAG & union & qryUStVVorschau_IDS_ALT & union & qryUStVVorschau_UTA_ALT & union & qryUStVVorschau_IDS_NEU & union & qryUStVVorschau_UTA_NEU & union & qryUStVVorschau_MSE_NEU & union & qryUStVVorschau_MSE_ALT & union & qryUStVVorschau_PLOSE_ALTE_LOGIK & union & qryUStVVorschau_PLOSE_NEUE_LOGIK + Dim dtVorschau As DataTable = SQL.loadDgvBySql(sqlQery, "FMZOLL") diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index 649c8cd8..bbbc20d5 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -55,16 +55,16 @@ Partial Class frmKundenblatt Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.dgvUmsaetze = New System.Windows.Forms.DataGridView() + Me.btnReloadOP = New System.Windows.Forms.Button() + Me.Label10 = New System.Windows.Forms.Label() + Me.btnOP = New System.Windows.Forms.Button() Me.TabPage2 = New System.Windows.Forms.TabPage() Me.dgvOffenePosten = New System.Windows.Forms.DataGridView() Me.txtUmsatzJahr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label13 = New System.Windows.Forms.Label() Me.lblAdressenzusatz = New System.Windows.Forms.TextBox() - Me.btnReloadOP = New System.Windows.Forms.Button() Me.Label11 = New System.Windows.Forms.Label() Me.cboFirmaFMZOLL = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.Label10 = New System.Windows.Forms.Label() - Me.btnOP = New System.Windows.Forms.Button() Me.Label17 = New System.Windows.Forms.Label() Me.dgvOfferte = New System.Windows.Forms.DataGridView() Me.picLogo = New System.Windows.Forms.PictureBox() @@ -328,7 +328,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(1652, 1164) + Me.tbcntrMain.Size = New System.Drawing.Size(1652, 1181) Me.tbcntrMain.TabIndex = 3 ' 'tbAllgemein @@ -365,7 +365,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(1644, 1135) + Me.tbAllgemein.Size = New System.Drawing.Size(1644, 1152) Me.tbAllgemein.TabIndex = 0 Me.tbAllgemein.Text = "Allgemein" ' @@ -436,6 +436,42 @@ Partial Class frmKundenblatt Me.dgvUmsaetze.Size = New System.Drawing.Size(707, 484) Me.dgvUmsaetze.TabIndex = 182 ' + 'btnReloadOP + ' + Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance_ + Me.btnReloadOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnReloadOP.Cursor = System.Windows.Forms.Cursors.Hand + Me.btnReloadOP.FlatAppearance.BorderSize = 0 + Me.btnReloadOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnReloadOP.Location = New System.Drawing.Point(482, 5) + Me.btnReloadOP.Name = "btnReloadOP" + Me.btnReloadOP.Size = New System.Drawing.Size(25, 25) + Me.btnReloadOP.TabIndex = 180 + Me.btnReloadOP.UseVisualStyleBackColor = True + Me.btnReloadOP.Visible = False + ' + 'Label10 + ' + Me.Label10.AutoSize = True + Me.Label10.Location = New System.Drawing.Point(523, 11) + Me.Label10.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(149, 13) + Me.Label10.TabIndex = 177 + Me.Label10.Text = "Zahlungserinnerung/OP-Liste:" + ' + 'btnOP + ' + Me.btnOP.BackgroundImage = Global.SDL.My.Resources.Resources.mahn + Me.btnOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnOP.Cursor = System.Windows.Forms.Cursors.Hand + Me.btnOP.FlatAppearance.BorderSize = 0 + Me.btnOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnOP.Location = New System.Drawing.Point(681, 5) + Me.btnOP.Name = "btnOP" + Me.btnOP.Size = New System.Drawing.Size(24, 24) + Me.btnOP.TabIndex = 174 + Me.btnOP.UseVisualStyleBackColor = True + ' 'TabPage2 ' Me.TabPage2.Controls.Add(Me.dgvOffenePosten) @@ -542,20 +578,6 @@ Partial Class frmKundenblatt Me.lblAdressenzusatz.TabIndex = 181 Me.lblAdressenzusatz.Text = "Zusatz" ' - 'btnReloadOP - ' - Me.btnReloadOP.BackgroundImage = Global.SDL.My.Resources.Resources.reloadFinance_ - Me.btnReloadOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnReloadOP.Cursor = System.Windows.Forms.Cursors.Hand - Me.btnReloadOP.FlatAppearance.BorderSize = 0 - Me.btnReloadOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnReloadOP.Location = New System.Drawing.Point(482, 5) - Me.btnReloadOP.Name = "btnReloadOP" - Me.btnReloadOP.Size = New System.Drawing.Size(25, 25) - Me.btnReloadOP.TabIndex = 180 - Me.btnReloadOP.UseVisualStyleBackColor = True - Me.btnReloadOP.Visible = False - ' 'Label11 ' Me.Label11.AutoSize = True @@ -578,28 +600,6 @@ Partial Class frmKundenblatt Me.cboFirmaFMZOLL.Size = New System.Drawing.Size(184, 21) Me.cboFirmaFMZOLL.TabIndex = 179 ' - 'Label10 - ' - Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(523, 11) - Me.Label10.Name = "Label10" - Me.Label10.Size = New System.Drawing.Size(149, 13) - Me.Label10.TabIndex = 177 - Me.Label10.Text = "Zahlungserinnerung/OP-Liste:" - ' - 'btnOP - ' - Me.btnOP.BackgroundImage = Global.SDL.My.Resources.Resources.mahn - Me.btnOP.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.btnOP.Cursor = System.Windows.Forms.Cursors.Hand - Me.btnOP.FlatAppearance.BorderSize = 0 - Me.btnOP.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnOP.Location = New System.Drawing.Point(681, 5) - Me.btnOP.Name = "btnOP" - Me.btnOP.Size = New System.Drawing.Size(24, 24) - Me.btnOP.TabIndex = 174 - Me.btnOP.UseVisualStyleBackColor = True - ' 'Label17 ' Me.Label17.AutoSize = True @@ -924,7 +924,7 @@ Partial Class frmKundenblatt Me.dgvSperrliste.Name = "dgvSperrliste" Me.dgvSperrliste.ReadOnly = True Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle11 - Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1092) + Me.dgvSperrliste.Size = New System.Drawing.Size(446, 1109) Me.dgvSperrliste.TabIndex = 23 ' 'PictureBox2 @@ -2376,7 +2376,7 @@ Partial Class frmKundenblatt ' Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM" - Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8 + Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4 Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4) Me.cntxtCntxtMDM.Text = "cntxtMDM" ' @@ -2516,7 +2516,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(1595, 1293) + Me.ClientSize = New System.Drawing.Size(1595, 1310) Me.Controls.Add(Me.lblAbfVerb) Me.Controls.Add(Me.btnAbfVerb) Me.Controls.Add(Me.tbcntrMain) diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index 26eb2e14..add7fe68 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -1741,7 +1741,7 @@ Public Class frmMDMDatenverarbetiung Dim displayFilter = False Dim sqlstr As String = "" - sqlstr &= " SELECT 'PLOSE',AdressenNr,plose_Kennzeichen,plose_DatumTransaktion,plp_Land,isnull([tblPLOSE_Produktbeschreibung].plp_Description_EN,plose_Produktbeschreibung) as plose_Produktbeschreibung ,isnull(plose_NummerKarteGeraet,plose_Kontonummer) as plose_NummerKarteGeraet ,plose_BeschreibungEinfahrt,plose_BeschreibungAusfahrt,plose_NettobetragWaehrungAbbuchung,(plose_BruttobetragWaehrungAbbuchung-plose_NettobetragWaehrungAbbuchung) as Steuer,plose_BruttobetragWaehrungAbbuchung " + sqlstr &= " SELECT 'PLOSE',AdressenNr,plose_Kennzeichen,plose_DatumTransaktion,plp_Land,isnull([tblPLOSE_Produktbeschreibung].plp_Description_EN,plose_Produktbeschreibung) as plose_Produktbeschreibung ,isnull(plose_NummerKarteGeraet,plose_Kontonummer) as plose_NummerKarteGeraet ,plose_BeschreibungEinfahrt,isnull(plose_BeschreibungAusfahrt,plose_BeschreibungMautTankstelle) as plose_BeschreibungAusfahrt,plose_NettobetragWaehrungAbbuchung,(plose_BruttobetragWaehrungAbbuchung-plose_NettobetragWaehrungAbbuchung) as Steuer,plose_BruttobetragWaehrungAbbuchung " sqlstr &= " FROM tblPLOSE_Details INNER JOIN [tblPLOSE_Produktbeschreibung] on plose_ProduktCode=plp_ProductCode INNER JOIN Adressen on plose_POLSEKundennummer=PLOSEKundenNr and plp_LeistungsNr is not null " sqlstr &= " WHERE 1=1 " sqlstr &= " AND plose_Fakturiert=0 AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " ) AND plp_Land NOT IN ('AT','DE') " diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb index 4b551e6d..d62120a1 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb @@ -1,8 +1,10 @@ -Imports javax.validation.constraints +Imports com.sun.org.apache.xpath.internal.functions +Imports javax.validation.constraints Public Class cMDMFunctionsAllgemein - Public Shared ploseSchnittstelle As Boolean = False + Public Shared ploseAlteLogikSchnittstelle As Boolean = False + Public Shared ploseNeueLogikSchnittstelle As Boolean = False Public Shared ITSchnittstelle As Boolean = False Public Shared MSEAlteSchnittstelle As Boolean = False Public Shared MSENeueSchnittstelle As Boolean = False @@ -11,9 +13,10 @@ Public Class cMDMFunctionsAllgemein Public Shared UTAAlteSchnittstelle As Boolean = False Public Shared UTANeueSchnittstelle As Boolean = False - Shared Function setSchnittstellen(plose As Boolean, IT As Boolean, MSEalt As Boolean, MSENeu As Boolean, IDSAlt As Boolean, IDSNeu As Boolean, UTAAlt As Boolean, UTANeu As Boolean) + Shared Function setSchnittstellen(ploseAlt As Boolean, IT As Boolean, MSEalt As Boolean, MSENeu As Boolean, IDSAlt As Boolean, IDSNeu As Boolean, UTAAlt As Boolean, UTANeu As Boolean, ploseNeu As Boolean) - ploseSchnittstelle = plose + ploseAlteLogikSchnittstelle = ploseAlt + ploseNeueLogikSchnittstelle = ploseNeu ITSchnittstelle = IT MSEAlteSchnittstelle = MSEalt MSENeueSchnittstelle = MSENeu @@ -181,8 +184,7 @@ Public Class cMDMFunctionsAllgemein curUStV_SummeVorschaubetragEUR_IT = UStVKunden_Summen_lesen_Vorschau_IT(r.Item("KundenNr"), invoiceDate, ITSchnittstelle) curUStV_SummeVorschaubetragEUR_MSE = UStVKunden_Summen_lesen_Vorschau_MSE(r.Item("KundenNr"), invoiceDate, MSEAlteSchnittstelle, MSENeueSchnittstelle) curUStV_SummeVorschaubetragEUR_UTA = UStVKunden_Summen_lesen_Vorschau_UTA(r.Item("KundenNr"), invoiceDate, UTAAlteSchnittstelle, UTANeueSchnittstelle) - - curUStV_SummeVorschaubetragEUR_PLOSE = UStVKunden_Summen_lesen_Vorschau_PLOSE(r.Item("KundenNr"), invoiceDate, ploseSchnittstelle) + curUStV_SummeVorschaubetragEUR_PLOSE = UStVKunden_Summen_lesen_Vorschau_PLOSE(r.Item("KundenNr"), invoiceDate, ploseAlteLogikSchnittstelle, ploseNeueLogikSchnittstelle) curUStV_SummeVorschaubetragEUR += curUStV_SummeVorschaubetragEUR_VERAG curUStV_SummeVorschaubetragEUR += curUStV_SummeVorschaubetragEUR_IDS @@ -420,16 +422,19 @@ Public Class cMDMFunctionsAllgemein End Function - Shared Function UStVKunden_Summen_lesen_Vorschau_PLOSE(varUStVAn_KuNr As Integer, invoiceDate As Date, calcSumme As Boolean) As Double + Shared Function UStVKunden_Summen_lesen_Vorschau_PLOSE(varUStVAn_KuNr As Integer, invoiceDate As Date, calcSummeAlteSchnittstelle As Boolean, calcSummeNeueSchnitttelle As Boolean) As Double ' set plose_Archiv=1, [plose_ArchiviertDatum]=GETDATE(), UStVAn_ID = @UStVAn_ID beim Einarbeiten in USTVA Try Dim sql As New VERAG_PROG_ALLGEMEIN.SQL - Dim summeSchnittstelle As Double = 0 + Dim summeAlteSchnittstelle As Double = 0 + Dim summeNeueSchnittstelle As Double = 0 - If calcSumme Then + If calcSummeAlteSchnittstelle Then + + 'plose_MWSTBetragWaehrungAbbuchung ist immer in EUR Dim sqlPLOSE = "select plose_POLSEKundennummer, sum([plose_MWSTBetragWaehrungAbbuchung])[plose_MWSTBetragWaehrungAbbuchung] FROM [tblPLOSE_Details] INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer WHERE plose_Archiv <> 1 AND plose_Fakturiert = 1 AND plose_LieferantCode IN (0,1,7) AND cast(plose_RechnungsDatum as date) >= '" & invoiceDate.ToShortDateString & "' and AdressenNr = " & varUStVAn_KuNr & " @@ -441,13 +446,50 @@ Public Class cMDMFunctionsAllgemein For Each r As DataRow In dtPLOSE.Rows Dim UST_org = CDbl(r.Item("plose_MWSTBetragWaehrungAbbuchung")) If UST_org <> 0 Then - summeSchnittstelle += UST_org + summeAlteSchnittstelle += UST_org End If Next End If - Return summeSchnittstelle + If calcSummeNeueSchnitttelle Then + + Dim sqlPLOSE = "select plInv_PLOSEKundennummer, sum([plInv_MWSTBetrag])[plInv_MWSTBetrag], ISNULL([plInv_Currency],'') as plInv_Currency FROM [tblPLOSE_Inv_Data] INNER JOIN Adressen on PLOSEKundenNr=plInv_PLOSEKundennummer + WHERE plInv_Archiv <> 1 AND plInv_ArchiviertDatum is null AND cast(plInv_SupplierRechnungsDatum as date) >= '" & invoiceDate.ToShortDateString & "' and AdressenNr = " & varUStVAn_KuNr & " + group by plInv_PLOSEKundennummer, plInv_Currency" + + + Dim dtPLOSE As DataTable = sql.loadDgvBySql(sqlPLOSE, "FMZOLL") + + + + For Each r As DataRow In dtPLOSE.Rows + Dim UST_org = CDbl(r.Item("plInv_MWSTBetrag")) + If UST_org <> 0 Then + Dim Weahrung As String = IIf(r.Item("plInv_Currency") IsNot Nothing, r.Item("plInv_Currency"), "") + If Weahrung <> "" Then + If Weahrung <> "EUR" Then + Dim kurs As New cEZB_Waehrungskurse(Weahrung) + Dim UST_EUR As Double = 0 + UST_EUR = Math.Round((UST_org / kurs.ezb_kurs), 2) '+ (UST_org Mod Math.Round(kurs.ezb_kurs, 2)), ")" + + summeNeueSchnittstelle += UST_EUR + + Else Weahrung = "EUR" + + + summeNeueSchnittstelle += UST_org + + End If + + End If + End If + + Next + End If + + + Return summeAlteSchnittstelle + summeNeueSchnittstelle Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG) diff --git a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb index 2f8cb588..6d1bb66e 100644 --- a/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb +++ b/VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb @@ -524,7 +524,7 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object( Shared Function getISO2LandFromISO3Land(Iso3Land As String) If Iso3Land Is Nothing Then Return Nothing If Iso3Land.Length <> 3 Then Return Nothing - Dim sqlstr = "SELECT TOP 1 isnull(LandKz,'') AS LandKzISO2 from [Länderverzeichnis für die Außenhandelsstatistik] where LandKz_ISO_3 = '" & Iso3Land & "' " + Dim sqlstr = "SELECT TOP 1 isnull(LandKz,'') AS LandKzISO2 from [Länderverzeichnis für die Außenhandelsstatistik] where LandKz_ISO_3 = Replace('" & Iso3Land & "','SLO','SVN')" Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Return SQL.getValueTxtBySql(sqlstr, "FMZOLL") End Function From 057afa710e2b80999960af088edd63bbcb31a2a2 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 11 Apr 2025 10:16:31 +0200 Subject: [PATCH 08/10] Vorschausummen. --- SDL/USTV/frmMDM_USTVAntrag.vb | 253 +++++++++++------- SDL/USTV/frmUSTVoffeneAntraege.vb | 4 +- SDL/USTV/usrCntlUSTV.vb | 3 +- .../Classes/cMDMFunctionsAllgemein.vb | 76 ++++-- 4 files changed, 207 insertions(+), 129 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index e04cf71e..1e953ed5 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -741,10 +741,12 @@ Public Class frmMDM_USTVAntrag End If If USTV_POS.INSERT() Then - If bytSchnittstellenNr = 11 Then + If bytSchnittstellenNr = 11 Then 'wegel bei welcher Einlesselogik, sollen immer [tblPLOSE_Details] und [tblPLOSE_Inv_Data] aktualisiert werden! MDM_Worker.cPLOSE.UPDATE_ARCHIV_NEULOGIK(USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_ID, USTV_POS.UStVPo_ReNr, True) + MDM_Worker.cPLOSE.UPDATE_ARCHIV(USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_ID, USTV_POS.UStVPo_ReNr, True) Else MDM_Worker.cPLOSE.UPDATE_ARCHIV(USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_ID, USTV_POS.UStVPo_ReNr, True) + MDM_Worker.cPLOSE.UPDATE_ARCHIV_NEULOGIK(USTV_ANTRAG.UStVAn_ReDatVon, USTV_ANTRAG.UStVAn_ReDatBis, USTV_ANTRAG.UStVAn_KuNr, USTV_ANTRAG.UStVAn_ID, USTV_POS.UStVPo_ReNr, True) End If End If @@ -1522,113 +1524,17 @@ Public Class frmMDM_USTVAntrag If vbYes = MsgBox("Möchten Sie den Eintrag wirklich löschen?", vbYesNoCancel) Then If UstCntlUSTV_AntragPosition1.cbxAPI IsNot Nothing AndAlso UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value IsNot Nothing Then - Dim updated As Boolean = False - Dim sqlText = "" - Dim test As Boolean = False - - Select Case UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value - - Case 1 'VERAG 360 GmbH; 4975 Suben - 'UStV-Antragsnummer im Buchungssatz löschen. - sqlText = "Update tblTrdinInvoice SET tblTrdinInvoice.UStVAn_ID = NULL WHERE tblTrdinInvoice.Rechnungsdatum = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' And tblTrdinInvoice.Rechnungsnummer = " & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr - If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") - - Case 2 ' UStV-Antragsnummer im IDSDieseldatenArchiv löschen 'IDS alte Schnittstelle - OK - sqlText = "UPDATE tblDieselArchiv SET tblDieselArchiv.UStVAn_ID = NULL FROM tblDieselArchiv INNER JOIN tbl_IDS_Länder ON tblDieselArchiv.[Outlet Country Code] = tbl_IDS_Länder.OutletCountryCode WHERE (((tblDieselArchiv.[Year Month Day])='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "') AND ((ISNULL([OBO Number],ISNULL([VR Number],[Payment summary number])))='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & "') AND ((tblDieselArchiv.KdNrVERAG)=" & USTV_ANTRAG.UStVAn_KuNr & ") AND ((tbl_IDS_Länder.LandNr)=" & USTV_ANTRAG.UStVAn_LandNr & "))" - If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") - - Case 3 'Telepass ' UStV-Antragsnummer in tblMautITArchiv löschen.- NICHT MEHR AKTIV - sqlText = "UPDATE tblMautITArchiv SET tblMautITArchiv.UStVAn_ID = NULL WHERE tblMautITArchiv.Verrechnungsdatum='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' AND tblMautITArchiv.Code_Adressat_des_Kontoauszugs='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & "' AND ([Betrag_mit_Preisnachlass_oder_Preisnachlass]-[Nicht_mehrwertsteuerpflichtiger_Betrag])<>0" - If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") - - - Case 4 'MS Europe BV; GC Rijswijk alte Schnittstelle UStV-Antragsnummer in tblMSETransactionsArchiv löschen. - OK - sqlText = "UPDATE tblMSETransactionsArchiv SET tblMSETransactionsArchiv.UStVAn_ID = NULL FROM tblMSETransactionsArchiv INNER JOIN Adressen ON tblMSETransactionsArchiv.[Customer ID] = Adressen.MSEKundenNr WHERE (((tblMSETransactionsArchiv.[Invoice Date])='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "') AND ((tblMSETransactionsArchiv.[Invoice ID])='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & "') AND ((tblMSETransactionsArchiv.[Specification Page])='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_Leistungsbezeichnung & "') AND ((Adressen.AdressenNr)=" & USTV_ANTRAG.UStVAn_KuNr & ") AND ((tblMSETransactionsArchiv.[Transaction Country])='" & UstCntlUSTV_AntragPosition1.Antrag_LandKz & "') AND ((tblMSETransactionsArchiv.[Original Currency])='" & USTV_ANTRAG.UStVAn_Währungscode & "') AND ((tblMSETransactionsArchiv.[Original VAT Amount])<>0))" - If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") - - Case 5 'UNIONTANK - UTA - OK - ' UStV-Antragsnummer in tblUTAArchiv löschen. - sqlText = - "UPDATE tblUTAArchiv SET tblUTAArchiv.UStVAn_ID = NULL FROM tblUTAArchiv INNER JOIN Adressen ON tblUTAArchiv.Kundennummer = Adressen.UTAKundenNr - WHERE tblUTAArchiv.Rechnungsdatum='" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' - AND tblUTAArchiv.Rechnungsnummer_pro_Lieferland=" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & " - AND tblUTAArchiv.Lieferland='" & VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO3LandFromLandNr(USTV_ANTRAG.UStVAn_LandNr) & "' - AND tblUTAArchiv.Lieferlandwährung_ISO='" & USTV_ANTRAG.UStVAn_Währungscode & "' - AND Adressen.AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr & " - AND ([Gesamtbetrag_Brutto_in_Lieferlandwährung]-[Gesamtbetrag_Netto_in_Lieferlandwährung])<>0" - If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") - - Case 6 'PLOSE-alte Logik -> aus Transaktionen - - - sqlText = "Update [tblPLOSE_Details] - set plose_Archiv=0, [plose_ArchiviertDatum]=NULL, UStVAn_ID = NULL - From [tblPLOSE_Details] INNER Join Adressen On PLOSEKundenNr=plose_POLSEKundennummer - INNER Join [tblPLOSE_Produktbeschreibung] ON [plp_ProductCode]=[plose_ProduktCode] - WHERE cast(plose_RechnungsDatum As Date) = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' And AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr & " AND plose_RechnungsNr = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & "' - And plose_LieferantCode IN (0,1,7,9) " - - - If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") - - Case 7 'RMC - neue Schnittstelle - OK - sqlText = "Update [tblRMCImport] Set rmc_archiv=0, [rmc_archiviertDatum] = NULL, UStVAn_ID = NULL FROM [tblRMCImport] inner join adressen on adressen.WölflKundenNr = tblRMCImport.rmc_kdNr Where cast(rmc_reDatum as date) = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' And rmc_reNr = " & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & " AND adressen.AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr - If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") - - Case 8 'IDS neue Schnittstelle - OK - sqlText = "update tblIDSTransactionsNew set UStVAn_ID = NULL - From tblIDSTransactionsNew - INNER Join tbl_IDS_Länder - On tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode - Where - tblIDSTransactionsNew.[YearMonthDay] = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' And ISNULL(tblIDSTransactionsNew.[OBONumber], ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & "' - And tblIDSTransactionsNew.KdNrVERAG = " & USTV_ANTRAG.UStVAn_KuNr & " - And tbl_IDS_Länder.[Lieferland_ISO2] = '" & Antrag_LandKz & "'" - If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") - - Case 9 'MSE neue Schnitttelle - OK - If UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr.ToString.Length >= 15 Then - Dim invoiceNo = UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr.ToString.Substring(0, 7) - Dim customerNo = UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr.ToString.Substring(10, 5) - sqlText = "UPDATE [tblMSEInvoices] set UStVAn_ID = NULL, archiv = 0, archiviertDatum = NULL FROM [tblMSEInvoices] inner join [tblMSECustomers] on tblMSEInvoices.customer_number = tblMSECustomers.customer_id WHERE cast(invoice_date as date) = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' And invoice_id = " & invoiceNo & " And tblMSECustomers.partner_customer_number= " & USTV_ANTRAG.UStVAn_KuNr & " And country = '" & UstCntlUSTV_AntragPosition1.Antrag_LandKz & "' and tblMSEInvoices.customer_number = " & customerNo - - If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") - End If - - Case 10 ' UTA neue Schnittstelle - OK - sqlText = "UPDATE [tblUTAImportNew] set UStVAn_ID = NULL, archiv = 0, archiviertDatum = NULL from [tblUTAImportNew] INNER JOIN Adressen ON [tblUTAImportNew].Kundennummer = Adressen.UTAKundenNr WHERE cast(Rechnungsdatum as date) = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' And Rechnungsnummer_pro_Lieferland = " & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & " And Adressen.AdressenNr= " & USTV_ANTRAG.UStVAn_KuNr & " AND Lieferland_ISO2 = '" & UstCntlUSTV_AntragPosition1.Antrag_LandKz & "'" - If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") - - Case 11 'PLOSE-neue Logik -> aus Belegen - - sqlText = "Update [tblPLOSE_Inv_Data] - set plInv_Archiv=0, [plInv_ArchiviertDatum]=NULL, plInv_UStVAn_ID = NULL - From [tblPLOSE_Inv_Data] INNER Join Adressen On PLOSEKundenNr=plInv_PLOSEKundennummer - WHERE cast(plInv_SupplierRechnungsDatum As Date) = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat & "' And AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr & " AND [plInv_SupplierRechnungsNr] = '" & UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr & "'" - - If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") - - End Select - - If UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value IsNot Nothing AndAlso (UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value > 0 And UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value < 11) Then - If Not updated Then - If Not vbYes = MsgBox("Fehler beim zurücksetzen der USTVA-ID!" & vbNewLine & "Möchten Sie den Eintrag trotzdem löschen?", vbYesNoCancel) Then - Exit Sub - End If + If setArchiv(UstCntlUSTV_AntragPosition1.cboSchnittstellennr._value, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReDat, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ReNr, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_Leistungsbezeichnung) Then + If UstCntlUSTV_AntragPosition1.UStV_POS.DELETE(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ID) Then + reorderUSTVAPositions(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID) End If - + init() End If - If UstCntlUSTV_AntragPosition1.UStV_POS.DELETE(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ID) Then - reorderUSTVAPositions(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID) - End If - - init() - End If - UstCntlUSTV_AntragPosition1.Enabled = False + UstCntlUSTV_AntragPosition1.Enabled = False End If End Sub @@ -1685,6 +1591,112 @@ Public Class frmMDM_USTVAntrag End Sub + Private Function setArchiv(SchnittstellenNr As Integer, RechnungsDatum As Date, RechnungsNr As String, Leistungsbez As String) As Boolean + + + Dim updated As Boolean = False + Dim sqlText = "" + Dim test As Boolean = False + + Select Case SchnittstellenNr + + Case 1 'VERAG 360 GmbH; 4975 Suben + 'UStV-Antragsnummer im Buchungssatz löschen. + sqlText = "Update tblTrdinInvoice SET tblTrdinInvoice.UStVAn_ID = NULL WHERE tblTrdinInvoice.Rechnungsdatum = '" & RechnungsDatum.ToShortDateString & "' And tblTrdinInvoice.Rechnungsnummer = " & RechnungsNr + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + Case 2 ' UStV-Antragsnummer im IDSDieseldatenArchiv löschen 'IDS alte Schnittstelle - OK + sqlText = "UPDATE tblDieselArchiv SET tblDieselArchiv.UStVAn_ID = NULL FROM tblDieselArchiv INNER JOIN tbl_IDS_Länder ON tblDieselArchiv.[Outlet Country Code] = tbl_IDS_Länder.OutletCountryCode WHERE (((tblDieselArchiv.[Year Month Day])='" & RechnungsDatum.ToShortDateString & "') AND ((ISNULL([OBO Number],ISNULL([VR Number],[Payment summary number])))='" & RechnungsNr & "') AND ((tblDieselArchiv.KdNrVERAG)=" & USTV_ANTRAG.UStVAn_KuNr & ") AND ((tbl_IDS_Länder.LandNr)=" & USTV_ANTRAG.UStVAn_LandNr & "))" + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + Case 3 'Telepass ' UStV-Antragsnummer in tblMautITArchiv löschen.- NICHT MEHR AKTIV + sqlText = "UPDATE tblMautITArchiv SET tblMautITArchiv.UStVAn_ID = NULL WHERE tblMautITArchiv.Verrechnungsdatum='" & RechnungsDatum.ToShortDateString & "' AND tblMautITArchiv.Code_Adressat_des_Kontoauszugs='" & RechnungsNr & "' AND ([Betrag_mit_Preisnachlass_oder_Preisnachlass]-[Nicht_mehrwertsteuerpflichtiger_Betrag])<>0" + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + + Case 4 'MS Europe BV; GC Rijswijk alte Schnittstelle UStV-Antragsnummer in tblMSETransactionsArchiv löschen. - OK + sqlText = "UPDATE tblMSETransactionsArchiv SET tblMSETransactionsArchiv.UStVAn_ID = NULL FROM tblMSETransactionsArchiv INNER JOIN Adressen ON tblMSETransactionsArchiv.[Customer ID] = Adressen.MSEKundenNr WHERE (((tblMSETransactionsArchiv.[Invoice Date])='" & RechnungsDatum.ToShortDateString & "') AND ((tblMSETransactionsArchiv.[Invoice ID])='" & RechnungsNr & "') AND ((tblMSETransactionsArchiv.[Specification Page])='" & Leistungsbez & "') AND ((Adressen.AdressenNr)=" & USTV_ANTRAG.UStVAn_KuNr & ") AND ((tblMSETransactionsArchiv.[Transaction Country])='" & Antrag_LandKz & "') AND ((tblMSETransactionsArchiv.[Original Currency])='" & USTV_ANTRAG.UStVAn_Währungscode & "') AND ((tblMSETransactionsArchiv.[Original VAT Amount])<>0))" + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + Case 5 'UNIONTANK - UTA - OK + ' UStV-Antragsnummer in tblUTAArchiv löschen. + sqlText = + "UPDATE tblUTAArchiv SET tblUTAArchiv.UStVAn_ID = NULL FROM tblUTAArchiv INNER JOIN Adressen ON tblUTAArchiv.Kundennummer = Adressen.UTAKundenNr + WHERE tblUTAArchiv.Rechnungsdatum='" & RechnungsDatum.ToShortDateString & "' + AND tblUTAArchiv.Rechnungsnummer_pro_Lieferland=" & RechnungsNr & " + AND tblUTAArchiv.Lieferland='" & VERAG_PROG_ALLGEMEIN.cProgramFunctions.getISO3LandFromLandNr(USTV_ANTRAG.UStVAn_LandNr) & "' + AND tblUTAArchiv.Lieferlandwährung_ISO='" & USTV_ANTRAG.UStVAn_Währungscode & "' + AND Adressen.AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr & " + AND ([Gesamtbetrag_Brutto_in_Lieferlandwährung]-[Gesamtbetrag_Netto_in_Lieferlandwährung])<>0" + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + Case 6, 11 'PLOSE-alte Logik -> aus Transaktionen und neue Logik -> aus Rechnungsdaten (immer beide Ausführen!) + + sqlText = "Update [tblPLOSE_Details] + set plose_Archiv=0, [plose_ArchiviertDatum]=NULL, UStVAn_ID = NULL + From [tblPLOSE_Details] INNER Join Adressen On PLOSEKundenNr=plose_POLSEKundennummer + INNER Join [tblPLOSE_Produktbeschreibung] ON [plp_ProductCode]=[plose_ProduktCode] + WHERE cast(plose_RechnungsDatum As Date) = '" & RechnungsDatum.ToShortDateString & "' And AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr & " AND plose_RechnungsNr = '" & RechnungsNr & "' + And plose_LieferantCode IN (0,1,7,9) " + + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + + sqlText = "Update [tblPLOSE_Inv_Data] + set plInv_Archiv=0, [plInv_ArchiviertDatum]=NULL, plInv_UStVAn_ID = NULL + From [tblPLOSE_Inv_Data] INNER Join Adressen On PLOSEKundenNr=plInv_PLOSEKundennummer + WHERE cast(plInv_SupplierRechnungsDatum As Date) = '" & RechnungsDatum.ToShortDateString & "' And AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr & " AND [plInv_SupplierRechnungsNr] = '" & RechnungsNr & "'" + + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + Case 7 'RMC - neue Schnittstelle - OK + sqlText = "Update [tblRMCImport] Set rmc_archiv=0, [rmc_archiviertDatum] = NULL, UStVAn_ID = NULL FROM [tblRMCImport] inner join adressen on adressen.WölflKundenNr = tblRMCImport.rmc_kdNr Where cast(rmc_reDatum as date) = '" & RechnungsDatum.ToShortDateString & "' And rmc_reNr = " & RechnungsNr & " AND adressen.AdressenNr=" & USTV_ANTRAG.UStVAn_KuNr + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + Case 8 'IDS neue Schnittstelle - OK + sqlText = "update tblIDSTransactionsNew set UStVAn_ID = NULL + From tblIDSTransactionsNew + INNER Join tbl_IDS_Länder + On tblIDSTransactionsNew.[OutletCountryCode] = tbl_IDS_Länder.OutletCountryCode + Where + tblIDSTransactionsNew.[YearMonthDay] = '" & RechnungsDatum.ToShortDateString & "' And ISNULL(tblIDSTransactionsNew.[OBONumber], ISNULL(tblIDSTransactionsNew.[VRNumber], tblIDSTransactionsNew.[Paymentsummarynumber])) = '" & RechnungsNr & "' + And tblIDSTransactionsNew.KdNrVERAG = " & USTV_ANTRAG.UStVAn_KuNr & " + And tbl_IDS_Länder.[Lieferland_ISO2] = '" & Antrag_LandKz & "'" + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + Case 9 'MSE neue Schnitttelle - OK + If RechnungsNr.ToString.Length >= 15 Then + Dim invoiceNo = RechnungsNr.ToString.Substring(0, 7) + Dim customerNo = RechnungsNr.ToString.Substring(10, 5) + sqlText = "UPDATE [tblMSEInvoices] set UStVAn_ID = NULL, archiv = 0, archiviertDatum = NULL FROM [tblMSEInvoices] inner join [tblMSECustomers] on tblMSEInvoices.customer_number = tblMSECustomers.customer_id WHERE cast(invoice_date as date) = '" & RechnungsDatum.ToShortDateString & "' And invoice_id = " & invoiceNo & " And tblMSECustomers.partner_customer_number= " & USTV_ANTRAG.UStVAn_KuNr & " And country = '" & Antrag_LandKz & "' and tblMSEInvoices.customer_number = " & customerNo + + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + End If + Case 10 ' UTA neue Schnittstelle - OK + sqlText = "UPDATE [tblUTAImportNew] set UStVAn_ID = NULL, archiv = 0, archiviertDatum = NULL from [tblUTAImportNew] INNER JOIN Adressen ON [tblUTAImportNew].Kundennummer = Adressen.UTAKundenNr WHERE cast(Rechnungsdatum as date) = '" & RechnungsDatum.ToShortDateString & "' And Rechnungsnummer_pro_Lieferland = " & RechnungsNr & " And Adressen.AdressenNr= " & USTV_ANTRAG.UStVAn_KuNr & " AND Lieferland_ISO2 = '" & Antrag_LandKz & "'" + If Not test Then updated = SQL.doSQL(sqlText, "FMZOLL") + + + + End Select + + If (SchnittstellenNr > 0 And SchnittstellenNr < 12) Then + If Not updated Then + If Not vbYes = MsgBox("Fehler beim zurücksetzen der USTVA-ID!" & vbNewLine & "Möchten Sie den Eintrag trotzdem löschen?", vbYesNoCancel) Then + Return updated + Else + Return True + End If + Else + + Return updated + End If + Else + Return True + + End If + + + End Function + Private Function excelAuswertung(ByRef Optional filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean @@ -2396,6 +2408,43 @@ Public Class frmMDM_USTVAntrag End Sub + Private Sub dgvUSTVPositionen_KeyUp(sender As Object, e As Windows.Forms.KeyEventArgs) Handles dgvUSTVPositionen.KeyUp + + If e.KeyCode = Keys.Delete Then + If dgvUSTVPositionen.SelectedRows.Count > 0 Then + + + + If vbYes = MsgBox("Möchten Sie die markierten " & dgvUSTVPositionen.SelectedRows.Count & " Einträge wirklich löschen?", vbYesNoCancel) Then + + For Each r As DataGridViewRow In dgvUSTVPositionen.SelectedRows + + If r.Cells("UStVPo_Schnittstelle").Value IsNot Nothing AndAlso r.Cells("UStVPo_SchnittstellenNr").Value IsNot Nothing AndAlso IsNumeric(r.Cells("UStVPo_SchnittstellenNr").Value) Then + + 'UstCntlUSTV_AntragPosition1.Antrag_LandKz + + If setArchiv(r.Cells("UStVPo_SchnittstellenNr").Value, r.Cells("UStVPo_ReDat").Value, r.Cells("UStVPo_ReNr").Value, r.Cells("UStVPo_Leistungsbezeichnung").Value) Then + + Dim sqlstr = " DELETE FROM tblUStVPositionen WHERE UStVAn_ID=" & Me.UStVAn_ID & " AND UStVPo_ID=" & r.Cells("UStVPo_ID").Value + If Not SQL.doSQL(sqlstr, "FMZOLL") Then + Exit Sub + End If + + End If + + End If + + Next + reorderUSTVAPositions(Me.UStVAn_ID) + init() + UstCntlUSTV_AntragPosition1.Enabled = False + End If + End If + e.Handled = True + End If + + + End Sub Private Sub calcSumme() diff --git a/SDL/USTV/frmUSTVoffeneAntraege.vb b/SDL/USTV/frmUSTVoffeneAntraege.vb index 0bfe2e1b..b5425c27 100644 --- a/SDL/USTV/frmUSTVoffeneAntraege.vb +++ b/SDL/USTV/frmUSTVoffeneAntraege.vb @@ -910,12 +910,12 @@ Public Class frmUSTVoffeneAntraege If MyDatagridview1.SelectedRows(0).Cells("antragExisitiert").Value > 0 Then Dim frm = New frmMDM_USTVAntrag(MyDatagridview1.SelectedRows(0).Cells("antragExisitiert").Value) - frm.ShowDialog() + frm.Show() Else Dim frm = New frmMDM_USTVAntrag(MyDatagridview1.SelectedRows(0).Cells("KdNr").Value, MyDatagridview1.SelectedRows(0).Cells("Einreichland").Value, dat_Sum_Von.Value, dat_Sum_Bis.Value) - frm.ShowDialog() + frm.Show() End If diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 26657eba..650db7b7 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -22,6 +22,7 @@ Public Class usrCntlUSTV pnlFilter.AutoScroll = False btnKundendatenaktualisieren.Enabled = False ' MsgBox(kdNr) + If kdNr > 0 Then Me.kdNr = kdNr KdSearchBox1.KdNr = kdNr @@ -307,7 +308,7 @@ Public Class usrCntlUSTV If dgvUSTV.SelectedRows.Count > 0 Then Dim f As New frmMDM_USTVAntrag(dgvUSTV.SelectedRows(0).Cells("UStVAn_ID").Value) - f.ShowDialog(Me) + f.Show(Me) dgvUSTV.RELOAD() End If End Sub diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb index d62120a1..45ec7430 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb @@ -1,5 +1,6 @@ Imports com.sun.org.apache.xpath.internal.functions Imports javax.validation.constraints +Imports Org.BouncyCastle.Asn1 Public Class cMDMFunctionsAllgemein @@ -25,6 +26,20 @@ Public Class cMDMFunctionsAllgemein UTAAlteSchnittstelle = UTAAlt UTANeueSchnittstelle = UTANeu + If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Then + + + ploseAlteLogikSchnittstelle = True + ploseNeueLogikSchnittstelle = True + ITSchnittstelle = False + MSEAlteSchnittstelle = True + MSENeueSchnittstelle = True + IDSAlteSchnittstelle = True + IDSNeueSchnittstelle = True + UTAAlteSchnittstelle = True + UTANeueSchnittstelle = True + End If + End Function @@ -130,8 +145,9 @@ Public Class cMDMFunctionsAllgemein End If 'alle Kunden, die eine SteuerNr hinterlegt haben inkl. deren hinterlegte Summen! - Dim sqlKunden = "SELECT Kunden.KundenNr as KundenNr, Kunden.UStV_SummeUmsatzsteuerbetragEUR, Kunden.UStV_SummeErstattungsbetragEUR, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR_VERAG, Kunden.UStV_SummeVorschaubetragEUR_IDS, Kunden.UStV_SummeVorschaubetragEUR_IT, Kunden.UStV_SummeVorschaubetragEUR_MSE, Kunden.UStV_SummeVorschaubetragEUR_UTA, Kunden.UStV_SummeVorschaubetragEUR, kde_UStV_SummeVorschaubetragEUR_PLOSE as UStV_SummeVorschaubetragEUR_PLOSE + Dim sqlKunden = "SELECT Kunden.KundenNr as KundenNr,isnull(Adressen.LandKz,'') as LandKz, Kunden.UStV_SummeUmsatzsteuerbetragEUR, Kunden.UStV_SummeErstattungsbetragEUR, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR_VERAG, Kunden.UStV_SummeVorschaubetragEUR_IDS, Kunden.UStV_SummeVorschaubetragEUR_IT, Kunden.UStV_SummeVorschaubetragEUR_MSE, Kunden.UStV_SummeVorschaubetragEUR_UTA, Kunden.UStV_SummeVorschaubetragEUR, kde_UStV_SummeVorschaubetragEUR_PLOSE as UStV_SummeVorschaubetragEUR_PLOSE FROM Kunden + INNER JOIN Adressen on Adressen.AdressenNr = Kunden.KundenNr left JOIN [tblKundenErweitert] on [kde_KundenNr] = Kunden.KundenNr WHERE Kunden.KundenNr " & sqlWhere & " order by Kunden.KundenNr" @@ -146,6 +162,13 @@ Public Class cMDMFunctionsAllgemein 'Neuberechnung der Steuerbeträge aus den Anträgen + + + 'WICHTIG laut Brigitte am 09.04.2025: + 'SRB und BIH Kunden bekommen die MWST direkt vom HU Finanzamt ausbezahlt. + 'Deswegen sollten alle ungarischen Anträge die wir für SRB und BIH Kunden stellen, nicht beim Risiko mitberechnet werden + + Dim sqlSummeBilden = "SELECT tblUStVAntrag.UStVAn_KuNr, SUM(tblUStVAntrag.UStVAn_USteuerbetragEUR) As UStVKu_SummeUmsatzsteuer, @@ -179,12 +202,12 @@ Public Class cMDMFunctionsAllgemein Dim invoiceDate = If(Date.Now > New Date(Date.Now.Year, 6, 30), New Date(Date.Now.Year, 1, 1), New Date(Date.Now.Year - 1, 1, 1)) 'Neuberechnung der Vorschausummen (also alle noch nicht verrechneten Transaktionen , die aber schon eingelesen wurden) - curUStV_SummeVorschaubetragEUR_VERAG = UStVKunden_Summen_lesen_Vorschau_VERAG(r.Item("KundenNr"), invoiceDate) - curUStV_SummeVorschaubetragEUR_IDS = UStVKunden_Summen_lesen_Vorschau_IDS(r.Item("KundenNr"), invoiceDate, IDSAlteSchnittstelle, IDSNeueSchnittstelle) - curUStV_SummeVorschaubetragEUR_IT = UStVKunden_Summen_lesen_Vorschau_IT(r.Item("KundenNr"), invoiceDate, ITSchnittstelle) - curUStV_SummeVorschaubetragEUR_MSE = UStVKunden_Summen_lesen_Vorschau_MSE(r.Item("KundenNr"), invoiceDate, MSEAlteSchnittstelle, MSENeueSchnittstelle) - curUStV_SummeVorschaubetragEUR_UTA = UStVKunden_Summen_lesen_Vorschau_UTA(r.Item("KundenNr"), invoiceDate, UTAAlteSchnittstelle, UTANeueSchnittstelle) - curUStV_SummeVorschaubetragEUR_PLOSE = UStVKunden_Summen_lesen_Vorschau_PLOSE(r.Item("KundenNr"), invoiceDate, ploseAlteLogikSchnittstelle, ploseNeueLogikSchnittstelle) + curUStV_SummeVorschaubetragEUR_VERAG = UStVKunden_Summen_lesen_Vorschau_VERAG(r.Item("KundenNr"), r.Item("LandKz"), invoiceDate) + curUStV_SummeVorschaubetragEUR_IDS = UStVKunden_Summen_lesen_Vorschau_IDS(r.Item("KundenNr"), r.Item("LandKz"), invoiceDate, IDSAlteSchnittstelle, IDSNeueSchnittstelle) + curUStV_SummeVorschaubetragEUR_IT = UStVKunden_Summen_lesen_Vorschau_IT(r.Item("KundenNr"), r.Item("LandKz"), invoiceDate, ITSchnittstelle) + curUStV_SummeVorschaubetragEUR_MSE = UStVKunden_Summen_lesen_Vorschau_MSE(r.Item("KundenNr"), r.Item("LandKz"), invoiceDate, MSEAlteSchnittstelle, MSENeueSchnittstelle) + curUStV_SummeVorschaubetragEUR_UTA = UStVKunden_Summen_lesen_Vorschau_UTA(r.Item("KundenNr"), r.Item("LandKz"), invoiceDate, UTAAlteSchnittstelle, UTANeueSchnittstelle) + curUStV_SummeVorschaubetragEUR_PLOSE = UStVKunden_Summen_lesen_Vorschau_PLOSE(r.Item("KundenNr"), r.Item("LandKz"), invoiceDate, ploseAlteLogikSchnittstelle, ploseNeueLogikSchnittstelle) curUStV_SummeVorschaubetragEUR += curUStV_SummeVorschaubetragEUR_VERAG curUStV_SummeVorschaubetragEUR += curUStV_SummeVorschaubetragEUR_IDS @@ -303,7 +326,7 @@ Public Class cMDMFunctionsAllgemein End Try End Function - Shared Function UStVKunden_Summen_lesen_Vorschau_VERAG(varUStVAn_KuNr As Integer, invoiceDate As Date) As Double + Shared Function UStVKunden_Summen_lesen_Vorschau_VERAG(varUStVAn_KuNr As Integer, landKZ As String, invoiceDate As Date) As Double 'Return 0 ' Public Function UStVKunden_Summen_lesen_Vorschau_VERAG(ByRef varUStVAn_KuNr As Variant) As Currency @@ -349,7 +372,7 @@ Public Class cMDMFunctionsAllgemein End Function - Shared Function UStVKunden_Summen_lesen_Vorschau_IDS(varUStVAn_KuNr As Integer, invoiceDate As Date, calcSummeAlteSchnittstelle As Boolean, calcSummeNeueSchnittstelle As Boolean) As Double + Shared Function UStVKunden_Summen_lesen_Vorschau_IDS(varUStVAn_KuNr As Integer, landKZ As String, invoiceDate As Date, calcSummeAlteSchnittstelle As Boolean, calcSummeNeueSchnittstelle As Boolean) As Double '1300 dtmRechnungsdatum = IIf(Date > DateSerial(Year(Date), 6, 30), DateSerial(Year(Date), 1, 1), DateSerial(Year(Date) - 1, 1, 1)) '1310 strParameter = ParameterBereitstellen(varUStVAn_KuNr, dtmRechnungsdatum) @@ -375,7 +398,7 @@ Public Class cMDMFunctionsAllgemein dbo.tblSteuernummern ON dbo.tblDieselArchiv.KdNrVERAG = dbo.tblSteuernummern.AdressenNr INNER JOIN dbo.tbl_IDS_Länder ON dbo.tblSteuernummern.LandNr = dbo.tbl_IDS_Länder.LandNr AND dbo.tblDieselArchiv.[Outlet Country Code] = dbo.tbl_IDS_Länder.OutletCountryCode WHERE (dbo.tblDieselArchiv.KdNrVERAG = " & varUStVAn_KuNr & " ) AND (dbo.tblDieselArchiv.[Year Month Day] >= '" & invoiceDate.ToShortDateString & "') AND (dbo.tblDieselArchiv.UStVAn_ID IS NULL) AND - (dbo.tblSteuernummern.UStV = 1) + (dbo.tblSteuernummern.UStV = 1) " & IIf(landKZ = "SRB" OrElse landKZ = "BIH", " AND dbo.tblSteuernummern.LandKZ <> 'HU'", "") & " GROUP BY dbo.tblDieselArchiv.KdNrVERAG, dbo.tblSteuernummern.LandNr ORDER BY dbo.tblDieselArchiv.KdNrVERAG, dbo.tblSteuernummern.LandNr" @@ -397,7 +420,7 @@ Public Class cMDMFunctionsAllgemein dbo.tblSteuernummern ON [tblIDSTransactionsNew].KdNrVERAG = dbo.tblSteuernummern.AdressenNr INNER JOIN dbo.tbl_IDS_Länder ON dbo.tblSteuernummern.LandNr = dbo.tbl_IDS_Länder.LandNr AND [tblIDSTransactionsNew].[OutletCountryCode] = dbo.tbl_IDS_Länder.OutletCountryCode WHERE ([tblIDSTransactionsNew].KdNrVERAG = " & varUStVAn_KuNr & " ) AND ([tblIDSTransactionsNew].[YearMonthDay] >= '" & invoiceDate.ToShortDateString & "') AND ([tblIDSTransactionsNew].UStVAn_ID IS NULL) AND - (dbo.tblSteuernummern.UStV = 1) + (dbo.tblSteuernummern.UStV = 1) " & IIf(landKZ = "SRB" OrElse landKZ = "BIH", " AND dbo.tblSteuernummern.LandKZ <> 'HU'", "") & " GROUP BY [tblIDSTransactionsNew].KdNrVERAG, dbo.tblSteuernummern.LandNr ORDER BY [tblIDSTransactionsNew].KdNrVERAG, dbo.tblSteuernummern.LandNr" @@ -422,7 +445,7 @@ Public Class cMDMFunctionsAllgemein End Function - Shared Function UStVKunden_Summen_lesen_Vorschau_PLOSE(varUStVAn_KuNr As Integer, invoiceDate As Date, calcSummeAlteSchnittstelle As Boolean, calcSummeNeueSchnitttelle As Boolean) As Double + Shared Function UStVKunden_Summen_lesen_Vorschau_PLOSE(varUStVAn_KuNr As Integer, landKZ As String, invoiceDate As Date, calcSummeAlteSchnittstelle As Boolean, calcSummeNeueSchnitttelle As Boolean) As Double ' set plose_Archiv=1, [plose_ArchiviertDatum]=GETDATE(), UStVAn_ID = @UStVAn_ID beim Einarbeiten in USTVA @@ -436,8 +459,11 @@ Public Class cMDMFunctionsAllgemein 'plose_MWSTBetragWaehrungAbbuchung ist immer in EUR - Dim sqlPLOSE = "select plose_POLSEKundennummer, sum([plose_MWSTBetragWaehrungAbbuchung])[plose_MWSTBetragWaehrungAbbuchung] FROM [tblPLOSE_Details] INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer - WHERE plose_Archiv <> 1 AND plose_Fakturiert = 1 AND plose_LieferantCode IN (0,1,7) AND cast(plose_RechnungsDatum as date) >= '" & invoiceDate.ToShortDateString & "' and AdressenNr = " & varUStVAn_KuNr & " + Dim sqlPLOSE = "select plose_POLSEKundennummer, sum([plose_MWSTBetragWaehrungAbbuchung])[plose_MWSTBetragWaehrungAbbuchung] FROM [tblPLOSE_Details] + INNER JOIN tblPLOSE_Produktbeschreibung ON [plp_ProductCode]=[plose_ProduktCode] + INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer + INNER JOIN dbo.tblSteuernummern ON dbo.tblSteuernummern.AdressenNr = dbo.Adressen.AdressenNr and dbo.tblPLOSE_Produktbeschreibung.plp_Land = tblSteuernummern.LandKZ + WHERE dbo.tblSteuernummern.AdressenNr = " & varUStVAn_KuNr & " AND (dbo.tblSteuernummern.UStV = 1) AND plose_Archiv <> 1 AND plose_Fakturiert = 1 AND plose_LieferantCode IN (0,1,7) AND cast(plose_RechnungsDatum as date) >= '" & invoiceDate.ToShortDateString & "' and Adressen.AdressenNr = " & varUStVAn_KuNr & IIf(landKZ = "SRB" OrElse landKZ = "BIH", " AND dbo.tblSteuernummern.LandKZ <> 'HU'", "") & " group by plose_POLSEKundennummer" @@ -454,8 +480,10 @@ Public Class cMDMFunctionsAllgemein If calcSummeNeueSchnitttelle Then - Dim sqlPLOSE = "select plInv_PLOSEKundennummer, sum([plInv_MWSTBetrag])[plInv_MWSTBetrag], ISNULL([plInv_Currency],'') as plInv_Currency FROM [tblPLOSE_Inv_Data] INNER JOIN Adressen on PLOSEKundenNr=plInv_PLOSEKundennummer - WHERE plInv_Archiv <> 1 AND plInv_ArchiviertDatum is null AND cast(plInv_SupplierRechnungsDatum as date) >= '" & invoiceDate.ToShortDateString & "' and AdressenNr = " & varUStVAn_KuNr & " + Dim sqlPLOSE = "select plInv_PLOSEKundennummer, sum([plInv_MWSTBetrag])[plInv_MWSTBetrag], ISNULL([plInv_Currency],'') as plInv_Currency FROM [tblPLOSE_Inv_Data] + INNER JOIN Adressen on PLOSEKundenNr=plInv_PLOSEKundennummer + INNER JOIN dbo.tblSteuernummern ON dbo.tblSteuernummern.AdressenNr = dbo.Adressen.AdressenNr and [tblPLOSE_Inv_Data].plInv_SupplierCountry = tblSteuernummern.LandKZ + WHERE dbo.tblSteuernummern.AdressenNr = " & varUStVAn_KuNr & " AND (dbo.tblSteuernummern.UStV = 1) AND plInv_Archiv <> 1 AND plInv_ArchiviertDatum is null AND cast(plInv_SupplierRechnungsDatum as date) >= '" & invoiceDate.ToShortDateString & "' and Adressen.AdressenNr = " & varUStVAn_KuNr & IIf(landKZ = "SRB" OrElse landKZ = "BIH", " AND dbo.tblSteuernummern.LandKZ <> 'HU'", "") & " group by plInv_PLOSEKundennummer, plInv_Currency" @@ -500,7 +528,7 @@ Public Class cMDMFunctionsAllgemein End Function - Shared Function UStVKunden_Summen_lesen_Vorschau_IT(varUStVAn_KuNr As Integer, invoiceDate As Date, calcSum As Boolean) As Double + Shared Function UStVKunden_Summen_lesen_Vorschau_IT(varUStVAn_KuNr As Integer, landKZ As String, invoiceDate As Date, calcSum As Boolean) As Double ' Dim qdf As DAO.QueryDef ' Dim rst As DAO.Recordset @@ -573,7 +601,7 @@ Public Class cMDMFunctionsAllgemein End Function - Shared Function UStVKunden_Summen_lesen_Vorschau_MSE(varUStVAn_KuNr As Integer, invoiceDate As Date, calcSumalteSchnittstelle As Boolean, calcSumneueSchnittstelle As Boolean) As Double + Shared Function UStVKunden_Summen_lesen_Vorschau_MSE(varUStVAn_KuNr As Integer, landKZ As String, invoiceDate As Date, calcSumalteSchnittstelle As Boolean, calcSumneueSchnittstelle As Boolean) As Double 'Return 0 ' dtmRechnungsdatum = IIf(Date > DateSerial(Year(Of Date), 6, 30), DateSerial(Year(Of Date), 1, 1), DateSerial(Year(Of Date)() - 1, 1, 1)) '1850 strParameter = ParameterBereitstellen(varUStVAn_KuNr, dtmRechnungsdatum) @@ -605,7 +633,7 @@ Public Class cMDMFunctionsAllgemein dbo.[Länderverzeichnis für die Außenhandelsstatistik] ON dbo.tblSteuernummern.LandNr = dbo.[Länderverzeichnis für die Außenhandelsstatistik].LandNr AND dbo.tblMSETransactionsArchiv.[Transaction Country] = dbo.[Länderverzeichnis für die Außenhandelsstatistik].LandKz WHERE (dbo.tblSteuernummern.AdressenNr = " & varUStVAn_KuNr & ") AND (dbo.tblSteuernummern.UStV = 1) AND (dbo.tblMSETransactionsArchiv.[Invoice Date] >= '" & invoiceDate.ToShortDateString & "') AND - (dbo.tblMSETransactionsArchiv.[Original VAT Amount] <> 0) AND (dbo.tblMSETransactionsArchiv.UStVAn_ID IS NULL) + (dbo.tblMSETransactionsArchiv.[Original VAT Amount] <> 0) AND (dbo.tblMSETransactionsArchiv.UStVAn_ID IS NULL) " & IIf(landKZ = "SRB" OrElse landKZ = "BIH", " AND dbo.tblSteuernummern.LandKZ <> 'HU'", "") & " GROUP BY dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr, dbo.tblMSETransactionsArchiv.[Invoice Date], dbo.tblMSETransactionsArchiv.[Original Currency] ORDER BY dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr, dbo.tblMSETransactionsArchiv.[Invoice Date], dbo.tblMSETransactionsArchiv.[Original Currency] " @@ -628,8 +656,8 @@ Public Class cMDMFunctionsAllgemein left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id] left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id left join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.invoice_id = bills.invoice_number - left join dbo.tblSteuernummern on dbo.tblSteuernummern.AdressenNr = trans.partner_haulier_id - where bills.invoice_date >= '" & invoiceDate.ToShortDateString & "' and inv.archiv <> 1 and dbo.tblSteuernummern.UStV = 1 and trans.charged = 1 and cust.[partner_customer_number] = " & varUStVAn_KuNr & " + left join dbo.tblSteuernummern on dbo.tblSteuernummern.AdressenNr = trans.partner_haulier_id and dbo.tblSteuernummern.LandKZ = trans.transaction_country + where bills.invoice_date >= '" & invoiceDate.ToShortDateString & "' and inv.archiv <> 1 and dbo.tblSteuernummern.UStV = 1 and trans.charged = 1 and cust.[partner_customer_number] = " & varUStVAn_KuNr & IIf(landKZ = "SRB" OrElse landKZ = "BIH", " AND dbo.tblSteuernummern.LandKZ <> 'HU'", "") & " group by bills.invoice_date, bills.invoice_number, cust.[customer_id], bills.specification_page_name, trans.transaction_country,trans.original_currency) as temp" Dim dtMSENeut As DataTable = sql.loadDgvBySql(sqlFMZollDatenNEU, "FMZOLL") @@ -656,7 +684,7 @@ Public Class cMDMFunctionsAllgemein End Function - Shared Function UStVKunden_Summen_lesen_Vorschau_UTA(varUStVAn_KuNr As Integer, invoiceDate As Date, calcSumalteSchnittstelle As Boolean, calcSumneueSchnittstelle As Boolean) As Double + Shared Function UStVKunden_Summen_lesen_Vorschau_UTA(varUStVAn_KuNr As Integer, landKZ As String, invoiceDate As Date, calcSumalteSchnittstelle As Boolean, calcSumneueSchnittstelle As Boolean) As Double 'Return 0 ' Dim qdf As DAO.QueryDef ' Dim rst As DAO.Recordset @@ -709,7 +737,7 @@ Public Class cMDMFunctionsAllgemein dbo.[Länderverzeichnis für die Außenhandelsstatistik] ON dbo.tblSteuernummern.LandNr = dbo.[Länderverzeichnis für die Außenhandelsstatistik].LandNr AND dbo.tblUTAArchiv.Lieferland = dbo.[Länderverzeichnis für die Außenhandelsstatistik].LandKz_ISO_3 WHERE (dbo.tblSteuernummern.AdressenNr = " & varUStVAn_KuNr & ") AND (dbo.tblSteuernummern.UStV = 1) AND (dbo.tblUTAArchiv.UStVAn_ID IS NULL) AND - (dbo.tblUTAArchiv.Rechnungsdatum >= '" & invoiceDate.ToShortDateString & "') AND (dbo.tblUTAArchiv.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung <> 0) + (dbo.tblUTAArchiv.Rechnungsdatum >= '" & invoiceDate.ToShortDateString & "') AND (dbo.tblUTAArchiv.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung <> 0) " & IIf(landKZ = "SRB" OrElse landKZ = "BIH", " AND dbo.tblSteuernummern.LandKZ <> 'HU'", "") & " GROUP BY dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr ORDER BY dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr" @@ -733,7 +761,7 @@ Public Class cMDMFunctionsAllgemein dbo.[Länderverzeichnis für die Außenhandelsstatistik] ON dbo.tblSteuernummern.LandNr = dbo.[Länderverzeichnis für die Außenhandelsstatistik].LandNr AND dbo.tblUTAImportNew.Lieferland = dbo.[Länderverzeichnis für die Außenhandelsstatistik].LandKz_ISO_3 WHERE (dbo.tblSteuernummern.AdressenNr = " & varUStVAn_KuNr & ") AND (dbo.tblSteuernummern.UStV = 1) AND (dbo.tblUTAImportNew.archiv IS NULL) AND (dbo.tblUTAImportNew.charged = 1) AND - (dbo.tblUTAImportNew.Rechnungsdatum >= '" & invoiceDate.ToShortDateString & "') AND (dbo.tblUTAImportNew.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung <> 0) + (dbo.tblUTAImportNew.Rechnungsdatum >= '" & invoiceDate.ToShortDateString & "') AND (dbo.tblUTAImportNew.Gesamtbetrag_Umsatzsteuer_in_Darstellwährung <> 0) " & IIf(landKZ = "SRB" OrElse landKZ = "BIH", " AND dbo.tblSteuernummern.LandKZ <> 'HU'", "") & " GROUP BY dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr ORDER BY dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr" From 4fa46772e1aae31b4b3dc46c58c789e26e52c9dd Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 11 Apr 2025 10:37:06 +0200 Subject: [PATCH 09/10] ustva steuernummern --- SDL/USTV/usrCntlUSTV.vb | 2 +- VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 650db7b7..4e798ab8 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -983,7 +983,7 @@ Public Class usrCntlUSTV Dim qryUStVVorschau_PLOSE_NEUE_LOGIK As String = "SELECT 'PLOSE_' as LF, tblPLOSE_Inv_Data.plInv_PLOSEKundennummer AS RechnungsKundenNr, tblSteuernummern.LandNr, [Länderverzeichnis für die Außenhandelsstatistik].LandKz, year(tblPLOSE_Inv_Data.[plInv_SupplierRechnungsDatum]) AS Jahr, Month(tblPLOSE_Inv_Data.[plInv_SupplierRechnungsDatum]) AS Monat, SUM(tblPLOSE_Inv_Data.[plInv_MWSTBetrag]) AS Steuerbetrag, isnull(plInv_Currency,'') as Wahrung FROM tblPLOSE_Inv_Data INNER JOIN Adressen ON tblPLOSE_Inv_Data.plInv_PLOSEKundennummer = Adressen.PLOSEKundenNr - INNER JOIN tblSteuernummern ON Adressen.AdressenNr = tblSteuernummern.AdressenNr + INNER JOIN tblSteuernummern ON Adressen.AdressenNr = tblSteuernummern.AdressenNr and [tblPLOSE_Inv_Data].plInv_SupplierCountry = tblSteuernummern.LandKZ INNER JOIN [Länderverzeichnis für die Außenhandelsstatistik] ON tblSteuernummern.LandNr = [Länderverzeichnis für die Außenhandelsstatistik].LandNr WHERE tblPLOSE_Inv_Data.plInv_SupplierRechnungsDatum >= CASE diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb index 45ec7430..fc35912f 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb @@ -460,9 +460,9 @@ Public Class cMDMFunctionsAllgemein 'plose_MWSTBetragWaehrungAbbuchung ist immer in EUR Dim sqlPLOSE = "select plose_POLSEKundennummer, sum([plose_MWSTBetragWaehrungAbbuchung])[plose_MWSTBetragWaehrungAbbuchung] FROM [tblPLOSE_Details] - INNER JOIN tblPLOSE_Produktbeschreibung ON [plp_ProductCode]=[plose_ProduktCode] - INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer - INNER JOIN dbo.tblSteuernummern ON dbo.tblSteuernummern.AdressenNr = dbo.Adressen.AdressenNr and dbo.tblPLOSE_Produktbeschreibung.plp_Land = tblSteuernummern.LandKZ + INNER JOIN tblPLOSE_Produktbeschreibung ON [plp_ProductCode]=[plose_ProduktCode] + INNER JOIN Adressen ON tblPLOSE_Details.plose_POLSEKundennummer = Adressen.PLOSEKundenNr + INNER JOIN tblSteuernummern ON Adressen.AdressenNr = tblSteuernummern.AdressenNr AND tblSteuernummern.LandKZ = tblPLOSE_Produktbeschreibung.plp_Land WHERE dbo.tblSteuernummern.AdressenNr = " & varUStVAn_KuNr & " AND (dbo.tblSteuernummern.UStV = 1) AND plose_Archiv <> 1 AND plose_Fakturiert = 1 AND plose_LieferantCode IN (0,1,7) AND cast(plose_RechnungsDatum as date) >= '" & invoiceDate.ToShortDateString & "' and Adressen.AdressenNr = " & varUStVAn_KuNr & IIf(landKZ = "SRB" OrElse landKZ = "BIH", " AND dbo.tblSteuernummern.LandKZ <> 'HU'", "") & " group by plose_POLSEKundennummer" From 329621d2d83894d3ec322f8da27f3f23798d7621 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 11 Apr 2025 12:13:42 +0200 Subject: [PATCH 10/10] ustva VZ --- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 64 +++++++++++++++++++++++++- SDL/USTV/frmMDM_USTVAntrag.vb | 36 ++++++++++++++- 2 files changed, 97 insertions(+), 3 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index abc560e1..de62ac85 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -48,6 +48,7 @@ Partial Class frmMDM_USTVAntrag Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblLand = New System.Windows.Forms.Label() Me.Panel8 = New System.Windows.Forms.Panel() + Me.btnAbfertigungsNrVergeben = New System.Windows.Forms.Button() Me.Label14 = New System.Windows.Forms.Label() Me.txtEingereichtAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblMWSTAntrag = New System.Windows.Forms.Label() @@ -116,6 +117,8 @@ Partial Class frmMDM_USTVAntrag Me.Button3 = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.Label15 = New System.Windows.Forms.Label() + Me.txtVZam = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnlBottom.SuspendLayout() CType(Me.picExcel, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit() @@ -456,6 +459,9 @@ Partial Class frmMDM_USTVAntrag ' Me.Panel8.BackColor = System.Drawing.Color.WhiteSmoke Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel8.Controls.Add(Me.Label15) + Me.Panel8.Controls.Add(Me.txtVZam) + Me.Panel8.Controls.Add(Me.btnAbfertigungsNrVergeben) Me.Panel8.Controls.Add(Me.Label14) Me.Panel8.Controls.Add(Me.txtEingereichtAm) Me.Panel8.Controls.Add(Me.lblMWSTAntrag) @@ -485,6 +491,19 @@ Partial Class frmMDM_USTVAntrag Me.Panel8.Size = New System.Drawing.Size(973, 87) Me.Panel8.TabIndex = 19 ' + 'btnAbfertigungsNrVergeben + ' + Me.btnAbfertigungsNrVergeben.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAbfertigungsNrVergeben.ForeColor = System.Drawing.Color.Black + Me.btnAbfertigungsNrVergeben.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnAbfertigungsNrVergeben.Location = New System.Drawing.Point(654, 31) + Me.btnAbfertigungsNrVergeben.Name = "btnAbfertigungsNrVergeben" + Me.btnAbfertigungsNrVergeben.Size = New System.Drawing.Size(146, 27) + Me.btnAbfertigungsNrVergeben.TabIndex = 50 + Me.btnAbfertigungsNrVergeben.Text = "AbfertigungsNr vergeben" + Me.btnAbfertigungsNrVergeben.UseVisualStyleBackColor = True + Me.btnAbfertigungsNrVergeben.Visible = False + ' 'Label14 ' Me.Label14.AutoSize = True @@ -618,7 +637,7 @@ Partial Class frmMDM_USTVAntrag Me.Label9.Cursor = System.Windows.Forms.Cursors.Hand Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label9.ForeColor = System.Drawing.Color.Black - Me.Label9.Location = New System.Drawing.Point(815, 37) + Me.Label9.Location = New System.Drawing.Point(826, 35) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(30, 17) Me.Label9.TabIndex = 19 @@ -671,7 +690,7 @@ Partial Class frmMDM_USTVAntrag Me.txtAbfNr.MaxLines_Warning = "" Me.txtAbfNr.MaxLines_Warning_Label = Nothing Me.txtAbfNr.Name = "txtAbfNr" - Me.txtAbfNr.Size = New System.Drawing.Size(146, 23) + Me.txtAbfNr.Size = New System.Drawing.Size(117, 23) Me.txtAbfNr.TabIndex = 18 ' 'Label8 @@ -1465,6 +1484,44 @@ Partial Class frmMDM_USTVAntrag Me.ContextMenuStrip2.Name = "ContextMenuStrip1" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' + 'Label15 + ' + Me.Label15.AutoSize = True + Me.Label15.BackColor = System.Drawing.Color.Transparent + Me.Label15.Cursor = System.Windows.Forms.Cursors.Hand + Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label15.ForeColor = System.Drawing.Color.Black + Me.Label15.Location = New System.Drawing.Point(800, 64) + Me.Label15.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(53, 17) + Me.Label15.TabIndex = 51 + Me.Label15.Text = "VZ am:" + ' + 'txtVZam + ' + Me.txtVZam._DateTimeOnly = False + Me.txtVZam._numbersOnly = True + Me.txtVZam._numbersOnlyKommastellen = "" + Me.txtVZam._numbersOnlyTrennzeichen = False + Me.txtVZam._Prozent = False + Me.txtVZam._ShortDateNew = True + Me.txtVZam._ShortDateOnly = True + Me.txtVZam._TimeOnly = False + Me.txtVZam._TimeOnly_Seconds = False + Me.txtVZam._value = "" + Me.txtVZam._Waehrung = False + Me.txtVZam._WaehrungZeichen = False + Me.txtVZam.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.txtVZam.ForeColor = System.Drawing.Color.Black + Me.txtVZam.Location = New System.Drawing.Point(865, 60) + Me.txtVZam.MaxLength = 10 + Me.txtVZam.MaxLineLength = -1 + Me.txtVZam.MaxLines_Warning = "" + Me.txtVZam.MaxLines_Warning_Label = Nothing + Me.txtVZam.Name = "txtVZam" + Me.txtVZam.Size = New System.Drawing.Size(100, 23) + Me.txtVZam.TabIndex = 52 + ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1599,4 +1656,7 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents picExcel As PictureBox Friend WithEvents txtSumme As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label27 As Label + Friend WithEvents btnAbfertigungsNrVergeben As Button + Friend WithEvents Label15 As Label + Friend WithEvents txtVZam As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 1e953ed5..ca8e6480 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -296,6 +296,7 @@ Public Class frmMDM_USTVAntrag txt3470.Text = If(USTV_ANTRAG.UStVAn_3470, "") txtVZ.Text = If(USTV_ANTRAG.UStVAn_VZBetrag, "") + txtVZam.Text = If(USTV_ANTRAG.UStVAn_VZDatum, "") txtBezugsNr.Text = If(USTV_ANTRAG.UStVAn_BezugsNr, "") txtAbfNr.Text = If(USTV_ANTRAG.AbfertigungsNr, "") txtEingereichtAm.Text = If(USTV_ANTRAG.UStVAn_AntragEingereichtAm, "") @@ -318,6 +319,7 @@ Public Class frmMDM_USTVAntrag USTV_ANTRAG.UStVAn_AntragArt = cboAntragArt._value USTV_ANTRAG.UStVAn_StatusText = rtbStatusText.Text + USTV_ANTRAG.FilialenNr = cbxFiliale._value USTV_ANTRAG.FilialenNr = cbxFiliale._value If txt3470.Text <> "" AndAlso IsNumeric(txt3470.Text) Then @@ -332,6 +334,13 @@ Public Class frmMDM_USTVAntrag USTV_ANTRAG.UStVAn_VZBetrag = Nothing End If + If txtVZam.Text <> "" AndAlso IsDate(txtVZam.Text) Then + USTV_ANTRAG.UStVAn_VZDatum = CDate(txtVZ.Text) + Else + USTV_ANTRAG.UStVAn_VZDatum = Nothing + End If + + USTV_ANTRAG.UStVAn_BezugsNr = txtBezugsNr.Text USTV_ANTRAG.AbfertigungsNr = txtAbfNr.Text @@ -523,6 +532,8 @@ Public Class frmMDM_USTVAntrag setinfofields() + If VERAG_PROG_ALLGEMEIN.cAllgemein.AUTO_ABF_NR Then btnAbfertigungsNrVergeben.Visible = True + End Sub @@ -1370,6 +1381,9 @@ Public Class frmMDM_USTVAntrag End Sub Private Sub frmMDM_USTVAntrag_Shown(sender As Object, e As EventArgs) Handles Me.Shown + + If IsNumeric(txtAbfNr.Text) AndAlso CInt(txtAbfNr.Text) > 0 Then btnAbfertigungsNrVergeben.Visible = False + Me.Top = 0 Me.Height = Screen.FromRectangle(Me.Bounds).WorkingArea.Size.Height End Sub @@ -1534,7 +1548,7 @@ Public Class frmMDM_USTVAntrag End If - UstCntlUSTV_AntragPosition1.Enabled = False + UstCntlUSTV_AntragPosition1.Enabled = False End If End Sub @@ -2446,6 +2460,26 @@ Public Class frmMDM_USTVAntrag End Sub + Private Sub txtAbfNr_TextChanged(sender As Object, e As EventArgs) Handles txtAbfNr.TextChanged + + If IsNumeric(txtAbfNr.Text) AndAlso CInt(txtAbfNr.Text) > 10000 AndAlso USTV_ANTRAG.AbfertigungsNr <> txtAbfNr.Text AndAlso Not btnAbfertigungsNrVergeben.Visible Then + Dim spedBuch As New cSpeditionsbuch(USTV_ANTRAG.FilialenNr, USTV_ANTRAG.AbfertigungsNr, 0) + If spedBuch.hasEntry Then MsgBox("Es existiert bereits ein Speditionsbucheintrag mit dieser Nr!") : Exit Sub + End If + + End Sub + + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles btnAbfertigungsNrVergeben.Click + + If Not IsNumeric(cbxFiliale._value) OrElse CInt(cbxFiliale._value) <= 0 Then + MsgBox("Bitte Filiale auswählen!") : Exit Sub + End If + txtAbfNr.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.getMaxPosNrIncrement(cbxFiliale._value, Now.Year) + cbxFiliale.Enabled = False + btnAbfertigungsNrVergeben.Visible = False + + End Sub + Private Sub calcSumme() Dim countSumme As Double = 0