diff --git a/SDL/Fakturierung/cAutomailversand.vb b/SDL/Fakturierung/cAutomailversand.vb index 8005902b..7ee77765 100644 --- a/SDL/Fakturierung/cAutomailversand.vb +++ b/SDL/Fakturierung/cAutomailversand.vb @@ -645,7 +645,22 @@ Public Class cAutomailversand If RECHNUNG IsNot Nothing Then Select Case sprache - Case "A", "AT", "D", "DE", "CH" : If BelegartenNr = 71 Then IIf(onlyBelegsuebersetzung, Anhangsbez = "Gutschrift.pdf", Anhangsbez = "Gutschriftsanhänge.pdf") Else IIf(onlyBelegsuebersetzung, Anhangsbez = "Rechnung.pdf", Anhangsbez = "Rechnungsanhänge.pdf") + Case "A", "AT", "D", "DE", "CH" + + If BelegartenNr = 71 Then + If onlyBelegsuebersetzung Then + Anhangsbez = "Gutschrift.pdf" + Else + Anhangsbez = "Gutschriftsanhaenge.pdf" + End If + Else + If onlyBelegsuebersetzung Then + Anhangsbez = "Rechnung.pdf" + Else + Anhangsbez = "Rechnungsanhaenge.pdf" + End If + End If + Case "TR" : If BelegartenNr = 71 Then Anhangsbez = "Kredi.pdf" Else Anhangsbez = "Fatura.pdf" Case Else : If BelegartenNr = 71 Then Anhangsbez = "Creditnote.pdf" Else Anhangsbez = "Invoice.pdf" End Select diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 7f1d8228..aaf2cda4 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/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index 55969250..a2ad12e3 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -3986,9 +3986,9 @@ Public Class usrCntlSpeditionsBuchSuche Me.Cursor = Cursors.Default End Sub - Function getJahrString() As String + Function getJahrString(start As Integer, ende As Integer) As String getJahrString = "" - For j = Now.Year To 2010 Step -1 + For j = ende To start Step -1 getJahrString &= "[" & j & "]," Next getJahrString = getJahrString.Substring(0, getJahrString.Length - 1) @@ -3999,22 +3999,38 @@ Public Class usrCntlSpeditionsBuchSuche If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_Auswertungen", "SDL") Then Me.Cursor = Cursors.WaitCursor Dim sqlstr As String = "" - Dim year As String = "2026" - If CDate(txtAbfertDat._value).Year = CDate(txtAbfertDatBis._value).Year Then - year = "[" & CDate(txtAbfertDatBis._value).Year.ToString & "]" - Else - year = "[" & CDate(txtAbfertDatBis._value).Year.ToString & "]" - year &= "," & "[" & CDate(txtAbfertDatBis._value).Year.ToString & "]" - End If - sqlstr &= " SELECT * FROM ( SELECT RechnungsKundenNr, KundenNrZentrale,Leistungsnummer, LeistungsBez,YEAR(Speditionsbuch.Abfertigungsdatum) as [Year], ([tblTrdinProduct].[SteuerpflichtigerBetragLokal]+[tblTrdinProduct].[SteuerfreierBetragLokal] ) - AS [Der Wert] FROM tblTrdinInvoice - INNER JOIN (tblTrdinProduct LEFT JOIN Leistungen ON Leistungsnummer = LeistungsNr) ON (tblTrdinInvoice.Rechnungsnummer = tblTrdinProduct.Rechnungsnummer) - INNER JOIN Speditionsbuch on Speditionsbuch.FilialenNr = tblTrdinInvoice.FilialenNr and Speditionsbuch.AbfertigungsNr = tblTrdinInvoice.AbfertigungsNr and tblTrdinInvoice.UnterNr = Speditionsbuch.UnterNr - AND (tblTrdinInvoice.Rechnungsdatum = tblTrdinProduct.Rechnungsdatum) - WHERE 1=1 " - sqlstr &= getSpedBuchWhere() - sqlstr &= " ) AS Rg PIVOT( SUM([Der Wert]) FOR [Year] IN (" & year & ")) AS MNamePivot order by Leistungsnummer" + sqlstr &= " SELECT * FROM + (SELECT i.RechnungsKundenNr, + i.KundenNrZentrale, + p.Leistungsnummer, + l.LeistungsBez, + YEAR(s.Abfertigungsdatum) AS [Year], + COUNT(*) AS Anzahl, + SUM(p.SteuerpflichtigerBetragLokal + p.SteuerfreierBetragLokal) AS [Der Wert] + FROM tblTrdinInvoice i + INNER JOIN tblTrdinProduct p + ON i.Rechnungsnummer = p.Rechnungsnummer + AND i.Rechnungsdatum = p.Rechnungsdatum + LEFT JOIN Leistungen l + ON p.Leistungsnummer = l.LeistungsNr + INNER JOIN Speditionsbuch s + ON s.FilialenNr = i.FilialenNr + AND s.AbfertigungsNr = i.AbfertigungsNr + AND s.UnterNr = i.UnterNr + WHERE 1=1 " + sqlstr &= getSpedBuchWhere().ToString.Replace("Speditionsbuch", "s") + sqlstr &= " GROUP BY + i.RechnungsKundenNr, + i.KundenNrZentrale, + p.Leistungsnummer, + l.LeistungsBez, + YEAR(s.Abfertigungsdatum) +) AS src +PIVOT +( + SUM([Der Wert]) + FOR [Year] IN (" & getJahrString(CDate(txtAbfertDat._value).Year, CDate(txtAbfertDatBis._value).Year) & ")) AS pvt;" Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL", , getSpedbuchList()) diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 247f1225..0bcbd299 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -3322,7 +3322,7 @@ Public Class frmMDM_USTVAntrag If UStVAn_ID <= 0 Then Exit Sub - .SET_SQL("SELECT [UStVAn_ID] ,[UStVEr_ID],[UStVEr_USteuerbetrag],[Belegdatum],[Belegnummer],[GutschriftsDatum],[GutschriftsNr],[Berufungsdatum],[Berufungshöhe],[Berufungsgrund],[Bemerkung],[UStVEr_Umrechnungskurs],[UStVEr_USteuerbetragEUR],[UStVEr_Sachbearbeiter],[UStVEr_Zeitstempel] + .SET_SQL("SELECT [UStVAn_ID] ,[UStVEr_ID],[UStVEr_USteuerbetragEUR],[Belegdatum],[Belegnummer],[GutschriftsDatum],[GutschriftsNr],UStVEr_VZ,UStVEr_RZVZ,UStVEr_Bank,[Berufungsdatum],[Berufungshöhe],[Berufungsgrund],[Bemerkung],[UStVEr_Umrechnungskurs],[UStVEr_USteuerbetrag],[UStVEr_Sachbearbeiter],[UStVEr_Zeitstempel] FROM [tblUStVErstattung] where UStVAn_ID=" & UStVAn_ID & " ORDER BY UStVEr_ID", "FMZOLL") .LOAD() @@ -3355,9 +3355,13 @@ Public Class frmMDM_USTVAntrag .Columns("Berufungshöhe").HeaderText = "BE-Höhe" .Columns("Berufungsgrund").HeaderText = "BE-Grund" + .Columns("UStVEr_VZ").HeaderText = "VZ" + .Columns("UStVEr_RZVZ").HeaderText = "RZVZ" + .Columns("UStVEr_Bank").HeaderText = "Bank" + .Columns("Berufungsdatum").Width = 80 - .Columns("Berufungshöhe").Width = 100 - .Columns("Berufungsgrund").Width = 150 + .Columns("Berufungshöhe").Width = 80 + .Columns("Berufungsgrund").Width = 100 .Columns("Bemerkung").Width = 200 .Columns("UStVEr_Umrechnungskurs").HeaderText = "Umrechnungskurs" diff --git a/SDL/USTV/usrCntlUSTV.Designer.vb b/SDL/USTV/usrCntlUSTV.Designer.vb index 9b96f204..01dd5763 100644 --- a/SDL/USTV/usrCntlUSTV.Designer.vb +++ b/SDL/USTV/usrCntlUSTV.Designer.vb @@ -23,7 +23,7 @@ Partial Class usrCntlUSTV Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlUSTV)) Me.pnlFilter = New System.Windows.Forms.Panel() Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) @@ -72,6 +72,7 @@ Partial Class usrCntlUSTV Me.btnUSTVAloeschen = New System.Windows.Forms.Button() Me.Panel2 = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() + Me.btn_Zahlungen_importieren = New System.Windows.Forms.Button() Me.btn3470 = New System.Windows.Forms.Button() Me.Button4 = New System.Windows.Forms.Button() Me.btnVZ = New System.Windows.Forms.Button() @@ -85,7 +86,7 @@ Partial Class usrCntlUSTV Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip4 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.btn_Zahlungen_importieren = New System.Windows.Forms.Button() + Me.Button2 = New System.Windows.Forms.Button() CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -107,8 +108,8 @@ Partial Class usrCntlUSTV Me.dgvUSTV.AKTUALISIERUNGS_INTERVALL = -1 Me.dgvUSTV.AllowUserToAddRows = False Me.dgvUSTV.AllowUserToDeleteRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvUSTV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvUSTV.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvUSTV.Location = New System.Drawing.Point(0, 108) @@ -793,6 +794,7 @@ Partial Class usrCntlUSTV 'Panel3 ' Me.Panel3.AutoSize = True + Me.Panel3.Controls.Add(Me.Button2) Me.Panel3.Controls.Add(Me.btn_Zahlungen_importieren) Me.Panel3.Controls.Add(Me.btn3470) Me.Panel3.Controls.Add(Me.Button4) @@ -812,6 +814,21 @@ Partial Class usrCntlUSTV Me.Panel3.Size = New System.Drawing.Size(1737, 77) Me.Panel3.TabIndex = 0 ' + 'btn_Zahlungen_importieren + ' + Me.btn_Zahlungen_importieren.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btn_Zahlungen_importieren.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.btn_Zahlungen_importieren.ForeColor = System.Drawing.Color.Black + Me.btn_Zahlungen_importieren.Image = Global.SDL.My.Resources.Resources.Excel_logo + Me.btn_Zahlungen_importieren.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btn_Zahlungen_importieren.Location = New System.Drawing.Point(778, 6) + Me.btn_Zahlungen_importieren.Name = "btn_Zahlungen_importieren" + Me.btn_Zahlungen_importieren.Size = New System.Drawing.Size(132, 40) + Me.btn_Zahlungen_importieren.TabIndex = 31 + Me.btn_Zahlungen_importieren.Text = "Erstattungspos. importieren" + Me.btn_Zahlungen_importieren.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btn_Zahlungen_importieren.UseVisualStyleBackColor = True + ' 'btn3470 ' Me.btn3470.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -829,7 +846,7 @@ Partial Class usrCntlUSTV Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button4.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button4.Location = New System.Drawing.Point(367, 7) + Me.Button4.Location = New System.Drawing.Point(349, 7) Me.Button4.Margin = New System.Windows.Forms.Padding(0) Me.Button4.Name = "Button4" Me.Button4.Size = New System.Drawing.Size(128, 41) @@ -898,7 +915,7 @@ Partial Class usrCntlUSTV Me.btnPLOSEAlle.ForeColor = System.Drawing.Color.Black Me.btnPLOSEAlle.Image = CType(resources.GetObject("btnPLOSEAlle.Image"), System.Drawing.Image) Me.btnPLOSEAlle.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnPLOSEAlle.Location = New System.Drawing.Point(516, 7) + Me.btnPLOSEAlle.Location = New System.Drawing.Point(629, 7) Me.btnPLOSEAlle.Name = "btnPLOSEAlle" Me.btnPLOSEAlle.Size = New System.Drawing.Size(132, 40) Me.btnPLOSEAlle.TabIndex = 24 @@ -925,7 +942,7 @@ Partial Class usrCntlUSTV Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button8.Image = Global.SDL.My.Resources.Resources.statistik_small Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button8.Location = New System.Drawing.Point(213, 7) + Me.Button8.Location = New System.Drawing.Point(194, 6) Me.Button8.Margin = New System.Windows.Forms.Padding(0) Me.Button8.Name = "Button8" Me.Button8.Size = New System.Drawing.Size(145, 41) @@ -954,20 +971,20 @@ Partial Class usrCntlUSTV Me.ContextMenuStrip4.Name = "ContextMenuStrip1" Me.ContextMenuStrip4.Size = New System.Drawing.Size(61, 4) ' - 'btn_Zahlungen_importieren + 'Button2 ' - Me.btn_Zahlungen_importieren.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btn_Zahlungen_importieren.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) - Me.btn_Zahlungen_importieren.ForeColor = System.Drawing.Color.Black - Me.btn_Zahlungen_importieren.Image = Global.SDL.My.Resources.Resources.Excel_logo - Me.btn_Zahlungen_importieren.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btn_Zahlungen_importieren.Location = New System.Drawing.Point(665, 6) - Me.btn_Zahlungen_importieren.Name = "btn_Zahlungen_importieren" - Me.btn_Zahlungen_importieren.Size = New System.Drawing.Size(132, 40) - Me.btn_Zahlungen_importieren.TabIndex = 31 - Me.btn_Zahlungen_importieren.Text = "Erstattungspos. importieren" - Me.btn_Zahlungen_importieren.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btn_Zahlungen_importieren.UseVisualStyleBackColor = True + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) + Me.Button2.ForeColor = System.Drawing.Color.Black + Me.Button2.Image = Global.SDL.My.Resources.Resources.statistik_small + Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button2.Location = New System.Drawing.Point(480, 7) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(132, 40) + Me.Button2.TabIndex = 32 + Me.Button2.Text = "MWST-Eingänge" + Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button2.UseVisualStyleBackColor = True ' 'usrCntlUSTV ' @@ -1048,4 +1065,5 @@ Partial Class usrCntlUSTV Friend WithEvents ContextMenuStrip4 As ContextMenuStrip Friend WithEvents btnoffeneAntraege As Button Friend WithEvents btn_Zahlungen_importieren As Button + Friend WithEvents Button2 As Button End Class diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 7476b5bf..5f5a484f 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -1,7 +1,12 @@ Imports System.ComponentModel +Imports System.Diagnostics.PerformanceData Imports System.Linq.Expressions Imports System.Text +Imports System.Web.UI.WebControls.Expressions +Imports com.sun.xml.internal.rngom.digested Imports GrapeCity.DataVisualization.TypeScript +Imports GrapeCity.Enterprise.Data.DataEngine.DataProcessing +Imports GrapeCity.Viewer.Common.Model Imports Microsoft.Office.Interop Imports org.BouncyCastle.Math.EC.Endo Imports VERAG_PROG_ALLGEMEIN @@ -392,15 +397,17 @@ Public Class usrCntlUSTV End Sub - Private Sub Button8_Click_1(sender As Object, e As EventArgs) Handles Button8.Click - 'Dim sqlStr = "SELECT [UStVAn_ID],[UStVAn_KuNr],[UStVAn_Name],LandKz,[UStVAn_ReDatVon],[UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_3470] ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],[UStVAn_Sachbearbeiter] - ' FROM [tblUStVAntrag] inner join [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr - ' where 1=1 " & getWhere(False) & " - ' AND cast( [UStVAn_USteuerbetragEUR] as decimal(17,2))-cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))<>0 - ' AND UStVAn_AntragEingereichtAm is not null - ' order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc" - Dim sqlStr = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KDNR,[UStVAn_Name] as Kundename,Adressen.LandKz as LKZ_KD, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr, LfdA.LandKz as LKZ,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as WKZ,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))) as DifferenzbetragEUR, (isnull(UStVAn_VZBetrag,0) - isnull(UStVAn_RZBetragVZ,0)) as VZ, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr - FROM [tblUStVAntrag] + Private Sub Button8_Click_1(sender As Object, e As EventArgs) Handles Button8.Click, Button2.Click + + Dim sqlStringSELECT As String = "" + + If sender.Name = "Button2" Then + sqlStringSELECT = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KDNR,[UStVAn_Name] as Kundename,Adressen.LandKz as LKZ_KD, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr, LfdA.LandKz as LKZ,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as WKZ,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))) as DifferenzbetragEUR, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr,'' as BANK, ''as Diff, '' as BelNr,(isnull(UStVAn_VZBetrag,0) - isnull(UStVAn_RZBetragVZ,0)) as VZ, '' as '3470', '' as GS, '' as RZVZ, '' as Info, '' as VZDIFF,'' as 'RG Retour'" + Else + sqlStringSELECT = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KDNR,[UStVAn_Name] as Kundename,Adressen.LandKz as LKZ_KD, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr, LfdA.LandKz as LKZ,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as WKZ,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))) as DifferenzbetragEUR, (isnull(UStVAn_VZBetrag,0) - isnull(UStVAn_RZBetragVZ,0)) as VZ, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr" + End If + + Dim sqlStr = sqlStringSELECT & " FROM [tblUStVAntrag] inner join [Länderverzeichnis für die Außenhandelsstatistik] as LfdA on UStVAn_LandNr=Landnr inner join Adressen on AdressenNr=UStVAn_KuNr left join [tblSteuernummern] as stnr on stnr.AdressenNr = UStVAn_KuNr and stnr.LandNr=UStVAn_LandNr @@ -411,7 +418,16 @@ Public Class usrCntlUSTV Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL") If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then - cProgramFunctions.genExcelFromDT_NEW(dt, ,,,,, True,,,,,, {"L1:Q" & (dt.Rows.Count + 1)}) + + Select Case sender.Name + Case "Button8" + cProgramFunctions.genExcelFromDT_NEW(dt, ,,,,, True,,,,,, {"L1:Q" & (dt.Rows.Count + 1)}) + Case Else + cProgramFunctions.genExcelFromDT_NEW(dt, ,, "MWST-Eingang " & Today.ToShortDateString,,, True,,,,,, {"L1:Q" & (dt.Rows.Count + 1)}, {"D", "E", "I", "J", "M", "O", "N", "Q", "R", "S"}) + End Select + + + Else MsgBox("Keine Daten!") End If @@ -1809,12 +1825,14 @@ Public Class usrCntlUSTV If dt IsNot Nothing And Not dt.Columns.Contains("name") Then dt.Columns.Add("AntragID", GetType(String)) - dt.Columns.Add("Steuerbetrag", GetType(Double)) + dt.Columns.Add("BetragEUR", GetType(Double)) dt.Columns.Add("Bank", GetType(String)) dt.Columns.Add("BelegNr", GetType(String)) dt.Columns.Add("GS", GetType(String)) + dt.Columns.Add("VZ", GetType(String)) dt.Columns.Add("RZVZ", GetType(String)) dt.Columns.Add("Info", GetType(String)) + dt.Columns.Add("Diff", GetType(String)) dt.Columns.Add("3470", GetType(String)) End If @@ -1845,12 +1863,14 @@ Public Class usrCntlUSTV ' Pflichtspalten prüfen Dim requiredHeaders As String() = { "ID", - "Steuerbetrag", + "DifferenzbetragEUR", "BANK", "BelNr", "GS", + "VZ", "RZVZ", "3470", + "Diff", "INFO" } @@ -1863,15 +1883,25 @@ Public Class usrCntlUSTV Next + + Dim BelegdatumInput As String = "" + Dim Belegdatum As Date + Dim letzteZeile As Integer = Blatt.UsedRange.Rows.Count + Dim input = Convert.ToString(Blatt.Cells(1, 1).Value).Trim() + If input <> "" AndAlso input.StartsWith("MWST-Eingang") Then + BelegdatumInput = input.Replace("MWST-Eingang", "") + BelegdatumInput = BelegdatumInput.Trim + End If + For row As Integer = 4 To letzteZeile Dim USTAV_ID As String = getTrimedString(Convert.ToString(Blatt.Cells(row, headerMap("ID")).Value), 6) - Dim Zahlungsbetrag As String = - Convert.ToString(Blatt.Cells(row, headerMap("Steuerbetrag")).Value) + Dim BetragEUR As String = + Convert.ToString(Blatt.Cells(row, headerMap("DifferenzbetragEUR")).Value) Dim BelNr As String = getTrimedString(Convert.ToString(Blatt.Cells(row, headerMap("BelNr")).Value), 6) @@ -1882,6 +1912,9 @@ Public Class usrCntlUSTV Dim GS As String = Convert.ToString(Blatt.Cells(row, headerMap("GS")).Value) + Dim VZ As String = + Convert.ToString(Blatt.Cells(row, headerMap("VZ")).Value) + Dim RZVZ As String = Convert.ToString(Blatt.Cells(row, headerMap("RZVZ")).Value) @@ -1891,21 +1924,26 @@ Public Class usrCntlUSTV Dim _3470 As String = Convert.ToString(Blatt.Cells(row, headerMap("3470")).Value) + Dim _Diff As String = + Convert.ToString(Blatt.Cells(row, headerMap("Diff")).Value) + If String.IsNullOrWhiteSpace(USTAV_ID) Then Continue For End If - If IsNumeric(USTAV_ID) AndAlso Bank <> "" AndAlso IsNumeric(Bank) AndAlso GS <> "" Then + If IsNumeric(USTAV_ID) AndAlso Bank <> "" AndAlso IsNumeric(Bank) Then Dim R As DataRow = dt.NewRow R("AntragID") = USTAV_ID - R("Steuerbetrag") = Zahlungsbetrag + R("BetragEUR") = BetragEUR R("Bank") = Bank R("BelegNr") = BelNr R("GS") = GS + R("VZ") = VZ R("RZVZ") = RZVZ R("Info") = INFO + R("Diff") = _Diff dt.Rows.Add(R) @@ -1920,6 +1958,24 @@ Public Class usrCntlUSTV If dt.Rows.Count > 0 Then + Dim counter As Integer = 0 + + If BelegdatumInput <> "" AndAlso IsDate(BelegdatumInput) Then + Belegdatum = CDate(BelegdatumInput) + Else + MsgBox("Das MWST-Datum kann nicht automatisch ausgelesen werden!") + Dim f As New frmDatumsabfrage("Bitte MWST-Datum eingeben", False) + f.ShowDialog() + + If f.DialogResult = DialogResult.OK Then + Belegdatum = CDate(f.Datum) + Else + Exit Sub + End If + + End If + + Using frm As New frmAbrechnungHandling(dt, Nothing, "Import " & dt.Rows.Count & " Erstattungspositionen") @@ -1933,6 +1989,7 @@ Public Class usrCntlUSTV For Each r As DataRow In dt.Rows + Dim BelegNr = r.Item("BelegNr") Dim USTV_ANTRAG = New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(r.Item("AntragID")) If USTV_ANTRAG.hasEntry Then @@ -1944,21 +2001,72 @@ Public Class usrCntlUSTV USTV_ANTRAG.SAVE() End If - 'Case "nein" - ' If USTV_ANTRAG.UStVAn_3470 Then - ' USTV_ANTRAG.UStVAn_3470 = False - ' USTV_ANTRAG.SAVE() - ' End If + + End Select + Dim UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen(Belegdatum, BelegNr, fd.FileName) + If Not UStV_ERS.hasEntry Then - Dim UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen() - UStV_ERS.UStVEr_ID = USTV_ANTRAG.getMaxPosNrErst() - UStV_ERS.UStVEr_interneNr = USTV_ANTRAG.getMaxinternePosNrErst() - UStV_ERS.UStVAn_ID = USTV_ANTRAG.UStVAn_ID + UStV_ERS.UStVEr_ID = USTV_ANTRAG.getMaxPosNrErst() + UStV_ERS.UStVEr_interneNr = USTV_ANTRAG.getMaxinternePosNrErst() + UStV_ERS.UStVAn_ID = USTV_ANTRAG.UStVAn_ID + UStV_ERS.Belegnummer = BelegNr + UStV_ERS.UStVEr_USteuerbetragEUR = r.Item("BetragEUR") + UStV_ERS.UStVEr_Importfilename = fd.FileName + UStV_ERS.UStVEr_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + UStV_ERS.UStVEr_Zeitstempel = Now + If USTV_ANTRAG.UStVAn_Währungscode <> "EUR" Then + Dim kurs As New cEZB_Waehrungskurse(USTV_ANTRAG.UStVAn_Währungscode) + UStV_ERS.UStVEr_USteuerbetrag = System.Math.Round(kurs.EXCHANGE_EURTOCUR(UStV_ERS.UStVEr_USteuerbetragEUR, USTV_ANTRAG.UStVAn_Währungscode, CDate(Belegdatum)), 2) + UStV_ERS.UStVEr_Umrechnungskurs = Math.floor((CDbl(UStV_ERS.UStVEr_USteuerbetrag) / CDbl(UStV_ERS.UStVEr_USteuerbetragEUR) * 100 + 0.5)) / 100 + Else + UStV_ERS.UStVEr_USteuerbetrag = r.Item("BetragEUR") + UStV_ERS.UStVEr_Umrechnungskurs = 1 + End If + + Dim Bemerkung As String = "" + + If Not String.IsNullOrWhiteSpace(r.Item("VZ")) AndAlso IsNumeric(r.Item("VZ")) AndAlso Not IsDBNull(r.Item("VZ")) Then + Bemerkung &= "VZ: " & CDbl(r.Item("VZ")).ToString("N2") & " " & USTV_ANTRAG.UStVAn_Währungscode + UStV_ERS.UStVEr_VZ = CDbl(r.Item("VZ")) + + If USTV_ANTRAG.UStVAn_VZBetrag Is Nothing OrElse IsNothing(USTV_ANTRAG.UStVAn_VZBetrag) Then + USTV_ANTRAG.UStVAn_VZBetrag = UStV_ERS.UStVEr_VZ + USTV_ANTRAG.SAVE() + End If + + End If + + If Not String.IsNullOrWhiteSpace(r.Item("Bank")) AndAlso IsNumeric(r.Item("Bank")) AndAlso Not IsDBNull(r.Item("Bank")) Then + Bemerkung &= ", a.K. : " & CDbl(r.Item("Bank")).ToString("N2") & " " & USTV_ANTRAG.UStVAn_Währungscode + UStV_ERS.UStVEr_Bank = CDbl(r.Item("Bank")) + End If + + If Not String.IsNullOrWhiteSpace(r.Item("Diff")) AndAlso IsNumeric(r.Item("Diff")) AndAlso Not IsDBNull(r.Item("Diff")) Then + Bemerkung &= ", Diff: " & CDbl(r.Item("Diff")).ToString("N2") + End If + If Bemerkung <> "" Then + UStV_ERS.Bemerkung = Bemerkung + End If + + If Not String.IsNullOrWhiteSpace(r.Item("RZVZ")) AndAlso IsNumeric(r.Item("RZVZ")) AndAlso Not IsDBNull(r.Item("RZVZ")) Then + UStV_ERS.UStVEr_RZVZ = CDbl(r.Item("RZVZ")).ToString("N2") + If USTV_ANTRAG.UStVAn_RZBetragVZ Is Nothing OrElse IsDBNull(USTV_ANTRAG.UStVAn_RZBetragVZ) Then + USTV_ANTRAG.UStVAn_RZBetragVZ = UStV_ERS.UStVEr_RZVZ + USTV_ANTRAG.SAVE() + End If + End If + + + If UStV_ERS.SAVE() Then + counter += 1 + End If + + End If End If @@ -1966,6 +2074,7 @@ Public Class usrCntlUSTV Next importiert = True + MsgBox(counter & " von " & dt.Rows.Count & " erfolgreich importiert!") End If @@ -1975,7 +2084,8 @@ Public Class usrCntlUSTV Else - Exit Sub + MsgBox("keine zu importierende Daten vorhanden!") + Exit Sub End If @@ -2098,4 +2208,8 @@ Public Class usrCntlUSTV If s.ToString.Trim = "" Then Return Nothing Return s.trim End Function + + Private Sub Button2_Click_1(sender As Object, e As EventArgs) Handles Button2.Click + + End Sub End Class diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb index e87f6d56..3767c614 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb @@ -42,6 +42,12 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.lblAenderungsdatum = New System.Windows.Forms.Label() Me.lblSachbearbeiter = New System.Windows.Forms.Label() Me.pnl = New System.Windows.Forms.Panel() + Me.txtRZVZ = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label21 = New System.Windows.Forms.Label() + Me.txtVZ = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label20 = New System.Windows.Forms.Label() + Me.txtBank = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label17 = New System.Windows.Forms.Label() Me.Label19 = New System.Windows.Forms.Label() Me.Label18 = New System.Windows.Forms.Label() Me.txtGuNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -98,7 +104,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label7.AutoSize = True Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label7.Location = New System.Drawing.Point(14, 31) + Me.Label7.Location = New System.Drawing.Point(14, 23) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(83, 15) Me.Label7.TabIndex = 2 @@ -118,7 +124,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label9.AutoSize = True Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label9.Location = New System.Drawing.Point(174, 33) + Me.Label9.Location = New System.Drawing.Point(174, 25) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(54, 13) Me.Label9.TabIndex = 3 @@ -128,7 +134,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(465, 14) + Me.Label1.Location = New System.Drawing.Point(465, 6) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(62, 13) Me.Label1.TabIndex = 1 @@ -164,7 +170,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label2.AutoSize = True Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label2.Location = New System.Drawing.Point(465, 31) + Me.Label2.Location = New System.Drawing.Point(465, 23) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(108, 15) Me.Label2.TabIndex = 4 @@ -174,7 +180,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label3.Location = New System.Drawing.Point(640, 31) + Me.Label3.Location = New System.Drawing.Point(640, 23) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(87, 15) Me.Label3.TabIndex = 5 @@ -184,7 +190,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label6.AutoSize = True Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label6.Location = New System.Drawing.Point(14, 14) + Me.Label6.Location = New System.Drawing.Point(14, 6) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(65, 13) Me.Label6.TabIndex = 0 @@ -194,7 +200,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label10.AutoSize = True Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label10.Location = New System.Drawing.Point(14, 92) + Me.Label10.Location = New System.Drawing.Point(14, 84) Me.Label10.Name = "Label10" Me.Label10.Size = New System.Drawing.Size(65, 13) Me.Label10.TabIndex = 10 @@ -204,7 +210,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label11.AutoSize = True Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label11.Location = New System.Drawing.Point(14, 112) + Me.Label11.Location = New System.Drawing.Point(14, 104) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(70, 15) Me.Label11.TabIndex = 11 @@ -214,7 +220,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label12.AutoSize = True Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label12.Location = New System.Drawing.Point(174, 112) + Me.Label12.Location = New System.Drawing.Point(174, 104) Me.Label12.Name = "Label12" Me.Label12.Size = New System.Drawing.Size(111, 15) Me.Label12.TabIndex = 12 @@ -224,7 +230,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label13.AutoSize = True Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label13.Location = New System.Drawing.Point(291, 112) + Me.Label13.Location = New System.Drawing.Point(291, 104) Me.Label13.Name = "Label13" Me.Label13.Size = New System.Drawing.Size(96, 15) Me.Label13.TabIndex = 13 @@ -234,7 +240,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label4.AutoSize = True Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label4.Location = New System.Drawing.Point(14, 191) + Me.Label4.Location = New System.Drawing.Point(14, 183) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(94, 15) Me.Label4.TabIndex = 19 @@ -244,7 +250,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label5.Location = New System.Drawing.Point(14, 207) + Me.Label5.Location = New System.Drawing.Point(14, 199) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(104, 15) Me.Label5.TabIndex = 21 @@ -254,7 +260,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.lblAenderungsdatum.AutoSize = True Me.lblAenderungsdatum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.lblAenderungsdatum.Location = New System.Drawing.Point(127, 207) + Me.lblAenderungsdatum.Location = New System.Drawing.Point(127, 199) Me.lblAenderungsdatum.Name = "lblAenderungsdatum" Me.lblAenderungsdatum.Size = New System.Drawing.Size(11, 15) Me.lblAenderungsdatum.TabIndex = 22 @@ -264,7 +270,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.lblSachbearbeiter.AutoSize = True Me.lblSachbearbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.lblSachbearbeiter.Location = New System.Drawing.Point(127, 191) + Me.lblSachbearbeiter.Location = New System.Drawing.Point(127, 183) Me.lblSachbearbeiter.Name = "lblSachbearbeiter" Me.lblSachbearbeiter.Size = New System.Drawing.Size(11, 15) Me.lblSachbearbeiter.TabIndex = 20 @@ -273,6 +279,12 @@ Partial Class ustCntlUSTV_ErstattungPosition 'pnl ' Me.pnl.BackColor = System.Drawing.Color.White + Me.pnl.Controls.Add(Me.txtRZVZ) + Me.pnl.Controls.Add(Me.Label21) + Me.pnl.Controls.Add(Me.txtVZ) + Me.pnl.Controls.Add(Me.Label20) + Me.pnl.Controls.Add(Me.txtBank) + Me.pnl.Controls.Add(Me.Label17) Me.pnl.Controls.Add(Me.Label19) Me.pnl.Controls.Add(Me.Label18) Me.pnl.Controls.Add(Me.txtGuNr) @@ -310,11 +322,113 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.pnl.Size = New System.Drawing.Size(1307, 235) Me.pnl.TabIndex = 1 ' + 'txtRZVZ + ' + Me.txtRZVZ._DateTimeOnly = False + Me.txtRZVZ._numbersOnly = False + Me.txtRZVZ._numbersOnlyKommastellen = "" + Me.txtRZVZ._numbersOnlyTrennzeichen = False + Me.txtRZVZ._Prozent = False + Me.txtRZVZ._ShortDateNew = False + Me.txtRZVZ._ShortDateOnly = False + Me.txtRZVZ._TimeOnly = False + Me.txtRZVZ._TimeOnly_Seconds = False + Me.txtRZVZ._value = "" + Me.txtRZVZ._Waehrung = True + Me.txtRZVZ._WaehrungZeichen = False + Me.txtRZVZ.ForeColor = System.Drawing.Color.Red + Me.txtRZVZ.Location = New System.Drawing.Point(699, 204) + Me.txtRZVZ.MaxLength = 15 + Me.txtRZVZ.MaxLineLength = -1 + Me.txtRZVZ.MaxLines_Warning = "" + Me.txtRZVZ.MaxLines_Warning_Label = Nothing + Me.txtRZVZ.Name = "txtRZVZ" + Me.txtRZVZ.Size = New System.Drawing.Size(105, 20) + Me.txtRZVZ.TabIndex = 40 + ' + 'Label21 + ' + Me.Label21.AutoSize = True + Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) + Me.Label21.Location = New System.Drawing.Point(696, 188) + Me.Label21.Name = "Label21" + Me.Label21.Size = New System.Drawing.Size(37, 15) + Me.Label21.TabIndex = 39 + Me.Label21.Text = "RZVZ" + ' + 'txtVZ + ' + Me.txtVZ._DateTimeOnly = False + Me.txtVZ._numbersOnly = False + Me.txtVZ._numbersOnlyKommastellen = "" + Me.txtVZ._numbersOnlyTrennzeichen = False + Me.txtVZ._Prozent = False + Me.txtVZ._ShortDateNew = False + Me.txtVZ._ShortDateOnly = False + Me.txtVZ._TimeOnly = False + Me.txtVZ._TimeOnly_Seconds = False + Me.txtVZ._value = "" + Me.txtVZ._Waehrung = True + Me.txtVZ._WaehrungZeichen = False + Me.txtVZ.ForeColor = System.Drawing.Color.Red + Me.txtVZ.Location = New System.Drawing.Point(588, 204) + Me.txtVZ.MaxLength = 15 + Me.txtVZ.MaxLineLength = -1 + Me.txtVZ.MaxLines_Warning = "" + Me.txtVZ.MaxLines_Warning_Label = Nothing + Me.txtVZ.Name = "txtVZ" + Me.txtVZ.Size = New System.Drawing.Size(105, 20) + Me.txtVZ.TabIndex = 38 + ' + 'Label20 + ' + Me.Label20.AutoSize = True + Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) + Me.Label20.Location = New System.Drawing.Point(585, 188) + Me.Label20.Name = "Label20" + Me.Label20.Size = New System.Drawing.Size(21, 15) + Me.Label20.TabIndex = 37 + Me.Label20.Text = "VZ" + ' + 'txtBank + ' + Me.txtBank._DateTimeOnly = False + Me.txtBank._numbersOnly = False + Me.txtBank._numbersOnlyKommastellen = "" + Me.txtBank._numbersOnlyTrennzeichen = False + Me.txtBank._Prozent = False + Me.txtBank._ShortDateNew = False + Me.txtBank._ShortDateOnly = False + Me.txtBank._TimeOnly = False + Me.txtBank._TimeOnly_Seconds = False + Me.txtBank._value = "" + Me.txtBank._Waehrung = True + Me.txtBank._WaehrungZeichen = False + Me.txtBank.ForeColor = System.Drawing.Color.Red + Me.txtBank.Location = New System.Drawing.Point(468, 203) + Me.txtBank.MaxLength = 15 + Me.txtBank.MaxLineLength = -1 + Me.txtBank.MaxLines_Warning = "" + Me.txtBank.MaxLines_Warning_Label = Nothing + Me.txtBank.Name = "txtBank" + Me.txtBank.Size = New System.Drawing.Size(105, 20) + Me.txtBank.TabIndex = 36 + ' + 'Label17 + ' + Me.Label17.AutoSize = True + Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) + Me.Label17.Location = New System.Drawing.Point(465, 187) + Me.Label17.Name = "Label17" + Me.Label17.Size = New System.Drawing.Size(35, 15) + Me.Label17.TabIndex = 35 + Me.Label17.Text = "Bank" + ' 'Label19 ' Me.Label19.AutoSize = True Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label19.Location = New System.Drawing.Point(465, 112) + Me.Label19.Location = New System.Drawing.Point(465, 104) Me.Label19.Name = "Label19" Me.Label19.Size = New System.Drawing.Size(107, 15) Me.Label19.TabIndex = 34 @@ -324,7 +438,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label18.AutoSize = True Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label18.Location = New System.Drawing.Point(465, 92) + Me.Label18.Location = New System.Drawing.Point(465, 84) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(58, 13) Me.Label18.TabIndex = 33 @@ -344,7 +458,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtGuNr._value = Nothing Me.txtGuNr._Waehrung = False Me.txtGuNr._WaehrungZeichen = False - Me.txtGuNr.Location = New System.Drawing.Point(643, 49) + Me.txtGuNr.Location = New System.Drawing.Point(643, 41) Me.txtGuNr.MaxLength = 22 Me.txtGuNr.MaxLineLength = -1 Me.txtGuNr.MaxLines_Warning = "" @@ -368,7 +482,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBerufungsdatum._Waehrung = False Me.txtBerufungsdatum._WaehrungZeichen = False Me.txtBerufungsdatum.ForeColor = System.Drawing.Color.Red - Me.txtBerufungsdatum.Location = New System.Drawing.Point(468, 130) + Me.txtBerufungsdatum.Location = New System.Drawing.Point(468, 122) Me.txtBerufungsdatum.MaxLength = 10 Me.txtBerufungsdatum.MaxLineLength = -1 Me.txtBerufungsdatum.MaxLines_Warning = "" @@ -402,7 +516,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBemerkung._Waehrung = False Me.txtBemerkung._WaehrungZeichen = False Me.txtBemerkung.ForeColor = System.Drawing.Color.Red - Me.txtBemerkung.Location = New System.Drawing.Point(468, 179) + Me.txtBemerkung.Location = New System.Drawing.Point(468, 166) Me.txtBemerkung.MaxLength = 255 Me.txtBemerkung.MaxLineLength = -1 Me.txtBemerkung.MaxLines_Warning = "" @@ -415,7 +529,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label14.AutoSize = True Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label14.Location = New System.Drawing.Point(645, 112) + Me.Label14.Location = New System.Drawing.Point(645, 104) Me.Label14.Name = "Label14" Me.Label14.Size = New System.Drawing.Size(95, 15) Me.Label14.TabIndex = 23 @@ -425,7 +539,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label15.AutoSize = True Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label15.Location = New System.Drawing.Point(784, 112) + Me.Label15.Location = New System.Drawing.Point(784, 104) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(91, 15) Me.Label15.TabIndex = 25 @@ -446,7 +560,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBerufungshoehe._Waehrung = True Me.txtBerufungshoehe._WaehrungZeichen = False Me.txtBerufungshoehe.ForeColor = System.Drawing.Color.Red - Me.txtBerufungshoehe.Location = New System.Drawing.Point(787, 130) + Me.txtBerufungshoehe.Location = New System.Drawing.Point(787, 122) Me.txtBerufungshoehe.MaxLength = 15 Me.txtBerufungshoehe.MaxLineLength = -1 Me.txtBerufungshoehe.MaxLines_Warning = "" @@ -469,7 +583,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBelegNr._value = Nothing Me.txtBelegNr._Waehrung = False Me.txtBelegNr._WaehrungZeichen = False - Me.txtBelegNr.Location = New System.Drawing.Point(177, 49) + Me.txtBelegNr.Location = New System.Drawing.Point(177, 41) Me.txtBelegNr.MaxLength = 250 Me.txtBelegNr.MaxLineLength = -1 Me.txtBelegNr.MaxLines_Warning = "" @@ -482,7 +596,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' Me.Label16.AutoSize = True Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label16.Location = New System.Drawing.Point(465, 161) + Me.Label16.Location = New System.Drawing.Point(465, 148) Me.Label16.Name = "Label16" Me.Label16.Size = New System.Drawing.Size(71, 15) Me.Label16.TabIndex = 27 @@ -503,7 +617,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBerurunfgrund._Waehrung = False Me.txtBerurunfgrund._WaehrungZeichen = False Me.txtBerurunfgrund.ForeColor = System.Drawing.Color.Red - Me.txtBerurunfgrund.Location = New System.Drawing.Point(643, 130) + Me.txtBerurunfgrund.Location = New System.Drawing.Point(643, 122) Me.txtBerurunfgrund.MaxLength = 50 Me.txtBerurunfgrund.MaxLineLength = -1 Me.txtBerurunfgrund.MaxLines_Warning = "" @@ -527,7 +641,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBelegDatum._Waehrung = False Me.txtBelegDatum._WaehrungZeichen = False Me.txtBelegDatum.ForeColor = System.Drawing.Color.Red - Me.txtBelegDatum.Location = New System.Drawing.Point(17, 49) + Me.txtBelegDatum.Location = New System.Drawing.Point(17, 41) Me.txtBelegDatum.MaxLength = 10 Me.txtBelegDatum.MaxLineLength = -1 Me.txtBelegDatum.MaxLines_Warning = "" @@ -550,7 +664,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtGuDatum._value = "" Me.txtGuDatum._Waehrung = False Me.txtGuDatum._WaehrungZeichen = False - Me.txtGuDatum.Location = New System.Drawing.Point(468, 49) + Me.txtGuDatum.Location = New System.Drawing.Point(468, 41) Me.txtGuDatum.MaxLength = 10 Me.txtGuDatum.MaxLineLength = -1 Me.txtGuDatum.MaxLines_Warning = "" @@ -574,7 +688,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtUSTBetragEUR._Waehrung = True Me.txtUSTBetragEUR._WaehrungZeichen = False Me.txtUSTBetragEUR.ForeColor = System.Drawing.Color.Red - Me.txtUSTBetragEUR.Location = New System.Drawing.Point(294, 130) + Me.txtUSTBetragEUR.Location = New System.Drawing.Point(294, 122) Me.txtUSTBetragEUR.MaxLength = 15 Me.txtUSTBetragEUR.MaxLineLength = -1 Me.txtUSTBetragEUR.MaxLines_Warning = "" @@ -598,7 +712,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtUmrechnungskurs._Waehrung = False Me.txtUmrechnungskurs._WaehrungZeichen = False Me.txtUmrechnungskurs.ForeColor = System.Drawing.Color.Red - Me.txtUmrechnungskurs.Location = New System.Drawing.Point(177, 130) + Me.txtUmrechnungskurs.Location = New System.Drawing.Point(177, 122) Me.txtUmrechnungskurs.MaxLength = 10 Me.txtUmrechnungskurs.MaxLineLength = -1 Me.txtUmrechnungskurs.MaxLines_Warning = "" @@ -622,7 +736,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtUSTBetrag._Waehrung = True Me.txtUSTBetrag._WaehrungZeichen = False Me.txtUSTBetrag.ForeColor = System.Drawing.Color.Red - Me.txtUSTBetrag.Location = New System.Drawing.Point(17, 130) + Me.txtUSTBetrag.Location = New System.Drawing.Point(17, 122) Me.txtUSTBetrag.MaxLength = 15 Me.txtUSTBetrag.MaxLineLength = -1 Me.txtUSTBetrag.MaxLines_Warning = "" @@ -870,4 +984,10 @@ Partial Class ustCntlUSTV_ErstattungPosition Friend WithEvents scanLieferschein As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan Friend WithEvents tabVZ As TabPage Friend WithEvents scanUSTVVollmachten As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList + Friend WithEvents txtBank As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label17 As Label + Friend WithEvents txtRZVZ As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label21 As Label + Friend WithEvents txtVZ As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label20 As Label End Class diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb index a5c02c9c..28517d63 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb @@ -37,6 +37,10 @@ Public Class ustCntlUSTV_ErstattungPosition txtBemerkung.Text = "" lblAenderungsdatum.Text = "-" + txtVZ._value = 0 + txtRZVZ._value = 0 + txtBank._value = 0 + End Sub Sub setValues(UstV_AN_ As cUSTVAntrag, Optional UStV_ERS As VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen = Nothing, Optional kdNr As Integer = -1) @@ -56,6 +60,11 @@ Public Class ustCntlUSTV_ErstattungPosition txtBerurunfgrund._value = If(UStV_ERS.Berufungsgrund, "") txtBerufungshoehe._value = If(UStV_ERS.Berufungshöhe, "") + txtVZ._value = If(UStV_ERS.UStVEr_VZ, "") + txtRZVZ._value = If(UStV_ERS.UStVEr_RZVZ, "") + txtBank._value = If(UStV_ERS.UStVEr_Bank, "") + + lblSachbearbeiter.Text = If(UStV_ERS.UStVEr_Sachbearbeiter, "") If UStV_ERS.UStVEr_Zeitstempel IsNot Nothing Then lblAenderungsdatum.Text = CDate(UStV_ERS.UStVEr_Zeitstempel).ToString("dd.MM.yyyy HH:mm") @@ -99,6 +108,11 @@ Public Class ustCntlUSTV_ErstattungPosition UStV_ERS.UStVEr_Umrechnungskurs = cProgramFunctions.isLeerNothingDbl(txtUmrechnungskurs.Text) + UStV_ERS.UStVEr_RZVZ = cProgramFunctions.isLeerNothingDbl(txtRZVZ.Text) + UStV_ERS.UStVEr_VZ = cProgramFunctions.isLeerNothingDbl(txtVZ.Text) + UStV_ERS.UStVEr_Bank = cProgramFunctions.isLeerNothingDbl(txtBank.Text) + + If txtBelegDatum.Text <> "" AndAlso IsDate(txtBelegDatum.Text) Then UStV_ERS.Belegdatum = txtBelegDatum._value @@ -263,4 +277,5 @@ Public Class ustCntlUSTV_ErstattungPosition If UStV_ERS.SAVE() Then RaiseEvent CHANGED(UStV_ERS.UStVEr_ID) End Sub + End Class diff --git a/SDL/cProgramFunctions.vb b/SDL/cProgramFunctions.vb index 5b9b4ac3..723d2615 100644 --- a/SDL/cProgramFunctions.vb +++ b/SDL/cProgramFunctions.vb @@ -1232,7 +1232,7 @@ Public Class cProgramFunctions Return "" End Function - Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "€", Optional fitCellsToContent As Boolean = False, Optional mergeHeadersToCell As Char = "", Optional Landscape As Boolean = False, Optional fitToOnePage As Boolean = False, Optional openFile As Boolean = True, Optional fitWideToOnePage As Boolean = False, Optional rangeAsBuchhaltung() As String = Nothing) As String + Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "€", Optional fitCellsToContent As Boolean = False, Optional mergeHeadersToCell As Char = "", Optional Landscape As Boolean = False, Optional fitToOnePage As Boolean = False, Optional openFile As Boolean = True, Optional fitWideToOnePage As Boolean = False, Optional rangeAsBuchhaltung() As String = Nothing, Optional hideRange() As String = Nothing) As String Try Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SDL\tmp\" ' My.Computer.FileSystem.GetTempFileName @@ -1267,6 +1267,16 @@ Public Class cProgramFunctions Next End If + If hideRange IsNot Nothing Then + For Each col As String In hideRange + Try + wb.Worksheets(0).Columns(col).Hide() + Catch ex As Exception + MsgBox(ex.Message & vbCrLf & ex.StackTrace) + End Try + Next + End If + If HeaderTxt <> "" Then wb.Worksheets(0).FirstRow.InsertRowsAbove(2) wb.Worksheets(0).Range("A1").Value = HeaderTxt diff --git a/SDL/mdm/frmMDMDatenverarbetiung.vb b/SDL/mdm/frmMDMDatenverarbetiung.vb index e6562a88..376573b2 100644 --- a/SDL/mdm/frmMDMDatenverarbetiung.vb +++ b/SDL/mdm/frmMDMDatenverarbetiung.vb @@ -4920,7 +4920,7 @@ LEFT JOIN VERAG.dbo.tbl_IDS_Länder land End Sub Sub setBillingDateCompleted(Lieferant_ As String, date_ As Date) - SQL.doSQL("UPDATE tblMDMEinarbeitung SET billingdate ='" & date_.ToShortDateString & "', WHERE supplier = '" & Lieferant_ & "' AND billingdate is null ", "FMZOLL") + SQL.doSQL("UPDATE tblMDMEinarbeitung SET billingdate ='" & date_.ToShortDateString & "' WHERE supplier = '" & Lieferant_ & "' AND billingdate is null ", "FMZOLL") End Sub diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb index d46b84fb..3c2e3e37 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb @@ -581,6 +581,10 @@ Public Class cUStVErstattungPositionen Property UStVEr_Zeitstempel As Object = Nothing Property UStVEr_daId As Object = Nothing Property UStVEr_interneNr As Integer + Property UStVEr_Importfilename As Object = Nothing + Property UStVEr_VZ As Object = Nothing + Property UStVEr_RZVZ As Object = Nothing + Property UStVEr_Bank As Object = Nothing Public hasEntry = False @@ -607,9 +611,22 @@ Public Class cUStVErstattungPositionen list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_Zeitstempel", UStVEr_Zeitstempel)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_daId", UStVEr_daId)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_interneNr", UStVEr_interneNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_Importfilename", UStVEr_Importfilename)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_VZ", UStVEr_VZ)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_RZVZ", UStVEr_RZVZ)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_Bank", UStVEr_Bank)) Return list End Function + Sub New(Belegdatum, Belegnummer, UStVEr_Importfilename) + Me.Belegdatum = Belegdatum + Me.Belegnummer = Belegnummer + Me.UStVEr_Importfilename = UStVEr_Importfilename + + LOAD(Belegdatum, Belegnummer, UStVEr_Importfilename) + End Sub + + Sub New(UStVAn_ID, UStVEr_ID) Me.UStVAn_ID = UStVAn_ID Me.UStVEr_ID = UStVEr_ID @@ -651,6 +668,37 @@ Public Class cUStVErstattungPositionen End Try End Sub + Public Sub LOAD(Belegdatum, Belegnummer, UStVEr_Importfilename) + Try + + hasEntry = False + + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM tblUStVErstattung WHERE Belegdatum=@Belegdatum AND Belegnummer=@Belegnummer AND UStVEr_Importfilename=@UStVEr_Importfilename ", conn) + cmd.Parameters.AddWithValue("@Belegdatum", Belegdatum) + cmd.Parameters.AddWithValue("@Belegnummer", Belegnummer) + cmd.Parameters.AddWithValue("@UStVEr_Importfilename", UStVEr_Importfilename) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + 'Dim l As New cOfferte + For Each i In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(i.Scalarvariable) + If dr.Item(i.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(i.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 Function SAVE() As Boolean Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()