diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index aaf2cda4..41868347 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/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 0bcbd299..68ca9ea0 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -1850,6 +1850,7 @@ Public Class frmMDM_USTVAntrag End If Next + If USTV_ANTRAG.UStVAn_Währungscode IsNot Nothing AndAlso USTV_ANTRAG.UStVAn_Währungscode <> "EUR" AndAlso USTV_ANTRAG.UStVAn_Währungscode <> "" Then Dim averageUmrechnungskurs As Double = 1 Dim invoicedateOK As Boolean = True @@ -3196,8 +3197,11 @@ Public Class frmMDM_USTVAntrag End If If UstCntlUSTV_AntragErstattungen1.UStV_ERS.DELETE(UstCntlUSTV_AntragErstattungen1.UstV_AN.UStVAn_ID, UstCntlUSTV_AntragErstattungen1.UStV_ERS.UStVEr_ID) Then + + checkIfMWSTEingangAbrechung() reorderUSTVAErstattzungen(UstCntlUSTV_AntragErstattungen1.UstV_AN.UStVAn_ID) initdgvErstattungen() + End If @@ -3205,6 +3209,17 @@ Public Class frmMDM_USTVAntrag End Sub + Private Sub checkIfMWSTEingangAbrechung() + + + Dim count_nichtMWSTOffen As Integer = -1 + count_nichtMWSTOffen = CInt(SQL.getValueTxtBySql("SELECT COUNT(*) FROM [tblUStVErstattung] WHERE [UStVAn_ID] = " & USTV_ANTRAG.UStVAn_ID & " and isnull([GutschriftsDatum],0) = 0 and UStVEr_Importfilename is not null", "FMZOLL")) + If count_nichtMWSTOffen = 0 Then + SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_MWSTEingang_offen = 0 WHERE [UStVAn_ID] =" & USTV_ANTRAG.UStVAn_ID, "FMZOLL") + End If + + End Sub + Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click getValue(USTV_ANTRAG) diff --git a/SDL/USTV/usrCntlUSTV.Designer.vb b/SDL/USTV/usrCntlUSTV.Designer.vb index 01dd5763..edc2c041 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 DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 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.Button2 = New System.Windows.Forms.Button() Me.btn_Zahlungen_importieren = New System.Windows.Forms.Button() Me.btn3470 = New System.Windows.Forms.Button() Me.Button4 = New System.Windows.Forms.Button() @@ -86,7 +87,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.Button2 = New System.Windows.Forms.Button() + Me.cbxMWSTnichtFakt = New System.Windows.Forms.CheckBox() CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.Panel2.SuspendLayout() @@ -108,8 +109,8 @@ Partial Class usrCntlUSTV Me.dgvUSTV.AKTUALISIERUNGS_INTERVALL = -1 Me.dgvUSTV.AllowUserToAddRows = False Me.dgvUSTV.AllowUserToDeleteRows = False - 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 + 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 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) @@ -134,6 +135,7 @@ Partial Class usrCntlUSTV 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.Panel1.Controls.Add(Me.cbxMWSTnichtFakt) Me.Panel1.Controls.Add(Me.btnoffeneAntraege) Me.Panel1.Controls.Add(Me.txtSucheID) Me.Panel1.Controls.Add(Me.MyComboBox1) @@ -185,7 +187,7 @@ Partial Class usrCntlUSTV Me.btnoffeneAntraege.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnoffeneAntraege.ForeColor = System.Drawing.Color.Black Me.btnoffeneAntraege.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnoffeneAntraege.Location = New System.Drawing.Point(806, 24) + Me.btnoffeneAntraege.Location = New System.Drawing.Point(806, 6) Me.btnoffeneAntraege.Name = "btnoffeneAntraege" Me.btnoffeneAntraege.Size = New System.Drawing.Size(83, 40) Me.btnoffeneAntraege.TabIndex = 79 @@ -235,9 +237,9 @@ Partial Class usrCntlUSTV Me.cbxVZnichtabgerechnet.CheckState = System.Windows.Forms.CheckState.Indeterminate Me.cbxVZnichtabgerechnet.Location = New System.Drawing.Point(668, 61) Me.cbxVZnichtabgerechnet.Name = "cbxVZnichtabgerechnet" - Me.cbxVZnichtabgerechnet.Size = New System.Drawing.Size(129, 17) + Me.cbxVZnichtabgerechnet.Size = New System.Drawing.Size(90, 17) Me.cbxVZnichtabgerechnet.TabIndex = 74 - Me.cbxVZnichtabgerechnet.Text = "VZ nicht abgerechnet" + Me.cbxVZnichtabgerechnet.Text = "VZ nicht fakt." Me.cbxVZnichtabgerechnet.ThreeState = True Me.cbxVZnichtabgerechnet.UseVisualStyleBackColor = True ' @@ -814,6 +816,21 @@ Partial Class usrCntlUSTV Me.Panel3.Size = New System.Drawing.Size(1737, 77) Me.Panel3.TabIndex = 0 ' + 'Button2 + ' + 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 + ' 'btn_Zahlungen_importieren ' Me.btn_Zahlungen_importieren.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -971,20 +988,18 @@ Partial Class usrCntlUSTV Me.ContextMenuStrip4.Name = "ContextMenuStrip1" Me.ContextMenuStrip4.Size = New System.Drawing.Size(61, 4) ' - 'Button2 + 'cbxMWSTnichtFakt ' - 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 + Me.cbxMWSTnichtFakt.AutoSize = True + Me.cbxMWSTnichtFakt.Checked = True + Me.cbxMWSTnichtFakt.CheckState = System.Windows.Forms.CheckState.Indeterminate + Me.cbxMWSTnichtFakt.Location = New System.Drawing.Point(764, 59) + Me.cbxMWSTnichtFakt.Name = "cbxMWSTnichtFakt" + Me.cbxMWSTnichtFakt.Size = New System.Drawing.Size(152, 17) + Me.cbxMWSTnichtFakt.TabIndex = 80 + Me.cbxMWSTnichtFakt.Text = "MWST-Eingang nicht fakt." + Me.cbxMWSTnichtFakt.ThreeState = True + Me.cbxMWSTnichtFakt.UseVisualStyleBackColor = True ' 'usrCntlUSTV ' @@ -1066,4 +1081,5 @@ Partial Class usrCntlUSTV Friend WithEvents btnoffeneAntraege As Button Friend WithEvents btn_Zahlungen_importieren As Button Friend WithEvents Button2 As Button + Friend WithEvents cbxMWSTnichtFakt As CheckBox End Class diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 5f5a484f..6f0f8015 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -1,16 +1,7 @@ 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 -Imports VERAG_PROG_ALLGEMEIN.TESTJSON Public Class usrCntlUSTV @@ -59,7 +50,7 @@ Public Class usrCntlUSTV From tblUStVErstattung e Where e.UStVAn_ID = [tblUStVAntrag].[UStVAn_ID] FOR XML PATH(''), TYPE - ).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS 'GutschriftsNr' ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],([UStVAn_USteuerbetrag] - [UStVAn_Erstattungsbetrag]) as UStVAn_Differenzbetrag,[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],([UStVAn_USteuerbetragEUR] - [UStVAn_ErstattungsbetragEUR]) as UStVAn_DifferenzbetragEUR,UStVAn_VZoffen ,[UStVAn_Sachbearbeiter] + ).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS 'GutschriftsNr' ,[UStVAn_Währungscode],[UStVAn_USteuerbetrag],[UStVAn_Erstattungsbetrag],([UStVAn_USteuerbetrag] - [UStVAn_Erstattungsbetrag]) as UStVAn_Differenzbetrag,[UStVAn_USteuerbetragEUR],[UStVAn_ErstattungsbetragEUR],([UStVAn_USteuerbetragEUR] - [UStVAn_ErstattungsbetragEUR]) as UStVAn_DifferenzbetragEUR,UStVAn_VZoffen,UStVAn_MWSTEingang_offen ,[UStVAn_Sachbearbeiter] FROM [tblUStVAntrag] inner join [Länderverzeichnis für die Außenhandelsstatistik] on UStVAn_LandNr=Landnr where 1=1 " & getWhere(Not ignoreDate, ID, AntragsLand) & " order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc" @@ -172,10 +163,15 @@ Public Class usrCntlUSTV .Columns("UStVAn_DifferenzbetragEUR").DefaultCellStyle.Format = "N2" .Columns("UStVAn_DifferenzbetragEUR").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight - .Columns("UStVAn_VZoffen").HeaderText = "VZ nicht abgerechnet" + .Columns("UStVAn_VZoffen").HeaderText = "VZ nicht fakt." .Columns("UStVAn_VZoffen").Width = 80 .Columns("UStVAn_VZoffen").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + .Columns("UStVAn_MWSTEingang_offen").HeaderText = "MWST-Eingang nicht fakt." + .Columns("UStVAn_MWSTEingang_offen").Width = 90 + .Columns("UStVAn_MWSTEingang_offen").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + + .Columns("GutschriftsNr").HeaderText = "GutschriftsNr" .Columns("GutschriftsNr").Width = 180 .Columns("GutschriftsNr").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter @@ -302,6 +298,14 @@ Public Class usrCntlUSTV Case CheckState.Indeterminate End Select + Select Case cbxMWSTnichtFakt.CheckState + Case CheckState.Checked + whereStr &= " AND isnull(UStVAn_MWSTEingang_offen,0) <> 0" + Case CheckState.Unchecked + whereStr &= " AND isnull(UStVAn_MWSTEingang_offen,0) = 0" + Case CheckState.Indeterminate + End Select + If KdSearchBox1.KdNr > 0 Then whereStr &= " AND UStVAn_KuNr=" & KdSearchBox1.KdNr & " " If AntragsLandKZ <> "" Then whereStr &= " AND LandKz='" & AntragsLandKZ & "' " @@ -1644,7 +1648,7 @@ Public Class usrCntlUSTV End Sub - Private Sub cbxVZnichtabgerechnet_CheckStateChanged(sender As Object, e As EventArgs) Handles cbxVZnichtabgerechnet.CheckStateChanged + Private Sub cbxVZnichtabgerechnet_CheckStateChanged(sender As Object, e As EventArgs) Handles cbxVZnichtabgerechnet.CheckStateChanged, cbxMWSTnichtFakt.CheckStateChanged If loaded = False Then Exit Sub init() End Sub @@ -1998,7 +2002,6 @@ Public Class usrCntlUSTV Case "ja" If Not USTV_ANTRAG.UStVAn_3470 Then USTV_ANTRAG.UStVAn_3470 = True - USTV_ANTRAG.SAVE() End If @@ -2015,7 +2018,7 @@ Public Class usrCntlUSTV 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_Importfilename = fd.SafeFileName UStV_ERS.UStVEr_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME UStV_ERS.UStVEr_Zeitstempel = Now @@ -2036,7 +2039,6 @@ Public Class usrCntlUSTV 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 @@ -2057,12 +2059,13 @@ Public Class usrCntlUSTV 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 + USTV_ANTRAG.UStVAn_MWSTEingang_offen = True + USTV_ANTRAG.SAVE() counter += 1 End If @@ -2212,4 +2215,6 @@ Public Class usrCntlUSTV 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 .vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb index 28517d63..9bbed559 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb @@ -163,7 +163,14 @@ Public Class ustCntlUSTV_ErstattungPosition lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME lblAenderungsdatum.Text = Now.ToString("dd.MM.yyyy HH:mm") ' If e.Column.ColumnName = "Sachbearbeiter" Or e.Column.ColumnName = "Änderungsdatum" Then Exit Sub - If save() Then RaiseEvent CHANGED(UStV_ERS.UStVEr_ID) + If save() Then + If UStV_ERS.GutschriftsDatum IsNot Nothing AndAlso IsDate(UStV_ERS.GutschriftsDatum) AndAlso UStV_ERS.UStVEr_Importfilename IsNot Nothing AndAlso Not IsDBNull(UStV_ERS.UStVEr_Importfilename) Then + Dim USTVA As New cUSTVAntrag(UStV_ERS.UStVAn_ID) + USTVA.UStVAn_MWSTEingang_offen = False + USTVA.SAVE() + End If + RaiseEvent CHANGED(UStV_ERS.UStVEr_ID) + End If End Sub diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb index 3c2e3e37..66730f28 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb @@ -60,6 +60,7 @@ Public Class cUSTVAntrag Property UStVAn_RGRetour As Object = Nothing Property UStVAn_VZoffen As Object = Nothing Property UStVAn_Sicherheit As Object = Nothing + Property UStVAn_MWSTEingang_offen As Object = Nothing Property POSITIONEN As New List(Of cUStVPositionen) '= Nothing Public hasEntry = False @@ -131,6 +132,7 @@ Public Class cUSTVAntrag list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_RGRetour", UStVAn_RGRetour)) ' DATETIME Default (getdate()) NULL, list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_VZoffen", UStVAn_VZoffen)) ' list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_Sicherheit", UStVAn_Sicherheit)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_MWSTEingang_offen", UStVAn_MWSTEingang_offen)) Return list