diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index f88fcbc1..79b7160b 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/Speditionsbuch/frmProvisionisverguetung.Designer.vb b/SDL/Speditionsbuch/frmProvisionisverguetung.Designer.vb index c095d8ab..22e267a1 100644 --- a/SDL/Speditionsbuch/frmProvisionisverguetung.Designer.vb +++ b/SDL/Speditionsbuch/frmProvisionisverguetung.Designer.vb @@ -31,10 +31,11 @@ Partial Class frmProvisionisverguetung Me.Label23 = New System.Windows.Forms.Label() Me.Label13 = New System.Windows.Forms.Label() Me.lblAbfertigungsdatum = New System.Windows.Forms.Label() - Me.Button9 = New System.Windows.Forms.Button() + Me.btnPDF = New System.Windows.Forms.Button() Me.txtAbfertDat = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtAbfertDatBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.btnMail = New System.Windows.Forms.Button() CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -77,19 +78,19 @@ Partial Class frmProvisionisverguetung Me.lblAbfertigungsdatum.TabIndex = 20 Me.lblAbfertigungsdatum.Text = "Rechnungsdatum" ' - 'Button9 + 'btnPDF ' - Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button9.Image = Global.SDL.My.Resources.Resources.statistik_small - Me.Button9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button9.Location = New System.Drawing.Point(13, 534) - Me.Button9.Margin = New System.Windows.Forms.Padding(0) - Me.Button9.Name = "Button9" - Me.Button9.Size = New System.Drawing.Size(106, 41) - Me.Button9.TabIndex = 35 - Me.Button9.Text = "Auswertung" - Me.Button9.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button9.UseVisualStyleBackColor = True + Me.btnPDF.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnPDF.Image = Global.SDL.My.Resources.Resources.statistik_small + Me.btnPDF.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnPDF.Location = New System.Drawing.Point(13, 534) + Me.btnPDF.Margin = New System.Windows.Forms.Padding(0) + Me.btnPDF.Name = "btnPDF" + Me.btnPDF.Size = New System.Drawing.Size(106, 41) + Me.btnPDF.TabIndex = 35 + Me.btnPDF.Text = "Auswertung" + Me.btnPDF.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnPDF.UseVisualStyleBackColor = True ' 'txtAbfertDat ' @@ -180,13 +181,27 @@ Partial Class frmProvisionisverguetung Me.MyDatagridview1.Size = New System.Drawing.Size(1013, 474) Me.MyDatagridview1.TabIndex = 0 ' + 'btnMail + ' + Me.btnMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnMail.Image = Global.SDL.My.Resources.Resources.email_big1 + Me.btnMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnMail.Location = New System.Drawing.Point(135, 534) + Me.btnMail.Margin = New System.Windows.Forms.Padding(0) + Me.btnMail.Name = "btnMail" + Me.btnMail.Size = New System.Drawing.Size(61, 41) + Me.btnMail.TabIndex = 36 + Me.btnMail.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnMail.UseVisualStyleBackColor = True + ' 'frmProvisionisverguetung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White Me.ClientSize = New System.Drawing.Size(1038, 584) - Me.Controls.Add(Me.Button9) + Me.Controls.Add(Me.btnMail) + Me.Controls.Add(Me.btnPDF) Me.Controls.Add(Me.lblAbfertigungsdatum) Me.Controls.Add(Me.txtAbfertDat) Me.Controls.Add(Me.txtAbfertDatBis) @@ -211,5 +226,6 @@ Partial Class frmProvisionisverguetung Friend WithEvents Label23 As Label Friend WithEvents Label13 As Label Friend WithEvents lblAbfertigungsdatum As Label - Friend WithEvents Button9 As Button + Friend WithEvents btnPDF As Button + Friend WithEvents btnMail As Button End Class diff --git a/SDL/Speditionsbuch/frmProvisionisverguetung.vb b/SDL/Speditionsbuch/frmProvisionisverguetung.vb index 35c6a913..b7de5417 100644 --- a/SDL/Speditionsbuch/frmProvisionisverguetung.vb +++ b/SDL/Speditionsbuch/frmProvisionisverguetung.vb @@ -1,6 +1,9 @@ -Imports com.sun.xml.internal.rngom +Imports System.IO +Imports com.sun.xml.internal.rngom +Imports DocumentFormat.OpenXml.Vml Imports javax.print.attribute.standard -Imports Org.BouncyCastle.Math +Imports Microsoft.Office.Interop +Imports org.BouncyCastle.Math Imports VERAG_PROG_ALLGEMEIN Public Class frmProvisionisverguetung @@ -57,6 +60,7 @@ Public Class frmProvisionisverguetung ", "FMZOLL") .LOAD() .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells + .Columns("GS_An").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("Firma_ID").Visible = False .Columns("RechnungsNrListe").Visible = False @@ -72,17 +76,18 @@ Public Class frmProvisionisverguetung initDGV() End Sub - Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click + Private Sub Button9_Click(sender As Object, e As EventArgs) Handles btnPDF.Click, btnMail.Click Try Me.Cursor = Cursors.WaitCursor If MyDatagridview1.SelectedRows.Count = 0 Then MsgBox("Bitte zuerst einen oder mehrere Einträge auswählen!") Exit Sub End If + Dim gsAnKdNr As Integer = -1 Dim PDF_LIST As New List(Of String) For Each row In MyDatagridview1.SelectedRows Dim adrNr = row.Cells("AdressenNr").Value - Dim gsAnKdNr = row.Cells("GS_AnKdNr").Value + gsAnKdNr = row.Cells("GS_AnKdNr").Value Dim provProz = row.Cells("ProvProz").Value Dim Firma_ID = row.Cells("Firma_ID").Value @@ -90,24 +95,35 @@ Public Class frmProvisionisverguetung If row.Cells("RechnungsNrListe").Value = "" Then Exit Sub Dim RechnungsNrListe = row.Cells("RechnungsNrListe").Value.ToString - ' In eine Liste von Integer umwandeln Dim RG_LIST As List(Of Integer) = RechnungsNrListe.Split(","c).Where(Function(s) Not String.IsNullOrWhiteSpace(s)).Select(Function(s) Convert.ToInt32(s)).ToList() If RG_LIST.Count > 0 Then ' Provisionsabrechnung erstellen Dim pathPDF_SammelBericht = "" 'DATENVERVER_OPTIONS.getTMPPath("\Provisionsabrechnung_" & Now.ToString("yyyyMMdd_HHmmss") & ".pdf", ".pdf") cFakturierung.doSAMMELRechnungDruck_Rechnungsdruck_Sammelrechnungsbericht(-1, Now, 4, pathPDF_SammelBericht, "", "PROVISIONSABRECHNUNG", Nothing, Nothing, RG_LIST, Firma_ID) - MsgBox(pathPDF_SammelBericht) + If pathPDF_SammelBericht <> "" Then PDF_LIST.Add(pathPDF_SammelBericht) End If Next + If PDF_LIST.Count = 1 Then - Process.Start(PDF_LIST(0)) + Select Case sender.name + Case "btnPDF" + Process.Start(PDF_LIST(0)) + Case Else + createMail(PDF_LIST(0), MyDatagridview1, gsAnKdNr) + End Select + ElseIf PDF_LIST.Count > 1 Then Dim merge_pathPDF_SammelBericht = DATENVERVER_OPTIONS.getTMPPath("\Provisionsabrechnung_Merge_" & Now.ToString("yyyyMMdd_HHmmss") & ".pdf", ".pdf",, False) If FormularManagerNEU.MergePdfFiles(PDF_LIST, merge_pathPDF_SammelBericht) Then - Process.Start(merge_pathPDF_SammelBericht) - End If + Select Case sender.name + Case "btnPDF" + Process.Start(merge_pathPDF_SammelBericht) + Case Else + createMail(merge_pathPDF_SammelBericht, MyDatagridview1, gsAnKdNr) + End Select + End If End If Catch ex As Exception @@ -115,4 +131,82 @@ Public Class frmProvisionisverguetung End Try Me.Cursor = Cursors.Default End Sub + + + Private Sub createMail(path As String, dgv As DataGridView, kdNr As Integer) + + Dim outl As New Outlook.Application + Dim Mail As Microsoft.Office.Interop.Outlook.MailItem + Dim ad As New cAdressen(kdNr) + Try + + Mail = outl.CreateItem(0) + + + Dim fileInfo As New FileInfo(path) + If path <> "" Then + Mail.Attachments.Add(path, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue,, "PROVISIONSABRECHNUNG" & fileInfo.Extension) + End If + + + Dim mailText As String = "Sehr geehrte Damen und Herren," & vbNewLine & vbNewLine & "anbei die PROVISIONSABRECHNUNG von " & txtAbfertDat._value & " bis " & txtAbfertDatBis._value & "." & vbNewLine & vbNewLine & vbNewLine + + mailText &= "" + mailText &= "" + + Dim sumProv As Double = 0 + Dim sumUmsatz As Double = 0 + Dim anzahl As Integer = 0 + + For Each row As DataGridViewRow In dgv.SelectedRows + + mailText &= "" + mailText &= "" + mailText &= "" + mailText &= "" + mailText &= "" + mailText &= "" + + sumProv += CDbl(row.Cells("Provision").Value) + sumUmsatz += CDbl(row.Cells("Umsatz").Value) + anzahl += CInt(row.Cells("Anzahl").Value) + + Next + + mailText &= "" + mailText &= "" + mailText &= "" + mailText &= "" + mailText &= "" + mailText &= "" + + mailText &= "
Anzahl RechnungenUmsatzProvision
" & row.Cells("Anzahl").Value & "" & CDbl(row.Cells("Umsatz").Value) & "" & CDbl(row.Cells("Provision").Value) & "
SUMME" & anzahl & "" & sumUmsatz & " " & sumProv & "
" & vbNewLine & vbNewLine & vbNewLine + + + Dim TextHTML = "" + If mailText <> "" Then + TextHTML = "
" & mailText.Replace(ControlChars.Lf, "
") & cFakturierung.getSignature(ad.LandKz, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA_ID,,,,,, ) & "
" + Mail.HTMLBody = TextHTML + End If + + Mail.To = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdress(ad.AdressenNr, "Rechnung an") + Mail.CC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressCC(ad.AdressenNr, "Rechnung an") + Mail.BCC = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getMailAdressBCC(ad.AdressenNr, "Rechnung an") + + If Mail.To = "" Then + Mail.To &= IIf(ad.E_Mail IsNot Nothing, ad.E_Mail, "") + End If + + Mail.Display() + Me.Cursor = Cursors.Default + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + Me.Cursor = Cursors.Default + End Try + + + + End Sub + End Class \ No newline at end of file diff --git a/SDL/USTV/frmUSTVoffeneAntraege.vb b/SDL/USTV/frmUSTVoffeneAntraege.vb index 3bd381fc..da9a85dd 100644 --- a/SDL/USTV/frmUSTVoffeneAntraege.vb +++ b/SDL/USTV/frmUSTVoffeneAntraege.vb @@ -1,6 +1,5 @@ Imports System.Windows.Documents Imports com.sun.org.apache.bcel.internal.generic -Imports java.awt.geom Imports MDM_Worker Imports VERAG_PROG_ALLGEMEIN diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb index 83be6b75..31327f8a 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb @@ -5,25 +5,19 @@ Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlATLAS_AnkunftsAnzeige Property ALLG As usrCntlATLAS_AnkunftsAnzeige - 'Property FilialeNr As Integer - ' Property AbfertigungsNr As Integer - - ' Property BezugsNr As String = "" - ' Property AvisoId As Integer - 'Property SENDUNGS_ID As Integer Property AVISO As VERAG_PROG_ALLGEMEIN.cAviso Property SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen Dim sentToDakosy = False Dim GesamtsicherheitREF As cGesamtsicherheitsReferenz Dim Standort As String = "" - + Dim gsnr As Integer = -1 Property FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Sub New(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, FIRMA_DY As String, GesamtsicherheitREF As cGesamtsicherheitsReferenz, Standort As String) + Sub New(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, FIRMA_DY As String, GesamtsicherheitREF As cGesamtsicherheitsReferenz, Standort As String, gsnr As Integer) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -33,6 +27,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige Me.GesamtsicherheitREF = GesamtsicherheitREF Me.Standort = Standort + Me.gsnr = gsnr @@ -114,16 +109,30 @@ Public Class usrCntlATLAS_AnkunftsAnzeige Dim FIRMA_DY = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA FIRMA_DY = DAKOSY_Worker.cDakosyFunftions.getFirma_DY(SENDUNG.FilialenNr, Me.FindForm) + If txtDyMandant.Text = "VERG" And FIRMA_DY = "IMEX" Then 'IMEX verwendet VERAG-Gestellungskonto!!! + FIRMA_DY = "VERAG" + End If + Dim saveFile = "" + Dim BezugsNrBez As String = "" - If generateEingangsanzeigeNCTSDE_003(AVISO, SENDUNG, lblBezugsnummer.Text, saveFile, cboDakosyAction._value, FIRMA_DY, cboStammreferenz._value) Then + If lblBezugsnummer.Text.Length > 23 Then + BezugsNrBez = lblBezugsnummer.Text.Substring(0, 23) 'Z. Zt. begrenzt auf 22 Stellen, weil Aufnahme in ATLAS beschränkt! + Else + BezugsNrBez = lblBezugsnummer.Text + End If + + + If generateEingangsanzeigeNCTSDE_003(AVISO, SENDUNG, BezugsNrBez, lblBezugsnummer.Text, saveFile, cboDakosyAction._value, FIRMA_DY, cboStammreferenz._value) Then If saveFile <> "" Then - If cDakosyFunftions.send_Data_To_Dakosy_FTP(saveFile, lblBezugsnummer.Text, dy_Id, FIRMA_DY) Then - 'DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_03) + + '------------------------------------------------------- + + If cDakosyFunftions.send_Data_To_Dakosy_FTP(saveFile, BezugsNrBez, dy_Id, FIRMA_DY) Then If SENDUNG IsNot Nothing Then SENDUNG.SET_VGMA() ' MA Vorgeschrieben in Sendung setzen. MsgBox("Gesendet!") - createGesamtsicherheitDummy(GesamtsicherheitREF, Standort, txtWarenort.Text) + createGesamtsicherheitDummy(GesamtsicherheitREF, Standort, txtWarenort.Text, gsnr) Else 'DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_09) MsgBox("Sendefehler!") @@ -132,12 +141,12 @@ Public Class usrCntlATLAS_AnkunftsAnzeige End If End If - ' DY_ANM.UPDATE_DATA() + ' DY_ANM.UPDATE_DATA() - 'Beim Senden soll die Sendung überhnommen + tblSnd_VG_MA gesetzt werden --> damit gleich gesehen wird, dass der Akt in Bearbeitung ist. - ' DY_ANM.UPDATE_AVISO_SND(DY_ANM.dy_SendungsId) + 'Beim Senden soll die Sendung überhnommen + tblSnd_VG_MA gesetzt werden --> damit gleich gesehen wird, dass der Akt in Bearbeitung ist. + ' DY_ANM.UPDATE_AVISO_SND(DY_ANM.dy_SendungsId) - Me.FindForm.Close() + Me.FindForm.Close() End If Me.Cursor = Cursors.Default End Sub @@ -145,7 +154,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige - Shared Function generateEingangsanzeigeNCTSDE_003(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SND As VERAG_PROG_ALLGEMEIN.cSendungen, ByVal Bezugsnummer As String, ByRef saveFile As String, DY_ACTION As String, FIRMA_DY As String, Optional BezugsnummerVorblendung As String = "") As Boolean + Shared Function generateEingangsanzeigeNCTSDE_003(AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SND As VERAG_PROG_ALLGEMEIN.cSendungen, ByVal Bezugsnummer As String, ByVal BezugsnummerALIAS As String, ByRef saveFile As String, DY_ACTION As String, FIRMA_DY As String, Optional BezugsnummerVorblendung As String = "") As Boolean Dim Interface_VERSION = "003" Dim ObjectAktion = DY_ACTION ' Dim BezugsnummerVorblendung = "AA_NCTS_DE_ZE_WO_MITTICH" @@ -168,7 +177,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige XML.EinzelEingangsanzeige.ObjektIdentifizierung = New EingangsanzeigeNCTSDE_003.ObjektIdentifizierungEATyp XML.EinzelEingangsanzeige.ObjektIdentifizierung.ObjektName = Bezugsnummer - If Bezugsnummer IsNot Nothing Then XML.EinzelEingangsanzeige.ObjektIdentifizierung.ObjektAliasname = Bezugsnummer + If BezugsnummerALIAS IsNot Nothing Then XML.EinzelEingangsanzeige.ObjektIdentifizierung.ObjektAliasname = BezugsnummerALIAS Dim ObjektAktion As New List(Of String) : ObjektAktion.Add(ObjectAktion) XML.EinzelEingangsanzeige.ObjektIdentifizierung.ObjektAktion = ObjektAktion If If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DAKOSY_SB, "") <> "" Then XML.EinzelEingangsanzeige.ObjektIdentifizierung.Bearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_DAKOSY_SB @@ -199,13 +208,15 @@ Public Class usrCntlATLAS_AnkunftsAnzeige Return True End Function - Private Function createGesamtsicherheitDummy(GesSichRef, Standort, Warenort) + Private Function createGesamtsicherheitDummy(GesSichRef, Standort, Warenort, gsnr) Try Dim SQL As New SQL - Dim OPEN_DUMMY As New cSicherheiten() + + Dim OPEN_DUMMY As New cSicherheiten() + Dim attachPosNrToExistingATB = False Dim firmaId As Integer = -1 Dim LKW_ID As String = "" @@ -225,11 +236,10 @@ Public Class usrCntlATLAS_AnkunftsAnzeige End Select With OPEN_DUMMY - .gs_gsNr = SQL.getValueTxtBySql("select MAX([gs_gsNr]) + 1 as MaxGesSich from tblGesamtsicherheit", "AVISO") .gs_ATBNr = txtMRN._value - .gs_posNr = 0 'mit 0 angeben, da ansonten durch DAKOSY überschrieben + 'mit 0 angeben, da ansonten durch DAKOSY überschrieben .gs_MRNNr = "" - .gs_posSubNr = 0 + .gs_posSubNr = Nothing .gs_datum = Today() .gs_warenwert = SENDUNG.tblSnd_Warenwert .gs_sicherheitsbetrag = Math.Round(SENDUNG.tblSnd_Warenwert * (GesSichRef.gsr_zollsatz / 100), 2) @@ -247,13 +257,27 @@ Public Class usrCntlATLAS_AnkunftsAnzeige .gs_systemuser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME .gs_warenort = Warenort .gs_LKWKZ = AVISO.LKW_Nr + .gs_dakoyimport = True + If gsnr > 0 Then + .gs_gsNr = gsnr + .gs_posNr = getLatestPosNr(gsnr, txtMRN._value) + attachPosNrToExistingATB = True + Else + .gs_gsNr = SQL.getValueTxtBySql("select MAX([gs_gsNr]) + 1 as MaxGesSich from tblGesamtsicherheit", "AVISO") + .gs_posNr = 0 + End If End With Dim indexGsId = OPEN_DUMMY.SAVEOBJECT() - Dim CLOSED_DUMMY = New cGesamtsicherheitsPositionen(indexGsId, 1) + Dim CLOSED_DUMMY As cGesamtsicherheitsPositionen + If attachPosNrToExistingATB Then + CLOSED_DUMMY = New cGesamtsicherheitsPositionen(indexGsId, OPEN_DUMMY.gs_posNr) + Else + CLOSED_DUMMY = New cGesamtsicherheitsPositionen(indexGsId, 1) + End If With CLOSED_DUMMY @@ -285,6 +309,22 @@ Public Class usrCntlATLAS_AnkunftsAnzeige End Function + Private Function getLatestPosNr(gs_gsnr As Integer, gs_ATBNr As String) As Integer + Dim posNr As Integer = 0 + Dim sqlq As String = "Select MAX([gs_posNr]) As MaxPosNr from [tblGesamtsicherheit] where gs_gsnr = " & gs_gsnr & " And gs_ATBNR = '" & gs_ATBNr & "'" + Dim dt As New DataTable + dt = (New SQL).loadDgvBySql(sqlq, "AVISO", 100, True) + + If (dt.Rows(0).Item(0) IsNot DBNull.Value) Then + + posNr = dt.Rows(0).Item(0) + + End If + + Return posNr + + End Function + Private Sub MyCheckbox1_CheckedChanged(sender As Object, e As EventArgs) Handles MyCheckbox1.CheckedChanged Button1.Enabled = Not MyCheckbox1.Checked diff --git a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb index 214740f1..e0c95c1e 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/frmZollanmeldung.vb @@ -22,6 +22,7 @@ Public Class frmZollanmeldung Dim GesamtsicherheitREF As cGesamtsicherheitsReferenz = Nothing Dim Standort As String = "" + Dim gsnr As Integer = -1 @@ -77,7 +78,7 @@ Public Class frmZollanmeldung End Sub - Sub New(ART As String, DY As DAKOSY_Worker.cDakosy_Zollanmeldungen, AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, JAHR As Integer, GesamtsicherheitREF As cGesamtsicherheitsReferenz, Standort As String, Optional ZOLL_SYSTEM As String = "DAKOSY") ', Optional ZA = Nothing) + Sub New(ART As String, DY As DAKOSY_Worker.cDakosy_Zollanmeldungen, AVISO As VERAG_PROG_ALLGEMEIN.cAviso, SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen, JAHR As Integer, GesamtsicherheitREF As cGesamtsicherheitsReferenz, Standort As String, Optional gsnr As Integer = -1, Optional ZOLL_SYSTEM As String = "DAKOSY") ', Optional ZA = Nothing) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -92,6 +93,7 @@ Public Class frmZollanmeldung Me.GesamtsicherheitREF = GesamtsicherheitREF Me.Standort = Standort + Me.gsnr = gsnr If SENDUNG IsNot Nothing Then Me.FilialenNr = SENDUNG.FilialenNr @@ -248,7 +250,7 @@ Public Class frmZollanmeldung End If Case "AA" 'AnkunftsAnzeige - Dim usrcntl As New usrCntlATLAS_AnkunftsAnzeige(AVISO, SENDUNG, FIRMA_DY, GesamtsicherheitRef, Standort) + Dim usrcntl As New usrCntlATLAS_AnkunftsAnzeige(AVISO, SENDUNG, FIRMA_DY, GesamtsicherheitREF, Standort, gsnr) usrcntl.Dock = DockStyle.Fill Me.pnl.Controls.Add(usrcntl) Me.Text = "AnkunftsAnzeige - Verwahrung" diff --git a/SDL/buchhaltung/usrCntlBH.vb b/SDL/buchhaltung/usrCntlBH.vb index dc3e2169..c59e6e10 100644 --- a/SDL/buchhaltung/usrCntlBH.vb +++ b/SDL/buchhaltung/usrCntlBH.vb @@ -857,7 +857,7 @@ Public Class usrCntlBH DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + 0 ), op_debitor.d_rechnung), op_debitor.d_zahlung) as ÜberschreitungInTagen, op_debitor.eur_zahlung AS Zahlungsbetrag, isnull(kde_zinssatz," & zinssatz.ToString.Replace(",", ".") & ") AS Zinssatz_Kunde, - case when DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + " & toleranztage & " ), op_debitor.d_rechnung), op_debitor.d_zahlung) > 0 then + case when DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + ISNULL(tblKundenErweitert.kde_abwToleranzTage," & toleranztage & ") ), op_debitor.d_rechnung), op_debitor.d_zahlung) > 0 then Round(op_debitor.eur_bruttobetrag * isnull(kde_zinssatz,9.5) / 100 * DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) ), op_debitor.d_rechnung), op_debitor.d_zahlung) / 360,2) @@ -865,10 +865,11 @@ Public Class usrCntlBH cast(0 as bit) as abgerechnet, op_debitor.eur_bruttobetrag AS Bruttobetrag, + ISNULL(tblKundenErweitert.kde_abwToleranzTage," & toleranztage & ") as TolInTagen, ISNULL(op_debitor.c_zahlziel, '0/0/20') AS ZZ_in_OP, ISNULL(fibu_konto.c_zahlziel, '0/0/20') AS ZZ_in_Debitor, ISNULL(dbo.fibu_zahlziel.si_ntage,20) as ZZinTage, - DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + " & toleranztage & "), op_debitor.d_rechnung) as ReZielZahlungsdatum + DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + ISNULL(tblKundenErweitert.kde_abwToleranzTage," & toleranztage & ")), op_debitor.d_rechnung) as ReZielZahlungsdatum FROM op_debitor INNER JOIN fibu_konto ON (op_debitor.i_personenkonto = fibu_konto.i_konto) @@ -882,7 +883,7 @@ Public Class usrCntlBH AND (op_debitor.eur_bruttobetrag + op_debitor.eur_zahlung >= (-1)) AND op_debitor.i_personenkonto >= @KundeVon AND op_debitor.i_personenkonto <= @KundeBis AND op_debitor.d_zahlung >= @ZahlungVon AND op_debitor.d_zahlung <= @ZahlungBis - AND DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + " & toleranztage & "), op_debitor.d_rechnung), op_debitor.d_zahlung) > 0 + AND DATEDIFF(DAY, DATEADD(DAY, (isnull(dbo.fibu_zahlziel.si_ntage,0) + ISNULL(tblKundenErweitert.kde_abwToleranzTage," & toleranztage & ")), op_debitor.d_rechnung), op_debitor.d_zahlung) > 0 AND Left(op_debitor.c_bemerkung,2) <> 'AR' AND Left(op_debitor.c_bemerkung,2) <> 'DA' AND Left(op_debitor.c_bemerkung,2) <> 'AU' AND Left(op_debitor.c_bemerkung,2) <> 'RE' AND Left(op_debitor.c_bemerkung,2) <> 'VI' AND Left(op_debitor.c_bemerkung,2) <> 'Ha' AND op_debitor.c_bemerkung not like '%nicht verzinsen%' @@ -1374,7 +1375,7 @@ Public Class usrCntlBH If txtUID_Monat.Text = "" OrElse txtUID_Monat.Text <> "" AndAlso IsNumeric(txtUID_Monat.Text) AndAlso CInt(txtUID_Monat.Text) > 0 AndAlso CInt(txtUID_Monat.Text) < 13 Then - Dim SQL_UID As String = "SELECT [uid_KundenNr] as KdNr , Adressen.[Name 1],[uid_UstIdKz] as UstIdKz,[uid_UstIdNr] as UstIdnr, case when [uid_valid] = 1 then 'GUELTIG' else 'UNGUELTIG' end as Ergebnis, cast([uid_Datum] as date) as Pruefdatum,Convert(varchar(8), [uid_Datum], 108) As Pruefzeit, [tblUIDPruefung].[firma] as Firma, cast(Adressen.UstIdGeprüft as date) as [letzte Prüfung], uid_pruefungstool as Quelle, uid_Sachbearbeiter as Sachbearbeiter, Filialen.FilialenNr + Dim SQL_UID As String = "SELECT [uid_KundenNr] as KdNr , Adressen.[Name 1],[uid_UstIdKz] as UstIdKz,[uid_UstIdNr] as UstIdnr, case when [uid_valid] = 1 then 'GUELTIG' else 'UNGUELTIG' end as Ergebnis, cast([uid_Datum] as date) as Pruefdatum,Convert(varchar(8), [uid_Datum], 108) As Pruefzeit, [tblUIDPruefung].[firma] as Firma, cast(Adressen.UstIdGeprüft as date) as [letzte Prüfung], uid_pruefungstool as Quelle, uid_Sachbearbeiter as Sachbearbeiter, Filialen.FilialenNr, isnull(uid_typ,'UID') as Typ FROM [VERAG].[dbo].[tblUIDPruefung] inner join Adressen on Adressen.AdressenNr = [uid_KundenNr] inner Join kunden On KundenNr=AdressenNr inner join Filialen On Filialen.FilialenNr=Kunden.FilialenNr where YEAR(uid_Datum) = " & txtUID_Jahr.Text & IIf(txtUID_Monat.Text <> "", " AND MONTH(uid_Datum) = " & txtUID_Monat.Text, "") & IIf(cbxFirmaUID._value <> "", " And Filialen.Firma = '" & cbxFirmaUID._value & "'", "") & IIf(cbx_nur_ungueltige.Checked, " AND [uid_valid] = 0 ", "") & " ORDER BY Filialen.FilialenNr " diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb index dea679ce..02dd391b 100644 --- a/SDL/kunden/frmKundenblatt.Designer.vb +++ b/SDL/kunden/frmKundenblatt.Designer.vb @@ -130,8 +130,8 @@ Partial Class frmKundenblatt Me.PictureBox6 = New System.Windows.Forms.PictureBox() Me.Button5 = New System.Windows.Forms.Button() Me.Panel5 = New System.Windows.Forms.Panel() + Me.Label22 = New System.Windows.Forms.Label() Me.btnBestelldateiErzeugen = New System.Windows.Forms.Button() - Me.Button7 = New System.Windows.Forms.Button() Me.Label35 = New System.Windows.Forms.Label() Me.flpSDLDok = New System.Windows.Forms.FlowLayoutPanel() Me.scanErstbestellung = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() @@ -211,6 +211,8 @@ Partial Class frmKundenblatt Me.tbUSTVAntrage = New System.Windows.Forms.TabPage() Me.UsrCntlUSTV = New SDL.usrCntlUSTV() Me.tbFIBU = New System.Windows.Forms.TabPage() + Me.txtZinsbelastungTolInTagen = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label23 = New System.Windows.Forms.Label() Me.txtZinsbelastungNew = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.btn_FIBU_speichern = New System.Windows.Forms.Button() Me.lblZNB_verrechnet = New System.Windows.Forms.Label() @@ -260,6 +262,7 @@ Partial Class frmKundenblatt Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem() Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem() Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem() + Me.cm_goboxen = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.pnlInfo.SuspendLayout() Me.tbFirmendaten.SuspendLayout() Me.Panel4.SuspendLayout() @@ -1570,8 +1573,8 @@ Partial Class frmKundenblatt ' 'Panel5 ' + Me.Panel5.Controls.Add(Me.Label22) Me.Panel5.Controls.Add(Me.btnBestelldateiErzeugen) - Me.Panel5.Controls.Add(Me.Button7) Me.Panel5.Controls.Add(Me.Label35) Me.Panel5.Controls.Add(Me.flpSDLDok) Me.Panel5.Controls.Add(Me.Label34) @@ -1592,26 +1595,26 @@ Partial Class frmKundenblatt Me.Panel5.Size = New System.Drawing.Size(1661, 143) Me.Panel5.TabIndex = 177 ' + 'Label22 + ' + Me.Label22.AutoSize = True + Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label22.Location = New System.Drawing.Point(1166, 0) + Me.Label22.Name = "Label22" + Me.Label22.Size = New System.Drawing.Size(62, 13) + Me.Label22.TabIndex = 180 + Me.Label22.Text = "Go Boxen" + ' 'btnBestelldateiErzeugen ' - Me.btnBestelldateiErzeugen.Location = New System.Drawing.Point(1169, 46) + Me.btnBestelldateiErzeugen.Location = New System.Drawing.Point(1169, 23) Me.btnBestelldateiErzeugen.Name = "btnBestelldateiErzeugen" - Me.btnBestelldateiErzeugen.Size = New System.Drawing.Size(155, 32) + Me.btnBestelldateiErzeugen.Size = New System.Drawing.Size(97, 32) Me.btnBestelldateiErzeugen.TabIndex = 179 - Me.btnBestelldateiErzeugen.Text = "Bestelldaten erzeugen" + Me.btnBestelldateiErzeugen.Text = "Bestelldaten" Me.btnBestelldateiErzeugen.UseVisualStyleBackColor = True Me.btnBestelldateiErzeugen.Visible = False ' - 'Button7 - ' - Me.Button7.Location = New System.Drawing.Point(1169, 20) - Me.Button7.Name = "Button7" - Me.Button7.Size = New System.Drawing.Size(101, 20) - Me.Button7.TabIndex = 177 - Me.Button7.Text = "GO BOX" - Me.Button7.UseVisualStyleBackColor = True - Me.Button7.Visible = False - ' 'Label35 ' Me.Label35.AutoSize = True @@ -2003,7 +2006,7 @@ Partial Class frmKundenblatt Me.tbLKW.Location = New System.Drawing.Point(4, 22) Me.tbLKW.Name = "tbLKW" Me.tbLKW.Padding = New System.Windows.Forms.Padding(3) - Me.tbLKW.Size = New System.Drawing.Size(1667, 964) + Me.tbLKW.Size = New System.Drawing.Size(178, 39) Me.tbLKW.TabIndex = 4 Me.tbLKW.Text = "LKWs" Me.tbLKW.UseVisualStyleBackColor = True @@ -2015,7 +2018,7 @@ Partial Class frmKundenblatt Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3) Me.pnlLKWRight.Name = "pnlLKWRight" Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) - Me.pnlLKWRight.Size = New System.Drawing.Size(1355, 958) + Me.pnlLKWRight.Size = New System.Drawing.Size(0, 33) Me.pnlLKWRight.TabIndex = 2 ' 'UsrCntlLKW1 @@ -2028,7 +2031,7 @@ Partial Class frmKundenblatt Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000) Me.UsrCntlLKW1.Name = "UsrCntlLKW1" - Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 958) + Me.UsrCntlLKW1.Size = New System.Drawing.Size(0, 33) Me.UsrCntlLKW1.TabIndex = 0 ' 'pnlLKW @@ -2039,7 +2042,7 @@ Partial Class frmKundenblatt Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left Me.pnlLKW.Location = New System.Drawing.Point(3, 3) Me.pnlLKW.Name = "pnlLKW" - Me.pnlLKW.Size = New System.Drawing.Size(306, 958) + Me.pnlLKW.Size = New System.Drawing.Size(306, 33) Me.pnlLKW.TabIndex = 3 ' 'dgvLKW @@ -2080,7 +2083,7 @@ Partial Class frmKundenblatt Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle28 Me.dgvLKW.RowHeadersVisible = False Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvLKW.Size = New System.Drawing.Size(306, 784) + Me.dgvLKW.Size = New System.Drawing.Size(306, 0) Me.dgvLKW.TabIndex = 2 ' 'pnlLKWBottom @@ -2092,7 +2095,7 @@ Partial Class frmKundenblatt Me.pnlLKWBottom.Controls.Add(Me.Button13) Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse) Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 846) + Me.pnlLKWBottom.Location = New System.Drawing.Point(0, -79) Me.pnlLKWBottom.Name = "pnlLKWBottom" Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112) Me.pnlLKWBottom.TabIndex = 3 @@ -2665,6 +2668,8 @@ Partial Class frmKundenblatt ' 'tbFIBU ' + Me.tbFIBU.Controls.Add(Me.txtZinsbelastungTolInTagen) + Me.tbFIBU.Controls.Add(Me.Label23) Me.tbFIBU.Controls.Add(Me.txtZinsbelastungNew) Me.tbFIBU.Controls.Add(Me.btn_FIBU_speichern) Me.tbFIBU.Controls.Add(Me.lblZNB_verrechnet) @@ -2685,6 +2690,40 @@ Partial Class frmKundenblatt Me.tbFIBU.Text = "FIBU" Me.tbFIBU.UseVisualStyleBackColor = True ' + 'txtZinsbelastungTolInTagen + ' + Me.txtZinsbelastungTolInTagen._DateTimeOnly = False + Me.txtZinsbelastungTolInTagen._numbersOnly = True + Me.txtZinsbelastungTolInTagen._numbersOnlyKommastellen = "0" + Me.txtZinsbelastungTolInTagen._numbersOnlyTrennzeichen = False + Me.txtZinsbelastungTolInTagen._Prozent = False + Me.txtZinsbelastungTolInTagen._ShortDateNew = False + Me.txtZinsbelastungTolInTagen._ShortDateOnly = False + Me.txtZinsbelastungTolInTagen._TimeOnly = False + Me.txtZinsbelastungTolInTagen._TimeOnly_Seconds = False + Me.txtZinsbelastungTolInTagen._value = "" + Me.txtZinsbelastungTolInTagen._Waehrung = False + Me.txtZinsbelastungTolInTagen._WaehrungZeichen = False + Me.txtZinsbelastungTolInTagen.ForeColor = System.Drawing.Color.Black + Me.txtZinsbelastungTolInTagen.Location = New System.Drawing.Point(848, 41) + Me.txtZinsbelastungTolInTagen.MaxLength = 6 + Me.txtZinsbelastungTolInTagen.MaxLineLength = -1 + Me.txtZinsbelastungTolInTagen.MaxLines_Warning = "" + Me.txtZinsbelastungTolInTagen.MaxLines_Warning_Label = Nothing + Me.txtZinsbelastungTolInTagen.Name = "txtZinsbelastungTolInTagen" + Me.txtZinsbelastungTolInTagen.Size = New System.Drawing.Size(39, 20) + Me.txtZinsbelastungTolInTagen.TabIndex = 32 + ' + 'Label23 + ' + Me.Label23.AutoSize = True + Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label23.Location = New System.Drawing.Point(685, 44) + Me.Label23.Name = "Label23" + Me.Label23.Size = New System.Drawing.Size(160, 13) + Me.Label23.TabIndex = 31 + Me.Label23.Text = "abweichende Toleranz in Tagen" + ' 'txtZinsbelastungNew ' Me.txtZinsbelastungNew._DateTimeOnly = False @@ -3261,6 +3300,11 @@ Partial Class frmKundenblatt Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22) Me.tbiVERAGCard.Text = "VERAG Card" ' + 'cm_goboxen + ' + Me.cm_goboxen.Name = "cm_goboxen" + Me.cm_goboxen.Size = New System.Drawing.Size(61, 4) + ' 'frmKundenblatt ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3514,7 +3558,6 @@ Partial Class frmKundenblatt Friend WithEvents Label11 As Label Friend WithEvents cboFirmaFMZOLL As VERAG_PROG_ALLGEMEIN.MyComboBox 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 @@ -3569,4 +3612,8 @@ Partial Class frmKundenblatt Friend WithEvents txtKundeninfo As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents btnRgMail As Button Friend WithEvents Button8 As Button + Friend WithEvents Label22 As Label + Friend WithEvents cm_goboxen As ContextMenuStrip + Friend WithEvents txtZinsbelastungTolInTagen As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label23 As Label End Class diff --git a/SDL/kunden/frmKundenblatt.resx b/SDL/kunden/frmKundenblatt.resx index 40b6bc2f..f828dfc1 100644 --- a/SDL/kunden/frmKundenblatt.resx +++ b/SDL/kunden/frmKundenblatt.resx @@ -135,6 +135,9 @@ 564, 17 + + 808, 17 + diff --git a/SDL/kunden/frmKundenblatt.vb b/SDL/kunden/frmKundenblatt.vb index 9cf321a3..82456ca0 100644 --- a/SDL/kunden/frmKundenblatt.vb +++ b/SDL/kunden/frmKundenblatt.vb @@ -474,6 +474,7 @@ Public Class frmKundenblatt rtbGespreachsbericht.Text = checkNullStr(KUNDE.Gesprächsbericht) txtFIBUKuerzel.Text = checkNullStr(KUNDE_ERW.kde_BezFIBU) txtZinsbelastungNew.Text = checkNullStr(KUNDE_ERW.kde_zinssatz) + txtZinsbelastungTolInTagen.Text = checkNullStr(KUNDE_ERW.kde_abwToleranzTage) initZNB() @@ -1509,7 +1510,6 @@ Public Class frmKundenblatt ' scanJaraVertretung.Visible = False scanErstbestellung.Visible = False scanMWSTAgreement.Visible = False - Button7.Visible = False btnBestelldateiErzeugen.Visible = False If dgvSDLLeistungenFull.SelectedRows.Count > 0 Then @@ -1524,7 +1524,7 @@ Public Class frmKundenblatt Select Case tmpSDLNr Case 100 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.IDSKundenNr 'IDS - Case 200 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.ATKundenNr : Button7.Visible = True : btnBestelldateiErzeugen.Visible = True + Case 200 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.ATKundenNr : btnBestelldateiErzeugen.Visible = True Case 212 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.UTAKundenNr 'UTA Case 101 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.WölflKundenNr 'WÖLFL Case 202 : txtPartnerKdNr.Text = PartnerKdNrFromFMZOLL.TELEPASS_Kd_Nr 'TELEPASS @@ -2259,9 +2259,8 @@ Public Class frmKundenblatt End If End Sub - Private Sub Button7_Click_1(sender As Object, e As EventArgs) Handles Button7.Click - Dim f As New frmGoMautBoxen_Bestellung(KUNDE, ADRESSE, KUNDE_ERW) - f.ShowDialog() + Private Sub Button7_Click_1(sender As Object, e As EventArgs) + End Sub Sub initDGVUmsatz() @@ -2712,6 +2711,89 @@ Public Class frmKundenblatt Private Sub btnBestelldateiErzeugen_Click(sender As Object, e As EventArgs) Handles btnBestelldateiErzeugen.Click + + If Not cm_goboxen.Items.ContainsKey("create") Then + Dim create = New ToolStripMenuItem() With {.Text = "Anlage", .Name = "create", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)} + cm_goboxen.Items.Add(create) + AddHandler create.Click, AddressOf mnuItem_Clicked + End If + + + If Not cm_goboxen.Items.ContainsKey("show") Then + Dim show = New ToolStripMenuItem() With {.Text = "Ansicht", .Name = "show", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)} + AddHandler show.Click, AddressOf mnuItem_Clicked + cm_goboxen.Items.Add(show) + End If + + If Not cm_goboxen.Items.ContainsKey("send") Then + Dim send = New ToolStripMenuItem() With {.Text = "Senden", .Name = "send", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)} + AddHandler send.Click, AddressOf mnuItem_Clicked + cm_goboxen.Items.Add(send) + End If + + cm_goboxen.Show(Cursor.Position) + + + End Sub + + Private Sub mnuItem_Clicked(sender As Object, e As EventArgs) + cm_goboxen.Hide() + Dim item As ToolStripMenuItem = TryCast(sender, ToolStripMenuItem) + + If item IsNot Nothing Then + If item.Name = "create" Then + Dim f As New frmGoMautBoxen_Bestellung(KUNDE, ADRESSE, KUNDE_ERW) + f.ShowDialog() + ElseIf item.Name = "show" Then + GoBoxBestelldaten_show() + ElseIf item.Name = "send" Then + GOBoxBestellung_erzeugen() + Else + MsgBox("Funktion nicht implementiert!") + End If + + End If + + End Sub + + Private Sub GoBoxBestelldaten_show() + + Try + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim frm As New Form + Dim dgv As New DataGridView() + Dim dt As DataTable = SQL.loadDgvBySql("SELECT gb_adressNr as Adresse, gb_CardNum as KartenNr, gb_CardValidMonth as [gültig bis_Monat] , gb_CardValidYear as [gültig bis_Jahr] , gb_licensePlate as Kennzeichen, gb_licensePlateNat as Land, gb_Axles as Achsen FROM [tblGOBOXBestellungen] WHERE gb_bestelldatum Is Null AND gb_bestellNr Is Null + ", "FMZOLL") + + + If dt.Rows.Count = 0 Then MsgBox("Keine nicht abgeschickten Bestellungen vorhanden!") : Exit Sub + + dgv.DataSource = dt + + + If dgv IsNot Nothing Then + frm.Size = New Size(500, 500) + dgv.Size = New Size(frm.Size.Width - 50, frm.Size.Height - 50) + dgv.Dock = DockStyle.Fill + dgv.Anchor = AnchorStyles.Left + dgv.Anchor = AnchorStyles.Top + dgv.ReadOnly = True + frm.Controls.Add(dgv) + frm.StartPosition = FormStartPosition.CenterScreen + frm.ShowDialog() + End If + + + Catch ex As System.Exception + + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + End Sub + + Private Sub GOBoxBestellung_erzeugen() + Dim dateBestelldatum As Date = Date.Now Dim intBestellnummer As Integer Dim lngBestellanzahl As Long @@ -2772,13 +2854,13 @@ Public Class frmKundenblatt End If Else - intBestellnummer = 1 + intBestellnummer = 1 End If - ' 6️ Datensätze aktualisieren - Dim ID_bestellungen As String = "" + ' 6️ Datensätze aktualisieren + Dim ID_bestellungen As String = "" If dtBestellungen.Columns.Contains("gb_ID") Then Dim dtNew As DataTable = dtBestellungen.Rows.Cast(Of DataRow)().Where(Function(row) Not row.ItemArray.All(Function(field) field Is DBNull.Value Or field.Equals(""))).CopyToDataTable() If dtNew.Rows.Count > 0 Then @@ -2844,7 +2926,7 @@ Public Class frmKundenblatt If SDLVerw = "" Then - Dim lfdNr As Integer = CInt(SQL.getValueTxtBySql("SELECT Max(History) As Historywert, COUNT(*) AS Anzahl FROM SDL WHERE (KundenNr = " & row("gb_adressNr") & ") AND (SDLNr = 200)", "SDL")) + Dim lfdNr As Integer = CInt(SQL.getValueTxtBySql("SELECT isnull(Max(History),1) As Historywert, COUNT(*) AS Anzahl FROM SDL WHERE (KundenNr = " & row("gb_adressNr") & ") AND (SDLNr = 200)", "SDL")) Dim SDL_DS As New cSDL(row("gb_adressNr"), row("gb_licensePlate"), 200) @@ -2907,130 +2989,15 @@ Public Class frmKundenblatt Me.Cursor = Cursors.Default - '----------------------------------------------------------------------------- - - ' Public Function fktSDL_GO_BOX_Bestellvorgang(ByRef rst1 As DAO.Recordset) - '2240 On Error GoTo Fehler - - ' Dim cnnSDL As ADODB.Connection - ' Dim rstKunden As ADODB.Recordset - ' Dim rstKundenSDL As ADODB.Recordset - ' Dim rstLKW As ADODB.Recordset - ' Dim rstSDL As ADODB.Recordset - ' Dim rstSDLLog As ADODB.Recordset - - ' Dim strSQL As String - ' Dim strKfzKennzeichen As String - - ' ' Eingabeprüfung. - '2250 If IsNull(rst1!AdressenNr) Then Exit Function - '2260 If IsNull(rst1![License plate]) Then Exit Function Else strKfzKennzeichen = fktSDL_Convert(rst1![License plate]) - - ' ' Verbindung zur SDL Datenbank auf dem SQL Server herstellen. - '2270 Set cnnSDL = New ADODB.Connection - '2280 If fktSDL_cnnSDL_Open(cnnSDL) = False Then GoTo Ende - - ' ' Kunden lesen. - '2290 strSQL = "SELECT KundenNr FROM vwKunden WHERE (KundenNr = " & rst1!AdressenNr & ")" - '2300 Set rstKunden = New ADODB.Recordset - '2310 rstKunden.Open strSQL, cnnSDL, adOpenForwardOnly, adLockReadOnly, adCmdText - '2320 If Not rstKunden.EOF Then - - ' ' KundenSDL Verwaltung. - '2330 strSQL = "SELECT * FROM vwKundenSDL WHERE (KundenNr = " & rst1!AdressenNr & ") AND (SDLNr = 200)" - '2340 Set rstKundenSDL = New ADODB.Recordset - '2350 With rstKundenSDL - '2360 .Open strSQL, cnnSDL, adOpenStatic, adLockOptimistic, adCmdText - '2370 If .EOF Then - '2380 .AddNew - '2390 !KundenNr = rst1!AdressenNr - '2400 !SDLNr = 200 - '2410 !Erfassungsdatum = Now - '2420 !Sachbearbeiter = CurrentUser() - '2430 .Update - '2440 End If - '2450 .Close - '2460 End With - - ' ' LKW Verwaltung. - '2470 strSQL = "SELECT * FROM vwLKW WHERE (KundenNr = " & rst1!AdressenNr & ") AND (KfzKennzeichen = '" & strKfzKennzeichen & "')" - '2480 Set rstLKW = New ADODB.Recordset - '2490 With rstLKW - '2500 .Open strSQL, cnnSDL, adOpenStatic, adLockOptimistic, adCmdText - '2510 If .EOF Then - '2520 .AddNew - '2530 !KundenNr = rst1!AdressenNr - '2540 !KfzKennzeichen = strKfzKennzeichen - '2550 !Nationalität = rst1![License plate Nationality] - '2560 !Erfassungsdatum = Now - '2570 !Sachbearbeiter = CurrentUser() - '2580 .Update - '2590 End If - '2600 .Close - '2610 End With - - ' ' SDL Verwaltung. - '2620 strSQL = "SELECT *" & _ - ' " FROM vwSDL" & _ - ' " WHERE (KundenNr = " & rst1!AdressenNr & ") AND (KfzKennzeichen = '" & strKfzKennzeichen & "') And (SDLNr = 200)" - '2630 Set rstSDL = New ADODB.Recordset - '2640 With rstSDL - '2650 .Open strSQL, cnnSDL, adOpenStatic, adLockOptimistic, adCmdText - '2660 If .EOF Then - '2670 .AddNew - '2680 !KundenNr = rst1!AdressenNr - '2690 !KfzKennzeichen = strKfzKennzeichen - '2700 !SDLNr = 200 - '2710 !LfdNr = fktSDL_LiefereHistorywert(!KundenNr, !SDLNr) - '2720 !BestellNr = rst1!Bestellnummer - '2730 !Bestelldatum = rst1!Bestelldatum - '2740 !KartenNr = rst1!CardNum - '2750 !Kategorie = rst1!Axles - '2760 !Erfassungsdatum = Now - '2770 !Sachbearbeiter = CurrentUser() - '2780 .Update - ' ' SDLLog Verwaltung. - '2790 Set rstSDLLog = New ADODB.Recordset - '2800 rstSDLLog.Open "SDLLog", cnnSDL, adOpenStatic, adLockOptimistic, adCmdTable - '2810 rstSDLLog.AddNew - '2820 rstSDLLog!KundenNr = !KundenNr - '2830 rstSDLLog!KfzKennzeichen = !KfzKennzeichen - '2840 rstSDLLog!SDLNr = !SDLNr - '2850 rstSDLLog!History = !LfdNr - '2860 rstSDLLog!BestellNr = !BestellNr - '2870 rstSDLLog!Bestelldatum = !Bestelldatum - '2880 rstSDLLog!KartenNr = !KartenNr - '2890 rstSDLLog!Kategorie = !Kategorie - '2900 rstSDLLog!Erfassungsdatum = !Erfassungsdatum - '2910 rstSDLLog!Sachbearbeiter = !Sachbearbeiter - '2920 rstSDLLog!RIUD = "I" - '2930 rstSDLLog!Name = CurrentUser() - '2940 rstSDLLog!Zeitstempel = Now - '2950 rstSDLLog.Update - '2960 rstSDLLog.Close - '2970 End If - '2980 .Close - '2990 End With - - '3000 End If - '3010 rstKunden.Close - - - '10 strSQL = "SELECT Max(LfdNr) As Historywert, COUNT(*) AS Anzahl" & _ - ' " FROM vwSDL" & _ - ' " WHERE (KundenNr = " & lngKundenNr & ")" & _ - ' " AND (SDLNr = " & lngSDLNr & ")" - - - - Catch ex As Exception - MessageBox.Show("Fehler beim Erzeugen der Bestelldatei: " & ex.Message, "Fehler", MessageBoxButtons.OK, MessageBoxIcon.Error) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try + End Sub Private Sub btn_FIBU_speichern_Click(sender As Object, e As EventArgs) Handles btn_FIBU_speichern.Click KUNDE_ERW.kde_BezFIBU = checkNullStr(txtFIBUKuerzel.Text) + KUNDE_ERW.kde_abwToleranzTage = checkNullStr(txtZinsbelastungTolInTagen.Text) If Not String.IsNullOrWhiteSpace(txtZinsbelastungNew.Text) Then Dim zinssatzText As String = txtZinsbelastungNew.Text.Replace(",", ".") diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index 4b87a510..f2029ad9 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -105,7 +105,14 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbFiskal = New System.Windows.Forms.TabPage() Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten() Me.tbVerrechnung = New System.Windows.Forms.TabPage() - Me.txtAbf_Vorlageprovision_Mindestbetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.pnlKundenUIDveranlagt = New System.Windows.Forms.Panel() + Me.Label122 = New System.Windows.Forms.Label() + Me.Button5 = New System.Windows.Forms.Button() + Me.Button6 = New System.Windows.Forms.Button() + Me.btnAddKundeUID = New System.Windows.Forms.Button() + Me.cboUSt_UstIdNrLand2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtUSt_UstIdNr2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.dgvKundenUID = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Label117 = New System.Windows.Forms.Label() Me.Panel2 = New System.Windows.Forms.Panel() Me.Label115 = New System.Windows.Forms.Label() @@ -126,7 +133,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.rbQ = New System.Windows.Forms.RadioButton() Me.txtVorauszahlung = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cbxVorauszahlung = New System.Windows.Forms.CheckBox() - Me.cbxKapitalWaehrung = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label103 = New System.Windows.Forms.Label() Me.Label101 = New System.Windows.Forms.Label() Me.cbxSndDatenAusSTB = New System.Windows.Forms.CheckBox() @@ -156,6 +162,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label49 = New System.Windows.Forms.Label() Me.Label48 = New System.Windows.Forms.Label() Me.Label39 = New System.Windows.Forms.Label() + Me.txtAbf_Vorlageprovision_Mindestbetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxKapitalWaehrung = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtKapital = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtAbwZZVL = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cboRechnungSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox() @@ -178,8 +186,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbVersicherung = New System.Windows.Forms.TabPage() Me.Label121 = New System.Windows.Forms.Label() Me.Label120 = New System.Windows.Forms.Label() - Me.txtSEG_vom = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtSEG_Summe = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.cbxBlanko = New System.Windows.Forms.CheckBox() Me.Label105 = New System.Windows.Forms.Label() Me.Label106 = New System.Windows.Forms.Label() @@ -212,6 +218,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label54 = New System.Windows.Forms.Label() Me.Label52 = New System.Windows.Forms.Label() Me.Label51 = New System.Windows.Forms.Label() + Me.txtSEG_vom = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtSEG_Summe = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtWechselErhaltenAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtWechselGueltigBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtWechsel = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -263,7 +271,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbUmsatzsteuer = New System.Windows.Forms.TabPage() Me.btnMWSTspeichern = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.dgvMWST = New System.Windows.Forms.DataGridView() - Me.txtUStIDGeprueftAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUStID = New System.Windows.Forms.TextBox() Me.Button3 = New System.Windows.Forms.Button() Me.Label85 = New System.Windows.Forms.Label() @@ -276,6 +283,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label89 = New System.Windows.Forms.Label() Me.Label87 = New System.Windows.Forms.Label() Me.Label86 = New System.Windows.Forms.Label() + Me.txtUStIDGeprueftAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.btnUStVAendSpeichern = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.txtUSt_GVAusgestelltAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUSt_GVAngefordertAm = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -298,7 +306,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.cbxCS_Added = New System.Windows.Forms.CheckBox() Me.Label113 = New System.Windows.Forms.Label() Me.Label112 = New System.Windows.Forms.Label() - Me.txtSumVerag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtSonst_KdNrVerag = New System.Windows.Forms.TextBox() Me.Label110 = New System.Windows.Forms.Label() Me.Label109 = New System.Windows.Forms.Label() @@ -325,6 +332,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtSonst_KdNrIDS = New System.Windows.Forms.TextBox() Me.Label70 = New System.Windows.Forms.Label() Me.Label71 = New System.Windows.Forms.Label() + Me.txtSumVerag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtSumPLOSE = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtSumUTA = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtSumMSE = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -448,6 +456,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.GroupBox6.SuspendLayout() Me.tbFiskal.SuspendLayout() Me.tbVerrechnung.SuspendLayout() + Me.pnlKundenUIDveranlagt.SuspendLayout() + CType(Me.dgvKundenUID, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel2.SuspendLayout() Me.pnlverag360.SuspendLayout() Me.gbMWSTAntraege.SuspendLayout() @@ -1166,12 +1176,11 @@ Partial Class usrcntlKundeBearbeitenFull ' 'tbVerrechnung ' - Me.tbVerrechnung.Controls.Add(Me.txtAbf_Vorlageprovision_Mindestbetrag) + Me.tbVerrechnung.Controls.Add(Me.pnlKundenUIDveranlagt) Me.tbVerrechnung.Controls.Add(Me.Label117) Me.tbVerrechnung.Controls.Add(Me.Panel2) Me.tbVerrechnung.Controls.Add(Me.cbpKopfsammelrechnung) Me.tbVerrechnung.Controls.Add(Me.pnlverag360) - Me.tbVerrechnung.Controls.Add(Me.cbxKapitalWaehrung) Me.tbVerrechnung.Controls.Add(Me.Label103) Me.tbVerrechnung.Controls.Add(Me.Label101) Me.tbVerrechnung.Controls.Add(Me.cbxSndDatenAusSTB) @@ -1201,6 +1210,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbVerrechnung.Controls.Add(Me.Label49) Me.tbVerrechnung.Controls.Add(Me.Label48) Me.tbVerrechnung.Controls.Add(Me.Label39) + Me.tbVerrechnung.Controls.Add(Me.txtAbf_Vorlageprovision_Mindestbetrag) + Me.tbVerrechnung.Controls.Add(Me.cbxKapitalWaehrung) Me.tbVerrechnung.Controls.Add(Me.txtKapital) Me.tbVerrechnung.Controls.Add(Me.txtAbwZZVL) Me.tbVerrechnung.Controls.Add(Me.cboRechnungSprache) @@ -1227,30 +1238,123 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbVerrechnung.Text = "Verrechnung" Me.tbVerrechnung.UseVisualStyleBackColor = True ' - 'txtAbf_Vorlageprovision_Mindestbetrag + 'pnlKundenUIDveranlagt ' - Me.txtAbf_Vorlageprovision_Mindestbetrag._DateTimeOnly = False - Me.txtAbf_Vorlageprovision_Mindestbetrag._numbersOnly = False - Me.txtAbf_Vorlageprovision_Mindestbetrag._numbersOnlyKommastellen = "" - Me.txtAbf_Vorlageprovision_Mindestbetrag._numbersOnlyTrennzeichen = True - Me.txtAbf_Vorlageprovision_Mindestbetrag._Prozent = False - Me.txtAbf_Vorlageprovision_Mindestbetrag._ShortDateNew = False - Me.txtAbf_Vorlageprovision_Mindestbetrag._ShortDateOnly = False - Me.txtAbf_Vorlageprovision_Mindestbetrag._TimeOnly = False - Me.txtAbf_Vorlageprovision_Mindestbetrag._TimeOnly_Seconds = False - Me.txtAbf_Vorlageprovision_Mindestbetrag._value = "" - Me.txtAbf_Vorlageprovision_Mindestbetrag._Waehrung = True - Me.txtAbf_Vorlageprovision_Mindestbetrag._WaehrungZeichen = True - Me.txtAbf_Vorlageprovision_Mindestbetrag.ForeColor = System.Drawing.Color.Red - Me.txtAbf_Vorlageprovision_Mindestbetrag.Location = New System.Drawing.Point(222, 90) - Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLength = 50 - Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLineLength = -1 - Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLines_Warning = "" - Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLines_Warning_Label = Nothing - Me.txtAbf_Vorlageprovision_Mindestbetrag.Name = "txtAbf_Vorlageprovision_Mindestbetrag" - Me.txtAbf_Vorlageprovision_Mindestbetrag.Size = New System.Drawing.Size(43, 20) - Me.txtAbf_Vorlageprovision_Mindestbetrag.TabIndex = 53 - Me.txtAbf_Vorlageprovision_Mindestbetrag.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + Me.pnlKundenUIDveranlagt.BackColor = System.Drawing.Color.WhiteSmoke + Me.pnlKundenUIDveranlagt.Controls.Add(Me.Label122) + Me.pnlKundenUIDveranlagt.Controls.Add(Me.Button5) + Me.pnlKundenUIDveranlagt.Controls.Add(Me.Button6) + Me.pnlKundenUIDveranlagt.Controls.Add(Me.btnAddKundeUID) + Me.pnlKundenUIDveranlagt.Controls.Add(Me.cboUSt_UstIdNrLand2) + Me.pnlKundenUIDveranlagt.Controls.Add(Me.txtUSt_UstIdNr2) + Me.pnlKundenUIDveranlagt.Controls.Add(Me.dgvKundenUID) + Me.pnlKundenUIDveranlagt.Location = New System.Drawing.Point(425, 285) + Me.pnlKundenUIDveranlagt.Name = "pnlKundenUIDveranlagt" + Me.pnlKundenUIDveranlagt.Size = New System.Drawing.Size(246, 207) + Me.pnlKundenUIDveranlagt.TabIndex = 52 + ' + 'Label122 + ' + Me.Label122.AutoSize = True + Me.Label122.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label122.Location = New System.Drawing.Point(7, 6) + Me.Label122.Name = "Label122" + Me.Label122.Size = New System.Drawing.Size(86, 13) + Me.Label122.TabIndex = 54 + Me.Label122.Text = "UID veranlagt" + ' + 'Button5 + ' + Me.Button5.BackgroundImage = Global.SDL.My.Resources.Resources.list + Me.Button5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button5.FlatAppearance.BorderSize = 0 + Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button5.Location = New System.Drawing.Point(213, 155) + Me.Button5.Name = "Button5" + Me.Button5.Size = New System.Drawing.Size(25, 20) + Me.Button5.TabIndex = 140 + Me.Button5.UseVisualStyleBackColor = True + ' + 'Button6 + ' + Me.Button6.BackgroundImage = Global.SDL.My.Resources.Resources.fragezeichen + Me.Button6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button6.FlatAppearance.BorderSize = 0 + Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button6.Location = New System.Drawing.Point(182, 155) + Me.Button6.Name = "Button6" + Me.Button6.Size = New System.Drawing.Size(25, 20) + Me.Button6.TabIndex = 139 + Me.Button6.UseVisualStyleBackColor = True + ' + 'btnAddKundeUID + ' + Me.btnAddKundeUID.BackgroundImage = Global.SDL.My.Resources.Resources.plus + Me.btnAddKundeUID.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.btnAddKundeUID.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnAddKundeUID.Location = New System.Drawing.Point(194, 178) + Me.btnAddKundeUID.Name = "btnAddKundeUID" + Me.btnAddKundeUID.Size = New System.Drawing.Size(44, 21) + Me.btnAddKundeUID.TabIndex = 139 + Me.btnAddKundeUID.UseVisualStyleBackColor = True + Me.btnAddKundeUID.Visible = False + ' + 'cboUSt_UstIdNrLand2 + ' + Me.cboUSt_UstIdNrLand2._allowedValuesFreiText = Nothing + Me.cboUSt_UstIdNrLand2._allowFreiText = False + Me.cboUSt_UstIdNrLand2._value = "" + Me.cboUSt_UstIdNrLand2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboUSt_UstIdNrLand2.DropDownWidth = 150 + Me.cboUSt_UstIdNrLand2.FlatStyle = System.Windows.Forms.FlatStyle.System + Me.cboUSt_UstIdNrLand2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboUSt_UstIdNrLand2.FormattingEnabled = True + Me.cboUSt_UstIdNrLand2.Location = New System.Drawing.Point(6, 178) + Me.cboUSt_UstIdNrLand2.Name = "cboUSt_UstIdNrLand2" + Me.cboUSt_UstIdNrLand2.Size = New System.Drawing.Size(43, 21) + Me.cboUSt_UstIdNrLand2.TabIndex = 139 + ' + 'txtUSt_UstIdNr2 + ' + Me.txtUSt_UstIdNr2._DateTimeOnly = False + Me.txtUSt_UstIdNr2._numbersOnly = False + Me.txtUSt_UstIdNr2._numbersOnlyKommastellen = "" + Me.txtUSt_UstIdNr2._numbersOnlyTrennzeichen = True + Me.txtUSt_UstIdNr2._Prozent = False + Me.txtUSt_UstIdNr2._ShortDateNew = False + Me.txtUSt_UstIdNr2._ShortDateOnly = False + Me.txtUSt_UstIdNr2._TimeOnly = False + Me.txtUSt_UstIdNr2._TimeOnly_Seconds = False + Me.txtUSt_UstIdNr2._value = Nothing + Me.txtUSt_UstIdNr2._Waehrung = False + Me.txtUSt_UstIdNr2._WaehrungZeichen = True + Me.txtUSt_UstIdNr2.ForeColor = System.Drawing.Color.Black + Me.txtUSt_UstIdNr2.Location = New System.Drawing.Point(55, 179) + Me.txtUSt_UstIdNr2.MaxLength = 12 + Me.txtUSt_UstIdNr2.MaxLineLength = -1 + Me.txtUSt_UstIdNr2.MaxLines_Warning = "" + Me.txtUSt_UstIdNr2.MaxLines_Warning_Label = Nothing + Me.txtUSt_UstIdNr2.Name = "txtUSt_UstIdNr2" + Me.txtUSt_UstIdNr2.Size = New System.Drawing.Size(133, 20) + Me.txtUSt_UstIdNr2.TabIndex = 140 + Me.txtUSt_UstIdNr2.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'dgvKundenUID + ' + Me.dgvKundenUID.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvKundenUID.AllowUserToAddRows = False + Me.dgvKundenUID.AllowUserToDeleteRows = False + Me.dgvKundenUID.AllowUserToResizeColumns = False + Me.dgvKundenUID.AllowUserToResizeRows = False + Me.dgvKundenUID.BackgroundColor = System.Drawing.Color.White + Me.dgvKundenUID.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvKundenUID.Location = New System.Drawing.Point(6, 22) + Me.dgvKundenUID.MultiSelect = False + Me.dgvKundenUID.Name = "dgvKundenUID" + Me.dgvKundenUID.ReadOnly = True + Me.dgvKundenUID.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvKundenUID.Size = New System.Drawing.Size(237, 127) + Me.dgvKundenUID.TabIndex = 0 ' 'Label117 ' @@ -1553,22 +1657,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.cbxVorauszahlung.Text = "Vorauszahlung" Me.cbxVorauszahlung.UseVisualStyleBackColor = True ' - 'cbxKapitalWaehrung - ' - Me.cbxKapitalWaehrung._allowedValuesFreiText = Nothing - Me.cbxKapitalWaehrung._allowFreiText = False - Me.cbxKapitalWaehrung._value = "" - Me.cbxKapitalWaehrung.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.cbxKapitalWaehrung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cbxKapitalWaehrung.DropDownWidth = 200 - Me.cbxKapitalWaehrung.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cbxKapitalWaehrung.ForeColor = System.Drawing.Color.Black - Me.cbxKapitalWaehrung.FormattingEnabled = True - Me.cbxKapitalWaehrung.Location = New System.Drawing.Point(191, 212) - Me.cbxKapitalWaehrung.Name = "cbxKapitalWaehrung" - Me.cbxKapitalWaehrung.Size = New System.Drawing.Size(47, 21) - Me.cbxKapitalWaehrung.TabIndex = 45 - ' 'Label103 ' Me.Label103.AutoSize = True @@ -1860,6 +1948,47 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label39.TabIndex = 3 Me.Label39.Text = "Sammelrechnung:" ' + 'txtAbf_Vorlageprovision_Mindestbetrag + ' + Me.txtAbf_Vorlageprovision_Mindestbetrag._DateTimeOnly = False + Me.txtAbf_Vorlageprovision_Mindestbetrag._numbersOnly = False + Me.txtAbf_Vorlageprovision_Mindestbetrag._numbersOnlyKommastellen = "" + Me.txtAbf_Vorlageprovision_Mindestbetrag._numbersOnlyTrennzeichen = True + Me.txtAbf_Vorlageprovision_Mindestbetrag._Prozent = False + Me.txtAbf_Vorlageprovision_Mindestbetrag._ShortDateNew = False + Me.txtAbf_Vorlageprovision_Mindestbetrag._ShortDateOnly = False + Me.txtAbf_Vorlageprovision_Mindestbetrag._TimeOnly = False + Me.txtAbf_Vorlageprovision_Mindestbetrag._TimeOnly_Seconds = False + Me.txtAbf_Vorlageprovision_Mindestbetrag._value = "" + Me.txtAbf_Vorlageprovision_Mindestbetrag._Waehrung = True + Me.txtAbf_Vorlageprovision_Mindestbetrag._WaehrungZeichen = True + Me.txtAbf_Vorlageprovision_Mindestbetrag.ForeColor = System.Drawing.Color.Red + Me.txtAbf_Vorlageprovision_Mindestbetrag.Location = New System.Drawing.Point(222, 90) + Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLength = 50 + Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLineLength = -1 + Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLines_Warning = "" + Me.txtAbf_Vorlageprovision_Mindestbetrag.MaxLines_Warning_Label = Nothing + Me.txtAbf_Vorlageprovision_Mindestbetrag.Name = "txtAbf_Vorlageprovision_Mindestbetrag" + Me.txtAbf_Vorlageprovision_Mindestbetrag.Size = New System.Drawing.Size(43, 20) + Me.txtAbf_Vorlageprovision_Mindestbetrag.TabIndex = 53 + Me.txtAbf_Vorlageprovision_Mindestbetrag.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'cbxKapitalWaehrung + ' + Me.cbxKapitalWaehrung._allowedValuesFreiText = Nothing + Me.cbxKapitalWaehrung._allowFreiText = False + Me.cbxKapitalWaehrung._value = "" + Me.cbxKapitalWaehrung.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.cbxKapitalWaehrung.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cbxKapitalWaehrung.DropDownWidth = 200 + Me.cbxKapitalWaehrung.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cbxKapitalWaehrung.ForeColor = System.Drawing.Color.Black + Me.cbxKapitalWaehrung.FormattingEnabled = True + Me.cbxKapitalWaehrung.Location = New System.Drawing.Point(191, 212) + Me.cbxKapitalWaehrung.Name = "cbxKapitalWaehrung" + Me.cbxKapitalWaehrung.Size = New System.Drawing.Size(47, 21) + Me.cbxKapitalWaehrung.TabIndex = 45 + ' 'txtKapital ' Me.txtKapital._DateTimeOnly = False @@ -2288,8 +2417,6 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.tbVersicherung.Controls.Add(Me.Label121) Me.tbVersicherung.Controls.Add(Me.Label120) - Me.tbVersicherung.Controls.Add(Me.txtSEG_vom) - Me.tbVersicherung.Controls.Add(Me.txtSEG_Summe) Me.tbVersicherung.Controls.Add(Me.cbxBlanko) Me.tbVersicherung.Controls.Add(Me.Label105) Me.tbVersicherung.Controls.Add(Me.Label106) @@ -2322,6 +2449,8 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbVersicherung.Controls.Add(Me.Label54) Me.tbVersicherung.Controls.Add(Me.Label52) Me.tbVersicherung.Controls.Add(Me.Label51) + Me.tbVersicherung.Controls.Add(Me.txtSEG_vom) + Me.tbVersicherung.Controls.Add(Me.txtSEG_Summe) Me.tbVersicherung.Controls.Add(Me.txtWechselErhaltenAm) Me.tbVersicherung.Controls.Add(Me.txtWechselGueltigBis) Me.tbVersicherung.Controls.Add(Me.txtWechsel) @@ -2373,55 +2502,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label120.TabIndex = 57 Me.Label120.Text = "vom:" ' - 'txtSEG_vom - ' - Me.txtSEG_vom._DateTimeOnly = False - Me.txtSEG_vom._numbersOnly = False - Me.txtSEG_vom._numbersOnlyKommastellen = "" - Me.txtSEG_vom._numbersOnlyTrennzeichen = True - Me.txtSEG_vom._Prozent = False - Me.txtSEG_vom._ShortDateNew = True - Me.txtSEG_vom._ShortDateOnly = False - Me.txtSEG_vom._TimeOnly = False - Me.txtSEG_vom._TimeOnly_Seconds = False - Me.txtSEG_vom._value = "" - Me.txtSEG_vom._Waehrung = False - Me.txtSEG_vom._WaehrungZeichen = True - Me.txtSEG_vom.ForeColor = System.Drawing.Color.Red - Me.txtSEG_vom.Location = New System.Drawing.Point(341, 75) - Me.txtSEG_vom.MaxLength = 10 - Me.txtSEG_vom.MaxLineLength = -1 - Me.txtSEG_vom.MaxLines_Warning = "" - Me.txtSEG_vom.MaxLines_Warning_Label = Nothing - Me.txtSEG_vom.Name = "txtSEG_vom" - Me.txtSEG_vom.Size = New System.Drawing.Size(60, 20) - Me.txtSEG_vom.TabIndex = 58 - Me.txtSEG_vom.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' - 'txtSEG_Summe - ' - Me.txtSEG_Summe._DateTimeOnly = False - Me.txtSEG_Summe._numbersOnly = False - Me.txtSEG_Summe._numbersOnlyKommastellen = "" - Me.txtSEG_Summe._numbersOnlyTrennzeichen = True - Me.txtSEG_Summe._Prozent = False - Me.txtSEG_Summe._ShortDateNew = False - Me.txtSEG_Summe._ShortDateOnly = False - Me.txtSEG_Summe._TimeOnly = False - Me.txtSEG_Summe._TimeOnly_Seconds = False - Me.txtSEG_Summe._value = "" - Me.txtSEG_Summe._Waehrung = True - Me.txtSEG_Summe._WaehrungZeichen = True - Me.txtSEG_Summe.ForeColor = System.Drawing.Color.Red - Me.txtSEG_Summe.Location = New System.Drawing.Point(159, 75) - Me.txtSEG_Summe.MaxLineLength = -1 - Me.txtSEG_Summe.MaxLines_Warning = "" - Me.txtSEG_Summe.MaxLines_Warning_Label = Nothing - Me.txtSEG_Summe.Name = "txtSEG_Summe" - Me.txtSEG_Summe.Size = New System.Drawing.Size(100, 20) - Me.txtSEG_Summe.TabIndex = 56 - Me.txtSEG_Summe.TextAlign = System.Windows.Forms.HorizontalAlignment.Right - ' 'cbxBlanko ' Me.cbxBlanko.AutoSize = True @@ -2724,6 +2804,55 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label51.TabIndex = 0 Me.Label51.Text = "Polizzennummer ACREDIA" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & ":" ' + 'txtSEG_vom + ' + Me.txtSEG_vom._DateTimeOnly = False + Me.txtSEG_vom._numbersOnly = False + Me.txtSEG_vom._numbersOnlyKommastellen = "" + Me.txtSEG_vom._numbersOnlyTrennzeichen = True + Me.txtSEG_vom._Prozent = False + Me.txtSEG_vom._ShortDateNew = True + Me.txtSEG_vom._ShortDateOnly = False + Me.txtSEG_vom._TimeOnly = False + Me.txtSEG_vom._TimeOnly_Seconds = False + Me.txtSEG_vom._value = "" + Me.txtSEG_vom._Waehrung = False + Me.txtSEG_vom._WaehrungZeichen = True + Me.txtSEG_vom.ForeColor = System.Drawing.Color.Red + Me.txtSEG_vom.Location = New System.Drawing.Point(341, 75) + Me.txtSEG_vom.MaxLength = 10 + Me.txtSEG_vom.MaxLineLength = -1 + Me.txtSEG_vom.MaxLines_Warning = "" + Me.txtSEG_vom.MaxLines_Warning_Label = Nothing + Me.txtSEG_vom.Name = "txtSEG_vom" + Me.txtSEG_vom.Size = New System.Drawing.Size(60, 20) + Me.txtSEG_vom.TabIndex = 58 + Me.txtSEG_vom.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'txtSEG_Summe + ' + Me.txtSEG_Summe._DateTimeOnly = False + Me.txtSEG_Summe._numbersOnly = False + Me.txtSEG_Summe._numbersOnlyKommastellen = "" + Me.txtSEG_Summe._numbersOnlyTrennzeichen = True + Me.txtSEG_Summe._Prozent = False + Me.txtSEG_Summe._ShortDateNew = False + Me.txtSEG_Summe._ShortDateOnly = False + Me.txtSEG_Summe._TimeOnly = False + Me.txtSEG_Summe._TimeOnly_Seconds = False + Me.txtSEG_Summe._value = "" + Me.txtSEG_Summe._Waehrung = True + Me.txtSEG_Summe._WaehrungZeichen = True + Me.txtSEG_Summe.ForeColor = System.Drawing.Color.Red + Me.txtSEG_Summe.Location = New System.Drawing.Point(159, 75) + Me.txtSEG_Summe.MaxLineLength = -1 + Me.txtSEG_Summe.MaxLines_Warning = "" + Me.txtSEG_Summe.MaxLines_Warning_Label = Nothing + Me.txtSEG_Summe.Name = "txtSEG_Summe" + Me.txtSEG_Summe.Size = New System.Drawing.Size(100, 20) + Me.txtSEG_Summe.TabIndex = 56 + Me.txtSEG_Summe.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' 'txtWechselErhaltenAm ' Me.txtWechselErhaltenAm._DateTimeOnly = False @@ -3694,7 +3823,6 @@ Partial Class usrcntlKundeBearbeitenFull ' Me.tbUmsatzsteuer.Controls.Add(Me.btnMWSTspeichern) Me.tbUmsatzsteuer.Controls.Add(Me.dgvMWST) - Me.tbUmsatzsteuer.Controls.Add(Me.txtUStIDGeprueftAm) Me.tbUmsatzsteuer.Controls.Add(Me.txtUStID) Me.tbUmsatzsteuer.Controls.Add(Me.Button3) Me.tbUmsatzsteuer.Controls.Add(Me.Label85) @@ -3707,6 +3835,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbUmsatzsteuer.Controls.Add(Me.Label89) Me.tbUmsatzsteuer.Controls.Add(Me.Label87) Me.tbUmsatzsteuer.Controls.Add(Me.Label86) + Me.tbUmsatzsteuer.Controls.Add(Me.txtUStIDGeprueftAm) Me.tbUmsatzsteuer.Controls.Add(Me.btnUStVAendSpeichern) Me.tbUmsatzsteuer.Controls.Add(Me.txtUSt_GVAusgestelltAm) Me.tbUmsatzsteuer.Controls.Add(Me.txtUSt_GVAngefordertAm) @@ -3761,32 +3890,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.dgvMWST.Size = New System.Drawing.Size(171, 125) Me.dgvMWST.TabIndex = 16 ' - 'txtUStIDGeprueftAm - ' - Me.txtUStIDGeprueftAm._DateTimeOnly = False - Me.txtUStIDGeprueftAm._numbersOnly = False - Me.txtUStIDGeprueftAm._numbersOnlyKommastellen = "" - Me.txtUStIDGeprueftAm._numbersOnlyTrennzeichen = True - Me.txtUStIDGeprueftAm._Prozent = False - Me.txtUStIDGeprueftAm._ShortDateNew = True - Me.txtUStIDGeprueftAm._ShortDateOnly = False - Me.txtUStIDGeprueftAm._TimeOnly = False - Me.txtUStIDGeprueftAm._TimeOnly_Seconds = False - Me.txtUStIDGeprueftAm._value = "" - Me.txtUStIDGeprueftAm._Waehrung = False - Me.txtUStIDGeprueftAm._WaehrungZeichen = True - Me.txtUStIDGeprueftAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtUStIDGeprueftAm.ForeColor = System.Drawing.Color.Red - Me.txtUStIDGeprueftAm.Location = New System.Drawing.Point(352, 6) - Me.txtUStIDGeprueftAm.MaxLength = 10 - Me.txtUStIDGeprueftAm.MaxLineLength = -1 - Me.txtUStIDGeprueftAm.MaxLines_Warning = "" - Me.txtUStIDGeprueftAm.MaxLines_Warning_Label = Nothing - Me.txtUStIDGeprueftAm.Name = "txtUStIDGeprueftAm" - Me.txtUStIDGeprueftAm.ReadOnly = True - Me.txtUStIDGeprueftAm.Size = New System.Drawing.Size(96, 20) - Me.txtUStIDGeprueftAm.TabIndex = 3 - ' 'txtUStID ' Me.txtUStID.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -3925,6 +4028,32 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label86.TabIndex = 4 Me.Label86.Text = "Steuernummer:" ' + 'txtUStIDGeprueftAm + ' + Me.txtUStIDGeprueftAm._DateTimeOnly = False + Me.txtUStIDGeprueftAm._numbersOnly = False + Me.txtUStIDGeprueftAm._numbersOnlyKommastellen = "" + Me.txtUStIDGeprueftAm._numbersOnlyTrennzeichen = True + Me.txtUStIDGeprueftAm._Prozent = False + Me.txtUStIDGeprueftAm._ShortDateNew = True + Me.txtUStIDGeprueftAm._ShortDateOnly = False + Me.txtUStIDGeprueftAm._TimeOnly = False + Me.txtUStIDGeprueftAm._TimeOnly_Seconds = False + Me.txtUStIDGeprueftAm._value = "" + Me.txtUStIDGeprueftAm._Waehrung = False + Me.txtUStIDGeprueftAm._WaehrungZeichen = True + Me.txtUStIDGeprueftAm.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtUStIDGeprueftAm.ForeColor = System.Drawing.Color.Red + Me.txtUStIDGeprueftAm.Location = New System.Drawing.Point(352, 6) + Me.txtUStIDGeprueftAm.MaxLength = 10 + Me.txtUStIDGeprueftAm.MaxLineLength = -1 + Me.txtUStIDGeprueftAm.MaxLines_Warning = "" + Me.txtUStIDGeprueftAm.MaxLines_Warning_Label = Nothing + Me.txtUStIDGeprueftAm.Name = "txtUStIDGeprueftAm" + Me.txtUStIDGeprueftAm.ReadOnly = True + Me.txtUStIDGeprueftAm.Size = New System.Drawing.Size(96, 20) + Me.txtUStIDGeprueftAm.TabIndex = 3 + ' 'btnUStVAendSpeichern ' Me.btnUStVAendSpeichern.allowBorder = False @@ -4004,7 +4133,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbSonstiges.Controls.Add(Me.cbxCS_Added) Me.tbSonstiges.Controls.Add(Me.Label113) Me.tbSonstiges.Controls.Add(Me.Label112) - Me.tbSonstiges.Controls.Add(Me.txtSumVerag) Me.tbSonstiges.Controls.Add(Me.txtSonst_KdNrVerag) Me.tbSonstiges.Controls.Add(Me.Label110) Me.tbSonstiges.Controls.Add(Me.Label109) @@ -4031,6 +4159,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbSonstiges.Controls.Add(Me.txtSonst_KdNrIDS) Me.tbSonstiges.Controls.Add(Me.Label70) Me.tbSonstiges.Controls.Add(Me.Label71) + Me.tbSonstiges.Controls.Add(Me.txtSumVerag) Me.tbSonstiges.Controls.Add(Me.txtSumPLOSE) Me.tbSonstiges.Controls.Add(Me.txtSumUTA) Me.tbSonstiges.Controls.Add(Me.txtSumMSE) @@ -4268,29 +4397,6 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label112.TabIndex = 35 Me.Label112.Text = "CSV-Daten bereitstellen" ' - 'txtSumVerag - ' - Me.txtSumVerag._DateTimeOnly = False - Me.txtSumVerag._numbersOnly = True - Me.txtSumVerag._numbersOnlyKommastellen = "" - Me.txtSumVerag._numbersOnlyTrennzeichen = True - Me.txtSumVerag._Prozent = False - Me.txtSumVerag._ShortDateNew = False - Me.txtSumVerag._ShortDateOnly = False - Me.txtSumVerag._TimeOnly = False - Me.txtSumVerag._TimeOnly_Seconds = False - Me.txtSumVerag._value = "" - Me.txtSumVerag._Waehrung = False - Me.txtSumVerag._WaehrungZeichen = True - Me.txtSumVerag.ForeColor = System.Drawing.Color.Black - Me.txtSumVerag.Location = New System.Drawing.Point(246, 160) - Me.txtSumVerag.MaxLineLength = -1 - Me.txtSumVerag.MaxLines_Warning = "" - Me.txtSumVerag.MaxLines_Warning_Label = Nothing - Me.txtSumVerag.Name = "txtSumVerag" - Me.txtSumVerag.Size = New System.Drawing.Size(100, 20) - Me.txtSumVerag.TabIndex = 32 - ' 'txtSonst_KdNrVerag ' Me.txtSonst_KdNrVerag.Location = New System.Drawing.Point(123, 164) @@ -4557,6 +4663,29 @@ Partial Class usrcntlKundeBearbeitenFull Me.Label71.TabIndex = 0 Me.Label71.Text = "Rechnungsdruck:" ' + 'txtSumVerag + ' + Me.txtSumVerag._DateTimeOnly = False + Me.txtSumVerag._numbersOnly = True + Me.txtSumVerag._numbersOnlyKommastellen = "" + Me.txtSumVerag._numbersOnlyTrennzeichen = True + Me.txtSumVerag._Prozent = False + Me.txtSumVerag._ShortDateNew = False + Me.txtSumVerag._ShortDateOnly = False + Me.txtSumVerag._TimeOnly = False + Me.txtSumVerag._TimeOnly_Seconds = False + Me.txtSumVerag._value = "" + Me.txtSumVerag._Waehrung = False + Me.txtSumVerag._WaehrungZeichen = True + Me.txtSumVerag.ForeColor = System.Drawing.Color.Black + Me.txtSumVerag.Location = New System.Drawing.Point(246, 160) + Me.txtSumVerag.MaxLineLength = -1 + Me.txtSumVerag.MaxLines_Warning = "" + Me.txtSumVerag.MaxLines_Warning_Label = Nothing + Me.txtSumVerag.Name = "txtSumVerag" + Me.txtSumVerag.Size = New System.Drawing.Size(100, 20) + Me.txtSumVerag.TabIndex = 32 + ' 'txtSumPLOSE ' Me.txtSumPLOSE._DateTimeOnly = False @@ -6036,6 +6165,9 @@ Partial Class usrcntlKundeBearbeitenFull Me.tbFiskal.ResumeLayout(False) Me.tbVerrechnung.ResumeLayout(False) Me.tbVerrechnung.PerformLayout() + Me.pnlKundenUIDveranlagt.ResumeLayout(False) + Me.pnlKundenUIDveranlagt.PerformLayout() + CType(Me.dgvKundenUID, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() Me.pnlverag360.ResumeLayout(False) @@ -6479,4 +6611,12 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents Label120 As Label Friend WithEvents txtSEG_vom As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents txtSEG_Summe As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents pnlKundenUIDveranlagt As Panel + Friend WithEvents cboUSt_UstIdNrLand2 As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents txtUSt_UstIdNr2 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents dgvKundenUID As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents btnAddKundeUID As Button + Friend WithEvents Button5 As Button + Friend WithEvents Button6 As Button + Friend WithEvents Label122 As Label End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index 2aed4815..52dd0212 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -61,9 +61,18 @@ Public Class usrcntlKundeBearbeitenFull If Not isVerag360 Then isVerag360 = _isVerag360 pnlverag360.Visible = isVerag360 + pnlKundenUIDveranlagt.Visible = Not isVerag360 bankverbindungBearbeiten = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Bankverbindung_bearbeiten", "SDL") + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG", "SDL") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG("BH_Hauptmenü", "SDL") = 0 Then + btnAddKundeUID.Enabled = True + Button6.Enabled = True + Else + btnAddKundeUID.Enabled = False + Button6.Enabled = False + End If + cboFiliale.changeItem(loadValue(KUNDE.FilialenNr, "")) 'zuerst Filiale, dmait Kundennummernkreis später den Wert überschreiben kann! Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA @@ -898,30 +907,30 @@ Public Class usrcntlKundeBearbeitenFull Dim allowdelete = Not (KUNDE.hasEntry And ADRESSE.hasEntry) ' wenn der Eintrag bereits existiert - If Not checkAbfertigungsverbot() Then - txtERROR.Text = "Grund für Abfertigungsverbot angeben!" : Exit Sub - End If + If Not checkAbfertigungsverbot() Then + txtERROR.Text = "Grund für Abfertigungsverbot angeben!" : Exit Sub + End If - If ADRESSE.SAVE() Then - If KUNDE.SAVE() Then - If FISKAL.SAVE AndAlso KUNDE_ERW.SAVE Then - If usrCntlAufschubkonten.SAVE() Then - pnlNeukunde.Visible = False - btnUIDPruef.Visible = True - RaiseEvent KD_SAVED(ADRESSE.AdressenNr) - init(KUNDE.KundenNr) - End If + If ADRESSE.SAVE() Then + If KUNDE.SAVE() Then + If FISKAL.SAVE AndAlso KUNDE_ERW.SAVE Then + If usrCntlAufschubkonten.SAVE() Then + pnlNeukunde.Visible = False + btnUIDPruef.Visible = True + RaiseEvent KD_SAVED(ADRESSE.AdressenNr) + init(KUNDE.KundenNr) End If - Else - If allowdelete Then sql.doSQL("DELETE FROM Adressen WHERE AdressenNr=" & ADRESSE.AdressenNr, "FMZOLL") - txtERROR.Text = "FEHLER beim Eintragen in die Tabelle 'Kunden'!" End If Else - txtERROR.Text = "FEHLER beim Eintragen in die Tabelle 'Adressen'!" + If allowdelete Then sql.doSQL("DELETE FROM Adressen WHERE AdressenNr=" & ADRESSE.AdressenNr, "FMZOLL") + txtERROR.Text = "FEHLER beim Eintragen in die Tabelle 'Kunden'!" End If + Else + txtERROR.Text = "FEHLER beim Eintragen in die Tabelle 'Adressen'!" End If - initBesonderheitenNEU() + End If + initBesonderheitenNEU() pnlverag360.Visible = isVerag360 @@ -946,7 +955,8 @@ Public Class usrcntlKundeBearbeitenFull cbxKapitalWaehrung.fillWithSQL("SELECT fw_iso3, fw_land FROM [VERAG].[dbo].[tblWahrungtabelleNEU] order by fw_iso3 ", , "FMZOLL", False) - 'cbxKapitalWaehrung.Items.AddRange(cboAbf_Waehrung.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray()) + + cboAbf_Steuerschluessel.fillWithSQL("SELECT [Steuerschlüssel], isnull(cast(cast( [Steuersatz %]*100 as decimal(2))as varchar(5)) + '% - ' +AuswahlSteuerbezeichnung,'') as Bezeichnung FROM [Steuertabelle] ORDER BY Steuerschlüssel", False, "FMZOLL", True) @@ -962,6 +972,7 @@ Public Class usrcntlKundeBearbeitenFull 'cbxLandKz.fillWithSQL(" select distinct adressen.landkz, Währungstabelle.Land from adressen inner join Währungstabelle ON Währungstabelle.LandKz=adressen.LandKz where adressen.landkz is not null order by LandKz", , "FMZOLL", True) cbxLandKz.fillWithSQL(" select distinct landkz, Währungstabelle.Land from Währungstabelle where landkz is not null order by LandKz", , "FMZOLL", True) + cboUSt_UstIdNrLand2.Items.AddRange(cboUSt_UstIdNrLand.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray()) cboRechnungSprache.Items.Clear() cboRechnungSprache.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Deutsch", "DE")) @@ -1500,29 +1511,8 @@ Public Class usrcntlKundeBearbeitenFull sender.BackgroundImage = My.Resources.wait btnUIDPruef.Enabled = False - Dim FO As New VERAG_PROG_ALLGEMEIN.cFinanzOnlineWebService - FO.initValues() + doUIDPruefung(ADRESSE.AdressenNr, sender, btnUIDPruef) - If FO.Call_Web_Service_MethodUID_Login_NEU2020() = 0 Then - Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(ADRESSE.AdressenNr,, , , 2) - If UID_TMP IsNot Nothing Then - If UID_TMP.uid_valid Then - init(ADRESSE.AdressenNr) - sender.BackgroundImage = My.Resources.ok - btnUIDPruef.Enabled = True - Else - sender.BackgroundImage = My.Resources.del - btnUIDPruef.Enabled = True - End If - Else - sender.BackgroundImage = My.Resources.fragezeichen - btnUIDPruef.Enabled = True - End If - - FO.Call_Web_Service_MethodUID_Logout_NEU2020() - btnUIDPruef.Enabled = True - - End If ' ' If cProgramFunctions.validUID(ADRESSE.UstIdKz, ADRESSE.UstIdNr) Then 'Dim UID = VERAG_PROG_ALLGEMEIN.cUIDPruefung.doUIDPruefung(ADRESSE.AdressenNr, True) @@ -1539,16 +1529,68 @@ Public Class usrcntlKundeBearbeitenFull End Sub Private Sub Button13_Click(sender As Object, e As EventArgs) Handles Button13.Click + genUIDEORIList(KUNDE.KundenNr, "UID") End Sub - Sub genUIDEORIList(kdNr, typeListe) + Private Sub Button13_new_Click(sender As Object, e As EventArgs) Handles Button5.Click + + genUIDEORIList(KUNDE.KundenNr, "UID", True) + + End Sub + + Private Sub doUIDPruefung(Kdnr As Integer, sender As Object, btn As Button, Optional Veranlagungskunden As Boolean = False, Optional dgv_UIDVeranlagungskunden As DataGridView = Nothing) + + Dim FO As New VERAG_PROG_ALLGEMEIN.cFinanzOnlineWebService + FO.initValues() + + If FO.Call_Web_Service_MethodUID_Login_NEU2020() = 0 Then + Dim UID_TMP As cUIDPruefung = Nothing + + If Veranlagungskunden Then + + If dgv_UIDVeranlagungskunden IsNot Nothing AndAlso dgv_UIDVeranlagungskunden.Rows.Count > 0 Then + For Each r As DataGridViewRow In dgv_UIDVeranlagungskunden.Rows + UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020_UIDVeranlagungskunden(r.Cells("KdNr").Value, r.Cells("UstIdKz").Value, r.Cells("UstIdNr").Value, r.Cells("UstIdGeprüft").Value, ,,, 2) + Next + + End If + + Else + UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(Kdnr,, , , 2) + End If + + If UID_TMP IsNot Nothing Then + If UID_TMP.uid_valid Then + init(Kdnr) + sender.BackgroundImage = My.Resources.ok + btn.Enabled = True + Else + sender.BackgroundImage = My.Resources.del + btn.Enabled = True + End If + Else + sender.BackgroundImage = My.Resources.fragezeichen + btn.Enabled = True + End If + + FO.Call_Web_Service_MethodUID_Logout_NEU2020() + btn.Enabled = True + + If Veranlagungskunden Then + initdgvKUNDENUID(Kdnr) + End If + + End If + End Sub + + Sub genUIDEORIList(kdNr, typeListe, Optional UIDVeranldgungskunden = False) If kdNr <= 0 Then Exit Sub Dim frmList As New frmKundenUIDEORI_List Select Case typeListe Case "UID" - Dim dt = sql.loadDgvBySql("SELECT [uid_id],[uid_KundenNr] KundenNr,[uid_UstIdKz]UstIdKz,[uid_UstIdNr]UstIdNr,[uid_Datum]Datum,[uid_valid]Gültig,[uid_Sachbearbeiter]Sachbearbeiter,[uid_stufe]Stufe FROM [tblUIDPruefung]where uid_KundenNr='" & kdNr & "' ORDER BY uid_Datum desc", "FMZOLL") + Dim dt = sql.loadDgvBySql("SELECT [uid_id],[uid_KundenNr] KundenNr,[uid_UstIdKz]UstIdKz,[uid_UstIdNr]UstIdNr,[uid_Datum]Datum,[uid_valid]Gültig,[uid_Sachbearbeiter]Sachbearbeiter,[uid_stufe]Stufe FROM [tblUIDPruefung] where uid_KundenNr='" & kdNr & "' AND ISNULL(uid_typ, 'UID') = '" & IIf(UIDVeranldgungskunden, "VAK", "UID") & "' ORDER BY uid_Datum desc", "FMZOLL") If dt IsNot Nothing Then frmList.dgv.DataSource = dt frmList.dgv.Columns("uid_id").Visible = False @@ -2418,6 +2460,24 @@ Public Class usrcntlKundeBearbeitenFull End With End Sub + Private Sub initdgvKUNDENUID(kdnr As Integer) + + With dgvKundenUID + + .DataSource = sql.loadDgvBySql("SELECT KdNr,UstIdKz,UstIdNr,cast([UstIdGeprüft] as Date) as UstIdGeprüft FROM tblKundenveranlagungUID WHERE KdNr=" & KUNDE.KundenNr & " ORDER BY UstIdKz", "FMZOLL") + + .Columns("KdNr").Visible = False + .Columns("UstIdKz").HeaderText = "KZ" + .Columns("UstIdNr").HeaderText = "Nr" + .Columns("UstIdGeprüft").HeaderText = "geprüft" + .Columns("UstIdKz").Width = 30 + .Columns("UstIdNr").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("UstIdGeprüft").Width = 80 + .RowHeadersVisible = False + + End With + End Sub + Private Sub initTabs() @@ -2427,6 +2487,11 @@ Public Class usrcntlKundeBearbeitenFull initdgvUmsatzbericht() End If + + If tbcntrDetails.SelectedTab Is tbVerrechnung Then + initdgvKUNDENUID(KUNDE.KundenNr) + End If + If tbcntrDetails.SelectedTab Is tbOP Then initdgvOP() End If @@ -2688,5 +2753,81 @@ Public Class usrcntlKundeBearbeitenFull End Function + Private Sub btnAddKundeUID_Click(sender As Object, e As EventArgs) Handles btnAddKundeUID.Click + If cboUSt_UstIdNrLand2._value <> "" AndAlso txtUSt_UstIdNr2.Text <> "" Then + Dim UID_KUNDE As New cKundenveranlagungUID(KUNDE.KundenNr, cboUSt_UstIdNrLand2._value) + If UID_KUNDE.hasEntry Then + If UID_KUNDE.UstIdNr = txtUSt_UstIdNr2.Text Then Exit Sub + If vbYes = MsgBox("Es existiert bereit ein Eintrag für " & cboUSt_UstIdNrLand2._value & "!" & vbNewLine & "Bestehenden Eintrag überschreiben?", vbYesNo) Then + UID_KUNDE.UstIdNr = txtUSt_UstIdNr2.Text.Trim() + UID_KUNDE.UstIdGeprüft = Nothing + If UID_KUNDE.SAVE() Then initdgvKUNDENUID(KUNDE.KundenNr) + Else + Exit Sub + End If + Else + UID_KUNDE.UstIdNr = txtUSt_UstIdNr2.Text.Trim() + If UID_KUNDE.SAVE() Then initdgvKUNDENUID(KUNDE.KundenNr) + End If + + End If + End Sub + + Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click + + + sender.BackgroundImage = My.Resources.wait + Button6.Enabled = False + + doUIDPruefung(ADRESSE.AdressenNr, sender, btnUIDPruef, True, dgvKundenUID) + + End Sub + + Private Sub cboUSt_UstIdNrLand2_SelectedValueChanged(sender As Object, e As EventArgs) Handles cboUSt_UstIdNrLand2.SelectedValueChanged, txtUSt_UstIdNr2.TextChanged + If cboUSt_UstIdNrLand2._value <> "" AndAlso txtUSt_UstIdNr2.Text <> "" Then + btnAddKundeUID.Visible = True + Else + btnAddKundeUID.Visible = False + End If + End Sub + + + Private Sub dgvKundenUID_SelectionChanged(sender As Object, e As EventArgs) Handles dgvKundenUID.SelectionChanged + If dgvKundenUID.SelectedRows.Count > 0 Then + + txtUSt_UstIdNr2.Text = dgvKundenUID.SelectedRows(0).Cells("UstIdNr").Value + + If dgvKundenUID.SelectedRows(0).Cells("UstIdKz").Value IsNot Nothing AndAlso dgvKundenUID.SelectedRows(0).Cells("UstIdKz").Value <> "" Then + cboUSt_UstIdNrLand2.changeItem(dgvKundenUID.SelectedRows(0).Cells("UstIdKz").Value) + End If + + Button6.Enabled = True + Else + Button6.Enabled = False + End If + End Sub + + Private Sub dgvKundenUID_KeyUp(sender As Object, e As KeyEventArgs) Handles dgvKundenUID.KeyUp + + If e.KeyCode = Keys.Delete Then + If dgvKundenUID.SelectedRows.Count > 0 Then + + + If vbYes = MsgBox("Möchten den markierten Eintrag löschen?", vbYesNoCancel) Then + + For Each r As DataGridViewRow In dgvKundenUID.SelectedRows + Dim UID_KUNDE As New cKundenveranlagungUID(KUNDE.KundenNr, r.Cells("UstIdKz").Value) + UID_KUNDE.DELETE + Next + + initdgvKUNDENUID(KUNDE.KundenNr) + + End If + End If + + End If + + + End Sub End Class diff --git a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb index 5f988f67..c7ed5925 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.Designer.vb @@ -129,6 +129,7 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage3 = New System.Windows.Forms.TabPage() Me.Label72 = New System.Windows.Forms.Label() Me.GroupBox21 = New System.Windows.Forms.GroupBox() + Me.cbxRechnungsdetails = New System.Windows.Forms.CheckBox() Me.txtJahr_rechnungen = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox8 = New System.Windows.Forms.PictureBox() Me.Label70 = New System.Windows.Forms.Label() @@ -187,8 +188,9 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage5 = New System.Windows.Forms.TabPage() Me.Label56 = New System.Windows.Forms.Label() Me.GroupBox17 = New System.Windows.Forms.GroupBox() + Me.cboASFINAG_DATUM = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbxAbrecnungszeitraum_ASFINAG = New System.Windows.Forms.CheckBox() Me.cbxExcel = New System.Windows.Forms.CheckBox() - Me.Label55 = New System.Windows.Forms.Label() Me.Button16 = New System.Windows.Forms.Button() Me.Label53 = New System.Windows.Forms.Label() Me.GroupBox16 = New System.Windows.Forms.GroupBox() @@ -209,7 +211,6 @@ Partial Class usrCntlMDMAuswertungen Me.btnContractdaten = New System.Windows.Forms.Button() Me.Button15 = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() - Me.cbxRechnungsdetails = New System.Windows.Forms.CheckBox() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() @@ -1434,9 +1435,9 @@ Partial Class usrCntlMDMAuswertungen Me.TabPage3.Controls.Add(Me.GroupBox21) Me.TabPage3.Controls.Add(Me.Label66) Me.TabPage3.Controls.Add(Me.GroupBox20) - Me.TabPage3.Controls.Add(Me.UsrCntlWoelfl_IM_CSVRg1) Me.TabPage3.Controls.Add(Me.Label4) Me.TabPage3.Controls.Add(Me.GroupBox2) + Me.TabPage3.Controls.Add(Me.UsrCntlWoelfl_IM_CSVRg1) Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" Me.TabPage3.Size = New System.Drawing.Size(1049, 990) @@ -1469,6 +1470,18 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox21.TabIndex = 18 Me.GroupBox21.TabStop = False ' + 'cbxRechnungsdetails + ' + Me.cbxRechnungsdetails.AutoSize = True + Me.cbxRechnungsdetails.Checked = True + Me.cbxRechnungsdetails.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxRechnungsdetails.Location = New System.Drawing.Point(273, 49) + Me.cbxRechnungsdetails.Name = "cbxRechnungsdetails" + Me.cbxRechnungsdetails.Size = New System.Drawing.Size(152, 17) + Me.cbxRechnungsdetails.TabIndex = 18 + Me.cbxRechnungsdetails.Text = "Rechnungsdetail anzeigen" + Me.cbxRechnungsdetails.UseVisualStyleBackColor = True + ' 'txtJahr_rechnungen ' Me.txtJahr_rechnungen._DateTimeOnly = False @@ -2111,8 +2124,9 @@ Partial Class usrCntlMDMAuswertungen ' 'GroupBox17 ' + Me.GroupBox17.Controls.Add(Me.cboASFINAG_DATUM) + Me.GroupBox17.Controls.Add(Me.cbxAbrecnungszeitraum_ASFINAG) Me.GroupBox17.Controls.Add(Me.cbxExcel) - Me.GroupBox17.Controls.Add(Me.Label55) Me.GroupBox17.Controls.Add(Me.Button16) Me.GroupBox17.Location = New System.Drawing.Point(6, 367) Me.GroupBox17.Name = "GroupBox17" @@ -2120,6 +2134,29 @@ Partial Class usrCntlMDMAuswertungen Me.GroupBox17.TabIndex = 13 Me.GroupBox17.TabStop = False ' + 'cboASFINAG_DATUM + ' + Me.cboASFINAG_DATUM._allowedValuesFreiText = Nothing + Me.cboASFINAG_DATUM._allowFreiText = False + Me.cboASFINAG_DATUM._value = "" + Me.cboASFINAG_DATUM.FormattingEnabled = True + Me.cboASFINAG_DATUM.Location = New System.Drawing.Point(346, 17) + Me.cboASFINAG_DATUM.Name = "cboASFINAG_DATUM" + Me.cboASFINAG_DATUM.Size = New System.Drawing.Size(103, 21) + Me.cboASFINAG_DATUM.TabIndex = 57 + ' + 'cbxAbrecnungszeitraum_ASFINAG + ' + Me.cbxAbrecnungszeitraum_ASFINAG.AutoSize = True + Me.cbxAbrecnungszeitraum_ASFINAG.Checked = True + Me.cbxAbrecnungszeitraum_ASFINAG.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxAbrecnungszeitraum_ASFINAG.Location = New System.Drawing.Point(150, 19) + Me.cbxAbrecnungszeitraum_ASFINAG.Name = "cbxAbrecnungszeitraum_ASFINAG" + Me.cbxAbrecnungszeitraum_ASFINAG.Size = New System.Drawing.Size(180, 17) + Me.cbxAbrecnungszeitraum_ASFINAG.TabIndex = 56 + Me.cbxAbrecnungszeitraum_ASFINAG.Text = "Abrechnungszeitraum auswerten" + Me.cbxAbrecnungszeitraum_ASFINAG.UseVisualStyleBackColor = True + ' 'cbxExcel ' Me.cbxExcel.AutoSize = True @@ -2132,15 +2169,6 @@ Partial Class usrCntlMDMAuswertungen Me.cbxExcel.Text = "als Excel" Me.cbxExcel.UseVisualStyleBackColor = True ' - 'Label55 - ' - Me.Label55.AutoSize = True - Me.Label55.Location = New System.Drawing.Point(147, 19) - Me.Label55.Name = "Label55" - Me.Label55.Size = New System.Drawing.Size(161, 13) - Me.Label55.TabIndex = 6 - Me.Label55.Text = "Abrechnungszeitraum auswerten" - ' 'Button16 ' Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -2353,18 +2381,6 @@ Partial Class usrCntlMDMAuswertungen Me.pnl.Size = New System.Drawing.Size(1057, 54) Me.pnl.TabIndex = 26 ' - 'cbxRechnungsdetails - ' - Me.cbxRechnungsdetails.AutoSize = True - Me.cbxRechnungsdetails.Checked = True - Me.cbxRechnungsdetails.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxRechnungsdetails.Location = New System.Drawing.Point(273, 49) - Me.cbxRechnungsdetails.Name = "cbxRechnungsdetails" - Me.cbxRechnungsdetails.Size = New System.Drawing.Size(152, 17) - Me.cbxRechnungsdetails.TabIndex = 18 - Me.cbxRechnungsdetails.Text = "Rechnungsdetail anzeigen" - Me.cbxRechnungsdetails.UseVisualStyleBackColor = True - ' 'usrCntlMDMAuswertungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2588,7 +2604,6 @@ Partial Class usrCntlMDMAuswertungen Friend WithEvents btnKartenpruefung As Button Friend WithEvents Label56 As Label Friend WithEvents GroupBox17 As GroupBox - Friend WithEvents Label55 As Label Friend WithEvents Button16 As Button Friend WithEvents Label60 As Label Friend WithEvents GroupBox18 As GroupBox @@ -2630,4 +2645,6 @@ Partial Class usrCntlMDMAuswertungen Friend WithEvents Label71 As Label Friend WithEvents Button21 As Button Friend WithEvents cbxRechnungsdetails As CheckBox + Friend WithEvents cbxAbrecnungszeitraum_ASFINAG As CheckBox + Friend WithEvents cboASFINAG_DATUM As VERAG_PROG_ALLGEMEIN.MyComboBox End Class diff --git a/SDL/mdm/usrCntlMDMAuswertungen.vb b/SDL/mdm/usrCntlMDMAuswertungen.vb index baa97905..ae87fffa 100644 --- a/SDL/mdm/usrCntlMDMAuswertungen.vb +++ b/SDL/mdm/usrCntlMDMAuswertungen.vb @@ -1153,16 +1153,6 @@ Public Class usrCntlMDMAuswertungen rpt.DataSource = dt - - 'If cbxProdukt.Checked Then - ' rpt.GroupHeader2.DataField = "prod_descr" - 'Else - ' rpt.GroupHeader2.Visible = False - ' rpt.GroupFooter2.Visible = False - 'End If - - - Dim sum = 0 rpt.lblUeberschrift.Text = "ASFINAG Summenbericht " & CDate(dat_Sum_Bis.Value.ToShortDateString) rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME @@ -1171,10 +1161,6 @@ Public Class usrCntlMDMAuswertungen 'Dim cnt As Integer = 0 rpt.lblDat.Text = Now.ToLongDateString - - - - Dim sumNetto As Double = 0 Dim sumMWST As Double = 0 Dim sumBrutto As Double = 0 @@ -1234,13 +1220,8 @@ Public Class usrCntlMDMAuswertungen End Function Private Sub TabPage5_Paint(sender As Object, e As PaintEventArgs) Handles TabPage5.Paint - Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Dim letzteMaut = SQL.getValueTxtBySql("SELECT Abrechnungsdatum FROM Abrechnungsdatum", "ASFINAG") - If letzteMaut IsNot Nothing AndAlso IsDate(letzteMaut) Then - lblDatletzteMaut.Text = letzteMaut - Else - lblDatletzteMaut.Text = "-" - End If + + End Sub Private Sub Button17_Click(sender As Object, e As EventArgs) Handles btnKartenpruefung.Click @@ -1336,16 +1317,25 @@ Public Class usrCntlMDMAuswertungen Dim frm As New Form Dim dgv As New DataGridView() + Dim SQLWhere As String = "" + + If Not cbxAbrecnungszeitraum_ASFINAG.Checked Then + SQLWhere = "(Abrechnungsdatum = (SELECT Abrechnungsdatum FROM Abrechnungsdatum))" + Else + SQLWhere = "(Abrechnungsdatum = '" & cboASFINAG_DATUM._value & "')" + End If + + Dim dt As DataTable = SQL.loadDgvBySql("SELECT PKFileName, FileCreationDate, - Abrechnungsdatum, - round(SUM(amountInclVAT) - SUM(VATAmount),2) AS Nettobetrag, - round(SUM(VATAmount),2) AS Umsatzsteuer, - VATRate AS 'USt %', - round(SUM(amountInclVAT),2) AS Bruttobetrag + Abrechnungsdatum as turnoverdate, + round(SUM(amountInclVAT) - SUM(VATAmount),2) AS Netamount, + round(SUM(VATAmount),2) AS VATAmount, + VATRate AS 'VAT-Rate %', + round(SUM(amountInclVAT),2) AS TotalAmount FROM TTRBody - WHERE (PKHistory = 0) AND (Abrechnungsdatum = (SELECT Abrechnungsdatum FROM Abrechnungsdatum)) + WHERE (PKHistory = 0) AND " & SQLWhere & " GROUP BY PKFileName, FileCreationDate, Abrechnungsdatum, VATRate ORDER BY PKFileName", "ASFINAG") @@ -1356,10 +1346,109 @@ Public Class usrCntlMDMAuswertungen If cbxExcel.Checked Then - VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt) + If Not cbxAbrecnungszeitraum_ASFINAG.Checked Then + + 'tblAsfinagMaut ist nur eine Zwischentabelle, die nach jeder Sammelrechnung wieder geleert wird!!! + + Dim dt_Abrechnung As DataTable = SQL.loadDgvBySql("select + 'AT' + ,Adressen.AdressenNr + ,licenceplate + ,turnoverdate + ,contractPartner + ,TT.PKFileName + ,MAUT.[cardnumber] as CardNumber + ,MAUT.[netAmount] as Netamount + ,MAUT.[VATamount] as VATAmount + ,MAUT.[totalAmount] as TotalAmount + + FROM [VERAG].[dbo].[tblAsfinagMaut] as MAUT + INNER JOIN [VERAG].[dbo].Kreditkarten ON cardnumber = Kreditkarten.KartenNr + INNER JOIN [VERAG].[dbo].Adressen ON Adressen.AdressenNr = Kreditkarten.AdressenNr + INNER JOIN TTRBody as TT on TT.receiptNumber = MAUT.receiptnumber and TT.cardnumber = MAUT.CardNumber + WHERE 1 = 1 + order by Adressen.AdressenNr, TT.PKFileName", "ASFINAG") + + Dim dt_Abrechnung_Summen As DataTable = SQL.loadDgvBySql(" select + TT.PKFileName + ,SUM(MAUT.[netAmount]) as Netamount + ,SUM(MAUT.[VATamount]) as VATAmount + ,SUM(MAUT.[totalAmount]) as TotalAmount + + FROM [VERAG].[dbo].[tblAsfinagMaut] as MAUT + INNER JOIN TTRBody as TT on TT.receiptNumber = MAUT.receiptnumber and TT.cardnumber = MAUT.CardNumber + WHERE 1 = 1 + group by TT.PKFileName + order by TT.PKFileName", "ASFINAG") + + SDL.cProgramFunctions.genExcelFromMultibleDT_NEW({dt, dt_Abrechnung, dt_Abrechnung_Summen}) + + Else + + If cboASFINAG_DATUM._value IsNot Nothing AndAlso IsDate(cboASFINAG_DATUM._value) Then + + Dim dt_Abrechnung As DataTable = SQL.loadDgvBySql("select + 'AT' + ,Adressen.AdressenNr + ,dbo.CLFArchiv.vehicleLicensePlate as licenceplate + ,dbo.TTRBody.DeliveryDate as turnoverdate + ,dbo.tblWarenarten.WarenartDE as ProductCode + ,dbo.TTRBody.PKFileName as PKFileName + ,dbo.TTRBody.[cardnumber] as CardNumber + ,dbo.TTRBody.amountInclVAT - [VATamount] as Netamount + ,dbo.TTRBody.[VATamount] as VATAmount + ,dbo.TTRBody.amountInclVAT as TotalAmount + From dbo.CLFArchiv + RIGHT OUTER Join dbo.TTRBody ON dbo.CLFArchiv.OBUID = dbo.TTRBody.OBUID + LEFT OUTER Join dbo.tblWarenarten ON dbo.TTRBody.ProductCode = dbo.tblWarenarten.ProductCode + INNER JOIN [VERAG].[dbo].Kreditkarten ON TTRBody.CardNumber = Kreditkarten.KartenNr + INNER JOIN [VERAG].[dbo].Adressen ON Adressen.AdressenNr = Kreditkarten.AdressenNr + Where TTRBody.abrechnungsdatum = '" & cboASFINAG_DATUM._value & "' + order by Adressen.AdressenNr, TTRBody.PKFileName", "ASFINAG") + + + Dim dt_Abrechnung_Summen As DataTable = SQL.loadDgvBySql("select + + dbo.TTRBody.PKFileName + ,sum(dbo.TTRBody.amountInclVAT - [VATamount]) as Netamount + ,sum(dbo.TTRBody.[VATamount]) as VATAmount + ,sum(dbo.TTRBody.amountInclVAT) as TotalAmount + From dbo.CLFArchiv + RIGHT OUTER Join dbo.TTRBody ON dbo.CLFArchiv.OBUID = dbo.TTRBody.OBUID + LEFT OUTER Join dbo.tblWarenarten ON dbo.TTRBody.ProductCode = dbo.tblWarenarten.ProductCode + INNER JOIN [VERAG].[dbo].Kreditkarten ON TTRBody.CardNumber = Kreditkarten.KartenNr + INNER JOIN [VERAG].[dbo].Adressen ON Adressen.AdressenNr = Kreditkarten.AdressenNr + Where TTRBody.abrechnungsdatum = '" & cboASFINAG_DATUM._value & "' + group by TTRBody.PKFileName + order by TTRBody.PKFileName", "ASFINAG") + + + + SDL.cProgramFunctions.genExcelFromMultibleDT_NEW({dt, dt_Abrechnung, dt_Abrechnung_Summen}) + End If + End If + + If cboASFINAG_DATUM._value IsNot Nothing AndAlso IsDate(cboASFINAG_DATUM._value) Then + Dim date_ASFINAG_start = CDate(cboASFINAG_DATUM._value).AddDays(-1) + Dim dt_Abrechnung_VERAG As DataTable = SQL.loadDgvBySql(" SELECT year(rechnungsdatum)Year,MONTH(rechnungsdatum)Month,RechnungsKundenNr CustomerNo, Adressen.Ordnungsbegriff Customer,Adressen.LandKz Ctry, Offertenstamm.OffertenNr, Offertenstamm.OffertenBez,leistungen.LeistungsNr ProdNo,leistungen.LeistungsBez ProdDscr, /*count(distinct([Rechnungsausgang].Rk_ID)) CountInv,*/ sum(RechnungsausgangPositionen.SteuerfreierBetrag+RechnungsausgangPositionen.SteuerpflichtigerBetrag)NetSum,ReverseCharge + FROM [VERAG].[dbo].[Rechnungsausgang] + inner join Adressen on RechnungsKundenNr=AdressenNr + inner join RechnungsausgangPositionen on Rechnungsausgang.RK_ID= RechnungsausgangPositionen.rk_id + inner join leistungen on leistungen.LeistungsNr=RechnungsausgangPositionen.LeistungsNr + inner join Offertenstamm on Offertenstamm.OffertenNr=Rechnungsausgang.OffertenNr + where Firma_ID=19 + and Rechnungsausgang.Abfertigungsdatum between '" & date_ASFINAG_start.ToShortDateString & "' and '" & cboASFINAG_DATUM._value & "' + and Rechnungsausgang.OffertenNr in (11) + group by year(rechnungsdatum),MONTH(rechnungsdatum),RechnungsKundenNr,Offertenstamm.OffertenNr,Offertenstamm.OffertenBez,Adressen.Ordnungsbegriff,Adressen.LandKz , leistungen.LeistungsNr,leistungen.LeistungsBez,ReverseCharge + order by Year,Month,CustomerNo,Offertenstamm.OffertenNr,Offertenstamm.OffertenBez,leistungen.LeistungsNr", "FMZOLL") + + VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt_Abrechnung_VERAG) + + End If + Else - dgv.DataSource = dt + dgv.DataSource = dt If dgv IsNot Nothing Then frm.Size = New Size(1400, 1000) @@ -1580,6 +1669,39 @@ Public Class usrCntlMDMAuswertungen End Sub + + Private Sub TabPage5_Click(sender As Object, e As EventArgs) Handles TabPage5.Click + + End Sub + + Private Sub tbcntr_SelectedIndexChanged(sender As Object, e As EventArgs) Handles tbcntr.SelectedIndexChanged + + Select Case tbcntr.SelectedIndex + Case 6 'ASFINAG + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim letzteMaut = SQL.getValueTxtBySql("SELECT Abrechnungsdatum FROM Abrechnungsdatum", "ASFINAG") + If letzteMaut IsNot Nothing AndAlso IsDate(letzteMaut) Then + lblDatletzteMaut.Text = letzteMaut + Else + lblDatletzteMaut.Text = "-" + End If + + cboASFINAG_DATUM.fillWithSQL("select cast([abrechnungsdatum] as Date) from [ASFINAG].[dbo].[TTRBody] where [abrechnungsdatum] is not null group by [abrechnungsdatum] order by [abrechnungsdatum] desc", False, "ASFINAG") + + End Select + + End Sub + + Private Sub cbxAbrecnungszeitraum_ASFINAG_CheckedChanged(sender As Object, e As EventArgs) Handles cbxAbrecnungszeitraum_ASFINAG.CheckedChanged + If Not cbxAbrecnungszeitraum_ASFINAG.Checked Then + cboASFINAG_DATUM._value = lblDatletzteMaut.Text + cboASFINAG_DATUM.Enabled = False + + Else + cboASFINAG_DATUM.Enabled = True + End If + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb index ebef10fe..7fe585a5 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb @@ -112,6 +112,7 @@ Public Class cKundenErweitert Property kde_CBAM_Warn2 As Decimal? = 40 Property kde_CBAM_ApplicationNo As Object = Nothing Property kde_CBAM_CBAMAccountNo As Object = Nothing + Property kde_abwToleranzTage As Object = Nothing Dim SQL As New SQL @@ -232,6 +233,7 @@ Public Class cKundenErweitert list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_Warn2", kde_CBAM_Warn2)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_ApplicationNo", kde_CBAM_ApplicationNo)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_CBAM_CBAMAccountNo", kde_CBAM_CBAMAccountNo)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_abwToleranzTage", kde_abwToleranzTage)) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenveranlagungUID.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenveranlagungUID.vb index 4874847b..34687654 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenveranlagungUID.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenveranlagungUID.vb @@ -18,6 +18,7 @@ Public Class cKundenveranlagungUID Me.UstIdKz = UstIdKz LOAD() End Sub + Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kdNr", kdNr)) @@ -28,18 +29,8 @@ Public Class cKundenveranlagungUID Return list End Function - - Shared Sub LOAD_LIST_ByKdNr(ByRef UID_LIST As List(Of cKundenveranlagungUID), kdNr As Integer) - If UID_LIST Is Nothing Then UID_LIST = New List(Of cKundenveranlagungUID) - UID_LIST.Clear() - Dim SQL As New SQL - For Each r In SQL.loadDgvBySql("SELECT UstIdKz FROM tblKundenveranlagungUID WHERE kdNr=" & kdNr, "AVISO").Rows - UID_LIST.Add(New VERAG_PROG_ALLGEMEIN.cKundenveranlagungUID(kdNr, r("UstIdKz"))) - Next - End Sub - - Public Function SAVE() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblKundenveranlagungUID WHERE kdNr=@kdNr and UstIdKz = @UstIdKz) " & @@ -48,7 +39,7 @@ Public Class cKundenveranlagungUID " BEGIN " & getInsertCmd() & " END " & " commit tran " - Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list) + Return SQL.doSQLVarList(sqlstr, "FMZOLL", , List) End Function Public Sub LOAD() @@ -93,7 +84,7 @@ Public Class cKundenveranlagungUID End If Next str = str.Substring(0, str.Length - 1) 'wg. ',' - Return (" UPDATE [tblKundenveranlagungUID] SET " & str & " WHERE kdNr=@kdNr and UstIdKz = @UstIdKz ") + Return (" UPDATE tblKundenveranlagungUID SET " & str & " WHERE kdNr=@kdNr and UstIdKz = @UstIdKz ") Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -122,4 +113,10 @@ Public Class cKundenveranlagungUID Return "" End Function + Public Function DELETE() + + SQL.doSQL("DELETE FROM tblKundenveranlagungUID WHERE kdNr=" & Me.kdNr & " and UstIdKz = '" & Me.UstIdKz & "'", "FMZOLL") + + End Function + End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cMDMZinsberechnung.vb b/VERAG_PROG_ALLGEMEIN/Classes/cMDMZinsberechnung.vb index 99077cdf..13b732d4 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMZinsberechnung.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMZinsberechnung.vb @@ -189,6 +189,7 @@ Public Class cMDMZinsberechnung kundenNr = @KundenNr AND zinsbetrag <> 0 AND verrechnet is null + AND left(buchungstext,6) <> 'Zinsen' ORDER BY belegDatum", conn) diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb index 30cfc734..cd506ed9 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb @@ -17,24 +17,18 @@ Public Class cUIDPruefung Property uid_MaId As Object = Nothing Property uid_Sachbearbeiter As String Property uid_firma As Object = Nothing - - Property uid_stufe As Integer = 1 Property Firma As String = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Property uid_abfrageUid As Object = Nothing Property uid_sessionId As Object = Nothing - - - Property uid_adr1 As Object = Nothing Property uid_adr2 As Object = Nothing Property uid_adr3 As Object = Nothing Property uid_adr4 As Object = Nothing Property uid_adr5 As Object = Nothing Property uid_adr6 As Object = Nothing - Property uid_pruefungstool As Object = Nothing - + Property uid_typ As Object = Nothing Shared SQL As New SQL @@ -57,21 +51,19 @@ Public Class cUIDPruefung list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_MaId", uid_MaId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_Sachbearbeiter", uid_Sachbearbeiter)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_firma", uid_firma)) - - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_stufe", uid_stufe)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma", Firma)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_abfrageUid", uid_abfrageUid)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_sessionId", uid_sessionId)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr1", uid_adr1)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr2", uid_adr2)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr3", uid_adr3)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr4", uid_adr4)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr5", uid_adr5)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_adr6", uid_adr6)) - list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_pruefungstool", uid_pruefungstool)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("uid_typ", uid_typ)) + Return list End Function @@ -238,7 +230,18 @@ Public Class cUIDPruefung counter += 1 Dim errorCode = -99 Dim errormsg = "" - Dim UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(r("KdNr"),, SaveErgInAdressen, showErr,, errorCode, errormsg) + + Dim UID_TMP = Nothing + + 'unterscheidung nach typ! + If Not IsDBNull(r("typ")) AndAlso r("typ") = "VAK" Then + UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020_UIDVeranlagungskunden(r("KdNr"), r("UstIdKz"), r("UstIdNr"), r("letzte Prüfung"),, SaveErgInAdressen, showErr,, errorCode, errormsg) + Else + UID_TMP = FO.Call_Web_Service_MethodUID_Abfrage_NEU2020(r("KdNr"),, SaveErgInAdressen, showErr,, errorCode, errormsg) + + End If + + If UID_TMP IsNot Nothing Then If UID_TMP.uid_valid Then r("Ergebnis") = "OK" @@ -325,24 +328,34 @@ Public Class cUIDPruefung End If If Validierungspruefung Then - where &= " AND UPPER(Adressen.UstIdKz) IN ( + where &= " AND UPPER(Adressen.UstIdKz) IN ( 'AT','BE','BG','CY','CZ','DE','DK','EE','EL','ES','FI','FR','HR', 'HU','IE','IT','LT','LU','LV','MT','NL','PL','PT','RO','SE','SI','SK' )" End If - - - dt = SQL.loadDgvBySql("SELECT " & Top & " [AdressenNr] as KdNr,[Ordnungsbegriff] as Firma,UstIdGeprüft as [letzte Prüfung],Adressen.UstIdKz,Adressen.UstIdnr ,CASE + Dim SQLUID As String = "SELECT " & Top & " [AdressenNr] as KdNr,[Ordnungsbegriff] as Firma,UstIdGeprüft as [letzte Prüfung],Adressen.UstIdKz,Adressen.UstIdnr ,CASE WHEN UPPER(Adressen.UstIdKz) IN ( 'AT','BE','BG','CY','CZ','DE','DK','EE','EL','ES','FI','FR','HR', 'HU','IE','IT','LT','LU','LV','MT','NL','PL','PT','RO','SE','SI','SK' ) THEN 'Ja' ELSE 'Nein' - END AS istEUVAT " & + END AS istEUVAT, 'UID' as typ " & " From [Adressen] inner Join kunden On KundenNr=AdressenNr inner join Filialen on Filialen.FilialenNr=Kunden.FilialenNr " & " where (UstIdGeprüft <= '" & datum.ToShortDateString & "' OR UstIdGeprüft is null) and (isnull(Adressen.UstIdKz,'') <> '' and isnull(Adressen.UstIdNr,'') <> '') " & - " And Auswahl='A' " & where & " ORDER BY Ordnungsbegriff", "FMZOLL") + " And Auswahl='A' " & where + + Dim SQLUID_Veranlagungskunden As String = "SELECT VAUID.KdNr,[Ordnungsbegriff] as Firma, VAUID.UstIdGeprüft, VAUID.UstIdKz,VAUID.UstIdNr, CASE WHEN UPPER(VAUID.UstIdKz) IN ( + 'AT','BE','BG','CY','CZ','DE','DK','EE','EL','ES','FI','FR','HR', + 'HU','IE','IT','LT','LU','LV','MT','NL','PL','PT','RO','SE','SI','SK' + ) THEN 'Ja' + ELSE 'Nein' END AS istEUVAT , 'VAK' as typ FROM [VERAG].[dbo].[tblKundenveranlagungUID] as VAUID + inner Join [Adressen] On AdressenNr=VAUID.KdNr + inner Join kunden On KundenNr=VAUID.KdNr + inner join Filialen on Filialen.FilialenNr=Kunden.FilialenNr + where (VAUID.UstIdGeprüft <= '" & datum.ToShortDateString & "' OR VAUID.UstIdGeprüft is null) and (isnull(VAUID.UstIdKz,'') <> '' and isnull(VAUID.UstIdNr,'') <> '') AND Filialen.firma='VERAG' " & where.Replace("Adressen.", "VAUID.") + + dt = SQL.loadDgvBySql(SQLUID & " UNION ALL " & SQLUID_Veranlagungskunden & " ORDER BY Ordnungsbegriff", "FMZOLL") Return dt diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb index 9386fa2f..d328e095 100644 --- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb +++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb @@ -213,7 +213,7 @@ Public Class frmMitarbeitersuche If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Überstunden_auszahlen", "SDL") Then - If MA.getFirma = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then 'MA derselben Firma bearbeiten + If MA.getFirma.ToUpper = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then 'MA derselben Firma bearbeiten Button3.Visible = True End If End If diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb index fc846b99..51ebcf65 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb @@ -255,26 +255,128 @@ Public Class cFinanzOnlineWebService End If + Return Nothing + End Function - 'If returnInt = 0 Then - ' Firma = name & vbNewLine & adrz1 - ' If adrz2 <> "" Then Firma = Firma & vbNewLine & adrz2 - ' If adrz3 <> "" Then Firma = Firma & vbNewLine & adrz3 - ' If adrz4 <> "" Then Firma = Firma & vbNewLine & adrz4 - ' If adrz5 <> "" Then Firma = Firma & vbNewLine & adrz5 - ' If adrz6 <> "" Then Firma = Firma & vbNewLine & adrz6 - - ' ' frmUIDCheck.firmaUIDFinanzOnline = firma - ' ' frmUIDCheck.firmaUIDProgramm = txtFirma - ' ' frmUIDCheck.uidnr = txtUid - ' ' frmUIDCheck.Show() + Function Call_Web_Service_MethodUID_Abfrage_NEU2020_UIDVeranlagungskunden(kdnr, UstIdKz, UstIdNr, UstIdGeprüft, Optional AskIfDouble = False, Optional SaveErgInAdressen = True, Optional showErr = True, Optional Stufe = 1, Optional ByRef errorCode = 0, Optional ByRef errorMsg = "") As VERAG_PROG_ALLGEMEIN.cUIDPruefung - 'Else - ' MsgBox(GetCodeText(returnInt)) - 'End If - ' msgErgebnis = msg - ' Call_Web_Service_MethodUID_Logout_NEU2020() + If UstIdKz IsNot Nothing AndAlso UstIdNr IsNot Nothing Then + + Try + If AskIfDouble Then + If IsDate(UstIdGeprüft) AndAlso CDate(UstIdGeprüft).ToShortDateString = Now.ToShortDateString Then + If vbYes <> MsgBox("Die UID-Nummer wurde heute bereits geprüft. Soll die Prüfung nochmal durchgeführt werden?", vbYesNoCancel) Then + Return Nothing + End If + End If + End If + + Dim tmp_SESSION_ID = SESSION_ID + Dim CallWebService As New VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageService + + Dim msg As String = "" + Dim name As String = "" + Dim adrz1 As String = "" + Dim adrz2 As String = "" + Dim adrz3 As String = "" + Dim adrz4 As String = "" + Dim adrz5 As String = "" + Dim adrz6 As String = "" + Dim countryCode As String = UstIdKz + Dim vatNumber As String = UstIdNr + + Dim StufeAbf = VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageServiceRequestStufe.Item1 + Select Case Stufe + Case 1 + StufeAbf = VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageServiceRequestStufe.Item1 + Case 2 + StufeAbf = VERAG_PROG_ALLGEMEIN.at.gv.bmf.finanzonline.uidAbfrageServiceRequestStufe.Item2 + End Select + + Dim returnInt As Integer + + Try + + returnInt = CallWebService.uidAbfrage(tid, benid, SESSION_ID, uid, countryCode & vatNumber, StufeAbf, msg, name, adrz1, adrz2, adrz3, adrz4, adrz5, adrz6) + If msg <> "" Then errorMsg = " " & msg + errorCode = returnInt + Catch ex As Exception + + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, "Fehler im externen Webservice " & System.Reflection.MethodInfo.GetCurrentMethod.Name & vbNewLine & " Daten: TID: " & tid & vbNewLine & " BENID: " & benid & vbNewLine & " SessionID: " & SESSION_ID & vbNewLine & " UID: " & uid & vbNewLine & " COUNTRY-CODE/VAT: " & countryCode & vatNumber & vbNewLine & " Stufe: " & StufeAbf & vbNewLine & " MSG: " & msg & vbNewLine & " Name: " & name & vbNewLine & " Adr1: " & adrz1 & vbNewLine & " Adr2: " & adrz2 & vbNewLine & " Adr3: " & adrz3 & vbNewLine & " Adr4: " & adrz4 & vbNewLine & " Adr5: " & adrz5 & vbNewLine & " Adr6: " & adrz6, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + + If ex.Message.Contains("Wegen Wartungsarbeiten") AndAlso ex.Message.Contains("Verf??gung") Then + Dim startIndex As Integer = ex.Message.IndexOf("Wegen Wartungsarbeiten") + Dim endIndex As Integer = ex.Message.IndexOf("Verf??gung", startIndex) + Dim messageError As String = ex.Message.Substring(startIndex, endIndex - startIndex + "Verf??gung".Length) + If messageError <> "" Then errorMsg = messageError + errorCode = -99 + + End If + + Exit Function + End Try + + If returnInt = 0 Or returnInt = 1 Then + + Dim UID_TMP As New VERAG_PROG_ALLGEMEIN.cUIDPruefung + + UID_TMP.uid_Datum = Now + UID_TMP.uid_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + If If(UID_TMP.uid_Sachbearbeiter, "") = "" Then UID_TMP.uid_Sachbearbeiter = "AUTO" + UID_TMP.uid_MaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID + UID_TMP.uid_valid = (returnInt = 0) + UID_TMP.uid_KundenNr = kdnr + + UID_TMP.uid_UstIdKz = countryCode + UID_TMP.uid_UstIdNr = vatNumber + + UID_TMP.Firma = If(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, "VERAG") + UID_TMP.uid_abfrageUid = uid + UID_TMP.uid_sessionId = tmp_SESSION_ID + UID_TMP.uid_typ = "VAK" + + UID_TMP.uid_firma = name + UID_TMP.uid_adr1 = adrz1 + UID_TMP.uid_adr2 = adrz2 + UID_TMP.uid_adr3 = adrz3 + UID_TMP.uid_adr4 = adrz4 + UID_TMP.uid_adr5 = adrz5 + UID_TMP.uid_adr6 = adrz6 + + UID_TMP.uid_stufe = Stufe + + UID_TMP.uid_pruefungstool = "FINANZONLINE" + + UID_TMP.SAVE() + + + + If (returnInt = 0) Then 'OK + If SaveErgInAdressen Then + + Dim UID_KUNDE As New cKundenveranlagungUID(kdnr, UstIdKz) + UID_KUNDE.UstIdGeprüft = Now.ToShortDateString + UID_KUNDE.SAVE() + + + End If + End If + + + Return UID_TMP + + End If + + If showErr Then MsgBox(GetCodeText(returnInt)) + + + Catch ex As Exception + If showErr Then MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + ' Call_Web_Service_MethodUID_Logout_NEU2020() + End Try + End If + Return Nothing @@ -336,6 +438,7 @@ Public Class cFinanzOnlineWebService UID_TMP.uid_adr4 = adrz4 UID_TMP.uid_adr5 = adrz5 UID_TMP.uid_adr6 = adrz6 + UID_TMP.uid_typ = "UID" UID_TMP.uid_stufe = Stufe diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb index efd519b0..fb63efdb 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb @@ -956,6 +956,8 @@ Public Class cMSEAPI rest.AddQueryParam("start_date", startDate.ToString("yyyy-MM-dd")) rest.AddQueryParam("end_date", end_date.ToString("yyyy-MM-dd")) + 'rest.AddQueryParam("end_date", "2026-03-17") + rest.AddHeader("X-API-Key", jwt) rest.IdleTimeoutMs = 1000000 diff --git a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj index 661425fd..ec06e656 100644 --- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj +++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj @@ -393,6 +393,7 @@ + diff --git a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb index a20cdce8..b2cbcb14 100644 --- a/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb +++ b/VERAG_PROG_ALLGEMEIN/cSicherheiten.vb @@ -30,6 +30,9 @@ Public Class cSicherheiten Property gs_MRNNr As Object = Nothing Property gs_posSubNr As Object = Nothing Property gs_VeralteteWeitereRegistriernummer As Object = Nothing + Property gs_dakoyimport As Boolean = False + Property gs_EH_Anzahl As Object = Nothing + Property gs_DK_laufnr As Object = Nothing Public hasEntry = False @@ -48,6 +51,15 @@ Public Class cSicherheiten LOADSubNr() End Sub + + Sub New(gs_gsID, gs_posNr, gs_posSubNr, gs_DK_laufnr) + Me.gs_gsId = gs_gsID + Me.gs_posNr = gs_posNr + Me.gs_posSubNr = gs_posSubNr + Me.gs_DK_laufnr = gs_DK_laufnr + LOADDakosyLaufNr() + End Sub + Sub New(gs_gsNr) Me.gs_gsNr = gs_gsNr LOADGSNR() @@ -85,6 +97,9 @@ Public Class cSicherheiten list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_systemuser", gs_systemuser)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_MRNNr", gs_MRNNr)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_VeralteteWeitereRegistriernummer", gs_VeralteteWeitereRegistriernummer)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_dakoyimport", gs_dakoyimport)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_EH_Anzahl", gs_EH_Anzahl)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_DK_laufnr", gs_DK_laufnr)) If Not WithoutPosSubNr Then list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("gs_posSubNr", gs_posSubNr)) Return list @@ -193,6 +208,36 @@ Public Class cSicherheiten End Try End Sub + Public Sub LOADDakosyLaufNr() + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionAVISO() + Using cmd As New SqlCommand("SELECT * FROM [tblGesamtsicherheit] WHERE gs_gsId=@gs_gsId AND gs_posNr=@gs_posNr AND gs_DK_laufnr=@gs_DK_laufnr ", conn) + cmd.Parameters.AddWithValue("@gs_gsID", gs_gsId) + cmd.Parameters.AddWithValue("@gs_posNr", gs_posNr) + cmd.Parameters.AddWithValue("@gs_DK_laufnr", gs_DK_laufnr) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each li In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable) + + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(li.Text)) + End If + + Next + hasEntry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + End Sub + Public Sub LOADGSNR() Try