From bab0a87512e8e14725847988074dedb95221003d Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 14 Feb 2025 09:30:15 +0100 Subject: [PATCH 1/6] ustva --- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 153 ++++++++++++++++--------- SDL/USTV/frmMDM_USTVAntrag.vb | 23 +++- 2 files changed, 120 insertions(+), 56 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 07440f1d..179a0f26 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -63,11 +63,11 @@ Partial Class frmMDM_USTVAntrag Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtBis = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Panel6 = New System.Windows.Forms.Panel() - Me.lblGesamtUSteuer = New System.Windows.Forms.Label() + Me.lblGesamtUSteuerFW = New System.Windows.Forms.Label() Me.Label12 = New System.Windows.Forms.Label() - Me.lblDiffernezbetrag = New System.Windows.Forms.Label() + Me.lblDiffernezbetragFW = New System.Windows.Forms.Label() Me.Label10 = New System.Windows.Forms.Label() - Me.lblGesamtErstattung = New System.Windows.Forms.Label() + Me.lblGesamtErstattungFW = New System.Windows.Forms.Label() Me.Label7 = New System.Windows.Forms.Label() Me.Panel5 = New System.Windows.Forms.Panel() Me.Panel7 = New System.Windows.Forms.Panel() @@ -95,6 +95,9 @@ Partial Class frmMDM_USTVAntrag Me.btnNeuerEintrag = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.lblGesamtUSteuer = New System.Windows.Forms.Label() + Me.lblDiffernezbetrag = New System.Windows.Forms.Label() + Me.lblGesamtErstattung = New System.Windows.Forms.Label() Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() Me.Panel3.SuspendLayout() CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit() @@ -202,21 +205,24 @@ Partial Class frmMDM_USTVAntrag 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Panel1.Controls.Add(Me.lblWarnung) + Me.Panel1.Controls.Add(Me.lblGesamtUSteuer) + Me.Panel1.Controls.Add(Me.lblDiffernezbetrag) + Me.Panel1.Controls.Add(Me.lblGesamtErstattung) Me.Panel1.Controls.Add(Me.KdSearchBox1) Me.Panel1.Controls.Add(Me.cboAntragArt) Me.Panel1.Controls.Add(Me.lblKdNr) Me.Panel1.Controls.Add(Me.Panel9) Me.Panel1.Controls.Add(Me.Panel8) Me.Panel1.Controls.Add(Me.Panel6) - Me.Panel1.Controls.Add(Me.lblGesamtUSteuer) + Me.Panel1.Controls.Add(Me.lblGesamtUSteuerFW) Me.Panel1.Controls.Add(Me.Label12) - Me.Panel1.Controls.Add(Me.lblDiffernezbetrag) + Me.Panel1.Controls.Add(Me.lblDiffernezbetragFW) Me.Panel1.Controls.Add(Me.Label10) - Me.Panel1.Controls.Add(Me.lblGesamtErstattung) + Me.Panel1.Controls.Add(Me.lblGesamtErstattungFW) Me.Panel1.Controls.Add(Me.Label7) Me.Panel1.Controls.Add(Me.Panel5) Me.Panel1.Controls.Add(Me.lblFirma) + Me.Panel1.Controls.Add(Me.lblWarnung) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" @@ -734,24 +740,24 @@ Partial Class frmMDM_USTVAntrag Me.Panel6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Panel6.BackColor = System.Drawing.Color.White Me.Panel6.ForeColor = System.Drawing.Color.White - Me.Panel6.Location = New System.Drawing.Point(676, 56) + Me.Panel6.Location = New System.Drawing.Point(571, 56) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(290, 1) + Me.Panel6.Size = New System.Drawing.Size(390, 1) Me.Panel6.TabIndex = 18 ' - 'lblGesamtUSteuer + 'lblGesamtUSteuerFW ' - Me.lblGesamtUSteuer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblGesamtUSteuer.BackColor = System.Drawing.Color.Transparent - Me.lblGesamtUSteuer.Cursor = System.Windows.Forms.Cursors.Default - Me.lblGesamtUSteuer.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) - Me.lblGesamtUSteuer.ForeColor = System.Drawing.Color.White - Me.lblGesamtUSteuer.Location = New System.Drawing.Point(826, 16) - Me.lblGesamtUSteuer.Name = "lblGesamtUSteuer" - Me.lblGesamtUSteuer.Size = New System.Drawing.Size(133, 17) - Me.lblGesamtUSteuer.TabIndex = 17 - Me.lblGesamtUSteuer.Text = "000.000,00 €" - Me.lblGesamtUSteuer.TextAlign = System.Drawing.ContentAlignment.TopRight + Me.lblGesamtUSteuerFW.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblGesamtUSteuerFW.BackColor = System.Drawing.Color.Transparent + Me.lblGesamtUSteuerFW.Cursor = System.Windows.Forms.Cursors.Default + Me.lblGesamtUSteuerFW.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) + Me.lblGesamtUSteuerFW.ForeColor = System.Drawing.Color.White + Me.lblGesamtUSteuerFW.Location = New System.Drawing.Point(721, 16) + Me.lblGesamtUSteuerFW.Name = "lblGesamtUSteuerFW" + Me.lblGesamtUSteuerFW.Size = New System.Drawing.Size(133, 17) + Me.lblGesamtUSteuerFW.TabIndex = 17 + Me.lblGesamtUSteuerFW.Text = "000.000,00 €" + Me.lblGesamtUSteuerFW.TextAlign = System.Drawing.ContentAlignment.TopRight ' 'Label12 ' @@ -761,25 +767,25 @@ Partial Class frmMDM_USTVAntrag Me.Label12.Cursor = System.Windows.Forms.Cursors.Default Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label12.ForeColor = System.Drawing.Color.White - Me.Label12.Location = New System.Drawing.Point(684, 16) + Me.Label12.Location = New System.Drawing.Point(579, 16) Me.Label12.Name = "Label12" Me.Label12.Size = New System.Drawing.Size(136, 15) Me.Label12.TabIndex = 16 Me.Label12.Text = "Gesamtbetrag USteuer:" ' - 'lblDiffernezbetrag + 'lblDiffernezbetragFW ' - Me.lblDiffernezbetrag.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblDiffernezbetrag.BackColor = System.Drawing.Color.Transparent - Me.lblDiffernezbetrag.Cursor = System.Windows.Forms.Cursors.Default - Me.lblDiffernezbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) - Me.lblDiffernezbetrag.ForeColor = System.Drawing.Color.White - Me.lblDiffernezbetrag.Location = New System.Drawing.Point(826, 59) - Me.lblDiffernezbetrag.Name = "lblDiffernezbetrag" - Me.lblDiffernezbetrag.Size = New System.Drawing.Size(133, 17) - Me.lblDiffernezbetrag.TabIndex = 15 - Me.lblDiffernezbetrag.Text = "000.000,00 €" - Me.lblDiffernezbetrag.TextAlign = System.Drawing.ContentAlignment.TopRight + Me.lblDiffernezbetragFW.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblDiffernezbetragFW.BackColor = System.Drawing.Color.Transparent + Me.lblDiffernezbetragFW.Cursor = System.Windows.Forms.Cursors.Default + Me.lblDiffernezbetragFW.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) + Me.lblDiffernezbetragFW.ForeColor = System.Drawing.Color.White + Me.lblDiffernezbetragFW.Location = New System.Drawing.Point(721, 59) + Me.lblDiffernezbetragFW.Name = "lblDiffernezbetragFW" + Me.lblDiffernezbetragFW.Size = New System.Drawing.Size(133, 17) + Me.lblDiffernezbetragFW.TabIndex = 15 + Me.lblDiffernezbetragFW.Text = "000.000,00 €" + Me.lblDiffernezbetragFW.TextAlign = System.Drawing.ContentAlignment.TopRight ' 'Label10 ' @@ -789,25 +795,25 @@ Partial Class frmMDM_USTVAntrag Me.Label10.Cursor = System.Windows.Forms.Cursors.Default Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label10.ForeColor = System.Drawing.Color.White - Me.Label10.Location = New System.Drawing.Point(684, 59) + Me.Label10.Location = New System.Drawing.Point(579, 59) Me.Label10.Name = "Label10" Me.Label10.Size = New System.Drawing.Size(94, 15) Me.Label10.TabIndex = 14 Me.Label10.Text = "Differenzbetrag:" ' - 'lblGesamtErstattung + 'lblGesamtErstattungFW ' - Me.lblGesamtErstattung.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblGesamtErstattung.BackColor = System.Drawing.Color.Transparent - Me.lblGesamtErstattung.Cursor = System.Windows.Forms.Cursors.Default - Me.lblGesamtErstattung.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) - Me.lblGesamtErstattung.ForeColor = System.Drawing.Color.White - Me.lblGesamtErstattung.Location = New System.Drawing.Point(826, 36) - Me.lblGesamtErstattung.Name = "lblGesamtErstattung" - Me.lblGesamtErstattung.Size = New System.Drawing.Size(133, 17) - Me.lblGesamtErstattung.TabIndex = 13 - Me.lblGesamtErstattung.Text = "000.000,00 €" - Me.lblGesamtErstattung.TextAlign = System.Drawing.ContentAlignment.TopRight + Me.lblGesamtErstattungFW.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblGesamtErstattungFW.BackColor = System.Drawing.Color.Transparent + Me.lblGesamtErstattungFW.Cursor = System.Windows.Forms.Cursors.Default + Me.lblGesamtErstattungFW.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) + Me.lblGesamtErstattungFW.ForeColor = System.Drawing.Color.White + Me.lblGesamtErstattungFW.Location = New System.Drawing.Point(721, 36) + Me.lblGesamtErstattungFW.Name = "lblGesamtErstattungFW" + Me.lblGesamtErstattungFW.Size = New System.Drawing.Size(133, 17) + Me.lblGesamtErstattungFW.TabIndex = 13 + Me.lblGesamtErstattungFW.Text = "000.000,00 €" + Me.lblGesamtErstattungFW.TextAlign = System.Drawing.ContentAlignment.TopRight ' 'Label7 ' @@ -817,7 +823,7 @@ Partial Class frmMDM_USTVAntrag Me.Label7.Cursor = System.Windows.Forms.Cursors.Default Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.Label7.ForeColor = System.Drawing.Color.White - Me.Label7.Location = New System.Drawing.Point(684, 36) + Me.Label7.Location = New System.Drawing.Point(579, 36) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(146, 15) Me.Label7.TabIndex = 12 @@ -1152,6 +1158,48 @@ Partial Class frmMDM_USTVAntrag Me.ContextMenuStrip2.Name = "ContextMenuStrip1" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' + 'lblGesamtUSteuer + ' + Me.lblGesamtUSteuer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblGesamtUSteuer.BackColor = System.Drawing.Color.Transparent + Me.lblGesamtUSteuer.Cursor = System.Windows.Forms.Cursors.Default + Me.lblGesamtUSteuer.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) + Me.lblGesamtUSteuer.ForeColor = System.Drawing.Color.White + Me.lblGesamtUSteuer.Location = New System.Drawing.Point(840, 16) + Me.lblGesamtUSteuer.Name = "lblGesamtUSteuer" + Me.lblGesamtUSteuer.Size = New System.Drawing.Size(133, 17) + Me.lblGesamtUSteuer.TabIndex = 26 + Me.lblGesamtUSteuer.Text = "000.000,00" + Me.lblGesamtUSteuer.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'lblDiffernezbetrag + ' + Me.lblDiffernezbetrag.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblDiffernezbetrag.BackColor = System.Drawing.Color.Transparent + Me.lblDiffernezbetrag.Cursor = System.Windows.Forms.Cursors.Default + Me.lblDiffernezbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) + Me.lblDiffernezbetrag.ForeColor = System.Drawing.Color.White + Me.lblDiffernezbetrag.Location = New System.Drawing.Point(840, 59) + Me.lblDiffernezbetrag.Name = "lblDiffernezbetrag" + Me.lblDiffernezbetrag.Size = New System.Drawing.Size(133, 17) + Me.lblDiffernezbetrag.TabIndex = 25 + Me.lblDiffernezbetrag.Text = "000.000,00" + Me.lblDiffernezbetrag.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'lblGesamtErstattung + ' + Me.lblGesamtErstattung.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblGesamtErstattung.BackColor = System.Drawing.Color.Transparent + Me.lblGesamtErstattung.Cursor = System.Windows.Forms.Cursors.Default + Me.lblGesamtErstattung.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) + Me.lblGesamtErstattung.ForeColor = System.Drawing.Color.White + Me.lblGesamtErstattung.Location = New System.Drawing.Point(840, 36) + Me.lblGesamtErstattung.Name = "lblGesamtErstattung" + Me.lblGesamtErstattung.Size = New System.Drawing.Size(133, 17) + Me.lblGesamtErstattung.TabIndex = 24 + Me.lblGesamtErstattung.Text = "000.000,00" + Me.lblGesamtErstattung.TextAlign = System.Drawing.ContentAlignment.TopRight + ' 'UstCntlUSTV_AntragPosition1 ' Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill @@ -1231,11 +1279,11 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents btnStorno As Button Friend WithEvents btnTeilerstattung As Button Friend WithEvents lblAntragAbgeschlossen As Label - Friend WithEvents lblGesamtUSteuer As Label + Friend WithEvents lblGesamtUSteuerFW As Label Friend WithEvents Label12 As Label - Friend WithEvents lblDiffernezbetrag As Label + Friend WithEvents lblDiffernezbetragFW As Label Friend WithEvents Label10 As Label - Friend WithEvents lblGesamtErstattung As Label + Friend WithEvents lblGesamtErstattungFW As Label Friend WithEvents Label7 As Label Friend WithEvents Panel6 As Panel Friend WithEvents Panel7 As Panel @@ -1268,4 +1316,7 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents txtGueltig As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label13 As Label Friend WithEvents lblMWSTAbrechnung As Label + Friend WithEvents lblGesamtUSteuer As Label + Friend WithEvents lblDiffernezbetrag As Label + Friend WithEvents lblGesamtErstattung As Label End Class diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index fc9949da..dd29928c 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -45,6 +45,11 @@ Public Class frmMDM_USTVAntrag Sub init(Optional Lieferant As String = "") pnlFilter.AutoScroll = False + lblGesamtUSteuerFW.Text = "-" + lblGesamtErstattungFW.Text = "-" + lblDiffernezbetragFW.Text = "-" + + lblGesamtUSteuer.Text = "-" lblGesamtErstattung.Text = "-" lblDiffernezbetrag.Text = "-" @@ -171,13 +176,21 @@ Public Class frmMDM_USTVAntrag End With - Dim GesamtUSteuer As Double = SQL.DLookup("isnull(sum(UStVPo_USteuerbetragEUR),0)", "tblUStVPositionen", "UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL", "0") - Dim GesamtErstattung As Double = SQL.DLookup("isnull(sum(UStVEr_USteuerbetragEUR),0)", "tblUStVErstattung", "UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL", "0") + Dim GesamtUSteuerEUR As Double = SQL.DLookup("isnull(sum(UStVPo_USteuerbetragEUR),0)", "tblUStVPositionen", "UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL", "0") + Dim GesamtErstattungEUR As Double = SQL.DLookup("isnull(sum(UStVEr_USteuerbetragEUR),0)", "tblUStVErstattung", "UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL", "0") + Dim DiffernezbetragEUR As Double = GesamtUSteuerEUR - GesamtErstattungEUR + + Dim GesamtUSteuer As Double = SQL.DLookup("isnull(sum(UStVPo_USteuerbetrag),0)", "tblUStVPositionen", "UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL", "0") + Dim GesamtErstattung As Double = SQL.DLookup("isnull(sum(UStVEr_USteuerbetrag),0)", "tblUStVErstattung", "UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL", "0") Dim Differnezbetrag As Double = GesamtUSteuer - GesamtErstattung - lblGesamtUSteuer.Text = GesamtUSteuer.ToString("C2") - lblGesamtErstattung.Text = GesamtErstattung.ToString("C2") - lblDiffernezbetrag.Text = Differnezbetrag.ToString("C2") + lblGesamtUSteuerFW.Text = GesamtUSteuer.ToString("C2") + lblGesamtErstattungFW.Text = GesamtErstattung.ToString("C2") + lblDiffernezbetragFW.Text = Differnezbetrag.ToString("C2") + + lblGesamtUSteuer.Text = GesamtUSteuerEUR.ToString("C2") + lblGesamtErstattung.Text = GesamtErstattungEUR.ToString("C2") + lblDiffernezbetrag.Text = DiffernezbetragEUR.ToString("C2") Dim GET_Antraege Dim antraegeVearbeitet = False From 1f6c439cb8b3a9daa0772cbec47d74cbd3aaf96a Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 14 Feb 2025 12:04:20 +0100 Subject: [PATCH 2/6] =?UTF-8?q?zus=C3=A4tz=20Feld=20Anmerkung=20MWST,=20us?= =?UTF-8?q?tva,=20etc.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDL/My Project/AssemblyInfo.vb | 4 +- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 26 +++++------ SDL/USTV/frmMDM_USTVAntrag.vb | 46 +++++++++++++++++-- .../usrcntlKundeBearbeitenFull.Designer.vb | 34 ++++++++++++-- SDL/kunden/usrcntlKundeBearbeitenFull.vb | 7 +++ .../Classes/cKundenErweitert.vb | 2 + 6 files changed, 97 insertions(+), 22 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index a00b2e98..3964dbed 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.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 179a0f26..74c01dd2 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -41,7 +41,7 @@ Partial Class frmMDM_USTVAntrag Me.cbxLand = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblLand = New System.Windows.Forms.Label() Me.Panel8 = New System.Windows.Forms.Panel() - Me.lblMWSTAbrechnung = New System.Windows.Forms.Label() + Me.lblMWSTAntrag = New System.Windows.Forms.Label() Me.Label13 = New System.Windows.Forms.Label() Me.txtGueltig = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label11 = New System.Windows.Forms.Label() @@ -341,7 +341,7 @@ Partial Class frmMDM_USTVAntrag ' Me.Panel8.BackColor = System.Drawing.Color.WhiteSmoke Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel8.Controls.Add(Me.lblMWSTAbrechnung) + Me.Panel8.Controls.Add(Me.lblMWSTAntrag) Me.Panel8.Controls.Add(Me.Label13) Me.Panel8.Controls.Add(Me.txtGueltig) Me.Panel8.Controls.Add(Me.Label11) @@ -368,17 +368,17 @@ Partial Class frmMDM_USTVAntrag Me.Panel8.Size = New System.Drawing.Size(973, 87) Me.Panel8.TabIndex = 19 ' - 'lblMWSTAbrechnung + 'lblMWSTAntrag ' - Me.lblMWSTAbrechnung.AutoSize = True - Me.lblMWSTAbrechnung.BackColor = System.Drawing.Color.Transparent - Me.lblMWSTAbrechnung.Cursor = System.Windows.Forms.Cursors.Hand - Me.lblMWSTAbrechnung.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblMWSTAbrechnung.ForeColor = System.Drawing.Color.Black - Me.lblMWSTAbrechnung.Location = New System.Drawing.Point(224, 41) - Me.lblMWSTAbrechnung.Name = "lblMWSTAbrechnung" - Me.lblMWSTAbrechnung.Size = New System.Drawing.Size(0, 17) - Me.lblMWSTAbrechnung.TabIndex = 25 + Me.lblMWSTAntrag.AutoSize = True + Me.lblMWSTAntrag.BackColor = System.Drawing.Color.Transparent + Me.lblMWSTAntrag.Cursor = System.Windows.Forms.Cursors.Hand + Me.lblMWSTAntrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblMWSTAntrag.ForeColor = System.Drawing.Color.Black + Me.lblMWSTAntrag.Location = New System.Drawing.Point(224, 41) + Me.lblMWSTAntrag.Name = "lblMWSTAntrag" + Me.lblMWSTAntrag.Size = New System.Drawing.Size(0, 17) + Me.lblMWSTAntrag.TabIndex = 25 ' 'Label13 ' @@ -1315,7 +1315,7 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents picPDF As PictureBox Friend WithEvents txtGueltig As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label13 As Label - Friend WithEvents lblMWSTAbrechnung As Label + Friend WithEvents lblMWSTAntrag As Label Friend WithEvents lblGesamtUSteuer As Label Friend WithEvents lblDiffernezbetrag As Label Friend WithEvents lblGesamtErstattung As Label diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index dd29928c..52e8683e 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -245,10 +245,11 @@ Public Class frmMDM_USTVAntrag If KUNDE_ERW IsNot Nothing Then If KUNDE_ERW.kde_MWStAbrechnung IsNot Nothing Then - lblMWSTAbrechnung.Text = KUNDE_ERW.kde_MWStAbrechnung + lblMWSTAntrag.Text = KUNDE_ERW.kde_MWStAbrechnung Else - lblMWSTAbrechnung.Text = "" + lblMWSTAntrag.Text = "" End If + If KUNDE_ERW.kde_AnmerkungAntrag IsNot Nothing AndAlso KUNDE_ERW.kde_AnmerkungAntrag <> "" Then lblMWSTAntrag.Text &= " - " & KUNDE_ERW.kde_AnmerkungAntrag End If End If @@ -1687,7 +1688,8 @@ Public Class frmMDM_USTVAntrag Dim list As New List(Of String) If dgvUSTVPositionen.SelectedRows.Count > 0 Then - For Each row As DataGridViewRow In dgvUSTVPositionen.SelectedRows + + For Each row As DataGridViewRow In dgvUSTVPositionen.SelectedRows.Cast(Of DataGridViewRow)().OrderBy(Function(dgvr) dgvr.Index) Dim pdf As String = "" pdf = getPDF(row.Cells("UStVPo_SchnittstellenNr").Value, row.Cells("UStVPo_ReNr").Value, row.Cells("UStVPo_ReDat").Value, row.Cells("UStVPo_daId").Value) @@ -1858,6 +1860,44 @@ Public Class frmMDM_USTVAntrag Next + End Sub + + Private Sub dgvUSTVPositionen_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles dgvUSTVPositionen.PreviewKeyDown + + If dgvUSTVPositionen.SelectedRows.Count <> 1 Then Exit Sub + + If (e.KeyCode) = Keys.Add AndAlso e.Control Then + + Dim id As Integer = dgvUSTVPositionen.SelectedRows(0).Cells("UStVPo_ID").Value + + initPosition(id) + + dgvUSTVPositionen.GetOrder() + + Dim USTV_POS_temp As New cUStVPositionen(UStVAn_ID, id) + + Dim USTV_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen + USTV_POS.UStVAn_ID = USTV_POS_temp.UStVAn_ID + USTV_POS.UStVPo_ID = USTV_ANTRAG.getMaxPosNr + USTV_POS.UStVPo_ReDat = USTV_POS_temp.UStVPo_ReDat + USTV_POS.UStVPo_ReNr = USTV_POS_temp.UStVPo_ReNr + USTV_POS.UStVPo_SchnittstellenNr = -1 + USTV_POS.UStVPo_Schnittstelle = False + USTV_POS.UStVPo_Leistungsbezeichnung = USTV_POS_temp.UStVPo_Leistungsbezeichnung + USTV_POS.UStVPo_Leistender = USTV_POS_temp.UStVPo_Leistender + USTV_POS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + USTV_POS.UStVPo_USteuerbetragEUR = 0 + USTV_POS.UStVPo_USteuerbetrag = 0 + USTV_POS.UStVPo_Umrechnungskurs = 1 + USTV_POS.UStVPo_Zeitstempel = Now() + If USTV_POS.SAVE() Then init() + + dgvUSTVPositionen.SetOrder() + + End If + + + End Sub Private Sub setinfofields() diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb index daab3510..a7ca107f 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.Designer.vb @@ -98,6 +98,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.UsrCntlKundeFiskaldaten1 = New SDL.usrCntlKundeFiskaldaten() Me.tbVerrechnung = New System.Windows.Forms.TabPage() Me.pnlverag360 = New System.Windows.Forms.Panel() + Me.txtAnmerkungAntraege = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.gbMWSTAntraege = New System.Windows.Forms.GroupBox() Me.rbJ = New System.Windows.Forms.RadioButton() Me.rbHJ = New System.Windows.Forms.RadioButton() @@ -1174,14 +1175,39 @@ Partial Class usrcntlKundeBearbeitenFull ' 'pnlverag360 ' + Me.pnlverag360.Controls.Add(Me.txtAnmerkungAntraege) Me.pnlverag360.Controls.Add(Me.gbMWSTAntraege) Me.pnlverag360.Controls.Add(Me.txtVorauszahlung) Me.pnlverag360.Controls.Add(Me.cbxVorauszahlung) Me.pnlverag360.Location = New System.Drawing.Point(417, 247) Me.pnlverag360.Name = "pnlverag360" - Me.pnlverag360.Size = New System.Drawing.Size(252, 117) + Me.pnlverag360.Size = New System.Drawing.Size(252, 143) Me.pnlverag360.TabIndex = 49 ' + 'txtAnmerkungAntraege + ' + Me.txtAnmerkungAntraege._DateTimeOnly = False + Me.txtAnmerkungAntraege._numbersOnly = False + Me.txtAnmerkungAntraege._numbersOnlyKommastellen = "" + Me.txtAnmerkungAntraege._numbersOnlyTrennzeichen = False + Me.txtAnmerkungAntraege._Prozent = False + Me.txtAnmerkungAntraege._ShortDateNew = False + Me.txtAnmerkungAntraege._ShortDateOnly = False + Me.txtAnmerkungAntraege._TimeOnly = False + Me.txtAnmerkungAntraege._TimeOnly_Seconds = False + Me.txtAnmerkungAntraege._value = "" + Me.txtAnmerkungAntraege._Waehrung = False + Me.txtAnmerkungAntraege._WaehrungZeichen = False + Me.txtAnmerkungAntraege.ForeColor = System.Drawing.Color.Red + Me.txtAnmerkungAntraege.Location = New System.Drawing.Point(8, 89) + Me.txtAnmerkungAntraege.MaxLength = 10 + Me.txtAnmerkungAntraege.MaxLineLength = -1 + Me.txtAnmerkungAntraege.MaxLines_Warning = "" + Me.txtAnmerkungAntraege.MaxLines_Warning_Label = Nothing + Me.txtAnmerkungAntraege.Name = "txtAnmerkungAntraege" + Me.txtAnmerkungAntraege.Size = New System.Drawing.Size(195, 20) + Me.txtAnmerkungAntraege.TabIndex = 49 + ' 'gbMWSTAntraege ' Me.gbMWSTAntraege.Controls.Add(Me.rbJ) @@ -1245,7 +1271,7 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtVorauszahlung._Waehrung = False Me.txtVorauszahlung._WaehrungZeichen = False Me.txtVorauszahlung.ForeColor = System.Drawing.Color.Red - Me.txtVorauszahlung.Location = New System.Drawing.Point(106, 92) + Me.txtVorauszahlung.Location = New System.Drawing.Point(110, 120) Me.txtVorauszahlung.MaxLength = 10 Me.txtVorauszahlung.MaxLineLength = -1 Me.txtVorauszahlung.MaxLines_Warning = "" @@ -1253,13 +1279,12 @@ Partial Class usrcntlKundeBearbeitenFull Me.txtVorauszahlung.Name = "txtVorauszahlung" Me.txtVorauszahlung.Size = New System.Drawing.Size(123, 20) Me.txtVorauszahlung.TabIndex = 48 - Me.txtVorauszahlung.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'cbxVorauszahlung ' Me.cbxVorauszahlung.AutoSize = True Me.cbxVorauszahlung.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxVorauszahlung.Location = New System.Drawing.Point(4, 92) + Me.cbxVorauszahlung.Location = New System.Drawing.Point(8, 120) Me.cbxVorauszahlung.Name = "cbxVorauszahlung" Me.cbxVorauszahlung.Size = New System.Drawing.Size(96, 17) Me.cbxVorauszahlung.TabIndex = 47 @@ -5732,4 +5757,5 @@ Partial Class usrcntlKundeBearbeitenFull Friend WithEvents pnlverag360 As Panel Friend WithEvents txtVorauszahlung As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents cbxVorauszahlung As CheckBox + Friend WithEvents txtAnmerkungAntraege As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/kunden/usrcntlKundeBearbeitenFull.vb b/SDL/kunden/usrcntlKundeBearbeitenFull.vb index a9f2bff5..83c7b0d1 100644 --- a/SDL/kunden/usrcntlKundeBearbeitenFull.vb +++ b/SDL/kunden/usrcntlKundeBearbeitenFull.vb @@ -203,6 +203,7 @@ txtHandelsregisterNr.Text = loadValue(KUNDE_ERW.kde_HRNr, "") cbxVorauszahlung.Checked = loadValue(KUNDE_ERW.kde_VZ, False) txtVorauszahlung.Text = loadValue(KUNDE_ERW.kde_AnmerkungVZ, "") + txtAnmerkungAntraege.Text = loadValue(KUNDE_ERW.kde_AnmerkungAntrag, "") txtEORI.Text = If(KUNDE.EORITIN, "") txtEORINL.Text = If(KUNDE.EORITIN_NL, "") @@ -619,6 +620,7 @@ KUNDE_ERW.kde_HRNr = isLeerNothing(txtHandelsregisterNr.Text) KUNDE_ERW.kde_VZ = cbxVorauszahlung.Checked KUNDE_ERW.kde_AnmerkungVZ = txtVorauszahlung.Text + KUNDE_ERW.kde_AnmerkungAntrag = txtAnmerkungAntraege.Text If isLeerNothing(txtGruendungsDatum.Text) IsNot Nothing AndAlso IsDate(txtGruendungsDatum.Text) Then KUNDE_ERW.kde_GruendungsDatum = CDate(txtGruendungsDatum.Text) @@ -2234,4 +2236,9 @@ End If End Sub + + Private Sub cbxVorauszahlung_CheckedChanged(sender As Object, e As EventArgs) Handles cbxVorauszahlung.CheckedChanged + txtVorauszahlung.Enabled = cbxVorauszahlung.Checked + If Not cbxVorauszahlung.Checked Then txtVorauszahlung.Text = "" + End Sub End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb index 7165fd79..a566dd39 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb @@ -91,6 +91,7 @@ Public Class cKundenErweitert Property kde_MWStAbrechnung As Object = Nothing Property kde_AnmerkungVZ As Object = Nothing Property kde_VZ As Boolean = False + Property kde_AnmerkungAntrag As Object = Nothing Dim SQL As New SQL @@ -184,6 +185,7 @@ Public Class cKundenErweitert list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_MWStAbrechnung", kde_MWStAbrechnung)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_AnmerkungVZ", kde_AnmerkungVZ)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_VZ", kde_VZ)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_AnmerkungAntrag", kde_AnmerkungAntrag)) Return list End Function From dbe1c4e863c9313feb18179918bf5cd08f69813a Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 14 Feb 2025 17:07:47 +0100 Subject: [PATCH 3/6] ustcntlErstattungspos, etc. --- SDL/SDL.vbproj | 9 + SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 375 +++++---- SDL/USTV/frmMDM_USTVAntrag.vb | 97 ++- SDL/USTV/usrCntlUSTV.vb | 4 +- ...stCntlUSTV_ErstattungPosition .Designer.vb | 722 ++++++++++++++++++ SDL/USTV/ustCntlUSTV_ErstattungPosition .resx | 120 +++ SDL/USTV/ustCntlUSTV_ErstattungPosition .vb | 208 +++++ .../Classes/USTV/cUSTVAntrag.vb | 153 ++++ 8 files changed, 1531 insertions(+), 157 deletions(-) create mode 100644 SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb create mode 100644 SDL/USTV/ustCntlUSTV_ErstattungPosition .resx create mode 100644 SDL/USTV/ustCntlUSTV_ErstattungPosition .vb diff --git a/SDL/SDL.vbproj b/SDL/SDL.vbproj index 921f6f4c..6ba29f44 100644 --- a/SDL/SDL.vbproj +++ b/SDL/SDL.vbproj @@ -1066,6 +1066,12 @@ Form + + ustCntlUSTV_ErstattungPosition .vb + + + UserControl + ustCntlUSTV_AntragPosition.vb @@ -3470,6 +3476,9 @@ frmNacherfassungEndEmpfaenger.vb + + ustCntlUSTV_ErstattungPosition .vb + ustCntlUSTV_AntragPosition.vb diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 74c01dd2..847ae3cb 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -24,16 +24,19 @@ Partial Class frmMDM_USTVAntrag 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(frmMDM_USTVAntrag)) - Me.Panel3 = New System.Windows.Forms.Panel() + Me.pnlBottom = New System.Windows.Forms.Panel() Me.picPDF = New System.Windows.Forms.PictureBox() Me.btnMail = New System.Windows.Forms.Button() Me.btnAntrageeinarbeiten = New System.Windows.Forms.Button() Me.cbxArchivierteEintracheNochmalsEinarbetien = New System.Windows.Forms.CheckBox() Me.Button1 = New System.Windows.Forms.Button() Me.lbl_EintrageVerarbetiet = New System.Windows.Forms.Label() - Me.Panel1 = New System.Windows.Forms.Panel() - Me.lblWarnung = New System.Windows.Forms.Label() + Me.pnlHeader = New System.Windows.Forms.Panel() + Me.lblGesamtUSteuer = New System.Windows.Forms.Label() + Me.lblDiffernezbetrag = New System.Windows.Forms.Label() + Me.lblGesamtErstattung = New System.Windows.Forms.Label() Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.cboAntragArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblKdNr = New System.Windows.Forms.Label() @@ -86,49 +89,55 @@ Partial Class frmMDM_USTVAntrag Me.Label5 = New System.Windows.Forms.Label() Me.cboStatus = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblFirma = New System.Windows.Forms.Label() - Me.pnlFilter = New System.Windows.Forms.Panel() + Me.lblWarnung = New System.Windows.Forms.Label() + Me.pnlBody = New System.Windows.Forms.Panel() + Me.TabControl1 = New System.Windows.Forms.TabControl() + Me.TabPage1 = New System.Windows.Forms.TabPage() Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.pnl = New System.Windows.Forms.Panel() + Me.pnlAntragsPosDetails = New System.Windows.Forms.Panel() Me.Panel2 = New System.Windows.Forms.Panel() + Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() Me.Panel4 = New System.Windows.Forms.Panel() Me.btnEintragloeschen = New System.Windows.Forms.Button() Me.btnNeuerEintrag = New System.Windows.Forms.Button() + Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.lblGesamtUSteuer = New System.Windows.Forms.Label() - Me.lblDiffernezbetrag = New System.Windows.Forms.Label() - Me.lblGesamtErstattung = New System.Windows.Forms.Label() - Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition() - Me.Panel3.SuspendLayout() + Me.pnlBottom.SuspendLayout() CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit() - Me.Panel1.SuspendLayout() + Me.pnlHeader.SuspendLayout() Me.Panel9.SuspendLayout() Me.Panel8.SuspendLayout() Me.Panel5.SuspendLayout() Me.Panel7.SuspendLayout() Me.FlowLayoutPanel.SuspendLayout() - Me.pnlFilter.SuspendLayout() + Me.pnlBody.SuspendLayout() + Me.TabControl1.SuspendLayout() + Me.TabPage1.SuspendLayout() CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).BeginInit() - Me.pnl.SuspendLayout() + Me.pnlAntragsPosDetails.SuspendLayout() Me.Panel2.SuspendLayout() Me.Panel4.SuspendLayout() + Me.TabPage2.SuspendLayout() + CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'Panel3 + 'pnlBottom ' - Me.Panel3.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.Panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel3.Controls.Add(Me.picPDF) - Me.Panel3.Controls.Add(Me.btnMail) - Me.Panel3.Controls.Add(Me.btnAntrageeinarbeiten) - Me.Panel3.Controls.Add(Me.cbxArchivierteEintracheNochmalsEinarbetien) - Me.Panel3.Controls.Add(Me.Button1) - Me.Panel3.Controls.Add(Me.lbl_EintrageVerarbetiet) - Me.Panel3.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel3.Location = New System.Drawing.Point(0, 649) - Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1454, 100) - Me.Panel3.TabIndex = 3 + Me.pnlBottom.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.pnlBottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlBottom.Controls.Add(Me.picPDF) + Me.pnlBottom.Controls.Add(Me.btnMail) + Me.pnlBottom.Controls.Add(Me.btnAntrageeinarbeiten) + Me.pnlBottom.Controls.Add(Me.cbxArchivierteEintracheNochmalsEinarbetien) + Me.pnlBottom.Controls.Add(Me.Button1) + Me.pnlBottom.Controls.Add(Me.lbl_EintrageVerarbetiet) + Me.pnlBottom.Dock = System.Windows.Forms.DockStyle.Bottom + Me.pnlBottom.Location = New System.Drawing.Point(0, 649) + Me.pnlBottom.Name = "pnlBottom" + Me.pnlBottom.Size = New System.Drawing.Size(1454, 100) + Me.pnlBottom.TabIndex = 3 ' 'picPDF ' @@ -202,45 +211,74 @@ Partial Class frmMDM_USTVAntrag Me.lbl_EintrageVerarbetiet.TextAlign = System.Drawing.ContentAlignment.TopRight Me.lbl_EintrageVerarbetiet.Visible = False ' - 'Panel1 + 'pnlHeader ' - Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Panel1.Controls.Add(Me.lblGesamtUSteuer) - Me.Panel1.Controls.Add(Me.lblDiffernezbetrag) - Me.Panel1.Controls.Add(Me.lblGesamtErstattung) - Me.Panel1.Controls.Add(Me.KdSearchBox1) - Me.Panel1.Controls.Add(Me.cboAntragArt) - Me.Panel1.Controls.Add(Me.lblKdNr) - Me.Panel1.Controls.Add(Me.Panel9) - Me.Panel1.Controls.Add(Me.Panel8) - Me.Panel1.Controls.Add(Me.Panel6) - Me.Panel1.Controls.Add(Me.lblGesamtUSteuerFW) - Me.Panel1.Controls.Add(Me.Label12) - Me.Panel1.Controls.Add(Me.lblDiffernezbetragFW) - Me.Panel1.Controls.Add(Me.Label10) - Me.Panel1.Controls.Add(Me.lblGesamtErstattungFW) - Me.Panel1.Controls.Add(Me.Label7) - Me.Panel1.Controls.Add(Me.Panel5) - Me.Panel1.Controls.Add(Me.lblFirma) - Me.Panel1.Controls.Add(Me.lblWarnung) - Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel1.Location = New System.Drawing.Point(0, 0) - Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1454, 177) - Me.Panel1.TabIndex = 0 + Me.pnlHeader.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.pnlHeader.Controls.Add(Me.lblGesamtUSteuer) + Me.pnlHeader.Controls.Add(Me.lblDiffernezbetrag) + Me.pnlHeader.Controls.Add(Me.lblGesamtErstattung) + Me.pnlHeader.Controls.Add(Me.KdSearchBox1) + Me.pnlHeader.Controls.Add(Me.cboAntragArt) + Me.pnlHeader.Controls.Add(Me.lblKdNr) + Me.pnlHeader.Controls.Add(Me.Panel9) + Me.pnlHeader.Controls.Add(Me.Panel8) + Me.pnlHeader.Controls.Add(Me.Panel6) + Me.pnlHeader.Controls.Add(Me.lblGesamtUSteuerFW) + Me.pnlHeader.Controls.Add(Me.Label12) + Me.pnlHeader.Controls.Add(Me.lblDiffernezbetragFW) + Me.pnlHeader.Controls.Add(Me.Label10) + Me.pnlHeader.Controls.Add(Me.lblGesamtErstattungFW) + Me.pnlHeader.Controls.Add(Me.Label7) + Me.pnlHeader.Controls.Add(Me.Panel5) + Me.pnlHeader.Controls.Add(Me.lblFirma) + Me.pnlHeader.Controls.Add(Me.lblWarnung) + Me.pnlHeader.Dock = System.Windows.Forms.DockStyle.Top + Me.pnlHeader.Location = New System.Drawing.Point(0, 0) + Me.pnlHeader.Name = "pnlHeader" + Me.pnlHeader.Size = New System.Drawing.Size(1454, 177) + Me.pnlHeader.TabIndex = 0 ' - 'lblWarnung + 'lblGesamtUSteuer ' - Me.lblWarnung.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblWarnung.BackColor = System.Drawing.Color.Transparent - Me.lblWarnung.Cursor = System.Windows.Forms.Cursors.Default - Me.lblWarnung.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) - Me.lblWarnung.ForeColor = System.Drawing.Color.Red - Me.lblWarnung.Location = New System.Drawing.Point(475, 10) - Me.lblWarnung.Name = "lblWarnung" - Me.lblWarnung.Size = New System.Drawing.Size(183, 18) - Me.lblWarnung.TabIndex = 23 + Me.lblGesamtUSteuer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblGesamtUSteuer.BackColor = System.Drawing.Color.Transparent + Me.lblGesamtUSteuer.Cursor = System.Windows.Forms.Cursors.Default + Me.lblGesamtUSteuer.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) + Me.lblGesamtUSteuer.ForeColor = System.Drawing.Color.White + Me.lblGesamtUSteuer.Location = New System.Drawing.Point(840, 16) + Me.lblGesamtUSteuer.Name = "lblGesamtUSteuer" + Me.lblGesamtUSteuer.Size = New System.Drawing.Size(133, 17) + Me.lblGesamtUSteuer.TabIndex = 26 + Me.lblGesamtUSteuer.Text = "000.000,00" + Me.lblGesamtUSteuer.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'lblDiffernezbetrag + ' + Me.lblDiffernezbetrag.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblDiffernezbetrag.BackColor = System.Drawing.Color.Transparent + Me.lblDiffernezbetrag.Cursor = System.Windows.Forms.Cursors.Default + Me.lblDiffernezbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) + Me.lblDiffernezbetrag.ForeColor = System.Drawing.Color.White + Me.lblDiffernezbetrag.Location = New System.Drawing.Point(840, 59) + Me.lblDiffernezbetrag.Name = "lblDiffernezbetrag" + Me.lblDiffernezbetrag.Size = New System.Drawing.Size(133, 17) + Me.lblDiffernezbetrag.TabIndex = 25 + Me.lblDiffernezbetrag.Text = "000.000,00" + Me.lblDiffernezbetrag.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'lblGesamtErstattung + ' + Me.lblGesamtErstattung.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblGesamtErstattung.BackColor = System.Drawing.Color.Transparent + Me.lblGesamtErstattung.Cursor = System.Windows.Forms.Cursors.Default + Me.lblGesamtErstattung.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) + Me.lblGesamtErstattung.ForeColor = System.Drawing.Color.White + Me.lblGesamtErstattung.Location = New System.Drawing.Point(840, 36) + Me.lblGesamtErstattung.Name = "lblGesamtErstattung" + Me.lblGesamtErstattung.Size = New System.Drawing.Size(133, 17) + Me.lblGesamtErstattung.TabIndex = 24 + Me.lblGesamtErstattung.Text = "000.000,00" + Me.lblGesamtErstattung.TextAlign = System.Drawing.ContentAlignment.TopRight ' 'KdSearchBox1 ' @@ -1057,16 +1095,54 @@ Partial Class frmMDM_USTVAntrag Me.lblFirma.TabIndex = 3 Me.lblFirma.Text = "VERAG Spedition AG" ' - 'pnlFilter + 'lblWarnung ' - Me.pnlFilter.BackColor = System.Drawing.Color.White - Me.pnlFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.pnlFilter.Controls.Add(Me.dgvUSTVPositionen) - Me.pnlFilter.Dock = System.Windows.Forms.DockStyle.Fill - Me.pnlFilter.Location = New System.Drawing.Point(0, 177) - Me.pnlFilter.Name = "pnlFilter" - Me.pnlFilter.Size = New System.Drawing.Size(1454, 203) - Me.pnlFilter.TabIndex = 1 + Me.lblWarnung.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblWarnung.BackColor = System.Drawing.Color.Transparent + Me.lblWarnung.Cursor = System.Windows.Forms.Cursors.Default + Me.lblWarnung.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) + Me.lblWarnung.ForeColor = System.Drawing.Color.Red + Me.lblWarnung.Location = New System.Drawing.Point(475, 10) + Me.lblWarnung.Name = "lblWarnung" + Me.lblWarnung.Size = New System.Drawing.Size(183, 18) + Me.lblWarnung.TabIndex = 23 + ' + 'pnlBody + ' + Me.pnlBody.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.pnlBody.BackColor = System.Drawing.Color.White + Me.pnlBody.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlBody.Controls.Add(Me.TabControl1) + Me.pnlBody.Location = New System.Drawing.Point(0, 177) + Me.pnlBody.Name = "pnlBody" + Me.pnlBody.Size = New System.Drawing.Size(1454, 472) + Me.pnlBody.TabIndex = 1 + ' + 'TabControl1 + ' + Me.TabControl1.Controls.Add(Me.TabPage1) + Me.TabControl1.Controls.Add(Me.TabPage2) + Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.TabControl1.Location = New System.Drawing.Point(0, 0) + Me.TabControl1.Name = "TabControl1" + Me.TabControl1.SelectedIndex = 0 + Me.TabControl1.Size = New System.Drawing.Size(1452, 470) + Me.TabControl1.TabIndex = 1 + ' + 'TabPage1 + ' + Me.TabPage1.Controls.Add(Me.dgvUSTVPositionen) + Me.TabPage1.Controls.Add(Me.pnlAntragsPosDetails) + Me.TabPage1.Location = New System.Drawing.Point(4, 22) + Me.TabPage1.Name = "TabPage1" + Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage1.Size = New System.Drawing.Size(1444, 444) + Me.TabPage1.TabIndex = 0 + Me.TabPage1.Text = "Antragspositionen" + Me.TabPage1.UseVisualStyleBackColor = True ' 'dgvUSTVPositionen ' @@ -1075,39 +1151,49 @@ Partial Class frmMDM_USTVAntrag Me.dgvUSTVPositionen.AllowUserToDeleteRows = False DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.dgvUSTVPositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvUSTVPositionen.BackgroundColor = System.Drawing.Color.White Me.dgvUSTVPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvUSTVPositionen.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgvUSTVPositionen.Location = New System.Drawing.Point(0, 0) + Me.dgvUSTVPositionen.Location = New System.Drawing.Point(3, 3) Me.dgvUSTVPositionen.Name = "dgvUSTVPositionen" Me.dgvUSTVPositionen.ReadOnly = True Me.dgvUSTVPositionen.RowHeadersVisible = False Me.dgvUSTVPositionen.RowHeadersWidth = 62 Me.dgvUSTVPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1452, 201) + Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1438, 169) Me.dgvUSTVPositionen.TabIndex = 0 ' - 'pnl + 'pnlAntragsPosDetails ' - Me.pnl.Controls.Add(Me.Panel2) - Me.pnl.Controls.Add(Me.Panel4) - Me.pnl.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnl.Location = New System.Drawing.Point(0, 380) - Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(1454, 269) - Me.pnl.TabIndex = 2 + Me.pnlAntragsPosDetails.Controls.Add(Me.Panel2) + Me.pnlAntragsPosDetails.Dock = System.Windows.Forms.DockStyle.Bottom + Me.pnlAntragsPosDetails.Location = New System.Drawing.Point(3, 178) + Me.pnlAntragsPosDetails.Name = "pnlAntragsPosDetails" + Me.pnlAntragsPosDetails.Size = New System.Drawing.Size(1438, 263) + Me.pnlAntragsPosDetails.TabIndex = 2 ' 'Panel2 ' Me.Panel2.BackColor = System.Drawing.Color.White Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.Panel2.Controls.Add(Me.UstCntlUSTV_AntragPosition1) + Me.Panel2.Controls.Add(Me.Panel4) Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill - Me.Panel2.Location = New System.Drawing.Point(154, 0) + Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(1300, 269) + Me.Panel2.Size = New System.Drawing.Size(1438, 263) Me.Panel2.TabIndex = 1 ' + 'UstCntlUSTV_AntragPosition1 + ' + Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" + Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 261) + Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 + ' 'Panel4 ' Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke @@ -1117,7 +1203,7 @@ Partial Class frmMDM_USTVAntrag Me.Panel4.Dock = System.Windows.Forms.DockStyle.Left Me.Panel4.Location = New System.Drawing.Point(0, 0) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(154, 269) + Me.Panel4.Size = New System.Drawing.Size(154, 261) Me.Panel4.TabIndex = 0 ' 'btnEintragloeschen @@ -1148,6 +1234,38 @@ Partial Class frmMDM_USTVAntrag Me.btnNeuerEintrag.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnNeuerEintrag.UseVisualStyleBackColor = True ' + 'TabPage2 + ' + Me.TabPage2.Controls.Add(Me.dgvErstattungspositionen) + Me.TabPage2.Location = New System.Drawing.Point(4, 22) + Me.TabPage2.Name = "TabPage2" + Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage2.Size = New System.Drawing.Size(1444, 444) + Me.TabPage2.TabIndex = 1 + Me.TabPage2.Text = "Erstattungspositionen" + Me.TabPage2.UseVisualStyleBackColor = True + ' + 'dgvErstattungspositionen + ' + Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500 + Me.dgvErstattungspositionen.AllowUserToAddRows = False + Me.dgvErstattungspositionen.AllowUserToDeleteRows = False + DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + Me.dgvErstattungspositionen.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.dgvErstattungspositionen.BackgroundColor = System.Drawing.Color.White + Me.dgvErstattungspositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvErstattungspositionen.Location = New System.Drawing.Point(3, 3) + Me.dgvErstattungspositionen.Name = "dgvErstattungspositionen" + Me.dgvErstattungspositionen.ReadOnly = True + Me.dgvErstattungspositionen.RowHeadersVisible = False + Me.dgvErstattungspositionen.RowHeadersWidth = 62 + Me.dgvErstattungspositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1438, 225) + Me.dgvErstattungspositionen.TabIndex = 1 + ' 'ContextMenuStrip1 ' Me.ContextMenuStrip1.Name = "ContextMenuStrip1" @@ -1158,75 +1276,24 @@ Partial Class frmMDM_USTVAntrag Me.ContextMenuStrip2.Name = "ContextMenuStrip1" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' - 'lblGesamtUSteuer - ' - Me.lblGesamtUSteuer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblGesamtUSteuer.BackColor = System.Drawing.Color.Transparent - Me.lblGesamtUSteuer.Cursor = System.Windows.Forms.Cursors.Default - Me.lblGesamtUSteuer.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) - Me.lblGesamtUSteuer.ForeColor = System.Drawing.Color.White - Me.lblGesamtUSteuer.Location = New System.Drawing.Point(840, 16) - Me.lblGesamtUSteuer.Name = "lblGesamtUSteuer" - Me.lblGesamtUSteuer.Size = New System.Drawing.Size(133, 17) - Me.lblGesamtUSteuer.TabIndex = 26 - Me.lblGesamtUSteuer.Text = "000.000,00" - Me.lblGesamtUSteuer.TextAlign = System.Drawing.ContentAlignment.TopRight - ' - 'lblDiffernezbetrag - ' - Me.lblDiffernezbetrag.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblDiffernezbetrag.BackColor = System.Drawing.Color.Transparent - Me.lblDiffernezbetrag.Cursor = System.Windows.Forms.Cursors.Default - Me.lblDiffernezbetrag.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) - Me.lblDiffernezbetrag.ForeColor = System.Drawing.Color.White - Me.lblDiffernezbetrag.Location = New System.Drawing.Point(840, 59) - Me.lblDiffernezbetrag.Name = "lblDiffernezbetrag" - Me.lblDiffernezbetrag.Size = New System.Drawing.Size(133, 17) - Me.lblDiffernezbetrag.TabIndex = 25 - Me.lblDiffernezbetrag.Text = "000.000,00" - Me.lblDiffernezbetrag.TextAlign = System.Drawing.ContentAlignment.TopRight - ' - 'lblGesamtErstattung - ' - Me.lblGesamtErstattung.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblGesamtErstattung.BackColor = System.Drawing.Color.Transparent - Me.lblGesamtErstattung.Cursor = System.Windows.Forms.Cursors.Default - Me.lblGesamtErstattung.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Bold) - Me.lblGesamtErstattung.ForeColor = System.Drawing.Color.White - Me.lblGesamtErstattung.Location = New System.Drawing.Point(840, 36) - Me.lblGesamtErstattung.Name = "lblGesamtErstattung" - Me.lblGesamtErstattung.Size = New System.Drawing.Size(133, 17) - Me.lblGesamtErstattung.TabIndex = 24 - Me.lblGesamtErstattung.Text = "000.000,00" - Me.lblGesamtErstattung.TextAlign = System.Drawing.ContentAlignment.TopRight - ' - 'UstCntlUSTV_AntragPosition1 - ' - Me.UstCntlUSTV_AntragPosition1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UstCntlUSTV_AntragPosition1.Location = New System.Drawing.Point(0, 0) - Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1" - Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1298, 267) - Me.UstCntlUSTV_AntragPosition1.TabIndex = 0 - ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1454, 749) - Me.Controls.Add(Me.pnlFilter) - Me.Controls.Add(Me.pnl) - Me.Controls.Add(Me.Panel3) - Me.Controls.Add(Me.Panel1) + Me.Controls.Add(Me.pnlHeader) + Me.Controls.Add(Me.pnlBody) + Me.Controls.Add(Me.pnlBottom) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.KeyPreview = True Me.Name = "frmMDM_USTVAntrag" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "USTV Antrag" - Me.Panel3.ResumeLayout(False) - Me.Panel3.PerformLayout() + Me.pnlBottom.ResumeLayout(False) + Me.pnlBottom.PerformLayout() CType(Me.picPDF, System.ComponentModel.ISupportInitialize).EndInit() - Me.Panel1.ResumeLayout(False) - Me.Panel1.PerformLayout() + Me.pnlHeader.ResumeLayout(False) + Me.pnlHeader.PerformLayout() Me.Panel9.ResumeLayout(False) Me.Panel8.ResumeLayout(False) Me.Panel8.PerformLayout() @@ -1236,20 +1303,24 @@ Partial Class frmMDM_USTVAntrag Me.Panel7.PerformLayout() Me.FlowLayoutPanel.ResumeLayout(False) Me.FlowLayoutPanel.PerformLayout() - Me.pnlFilter.ResumeLayout(False) + Me.pnlBody.ResumeLayout(False) + Me.TabControl1.ResumeLayout(False) + Me.TabPage1.ResumeLayout(False) CType(Me.dgvUSTVPositionen, System.ComponentModel.ISupportInitialize).EndInit() - Me.pnl.ResumeLayout(False) + Me.pnlAntragsPosDetails.ResumeLayout(False) Me.Panel2.ResumeLayout(False) Me.Panel4.ResumeLayout(False) + Me.TabPage2.ResumeLayout(False) + CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub - Friend WithEvents Panel3 As Panel + Friend WithEvents pnlBottom As Panel Friend WithEvents btnAntrageeinarbeiten As Button - Friend WithEvents Panel1 As Panel + Friend WithEvents pnlHeader As Panel Friend WithEvents lblFirma As Label - Friend WithEvents pnlFilter As Panel + Friend WithEvents pnlBody As Panel Friend WithEvents dgvUSTVPositionen As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents lbl_EintrageVerarbetiet As Label Friend WithEvents cbxArchivierteEintracheNochmalsEinarbetien As CheckBox @@ -1259,7 +1330,7 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents Label5 As Label Friend WithEvents rtbStatusText As RichTextBox Friend WithEvents Button1 As Button - Friend WithEvents pnl As Panel + Friend WithEvents pnlAntragsPosDetails As Panel Friend WithEvents Panel2 As Panel Friend WithEvents btnNeuerEintrag As Button Friend WithEvents Panel4 As Panel @@ -1319,4 +1390,8 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents lblGesamtUSteuer As Label Friend WithEvents lblDiffernezbetrag As Label Friend WithEvents lblGesamtErstattung As Label + Friend WithEvents TabControl1 As TabControl + Friend WithEvents TabPage1 As TabPage + Friend WithEvents TabPage2 As TabPage + Friend WithEvents dgvErstattungspositionen As VERAG_PROG_ALLGEMEIN.MyDatagridview End Class diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 52e8683e..9d81b0bb 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -43,7 +43,7 @@ Public Class frmMDM_USTVAntrag End Sub Sub init(Optional Lieferant As String = "") - pnlFilter.AutoScroll = False + pnlBody.AutoScroll = False lblGesamtUSteuerFW.Text = "-" lblGesamtErstattungFW.Text = "-" @@ -235,10 +235,10 @@ Public Class frmMDM_USTVAntrag Dim KUNDE As New cKunde(USTV_ANTRAG.UStVAn_KuNr) Dim KUNDE_ERW As New cKundenErweitert(USTV_ANTRAG.UStVAn_KuNr) If KUNDE IsNot Nothing Then - Panel1.BackColor = Color.FromArgb(0, 54, 128) - If KUNDE.Abfertigungsverbot Then Panel1.BackColor = Color.IndianRed + pnlHeader.BackColor = Color.FromArgb(0, 54, 128) + If KUNDE.Abfertigungsverbot Then pnlHeader.BackColor = Color.IndianRed Else - Panel1.BackColor = Color.FromArgb(0, 54, 128) + pnlHeader.BackColor = Color.FromArgb(0, 54, 128) End If @@ -1142,8 +1142,12 @@ Public Class frmMDM_USTVAntrag End Sub Private Sub dgvUSTVPositionen_SelectionChanged(sender As Object, e As EventArgs) Handles dgvUSTVPositionen.SelectionChanged - If dgvUSTVPositionen.SelectedRows.Count > 0 Then - initPosition(dgvUSTVPositionen.SelectedRows(0).Cells("UStVPo_ID").Value) + If TabControl1.SelectedTab Is TabPage1 Then + If dgvUSTVPositionen.SelectedRows.Count > 0 Then + initPosition(dgvUSTVPositionen.SelectedRows(0).Cells("UStVPo_ID").Value) + End If + ElseIf TabControl1.SelectedTab Is TabPage2 Then + 'TODO-Logik für Erstattung End If @@ -1898,6 +1902,20 @@ Public Class frmMDM_USTVAntrag + End Sub + + + + Private Sub TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged + + If TabControl1.SelectedTab Is TabPage1 Then + init() + + ElseIf TabControl1.SelectedTab Is TabPage2 Then + initdgvErstattungen() + End If + + End Sub Private Sub setinfofields() @@ -1957,4 +1975,71 @@ Public Class frmMDM_USTVAntrag End Sub + + Private Sub initdgvErstattungen() + + + With dgvErstattungspositionen + .ClearSelection() + + 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] + FROM [tblUStVErstattung] + where UStVAn_ID='" & UStVAn_ID & "' ORDER BY UStVEr_ID", "FMZOLL") + .LOAD() + .RowTemplate.Height = 20 + .AllowUserToOrderColumns = False + .AllowUserToResizeRows = False + + If .Columns.Count > 0 Then + + .Columns("UStVAn_ID").Visible = False + .Columns("UStVEr_ID").HeaderText = "Pos" + .Columns("UStVEr_ID").Width = 40 + + .Columns("Belegdatum").Width = 80 + .Columns("Belegnummer").Width = 180 + + .Columns("UStVEr_USteuerbetrag").HeaderText = "USt-Betrag" + .Columns("UStVEr_USteuerbetrag").Width = 110 + .Columns("UStVEr_USteuerbetrag").DefaultCellStyle.Format = "N2" + .Columns("UStVEr_USteuerbetrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + + .Columns("GutschriftsDatum").HeaderText = "GS-Datum" + .Columns("GutschriftsNr").HeaderText = "GS-Nr" + + .Columns("GutschriftsDatum").Width = 80 + .Columns("GutschriftsNr").Width = 180 + + .Columns("Berufungsdatum").Width = 80 + .Columns("Berufungshöhe").Width = 100 + .Columns("Berufungsgrund").Width = 200 + .Columns("Bemerkung").Width = 200 + + .Columns("UStVEr_Umrechnungskurs").HeaderText = "Umrechnungskurs" + .Columns("UStVEr_Umrechnungskurs").Width = 60 + .Columns("UStVEr_Umrechnungskurs").DefaultCellStyle.Format = "N2" + .Columns("UStVEr_Umrechnungskurs").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + + .Columns("UStVEr_USteuerbetragEUR").HeaderText = "USt-Betrag EUR" + .Columns("UStVEr_USteuerbetragEUR").Width = 110 + .Columns("UStVEr_USteuerbetragEUR").DefaultCellStyle.Format = "N2" + .Columns("UStVEr_USteuerbetragEUR").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight + + .Columns("UStVEr_Sachbearbeiter").HeaderText = "Sachbearbeiter" + .Columns("UStVEr_Sachbearbeiter").MinimumWidth = 100 + .Columns("UStVEr_Sachbearbeiter").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + + .Columns("UStVEr_Zeitstempel").Visible = False + + End If + + End With + + + End Sub + + + End Class \ No newline at end of file diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index c9a267d6..a4f63f39 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -1006,6 +1006,7 @@ Public Class usrCntlUSTV Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim frm As New Form + frm.Text = "Finanzamt-Bestätigung E-Mails" Dim dgv As New DataGridView() Dim dt As DataTable = SQL.loadDgvBySql(" select [api_datetime] as erstelltAm,[api_EMail] as An ,[api_EMailCC] as CC,[api_EMailBCC] as BCC,[api_EMailSubject] as Betreff,[api_EMailAttCnt] as Anzahl_Anhänge, [api_KundenNr] as KundenNr, [api_Username] as erstelltVon from [tblAPI] where [api_apiUArt] = 'FA-Bestaetigung' AND api_progName = 'SDL'" & sqlKundeadmin & " Order by api_datetime desc", "ADMIN") @@ -1020,6 +1021,7 @@ Public Class usrCntlUSTV frm.Controls.Add(dgv) frm.StartPosition = FormStartPosition.CenterScreen frm.ShowDialog() + If dgv.ColumnCount > 0 AndAlso dgv.Columns.Contains("An") Then dgv.Columns("An").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill End If @@ -1134,7 +1136,7 @@ Public Class usrCntlUSTV Mail.HTMLBody = "
" & TextHTML & SDL.cFakturierung.getSignature("DE") & "
" If Not IsDBNull(dt_Data_selected.Rows(0).Item("E-Mail")) Then Mail.To &= dt_Data_selected.Rows(0).Item("E-Mail") & ";" - If Not IsDBNull(dt_Data_selected.Rows(0).Item("E-Mail2")) Then Mail.To &= dt_Data_selected.Rows(0).Item("E-Mail2") & ";" + 'If Not IsDBNull(dt_Data_selected.Rows(0).Item("E-Mail2")) Then Mail.To &= dt_Data_selected.Rows(0).Item("E-Mail2") & ";" If attachmentSRB Then Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "MDM", "", "SRB_FA_BESTAETIGUNG") diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb new file mode 100644 index 00000000..0e5e78b9 --- /dev/null +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb @@ -0,0 +1,722 @@ + +Partial Class ustCntlUSTV_ErstattungPosition + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + + Private Sub InitializeComponent() + Me.Label8 = New System.Windows.Forms.Label() + Me.Label7 = New System.Windows.Forms.Label() + Me.Panel2 = New System.Windows.Forms.Panel() + Me.Label9 = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() + Me.btnBildAuf = New System.Windows.Forms.Button() + Me.Button1 = New System.Windows.Forms.Button() + Me.Label2 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.Label6 = New System.Windows.Forms.Label() + Me.Label10 = New System.Windows.Forms.Label() + Me.Label11 = New System.Windows.Forms.Label() + Me.Label12 = New System.Windows.Forms.Label() + Me.Label13 = New System.Windows.Forms.Label() + Me.Label4 = New System.Windows.Forms.Label() + Me.Label5 = New System.Windows.Forms.Label() + Me.lblAenderungsdatum = New System.Windows.Forms.Label() + Me.lblSachbearbeiter = New System.Windows.Forms.Label() + Me.pnl = New System.Windows.Forms.Panel() + Me.lblWarning = New System.Windows.Forms.Label() + Me.sbLeistender = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.txtStrasse = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtUIDNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label14 = New System.Windows.Forms.Label() + Me.Label17 = New System.Windows.Forms.Label() + Me.Label15 = New System.Windows.Forms.Label() + Me.txtLand = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtPLZ = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtStrassenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label16 = New System.Windows.Forms.Label() + Me.txtOrt = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtBelegNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtBelegDatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtLeistungsbezeichnung = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtUSTBetragEUR = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtUmrechnungskurs = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtUSTBetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.Panel2.SuspendLayout() + Me.pnl.SuspendLayout() + Me.Panel1.SuspendLayout() + Me.SuspendLayout() + ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label8.ForeColor = System.Drawing.Color.White + Me.Label8.Location = New System.Drawing.Point(6, 9) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(46, 13) + Me.Label8.TabIndex = 0 + Me.Label8.Text = "Details" + ' + 'Label7 + ' + 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.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(83, 15) + Me.Label7.TabIndex = 2 + Me.Label7.Text = "Beleg-Datum:" + ' + 'Panel2 + ' + Me.Panel2.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Panel2.Controls.Add(Me.Label8) + Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel2.Location = New System.Drawing.Point(0, 0) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(1300, 30) + Me.Panel2.TabIndex = 0 + ' + 'Label9 + ' + 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.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(54, 13) + Me.Label9.TabIndex = 3 + Me.Label9.Text = "Beleg-Nr.:" + ' + 'Label1 + ' + 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(442, 14) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(55, 13) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "Leistung" + ' + 'btnBildAuf + ' + Me.btnBildAuf.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_oben + Me.btnBildAuf.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.btnBildAuf.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnBildAuf.Location = New System.Drawing.Point(16, 7) + Me.btnBildAuf.Name = "btnBildAuf" + Me.btnBildAuf.Size = New System.Drawing.Size(71, 77) + Me.btnBildAuf.TabIndex = 0 + Me.btnBildAuf.Text = "Bild auf" + Me.btnBildAuf.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnBildAuf.UseVisualStyleBackColor = True + ' + 'Button1 + ' + Me.Button1.BackgroundImage = Global.SDL.My.Resources.Resources.pfeil_unten + Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Location = New System.Drawing.Point(16, 90) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(71, 77) + Me.Button1.TabIndex = 1 + Me.Button1.Text = "Bild ab" + Me.Button1.TextAlign = System.Drawing.ContentAlignment.TopCenter + Me.Button1.UseVisualStyleBackColor = True + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) + Me.Label2.Location = New System.Drawing.Point(442, 31) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(139, 15) + Me.Label2.TabIndex = 4 + Me.Label2.Text = "Leistungs-Bezeichnung:" + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) + Me.Label3.Location = New System.Drawing.Point(630, 31) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(101, 15) + Me.Label3.TabIndex = 5 + Me.Label3.Text = "Leistungs-Geber:" + ' + 'Label6 + ' + 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.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(65, 13) + Me.Label6.TabIndex = 0 + Me.Label6.Text = "Rechnung" + ' + 'Label10 + ' + 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.Name = "Label10" + Me.Label10.Size = New System.Drawing.Size(65, 13) + Me.Label10.TabIndex = 10 + Me.Label10.Text = "Rechnung" + ' + 'Label11 + ' + 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.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(70, 15) + Me.Label11.TabIndex = 11 + Me.Label11.Text = "USt-Betrag:" + ' + 'Label12 + ' + 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.Name = "Label12" + Me.Label12.Size = New System.Drawing.Size(111, 15) + Me.Label12.TabIndex = 12 + Me.Label12.Text = "Umrechnungskurs:" + ' + 'Label13 + ' + 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.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(96, 15) + Me.Label13.TabIndex = 13 + Me.Label13.Text = "USt-Betrag EUR" + ' + 'Label4 + ' + 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.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(94, 15) + Me.Label4.TabIndex = 19 + Me.Label4.Text = "Sachbearbeiter:" + ' + 'Label5 + ' + 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.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(104, 15) + Me.Label5.TabIndex = 21 + Me.Label5.Text = "Änderungsdatum:" + ' + 'lblAenderungsdatum + ' + 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.Name = "lblAenderungsdatum" + Me.lblAenderungsdatum.Size = New System.Drawing.Size(11, 15) + Me.lblAenderungsdatum.TabIndex = 22 + Me.lblAenderungsdatum.Text = "-" + ' + 'lblSachbearbeiter + ' + 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.Name = "lblSachbearbeiter" + Me.lblSachbearbeiter.Size = New System.Drawing.Size(11, 15) + Me.lblSachbearbeiter.TabIndex = 20 + Me.lblSachbearbeiter.Text = "-" + ' + 'pnl + ' + Me.pnl.BackColor = System.Drawing.Color.White + Me.pnl.Controls.Add(Me.txtStrasse) + Me.pnl.Controls.Add(Me.lblWarning) + Me.pnl.Controls.Add(Me.txtUIDNr) + Me.pnl.Controls.Add(Me.Label14) + Me.pnl.Controls.Add(Me.sbLeistender) + Me.pnl.Controls.Add(Me.Label17) + Me.pnl.Controls.Add(Me.Label15) + Me.pnl.Controls.Add(Me.Label6) + Me.pnl.Controls.Add(Me.txtLand) + Me.pnl.Controls.Add(Me.Label9) + Me.pnl.Controls.Add(Me.txtPLZ) + Me.pnl.Controls.Add(Me.lblAenderungsdatum) + Me.pnl.Controls.Add(Me.txtStrassenNr) + Me.pnl.Controls.Add(Me.txtBelegNr) + Me.pnl.Controls.Add(Me.Label16) + Me.pnl.Controls.Add(Me.lblSachbearbeiter) + Me.pnl.Controls.Add(Me.txtOrt) + Me.pnl.Controls.Add(Me.Label7) + Me.pnl.Controls.Add(Me.Label5) + Me.pnl.Controls.Add(Me.txtBelegDatum) + Me.pnl.Controls.Add(Me.Label4) + Me.pnl.Controls.Add(Me.Label1) + Me.pnl.Controls.Add(Me.txtLeistungsbezeichnung) + Me.pnl.Controls.Add(Me.txtUSTBetragEUR) + Me.pnl.Controls.Add(Me.Label2) + Me.pnl.Controls.Add(Me.Label13) + Me.pnl.Controls.Add(Me.Label3) + Me.pnl.Controls.Add(Me.txtUmrechnungskurs) + Me.pnl.Controls.Add(Me.Label11) + Me.pnl.Controls.Add(Me.Label12) + Me.pnl.Controls.Add(Me.txtUSTBetrag) + Me.pnl.Controls.Add(Me.Label10) + Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill + Me.pnl.Location = New System.Drawing.Point(0, 30) + Me.pnl.Name = "pnl" + Me.pnl.Size = New System.Drawing.Size(1300, 239) + Me.pnl.TabIndex = 1 + ' + 'lblWarning + ' + Me.lblWarning.AutoSize = True + Me.lblWarning.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblWarning.ForeColor = System.Drawing.Color.Red + Me.lblWarning.Location = New System.Drawing.Point(14, 167) + Me.lblWarning.Name = "lblWarning" + Me.lblWarning.Size = New System.Drawing.Size(0, 16) + Me.lblWarning.TabIndex = 23 + ' + 'sbLeistender + ' + Me.sbLeistender._allowFreitext = True + Me.sbLeistender._AllowSetValue = False + Me.sbLeistender._allowSpaceAsSplitter = False + Me.sbLeistender._autoSizeGross = False + Me.sbLeistender._hideIfListEmpty = True + Me.sbLeistender._value = Nothing + Me.sbLeistender.conn_art = "FMZOLL" + Me.sbLeistender.dgvpos = "LEFT" + Me.sbLeistender.DISPLAY_PARAM = Nothing + Me.sbLeistender.INVISIBLE_COLUMNS = Nothing + Me.sbLeistender.key_visible = False + Me.sbLeistender.KEYPARAM = Nothing + Me.sbLeistender.Location = New System.Drawing.Point(630, 49) + Me.sbLeistender.Name = "sbLeistender" + Me.sbLeistender.searchActive = True + Me.sbLeistender.Size = New System.Drawing.Size(283, 20) + Me.sbLeistender.SQL_ORDER_BY = Nothing + Me.sbLeistender.SQL_SELECT = Nothing + Me.sbLeistender.SQL_WHERE = Nothing + Me.sbLeistender.SQL_WhereParamList = Nothing + Me.sbLeistender.TabIndex = 13 + Me.sbLeistender.usrcntl = Nothing + ' + 'txtStrasse + ' + Me.txtStrasse._DateTimeOnly = False + Me.txtStrasse._numbersOnly = False + Me.txtStrasse._numbersOnlyKommastellen = "" + Me.txtStrasse._numbersOnlyTrennzeichen = True + Me.txtStrasse._Prozent = False + Me.txtStrasse._ShortDateNew = False + Me.txtStrasse._ShortDateOnly = False + Me.txtStrasse._TimeOnly = False + Me.txtStrasse._TimeOnly_Seconds = False + Me.txtStrasse._value = "" + Me.txtStrasse._Waehrung = False + Me.txtStrasse._WaehrungZeichen = True + Me.txtStrasse.ForeColor = System.Drawing.Color.Red + Me.txtStrasse.Location = New System.Drawing.Point(729, 93) + Me.txtStrasse.MaxLength = 50 + Me.txtStrasse.MaxLineLength = -1 + Me.txtStrasse.MaxLines_Warning = "" + Me.txtStrasse.MaxLines_Warning_Label = Nothing + Me.txtStrasse.Name = "txtStrasse" + Me.txtStrasse.Size = New System.Drawing.Size(169, 20) + Me.txtStrasse.TabIndex = 15 + ' + 'txtUIDNr + ' + Me.txtUIDNr._DateTimeOnly = False + Me.txtUIDNr._numbersOnly = False + Me.txtUIDNr._numbersOnlyKommastellen = "" + Me.txtUIDNr._numbersOnlyTrennzeichen = True + Me.txtUIDNr._Prozent = False + Me.txtUIDNr._ShortDateNew = False + Me.txtUIDNr._ShortDateOnly = False + Me.txtUIDNr._TimeOnly = False + Me.txtUIDNr._TimeOnly_Seconds = False + Me.txtUIDNr._value = "" + Me.txtUIDNr._Waehrung = False + Me.txtUIDNr._WaehrungZeichen = True + Me.txtUIDNr.ForeColor = System.Drawing.Color.Red + Me.txtUIDNr.Location = New System.Drawing.Point(843, 150) + Me.txtUIDNr.MaxLength = 50 + Me.txtUIDNr.MaxLineLength = -1 + Me.txtUIDNr.MaxLines_Warning = "" + Me.txtUIDNr.MaxLines_Warning_Label = Nothing + Me.txtUIDNr.Name = "txtUIDNr" + Me.txtUIDNr.Size = New System.Drawing.Size(106, 20) + Me.txtUIDNr.TabIndex = 20 + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) + Me.Label14.Location = New System.Drawing.Point(667, 95) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(64, 15) + Me.Label14.TabIndex = 23 + Me.Label14.Text = "Strasse/Nr" + ' + 'Label17 + ' + Me.Label17.AutoSize = True + Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) + Me.Label17.Location = New System.Drawing.Point(792, 153) + Me.Label17.Name = "Label17" + Me.Label17.Size = New System.Drawing.Size(45, 15) + Me.Label17.TabIndex = 31 + Me.Label17.Text = "UID-Nr" + ' + 'Label15 + ' + Me.Label15.AutoSize = True + Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) + Me.Label15.Location = New System.Drawing.Point(671, 122) + Me.Label15.Name = "Label15" + Me.Label15.Size = New System.Drawing.Size(48, 15) + Me.Label15.TabIndex = 25 + Me.Label15.Text = "PLZ/Ort" + ' + 'txtLand + ' + Me.txtLand._DateTimeOnly = False + Me.txtLand._numbersOnly = False + Me.txtLand._numbersOnlyKommastellen = "" + Me.txtLand._numbersOnlyTrennzeichen = True + Me.txtLand._Prozent = False + Me.txtLand._ShortDateNew = False + Me.txtLand._ShortDateOnly = False + Me.txtLand._TimeOnly = False + Me.txtLand._TimeOnly_Seconds = False + Me.txtLand._value = "" + Me.txtLand._Waehrung = False + Me.txtLand._WaehrungZeichen = True + Me.txtLand.ForeColor = System.Drawing.Color.Red + Me.txtLand.Location = New System.Drawing.Point(729, 148) + Me.txtLand.MaxLength = 2 + Me.txtLand.MaxLineLength = -1 + Me.txtLand.MaxLines_Warning = "" + Me.txtLand.MaxLines_Warning_Label = Nothing + Me.txtLand.Name = "txtLand" + Me.txtLand.Size = New System.Drawing.Size(38, 20) + Me.txtLand.TabIndex = 19 + ' + 'txtPLZ + ' + Me.txtPLZ._DateTimeOnly = False + Me.txtPLZ._numbersOnly = False + Me.txtPLZ._numbersOnlyKommastellen = "" + Me.txtPLZ._numbersOnlyTrennzeichen = True + Me.txtPLZ._Prozent = False + Me.txtPLZ._ShortDateNew = False + Me.txtPLZ._ShortDateOnly = False + Me.txtPLZ._TimeOnly = False + Me.txtPLZ._TimeOnly_Seconds = False + Me.txtPLZ._value = "" + Me.txtPLZ._Waehrung = False + Me.txtPLZ._WaehrungZeichen = True + Me.txtPLZ.ForeColor = System.Drawing.Color.Red + Me.txtPLZ.Location = New System.Drawing.Point(729, 119) + Me.txtPLZ.MaxLength = 10 + Me.txtPLZ.MaxLineLength = -1 + Me.txtPLZ.MaxLines_Warning = "" + Me.txtPLZ.MaxLines_Warning_Label = Nothing + Me.txtPLZ.Name = "txtPLZ" + Me.txtPLZ.Size = New System.Drawing.Size(59, 20) + Me.txtPLZ.TabIndex = 17 + ' + 'txtStrassenNr + ' + Me.txtStrassenNr._DateTimeOnly = False + Me.txtStrassenNr._numbersOnly = False + Me.txtStrassenNr._numbersOnlyKommastellen = "" + Me.txtStrassenNr._numbersOnlyTrennzeichen = True + Me.txtStrassenNr._Prozent = False + Me.txtStrassenNr._ShortDateNew = False + Me.txtStrassenNr._ShortDateOnly = False + Me.txtStrassenNr._TimeOnly = False + Me.txtStrassenNr._TimeOnly_Seconds = False + Me.txtStrassenNr._value = "" + Me.txtStrassenNr._Waehrung = False + Me.txtStrassenNr._WaehrungZeichen = True + Me.txtStrassenNr.ForeColor = System.Drawing.Color.Red + Me.txtStrassenNr.Location = New System.Drawing.Point(904, 92) + Me.txtStrassenNr.MaxLength = 10 + Me.txtStrassenNr.MaxLineLength = -1 + Me.txtStrassenNr.MaxLines_Warning = "" + Me.txtStrassenNr.MaxLines_Warning_Label = Nothing + Me.txtStrassenNr.Name = "txtStrassenNr" + Me.txtStrassenNr.Size = New System.Drawing.Size(45, 20) + Me.txtStrassenNr.TabIndex = 16 + ' + 'Label16 + ' + Me.Label16.AutoSize = True + Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) + Me.Label16.Location = New System.Drawing.Point(671, 148) + Me.Label16.Name = "Label16" + Me.Label16.Size = New System.Drawing.Size(35, 15) + Me.Label16.TabIndex = 27 + Me.Label16.Text = "Land" + ' + 'txtOrt + ' + Me.txtOrt._DateTimeOnly = False + Me.txtOrt._numbersOnly = False + Me.txtOrt._numbersOnlyKommastellen = "" + Me.txtOrt._numbersOnlyTrennzeichen = True + Me.txtOrt._Prozent = False + Me.txtOrt._ShortDateNew = False + Me.txtOrt._ShortDateOnly = False + Me.txtOrt._TimeOnly = False + Me.txtOrt._TimeOnly_Seconds = False + Me.txtOrt._value = "" + Me.txtOrt._Waehrung = False + Me.txtOrt._WaehrungZeichen = True + Me.txtOrt.ForeColor = System.Drawing.Color.Red + Me.txtOrt.Location = New System.Drawing.Point(795, 119) + Me.txtOrt.MaxLength = 50 + Me.txtOrt.MaxLineLength = -1 + Me.txtOrt.MaxLines_Warning = "" + Me.txtOrt.MaxLines_Warning_Label = Nothing + Me.txtOrt.Name = "txtOrt" + Me.txtOrt.Size = New System.Drawing.Size(154, 20) + Me.txtOrt.TabIndex = 18 + ' + 'txtBelegNr + ' + Me.txtBelegNr._DateTimeOnly = False + Me.txtBelegNr._numbersOnly = False + Me.txtBelegNr._numbersOnlyKommastellen = "" + Me.txtBelegNr._numbersOnlyTrennzeichen = True + Me.txtBelegNr._Prozent = False + Me.txtBelegNr._ShortDateNew = False + Me.txtBelegNr._ShortDateOnly = False + Me.txtBelegNr._TimeOnly = False + Me.txtBelegNr._TimeOnly_Seconds = False + Me.txtBelegNr._value = Nothing + Me.txtBelegNr._Waehrung = False + Me.txtBelegNr._WaehrungZeichen = True + Me.txtBelegNr.Location = New System.Drawing.Point(177, 49) + Me.txtBelegNr.MaxLength = 250 + Me.txtBelegNr.MaxLineLength = -1 + Me.txtBelegNr.MaxLines_Warning = "" + Me.txtBelegNr.MaxLines_Warning_Label = Nothing + Me.txtBelegNr.Name = "txtBelegNr" + Me.txtBelegNr.Size = New System.Drawing.Size(183, 20) + Me.txtBelegNr.TabIndex = 7 + ' + 'txtBelegDatum + ' + Me.txtBelegDatum._DateTimeOnly = False + Me.txtBelegDatum._numbersOnly = False + Me.txtBelegDatum._numbersOnlyKommastellen = "" + Me.txtBelegDatum._numbersOnlyTrennzeichen = False + Me.txtBelegDatum._Prozent = False + Me.txtBelegDatum._ShortDateNew = False + Me.txtBelegDatum._ShortDateOnly = False + Me.txtBelegDatum._TimeOnly = False + Me.txtBelegDatum._TimeOnly_Seconds = False + Me.txtBelegDatum._value = "" + 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.MaxLength = 10 + Me.txtBelegDatum.MaxLineLength = -1 + Me.txtBelegDatum.MaxLines_Warning = "" + Me.txtBelegDatum.MaxLines_Warning_Label = Nothing + Me.txtBelegDatum.Name = "txtBelegDatum" + Me.txtBelegDatum.Size = New System.Drawing.Size(154, 20) + Me.txtBelegDatum.TabIndex = 6 + ' + 'txtLeistungsbezeichnung + ' + Me.txtLeistungsbezeichnung._DateTimeOnly = False + Me.txtLeistungsbezeichnung._numbersOnly = False + Me.txtLeistungsbezeichnung._numbersOnlyKommastellen = "" + Me.txtLeistungsbezeichnung._numbersOnlyTrennzeichen = True + Me.txtLeistungsbezeichnung._Prozent = False + Me.txtLeistungsbezeichnung._ShortDateNew = False + Me.txtLeistungsbezeichnung._ShortDateOnly = False + Me.txtLeistungsbezeichnung._TimeOnly = False + Me.txtLeistungsbezeichnung._TimeOnly_Seconds = False + Me.txtLeistungsbezeichnung._value = Nothing + Me.txtLeistungsbezeichnung._Waehrung = False + Me.txtLeistungsbezeichnung._WaehrungZeichen = True + Me.txtLeistungsbezeichnung.Location = New System.Drawing.Point(445, 49) + Me.txtLeistungsbezeichnung.MaxLength = 22 + Me.txtLeistungsbezeichnung.MaxLineLength = -1 + Me.txtLeistungsbezeichnung.MaxLines_Warning = "" + Me.txtLeistungsbezeichnung.MaxLines_Warning_Label = Nothing + Me.txtLeistungsbezeichnung.Name = "txtLeistungsbezeichnung" + Me.txtLeistungsbezeichnung.Size = New System.Drawing.Size(182, 20) + Me.txtLeistungsbezeichnung.TabIndex = 8 + ' + 'txtUSTBetragEUR + ' + Me.txtUSTBetragEUR._DateTimeOnly = False + Me.txtUSTBetragEUR._numbersOnly = False + Me.txtUSTBetragEUR._numbersOnlyKommastellen = "" + Me.txtUSTBetragEUR._numbersOnlyTrennzeichen = False + Me.txtUSTBetragEUR._Prozent = False + Me.txtUSTBetragEUR._ShortDateNew = False + Me.txtUSTBetragEUR._ShortDateOnly = False + Me.txtUSTBetragEUR._TimeOnly = False + Me.txtUSTBetragEUR._TimeOnly_Seconds = False + Me.txtUSTBetragEUR._value = "" + 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.MaxLength = 10 + Me.txtUSTBetragEUR.MaxLineLength = -1 + Me.txtUSTBetragEUR.MaxLines_Warning = "" + Me.txtUSTBetragEUR.MaxLines_Warning_Label = Nothing + Me.txtUSTBetragEUR.Name = "txtUSTBetragEUR" + Me.txtUSTBetragEUR.Size = New System.Drawing.Size(154, 20) + Me.txtUSTBetragEUR.TabIndex = 11 + ' + 'txtUmrechnungskurs + ' + Me.txtUmrechnungskurs._DateTimeOnly = False + Me.txtUmrechnungskurs._numbersOnly = False + Me.txtUmrechnungskurs._numbersOnlyKommastellen = "" + Me.txtUmrechnungskurs._numbersOnlyTrennzeichen = True + Me.txtUmrechnungskurs._Prozent = False + Me.txtUmrechnungskurs._ShortDateNew = False + Me.txtUmrechnungskurs._ShortDateOnly = False + Me.txtUmrechnungskurs._TimeOnly = False + Me.txtUmrechnungskurs._TimeOnly_Seconds = False + Me.txtUmrechnungskurs._value = "" + 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.MaxLength = 10 + Me.txtUmrechnungskurs.MaxLineLength = -1 + Me.txtUmrechnungskurs.MaxLines_Warning = "" + Me.txtUmrechnungskurs.MaxLines_Warning_Label = Nothing + Me.txtUmrechnungskurs.Name = "txtUmrechnungskurs" + Me.txtUmrechnungskurs.Size = New System.Drawing.Size(108, 20) + Me.txtUmrechnungskurs.TabIndex = 10 + ' + 'txtUSTBetrag + ' + Me.txtUSTBetrag._DateTimeOnly = False + Me.txtUSTBetrag._numbersOnly = False + Me.txtUSTBetrag._numbersOnlyKommastellen = "" + Me.txtUSTBetrag._numbersOnlyTrennzeichen = False + Me.txtUSTBetrag._Prozent = False + Me.txtUSTBetrag._ShortDateNew = False + Me.txtUSTBetrag._ShortDateOnly = False + Me.txtUSTBetrag._TimeOnly = False + Me.txtUSTBetrag._TimeOnly_Seconds = False + Me.txtUSTBetrag._value = "" + Me.txtUSTBetrag._Waehrung = False + Me.txtUSTBetrag._WaehrungZeichen = False + Me.txtUSTBetrag.ForeColor = System.Drawing.Color.Red + Me.txtUSTBetrag.Location = New System.Drawing.Point(17, 130) + Me.txtUSTBetrag.MaxLength = 10 + Me.txtUSTBetrag.MaxLineLength = -1 + Me.txtUSTBetrag.MaxLines_Warning = "" + Me.txtUSTBetrag.MaxLines_Warning_Label = Nothing + Me.txtUSTBetrag.Name = "txtUSTBetrag" + Me.txtUSTBetrag.Size = New System.Drawing.Size(154, 20) + Me.txtUSTBetrag.TabIndex = 9 + ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.btnBildAuf) + Me.Panel1.Controls.Add(Me.Button1) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Right + Me.Panel1.Location = New System.Drawing.Point(1201, 30) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(99, 239) + Me.Panel1.TabIndex = 2 + ' + 'ustCntlUSTV_ErstattungPosition + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.Panel1) + Me.Controls.Add(Me.pnl) + Me.Controls.Add(Me.Panel2) + Me.Name = "ustCntlUSTV_ErstattungPosition" + Me.Size = New System.Drawing.Size(1300, 269) + Me.Panel2.ResumeLayout(False) + Me.Panel2.PerformLayout() + Me.pnl.ResumeLayout(False) + Me.pnl.PerformLayout() + Me.Panel1.ResumeLayout(False) + Me.ResumeLayout(False) + + End Sub + Friend WithEvents Label8 As Label + Friend WithEvents txtBelegDatum As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label7 As Label + Friend WithEvents Panel2 As Panel + Friend WithEvents txtBelegNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label9 As Label + Friend WithEvents Label1 As Label + Friend WithEvents btnBildAuf As Button + Friend WithEvents Button1 As Button + Friend WithEvents txtLeistungsbezeichnung As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label2 As Label + Friend WithEvents Label3 As Label + Friend WithEvents Label6 As Label + Friend WithEvents Label10 As Label + Friend WithEvents txtUSTBetrag As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label11 As Label + Friend WithEvents txtUmrechnungskurs As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label12 As Label + Friend WithEvents txtUSTBetragEUR As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label13 As Label + Friend WithEvents Label4 As Label + Friend WithEvents Label5 As Label + Friend WithEvents lblAenderungsdatum As Label + Friend WithEvents lblSachbearbeiter As Label + Friend WithEvents pnl As Panel + Friend WithEvents Panel1 As Panel + Friend WithEvents txtStrassenNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtOrt As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label16 As Label + Friend WithEvents txtPLZ As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label15 As Label + Friend WithEvents txtStrasse As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label14 As Label + Friend WithEvents txtUIDNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label17 As Label + Friend WithEvents txtLand As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents sbLeistender As VERAG_PROG_ALLGEMEIN.MySearchBox + Friend WithEvents lblWarning As Label +End Class diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .resx b/SDL/USTV/ustCntlUSTV_ErstattungPosition .resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb new file mode 100644 index 00000000..0076057b --- /dev/null +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb @@ -0,0 +1,208 @@ +Imports GrapeCity.ActiveReports.ReportsCore.Tools +Imports VERAG_PROG_ALLGEMEIN + +Public Class ustCntlUSTV_ErstattungPosition + Public UStV_ERS As VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen = Nothing + + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + Public Antrag_LandKz = "" + Dim kdnr = "" + + Public Event EV_PREV() + Public Event EV_NEXT() + Public Event CHANGED(UStVPo_ID) + Dim gridAktiv = False + Dim txtChanged As Boolean = False + Private Sub btnBildAuf_Click(sender As Object, e As EventArgs) Handles btnBildAuf.Click + RaiseEvent EV_PREV() + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + RaiseEvent EV_NEXT() + End Sub + + Sub reset() + txtBelegDatum._value = "" + txtBelegNr._value = "" + + txtUmrechnungskurs._value = 1 + txtLeistungsbezeichnung._value = "" + txtUmrechnungskurs._value = 1 + txtUSTBetrag._value = 0 + txtUSTBetragEUR._value = 0 + + + + End Sub + + Sub setValues(kdnr As Integer, UStV_ERS As VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen, Antrag_LandKz As String) + + + + gridAktiv = False + + Me.Antrag_LandKz = Antrag_LandKz + Me.UStV_ERS = UStV_ERS + Me.kdnr = kdnr + + txtBelegDatum._value = If(UStV_ERS.Belegdatum, "") + txtBelegNr._value = If(UStV_ERS.Belegnummer, "") + 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") + + txtLeistungsbezeichnung.Text = If(UStV_ERS.Bemerkung, "") + txtUSTBetrag.Text = If(UStV_ERS.UStVEr_USteuerbetrag, "") + txtUmrechnungskurs.Text = If(UStV_ERS.UStVEr_Umrechnungskurs, "") + txtUSTBetragEUR.Text = If(UStV_ERS.UStVEr_USteuerbetragEUR, "") + + gridAktiv = True + End Sub + + Sub getValues(ByRef UStV_ERS, ByRef save) + + If UStV_ERS Is Nothing Then UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen() + + UStV_ERS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + UStV_ERS.UStVPo_Zeitstempel = Now + + If txtBelegNr.Text <> "" Then + UStV_ERS.UStVPo_ReNr = txtBelegNr.Text + Else + save = False + End If + + If txtBelegDatum.Text <> "" AndAlso IsDate(txtBelegDatum.Text) Then + UStV_ERS.UStVPo_ReDat = txtBelegDatum._value + Else + save = False + End If + If txtUSTBetrag.Text <> "" Then + UStV_ERS.UStVPo_USteuerbetrag = txtUSTBetrag.Text.Replace(",", ".") + Else + save = False + End If + + If txtUSTBetragEUR.Text <> "" Then + UStV_ERS.UStVPo_USteuerbetragEUR = txtUSTBetragEUR.Text.Replace(",", ".") + Else + save = False + End If + If txtLeistungsbezeichnung.Text <> "" Then + UStV_ERS.UStVPo_Leistungsbezeichnung = txtLeistungsbezeichnung.Text + Else + save = False + End If + If Not txtUmrechnungskurs.Text = "" Then + If txtUmrechnungskurs.Text <> "" Then + UStV_ERS.UStVPo_Umrechnungskurs = txtUmrechnungskurs.Text.Replace(",", ".") + End If + Else + save = False + End If + + + End Sub + + Private Sub ustCntlUSTV_AntragPosition_KeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles Me.PreviewKeyDown + If e.KeyValue = Keys.PageDown Then + RaiseEvent EV_NEXT() + End If + If e.KeyValue = Keys.PageUp Then + RaiseEvent EV_PREV() + End If + End Sub + + Function save() + Dim setSave As Boolean = True + getValues(UStV_ERS, setSave) + 'MsgBox("TEST") + If setSave Then Return UStV_ERS.SAVE + Return False + End Function + + Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtLeistungsbezeichnung.TextChanged, txtBelegDatum.TextChanged, txtBelegNr.TextChanged, txtUSTBetrag.TextChanged, txtUmrechnungskurs.TextChanged, txtUSTBetragEUR.TextChanged + + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) Then Exit Sub + + End Sub + + Sub values_changed() + 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) + End Sub + + + + + + Private Sub txtUSTBetrag_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtUSTBetrag.PreviewKeyDown, txtUSTBetragEUR.PreviewKeyDown, txtBelegDatum.PreviewKeyDown, txtBelegNr.PreviewKeyDown, txtUmrechnungskurs.PreviewKeyDown + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) Then Exit Sub + + If gridAktiv And Me.FindForm IsNot Nothing Then + + ' Eingabeprüfung + If e.KeyValue = 9 Then + + lblWarning.Text = "" + If sender Is txtUSTBetrag Or sender Is txtUSTBetragEUR Or sender Is txtUmrechnungskurs Then + + If txtUSTBetrag.Text = "" Then + lblWarning.Text = "Bitte Umsatzsteuerbetrag eingeben." + Exit Sub + End If + + End If + + + If sender Is txtUSTBetrag Then + If IsNumeric(txtUSTBetrag.Text) AndAlso IsNumeric(txtUmrechnungskurs.Text) Then + txtUSTBetragEUR.Text = Math.Floor((txtUSTBetrag.Text / txtUmrechnungskurs.Text) * 100 + 0.5) / 100 + txtChanged = True + End If + + ElseIf sender Is txtUSTBetragEUR Then + + 'so herum nicht umrechnen!!!! + 'If IsNumeric(txtUSTBetragEUR._value) AndAlso IsNumeric(txtUmrechnungskurs._value) Then + ' txtUSTBetrag.Text = Math.Floor((txtUSTBetragEUR._value * txtUmrechnungskurs._value) * 100 + 0.5) / 100 + ' 'values_changed() + 'End If + + + If IsNumeric(txtUSTBetragEUR.Text) AndAlso IsNumeric(txtUSTBetrag.Text) Then + + Dim zahl1 = txtUSTBetragEUR.Text / txtUSTBetrag.Text + + txtUmrechnungskurs.Text = zahl1 + txtChanged = True + End If + + ElseIf sender Is txtUmrechnungskurs Then + + + If IsNumeric(txtUSTBetrag.Text) AndAlso IsNumeric(txtUmrechnungskurs._value) Then + txtUSTBetragEUR.Text = Math.Floor((txtUSTBetrag.Text / txtUmrechnungskurs.Text) * 100 + 0.5) / 100 + txtChanged = True + End If + + + End If + + + + + End If + + If txtChanged Then + values_changed() + txtChanged = False + End If + + + End If + + End Sub + +End Class diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb index 8cb95c7b..2ca49127 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb @@ -430,3 +430,156 @@ Public Class cUStVPositionen End Function End Class + + + +Public Class cUStVErstattungPositionen + + Property UStVAn_ID As Integer + Property UStVEr_ID As Integer + Property UStVEr_USteuerbetrag As Object = Nothing + Property Belegdatum As Object = Nothing + Property Belegnummer As Object = Nothing + Property GutschriftsDatum As Object = Nothing + Property GutschriftsNr As Object = Nothing + Property Berufungsdatum As Object = Nothing + Property Berufungshöhe As Object = Nothing + Property Berufungsgrund As Object = Nothing + Property Bemerkung As Object = Nothing ' + Property UStVEr_Umrechnungskurs As Object = Nothing + Property UStVEr_USteuerbetragEUR As Object = Nothing + Property UStVEr_Sachbearbeiter As Object = Nothing + Property UStVEr_Zeitstempel As Object = Nothing + + Dim SQL As New SQL + + + + 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("UStVAn_ID", UStVAn_ID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_ID", UStVEr_ID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_USteuerbetrag", UStVEr_USteuerbetrag)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Belegdatum", Belegdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Belegnummer", Belegnummer)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GutschriftsDatum", GutschriftsDatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("GutschriftsNr", GutschriftsNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Berufungsdatum", Berufungsdatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Berufungshöhe", Berufungshöhe)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Berufungsgrund", Berufungsgrund)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Bemerkung", Bemerkung)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_Umrechnungskurs", UStVEr_Umrechnungskurs)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_USteuerbetragEUR", UStVEr_USteuerbetragEUR)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_Sachbearbeiter", UStVEr_Sachbearbeiter)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVEr_Zeitstempel", UStVEr_Zeitstempel)) + Return list + End Function + + Sub New(UStVAn_ID, UStVEr_ID) + Me.UStVAn_ID = UStVAn_ID + Me.UStVEr_ID = UStVEr_ID + + LOAD(UStVAn_ID, UStVEr_ID) + End Sub + Sub New() + + End Sub + + + Public Sub LOAD(UStVAn_ID, UStVEr_ID) + Try + + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM tblUStVErstattung WHERE UStVAn_ID=@UStVAn_ID AND UStVEr_ID=@UStVEr_ID ", conn) + cmd.Parameters.AddWithValue("@UStVAn_ID", UStVAn_ID) + cmd.Parameters.AddWithValue("@UStVEr_ID", UStVEr_ID) + 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 + + 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() + + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblUStVErstattung WHERE UStVAn_ID=@UStVAn_ID AND UStVEr_ID=@UStVEr_ID) " & + " BEGIN " & getUpdateCmd() & " END " & + " Else " & + " BEGIN " & getInsertCmd() & " END " & + " commit tran " + + Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list) + End Function + + + Public Function getUpdateCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim str As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + Return (" UPDATE [tblUStVErstattung] SET " & str & " WHERE UStVAn_ID=@UStVAn_ID AND UStVEr_ID=@UStVEr_ID") + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + + + + + Public Function INSERT() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Return SQL.doSQLVarList(getInsertCmd, "FMZOLL", , list) + End Function + + Public Function getInsertCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim str As String = "" + Dim values As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "]," + values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + values = values.Substring(0, values.Length - 1) 'wg. ',' + Return (" INSERT INTO tblUStVErstattung (" & str & ") VALUES(" & values & ") ") + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + + + Public Function DELETE(UStVAn_ID, UStVEr_ID) As Boolean + + Dim sqlstr = " DELETE FROM tblUStVErstattung WHERE UStVAn_ID=" & Me.UStVAn_ID & " AND UStVEr_ID=" & Me.UStVEr_ID + Return SQL.doSQL(sqlstr, "FMZOLL") + + End Function +End Class From a9557ee91cb38261b949911f54c4339f295a686d Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 14 Feb 2025 17:22:06 +0100 Subject: [PATCH 4/6] mdm_erstattungsantraege --- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 68 ++- SDL/USTV/frmMDM_USTVAntrag.vb | 4 + ...stCntlUSTV_ErstattungPosition .Designer.vb | 463 ++++++++---------- SDL/USTV/ustCntlUSTV_ErstattungPosition .vb | 18 +- 4 files changed, 289 insertions(+), 264 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 847ae3cb..8de53bf6 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -104,6 +104,10 @@ Partial Class frmMDM_USTVAntrag Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.Panel3 = New System.Windows.Forms.Panel() + Me.pnlErstattungsdetails = New System.Windows.Forms.Panel() + Me.Button4 = New System.Windows.Forms.Button() + Me.Button5 = New System.Windows.Forms.Button() Me.pnlBottom.SuspendLayout() CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlHeader.SuspendLayout() @@ -121,6 +125,8 @@ Partial Class frmMDM_USTVAntrag Me.Panel4.SuspendLayout() Me.TabPage2.SuspendLayout() CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel3.SuspendLayout() + Me.pnlErstattungsdetails.SuspendLayout() Me.SuspendLayout() ' 'pnlBottom @@ -1236,7 +1242,7 @@ Partial Class frmMDM_USTVAntrag ' 'TabPage2 ' - Me.TabPage2.Controls.Add(Me.dgvErstattungspositionen) + Me.TabPage2.Controls.Add(Me.Panel3) Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) @@ -1263,7 +1269,7 @@ Partial Class frmMDM_USTVAntrag Me.dgvErstattungspositionen.RowHeadersVisible = False Me.dgvErstattungspositionen.RowHeadersWidth = 62 Me.dgvErstattungspositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1438, 225) + Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1438, 172) Me.dgvErstattungspositionen.TabIndex = 1 ' 'ContextMenuStrip1 @@ -1276,6 +1282,58 @@ Partial Class frmMDM_USTVAntrag Me.ContextMenuStrip2.Name = "ContextMenuStrip1" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' + 'Panel3 + ' + Me.Panel3.BackColor = System.Drawing.Color.White + Me.Panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel3.Controls.Add(Me.dgvErstattungspositionen) + Me.Panel3.Controls.Add(Me.pnlErstattungsdetails) + Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel3.Location = New System.Drawing.Point(3, 3) + Me.Panel3.Name = "Panel3" + Me.Panel3.Size = New System.Drawing.Size(1438, 438) + Me.Panel3.TabIndex = 3 + ' + 'pnlErstattungsdetails + ' + Me.pnlErstattungsdetails.BackColor = System.Drawing.Color.WhiteSmoke + Me.pnlErstattungsdetails.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlErstattungsdetails.Controls.Add(Me.Button4) + Me.pnlErstattungsdetails.Controls.Add(Me.Button5) + Me.pnlErstattungsdetails.Dock = System.Windows.Forms.DockStyle.Bottom + Me.pnlErstattungsdetails.Location = New System.Drawing.Point(0, 175) + Me.pnlErstattungsdetails.Name = "pnlErstattungsdetails" + Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1436, 261) + Me.pnlErstattungsdetails.TabIndex = 0 + ' + 'Button4 + ' + Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button4.ForeColor = System.Drawing.Color.Black + Me.Button4.Image = Global.SDL.My.Resources.Resources.del + Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button4.Location = New System.Drawing.Point(6, 50) + Me.Button4.Name = "Button4" + Me.Button4.Size = New System.Drawing.Size(135, 39) + Me.Button4.TabIndex = 1 + Me.Button4.Text = "Eintrag löschen" + Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button4.UseVisualStyleBackColor = True + ' + 'Button5 + ' + Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button5.ForeColor = System.Drawing.Color.Black + Me.Button5.Image = Global.SDL.My.Resources.Resources.plus + Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button5.Location = New System.Drawing.Point(6, 5) + Me.Button5.Name = "Button5" + Me.Button5.Size = New System.Drawing.Size(135, 39) + Me.Button5.TabIndex = 0 + Me.Button5.Text = "Neuer Eintrag" + Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button5.UseVisualStyleBackColor = True + ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1312,6 +1370,8 @@ Partial Class frmMDM_USTVAntrag Me.Panel4.ResumeLayout(False) Me.TabPage2.ResumeLayout(False) CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel3.ResumeLayout(False) + Me.pnlErstattungsdetails.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -1394,4 +1454,8 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents TabPage1 As TabPage Friend WithEvents TabPage2 As TabPage Friend WithEvents dgvErstattungspositionen As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents Panel3 As Panel + Friend WithEvents pnlErstattungsdetails As Panel + Friend WithEvents Button4 As Button + Friend WithEvents Button5 As Button End Class diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 9d81b0bb..2cbabf60 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -1974,6 +1974,10 @@ Public Class frmMDM_USTVAntrag + End Sub + + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + End Sub Private Sub initdgvErstattungen() diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb index 0e5e78b9..d29593ac 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb @@ -41,25 +41,24 @@ 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.txtBerufungsdatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblWarning = New System.Windows.Forms.Label() - Me.sbLeistender = New VERAG_PROG_ALLGEMEIN.MySearchBox() - Me.txtStrasse = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtUIDNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtBemerkung = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label14 = New System.Windows.Forms.Label() - Me.Label17 = New System.Windows.Forms.Label() Me.Label15 = New System.Windows.Forms.Label() - Me.txtLand = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtPLZ = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtStrassenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label16 = New System.Windows.Forms.Label() - Me.txtOrt = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtBerufungshoehe = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtBelegNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label16 = New System.Windows.Forms.Label() + Me.txtBerurunfgrund = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtBelegDatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtLeistungsbezeichnung = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtGuDatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUSTBetragEUR = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUmrechnungskurs = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUSTBetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Panel1 = New System.Windows.Forms.Panel() + Me.txtGuNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label18 = New System.Windows.Forms.Label() + Me.Label19 = New System.Windows.Forms.Label() Me.Panel2.SuspendLayout() Me.pnl.SuspendLayout() Me.Panel1.SuspendLayout() @@ -110,11 +109,11 @@ 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(442, 14) + Me.Label1.Location = New System.Drawing.Point(504, 14) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(55, 13) + Me.Label1.Size = New System.Drawing.Size(62, 13) Me.Label1.TabIndex = 1 - Me.Label1.Text = "Leistung" + Me.Label1.Text = "Gutschrift" ' 'btnBildAuf ' @@ -146,21 +145,21 @@ 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(442, 31) + Me.Label2.Location = New System.Drawing.Point(504, 31) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(139, 15) + Me.Label2.Size = New System.Drawing.Size(108, 15) Me.Label2.TabIndex = 4 - Me.Label2.Text = "Leistungs-Bezeichnung:" + Me.Label2.Text = "Gutschrifts-Datum:" ' 'Label3 ' Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label3.Location = New System.Drawing.Point(630, 31) + Me.Label3.Location = New System.Drawing.Point(692, 31) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(101, 15) + Me.Label3.Size = New System.Drawing.Size(87, 15) Me.Label3.TabIndex = 5 - Me.Label3.Text = "Leistungs-Geber:" + Me.Label3.Text = "Gutschritfs-Nr.:" ' 'Label6 ' @@ -255,29 +254,28 @@ Partial Class ustCntlUSTV_ErstattungPosition 'pnl ' Me.pnl.BackColor = System.Drawing.Color.White - Me.pnl.Controls.Add(Me.txtStrasse) + Me.pnl.Controls.Add(Me.Label19) + Me.pnl.Controls.Add(Me.Label18) + Me.pnl.Controls.Add(Me.txtGuNr) + Me.pnl.Controls.Add(Me.txtBerufungsdatum) Me.pnl.Controls.Add(Me.lblWarning) - Me.pnl.Controls.Add(Me.txtUIDNr) + Me.pnl.Controls.Add(Me.txtBemerkung) Me.pnl.Controls.Add(Me.Label14) - Me.pnl.Controls.Add(Me.sbLeistender) - Me.pnl.Controls.Add(Me.Label17) Me.pnl.Controls.Add(Me.Label15) Me.pnl.Controls.Add(Me.Label6) - Me.pnl.Controls.Add(Me.txtLand) Me.pnl.Controls.Add(Me.Label9) - Me.pnl.Controls.Add(Me.txtPLZ) Me.pnl.Controls.Add(Me.lblAenderungsdatum) - Me.pnl.Controls.Add(Me.txtStrassenNr) + Me.pnl.Controls.Add(Me.txtBerufungshoehe) Me.pnl.Controls.Add(Me.txtBelegNr) Me.pnl.Controls.Add(Me.Label16) Me.pnl.Controls.Add(Me.lblSachbearbeiter) - Me.pnl.Controls.Add(Me.txtOrt) + Me.pnl.Controls.Add(Me.txtBerurunfgrund) Me.pnl.Controls.Add(Me.Label7) Me.pnl.Controls.Add(Me.Label5) Me.pnl.Controls.Add(Me.txtBelegDatum) Me.pnl.Controls.Add(Me.Label4) Me.pnl.Controls.Add(Me.Label1) - Me.pnl.Controls.Add(Me.txtLeistungsbezeichnung) + Me.pnl.Controls.Add(Me.txtGuDatum) Me.pnl.Controls.Add(Me.txtUSTBetragEUR) Me.pnl.Controls.Add(Me.Label2) Me.pnl.Controls.Add(Me.Label13) @@ -290,9 +288,33 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill Me.pnl.Location = New System.Drawing.Point(0, 30) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(1300, 239) + Me.pnl.Size = New System.Drawing.Size(1300, 235) Me.pnl.TabIndex = 1 ' + 'txtBerufungsdatum + ' + Me.txtBerufungsdatum._DateTimeOnly = False + Me.txtBerufungsdatum._numbersOnly = False + Me.txtBerufungsdatum._numbersOnlyKommastellen = "" + Me.txtBerufungsdatum._numbersOnlyTrennzeichen = True + Me.txtBerufungsdatum._Prozent = False + Me.txtBerufungsdatum._ShortDateNew = False + Me.txtBerufungsdatum._ShortDateOnly = False + Me.txtBerufungsdatum._TimeOnly = False + Me.txtBerufungsdatum._TimeOnly_Seconds = False + Me.txtBerufungsdatum._value = "" + Me.txtBerufungsdatum._Waehrung = False + Me.txtBerufungsdatum._WaehrungZeichen = True + Me.txtBerufungsdatum.ForeColor = System.Drawing.Color.Red + Me.txtBerufungsdatum.Location = New System.Drawing.Point(507, 130) + Me.txtBerufungsdatum.MaxLength = 50 + Me.txtBerufungsdatum.MaxLineLength = -1 + Me.txtBerufungsdatum.MaxLines_Warning = "" + Me.txtBerufungsdatum.MaxLines_Warning_Label = Nothing + Me.txtBerufungsdatum.Name = "txtBerufungsdatum" + Me.txtBerufungsdatum.Size = New System.Drawing.Size(169, 20) + Me.txtBerufungsdatum.TabIndex = 15 + ' 'lblWarning ' Me.lblWarning.AutoSize = True @@ -303,214 +325,73 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.lblWarning.Size = New System.Drawing.Size(0, 16) Me.lblWarning.TabIndex = 23 ' - 'sbLeistender + 'txtBemerkung ' - Me.sbLeistender._allowFreitext = True - Me.sbLeistender._AllowSetValue = False - Me.sbLeistender._allowSpaceAsSplitter = False - Me.sbLeistender._autoSizeGross = False - Me.sbLeistender._hideIfListEmpty = True - Me.sbLeistender._value = Nothing - Me.sbLeistender.conn_art = "FMZOLL" - Me.sbLeistender.dgvpos = "LEFT" - Me.sbLeistender.DISPLAY_PARAM = Nothing - Me.sbLeistender.INVISIBLE_COLUMNS = Nothing - Me.sbLeistender.key_visible = False - Me.sbLeistender.KEYPARAM = Nothing - Me.sbLeistender.Location = New System.Drawing.Point(630, 49) - Me.sbLeistender.Name = "sbLeistender" - Me.sbLeistender.searchActive = True - Me.sbLeistender.Size = New System.Drawing.Size(283, 20) - Me.sbLeistender.SQL_ORDER_BY = Nothing - Me.sbLeistender.SQL_SELECT = Nothing - Me.sbLeistender.SQL_WHERE = Nothing - Me.sbLeistender.SQL_WhereParamList = Nothing - Me.sbLeistender.TabIndex = 13 - Me.sbLeistender.usrcntl = Nothing - ' - 'txtStrasse - ' - Me.txtStrasse._DateTimeOnly = False - Me.txtStrasse._numbersOnly = False - Me.txtStrasse._numbersOnlyKommastellen = "" - Me.txtStrasse._numbersOnlyTrennzeichen = True - Me.txtStrasse._Prozent = False - Me.txtStrasse._ShortDateNew = False - Me.txtStrasse._ShortDateOnly = False - Me.txtStrasse._TimeOnly = False - Me.txtStrasse._TimeOnly_Seconds = False - Me.txtStrasse._value = "" - Me.txtStrasse._Waehrung = False - Me.txtStrasse._WaehrungZeichen = True - Me.txtStrasse.ForeColor = System.Drawing.Color.Red - Me.txtStrasse.Location = New System.Drawing.Point(729, 93) - Me.txtStrasse.MaxLength = 50 - Me.txtStrasse.MaxLineLength = -1 - Me.txtStrasse.MaxLines_Warning = "" - Me.txtStrasse.MaxLines_Warning_Label = Nothing - Me.txtStrasse.Name = "txtStrasse" - Me.txtStrasse.Size = New System.Drawing.Size(169, 20) - Me.txtStrasse.TabIndex = 15 - ' - 'txtUIDNr - ' - Me.txtUIDNr._DateTimeOnly = False - Me.txtUIDNr._numbersOnly = False - Me.txtUIDNr._numbersOnlyKommastellen = "" - Me.txtUIDNr._numbersOnlyTrennzeichen = True - Me.txtUIDNr._Prozent = False - Me.txtUIDNr._ShortDateNew = False - Me.txtUIDNr._ShortDateOnly = False - Me.txtUIDNr._TimeOnly = False - Me.txtUIDNr._TimeOnly_Seconds = False - Me.txtUIDNr._value = "" - Me.txtUIDNr._Waehrung = False - Me.txtUIDNr._WaehrungZeichen = True - Me.txtUIDNr.ForeColor = System.Drawing.Color.Red - Me.txtUIDNr.Location = New System.Drawing.Point(843, 150) - Me.txtUIDNr.MaxLength = 50 - Me.txtUIDNr.MaxLineLength = -1 - Me.txtUIDNr.MaxLines_Warning = "" - Me.txtUIDNr.MaxLines_Warning_Label = Nothing - Me.txtUIDNr.Name = "txtUIDNr" - Me.txtUIDNr.Size = New System.Drawing.Size(106, 20) - Me.txtUIDNr.TabIndex = 20 + Me.txtBemerkung._DateTimeOnly = False + Me.txtBemerkung._numbersOnly = False + Me.txtBemerkung._numbersOnlyKommastellen = "" + Me.txtBemerkung._numbersOnlyTrennzeichen = True + Me.txtBemerkung._Prozent = False + Me.txtBemerkung._ShortDateNew = False + Me.txtBemerkung._ShortDateOnly = False + Me.txtBemerkung._TimeOnly = False + Me.txtBemerkung._TimeOnly_Seconds = False + Me.txtBemerkung._value = "" + Me.txtBemerkung._Waehrung = False + Me.txtBemerkung._WaehrungZeichen = True + Me.txtBemerkung.ForeColor = System.Drawing.Color.Red + Me.txtBemerkung.Location = New System.Drawing.Point(507, 179) + Me.txtBemerkung.MaxLength = 50 + Me.txtBemerkung.MaxLineLength = -1 + Me.txtBemerkung.MaxLines_Warning = "" + Me.txtBemerkung.MaxLines_Warning_Label = Nothing + Me.txtBemerkung.Name = "txtBemerkung" + Me.txtBemerkung.Size = New System.Drawing.Size(431, 20) + Me.txtBemerkung.TabIndex = 20 ' 'Label14 ' Me.Label14.AutoSize = True Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label14.Location = New System.Drawing.Point(667, 95) + Me.Label14.Location = New System.Drawing.Point(692, 112) Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(64, 15) + Me.Label14.Size = New System.Drawing.Size(95, 15) Me.Label14.TabIndex = 23 - Me.Label14.Text = "Strasse/Nr" - ' - 'Label17 - ' - Me.Label17.AutoSize = True - Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label17.Location = New System.Drawing.Point(792, 153) - Me.Label17.Name = "Label17" - Me.Label17.Size = New System.Drawing.Size(45, 15) - Me.Label17.TabIndex = 31 - Me.Label17.Text = "UID-Nr" + Me.Label14.Text = "Berufungsgrund" ' 'Label15 ' Me.Label15.AutoSize = True Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label15.Location = New System.Drawing.Point(671, 122) + Me.Label15.Location = New System.Drawing.Point(863, 112) Me.Label15.Name = "Label15" - Me.Label15.Size = New System.Drawing.Size(48, 15) + Me.Label15.Size = New System.Drawing.Size(91, 15) Me.Label15.TabIndex = 25 - Me.Label15.Text = "PLZ/Ort" + Me.Label15.Text = "Berufungshöhe" ' - 'txtLand + 'txtBerufungshoehe ' - Me.txtLand._DateTimeOnly = False - Me.txtLand._numbersOnly = False - Me.txtLand._numbersOnlyKommastellen = "" - Me.txtLand._numbersOnlyTrennzeichen = True - Me.txtLand._Prozent = False - Me.txtLand._ShortDateNew = False - Me.txtLand._ShortDateOnly = False - Me.txtLand._TimeOnly = False - Me.txtLand._TimeOnly_Seconds = False - Me.txtLand._value = "" - Me.txtLand._Waehrung = False - Me.txtLand._WaehrungZeichen = True - Me.txtLand.ForeColor = System.Drawing.Color.Red - Me.txtLand.Location = New System.Drawing.Point(729, 148) - Me.txtLand.MaxLength = 2 - Me.txtLand.MaxLineLength = -1 - Me.txtLand.MaxLines_Warning = "" - Me.txtLand.MaxLines_Warning_Label = Nothing - Me.txtLand.Name = "txtLand" - Me.txtLand.Size = New System.Drawing.Size(38, 20) - Me.txtLand.TabIndex = 19 - ' - 'txtPLZ - ' - Me.txtPLZ._DateTimeOnly = False - Me.txtPLZ._numbersOnly = False - Me.txtPLZ._numbersOnlyKommastellen = "" - Me.txtPLZ._numbersOnlyTrennzeichen = True - Me.txtPLZ._Prozent = False - Me.txtPLZ._ShortDateNew = False - Me.txtPLZ._ShortDateOnly = False - Me.txtPLZ._TimeOnly = False - Me.txtPLZ._TimeOnly_Seconds = False - Me.txtPLZ._value = "" - Me.txtPLZ._Waehrung = False - Me.txtPLZ._WaehrungZeichen = True - Me.txtPLZ.ForeColor = System.Drawing.Color.Red - Me.txtPLZ.Location = New System.Drawing.Point(729, 119) - Me.txtPLZ.MaxLength = 10 - Me.txtPLZ.MaxLineLength = -1 - Me.txtPLZ.MaxLines_Warning = "" - Me.txtPLZ.MaxLines_Warning_Label = Nothing - Me.txtPLZ.Name = "txtPLZ" - Me.txtPLZ.Size = New System.Drawing.Size(59, 20) - Me.txtPLZ.TabIndex = 17 - ' - 'txtStrassenNr - ' - Me.txtStrassenNr._DateTimeOnly = False - Me.txtStrassenNr._numbersOnly = False - Me.txtStrassenNr._numbersOnlyKommastellen = "" - Me.txtStrassenNr._numbersOnlyTrennzeichen = True - Me.txtStrassenNr._Prozent = False - Me.txtStrassenNr._ShortDateNew = False - Me.txtStrassenNr._ShortDateOnly = False - Me.txtStrassenNr._TimeOnly = False - Me.txtStrassenNr._TimeOnly_Seconds = False - Me.txtStrassenNr._value = "" - Me.txtStrassenNr._Waehrung = False - Me.txtStrassenNr._WaehrungZeichen = True - Me.txtStrassenNr.ForeColor = System.Drawing.Color.Red - Me.txtStrassenNr.Location = New System.Drawing.Point(904, 92) - Me.txtStrassenNr.MaxLength = 10 - Me.txtStrassenNr.MaxLineLength = -1 - Me.txtStrassenNr.MaxLines_Warning = "" - Me.txtStrassenNr.MaxLines_Warning_Label = Nothing - Me.txtStrassenNr.Name = "txtStrassenNr" - Me.txtStrassenNr.Size = New System.Drawing.Size(45, 20) - Me.txtStrassenNr.TabIndex = 16 - ' - 'Label16 - ' - Me.Label16.AutoSize = True - Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label16.Location = New System.Drawing.Point(671, 148) - Me.Label16.Name = "Label16" - Me.Label16.Size = New System.Drawing.Size(35, 15) - Me.Label16.TabIndex = 27 - Me.Label16.Text = "Land" - ' - 'txtOrt - ' - Me.txtOrt._DateTimeOnly = False - Me.txtOrt._numbersOnly = False - Me.txtOrt._numbersOnlyKommastellen = "" - Me.txtOrt._numbersOnlyTrennzeichen = True - Me.txtOrt._Prozent = False - Me.txtOrt._ShortDateNew = False - Me.txtOrt._ShortDateOnly = False - Me.txtOrt._TimeOnly = False - Me.txtOrt._TimeOnly_Seconds = False - Me.txtOrt._value = "" - Me.txtOrt._Waehrung = False - Me.txtOrt._WaehrungZeichen = True - Me.txtOrt.ForeColor = System.Drawing.Color.Red - Me.txtOrt.Location = New System.Drawing.Point(795, 119) - Me.txtOrt.MaxLength = 50 - Me.txtOrt.MaxLineLength = -1 - Me.txtOrt.MaxLines_Warning = "" - Me.txtOrt.MaxLines_Warning_Label = Nothing - Me.txtOrt.Name = "txtOrt" - Me.txtOrt.Size = New System.Drawing.Size(154, 20) - Me.txtOrt.TabIndex = 18 + Me.txtBerufungshoehe._DateTimeOnly = False + Me.txtBerufungshoehe._numbersOnly = False + Me.txtBerufungshoehe._numbersOnlyKommastellen = "" + Me.txtBerufungshoehe._numbersOnlyTrennzeichen = True + Me.txtBerufungshoehe._Prozent = False + Me.txtBerufungshoehe._ShortDateNew = False + Me.txtBerufungshoehe._ShortDateOnly = False + Me.txtBerufungshoehe._TimeOnly = False + Me.txtBerufungshoehe._TimeOnly_Seconds = False + Me.txtBerufungshoehe._value = "" + Me.txtBerufungshoehe._Waehrung = False + Me.txtBerufungshoehe._WaehrungZeichen = True + Me.txtBerufungshoehe.ForeColor = System.Drawing.Color.Red + Me.txtBerufungshoehe.Location = New System.Drawing.Point(866, 130) + Me.txtBerufungshoehe.MaxLength = 10 + Me.txtBerufungshoehe.MaxLineLength = -1 + Me.txtBerufungshoehe.MaxLines_Warning = "" + Me.txtBerufungshoehe.MaxLines_Warning_Label = Nothing + Me.txtBerufungshoehe.Name = "txtBerufungshoehe" + Me.txtBerufungshoehe.Size = New System.Drawing.Size(99, 20) + Me.txtBerufungshoehe.TabIndex = 16 ' 'txtBelegNr ' @@ -525,7 +406,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBelegNr._TimeOnly_Seconds = False Me.txtBelegNr._value = Nothing Me.txtBelegNr._Waehrung = False - Me.txtBelegNr._WaehrungZeichen = True + Me.txtBelegNr._WaehrungZeichen = False Me.txtBelegNr.Location = New System.Drawing.Point(177, 49) Me.txtBelegNr.MaxLength = 250 Me.txtBelegNr.MaxLineLength = -1 @@ -535,6 +416,40 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBelegNr.Size = New System.Drawing.Size(183, 20) Me.txtBelegNr.TabIndex = 7 ' + 'Label16 + ' + Me.Label16.AutoSize = True + Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) + Me.Label16.Location = New System.Drawing.Point(504, 161) + Me.Label16.Name = "Label16" + Me.Label16.Size = New System.Drawing.Size(71, 15) + Me.Label16.TabIndex = 27 + Me.Label16.Text = "Bemerkung" + ' + 'txtBerurunfgrund + ' + Me.txtBerurunfgrund._DateTimeOnly = False + Me.txtBerurunfgrund._numbersOnly = False + Me.txtBerurunfgrund._numbersOnlyKommastellen = "" + Me.txtBerurunfgrund._numbersOnlyTrennzeichen = True + Me.txtBerurunfgrund._Prozent = False + Me.txtBerurunfgrund._ShortDateNew = False + Me.txtBerurunfgrund._ShortDateOnly = False + Me.txtBerurunfgrund._TimeOnly = False + Me.txtBerurunfgrund._TimeOnly_Seconds = False + Me.txtBerurunfgrund._value = "" + Me.txtBerurunfgrund._Waehrung = False + Me.txtBerurunfgrund._WaehrungZeichen = True + Me.txtBerurunfgrund.ForeColor = System.Drawing.Color.Red + Me.txtBerurunfgrund.Location = New System.Drawing.Point(695, 130) + Me.txtBerurunfgrund.MaxLength = 50 + Me.txtBerurunfgrund.MaxLineLength = -1 + Me.txtBerurunfgrund.MaxLines_Warning = "" + Me.txtBerurunfgrund.MaxLines_Warning_Label = Nothing + Me.txtBerurunfgrund.Name = "txtBerurunfgrund" + Me.txtBerurunfgrund.Size = New System.Drawing.Size(154, 20) + Me.txtBerurunfgrund.TabIndex = 18 + ' 'txtBelegDatum ' Me.txtBelegDatum._DateTimeOnly = False @@ -559,28 +474,28 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBelegDatum.Size = New System.Drawing.Size(154, 20) Me.txtBelegDatum.TabIndex = 6 ' - 'txtLeistungsbezeichnung + 'txtGuDatum ' - Me.txtLeistungsbezeichnung._DateTimeOnly = False - Me.txtLeistungsbezeichnung._numbersOnly = False - Me.txtLeistungsbezeichnung._numbersOnlyKommastellen = "" - Me.txtLeistungsbezeichnung._numbersOnlyTrennzeichen = True - Me.txtLeistungsbezeichnung._Prozent = False - Me.txtLeistungsbezeichnung._ShortDateNew = False - Me.txtLeistungsbezeichnung._ShortDateOnly = False - Me.txtLeistungsbezeichnung._TimeOnly = False - Me.txtLeistungsbezeichnung._TimeOnly_Seconds = False - Me.txtLeistungsbezeichnung._value = Nothing - Me.txtLeistungsbezeichnung._Waehrung = False - Me.txtLeistungsbezeichnung._WaehrungZeichen = True - Me.txtLeistungsbezeichnung.Location = New System.Drawing.Point(445, 49) - Me.txtLeistungsbezeichnung.MaxLength = 22 - Me.txtLeistungsbezeichnung.MaxLineLength = -1 - Me.txtLeistungsbezeichnung.MaxLines_Warning = "" - Me.txtLeistungsbezeichnung.MaxLines_Warning_Label = Nothing - Me.txtLeistungsbezeichnung.Name = "txtLeistungsbezeichnung" - Me.txtLeistungsbezeichnung.Size = New System.Drawing.Size(182, 20) - Me.txtLeistungsbezeichnung.TabIndex = 8 + Me.txtGuDatum._DateTimeOnly = False + Me.txtGuDatum._numbersOnly = False + Me.txtGuDatum._numbersOnlyKommastellen = "" + Me.txtGuDatum._numbersOnlyTrennzeichen = True + Me.txtGuDatum._Prozent = False + Me.txtGuDatum._ShortDateNew = False + Me.txtGuDatum._ShortDateOnly = False + Me.txtGuDatum._TimeOnly = False + Me.txtGuDatum._TimeOnly_Seconds = False + Me.txtGuDatum._value = Nothing + Me.txtGuDatum._Waehrung = False + Me.txtGuDatum._WaehrungZeichen = False + Me.txtGuDatum.Location = New System.Drawing.Point(507, 49) + Me.txtGuDatum.MaxLength = 22 + Me.txtGuDatum.MaxLineLength = -1 + Me.txtGuDatum.MaxLines_Warning = "" + Me.txtGuDatum.MaxLines_Warning_Label = Nothing + Me.txtGuDatum.Name = "txtGuDatum" + Me.txtGuDatum.Size = New System.Drawing.Size(182, 20) + Me.txtGuDatum.TabIndex = 8 ' 'txtUSTBetragEUR ' @@ -661,9 +576,52 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.Panel1.Dock = System.Windows.Forms.DockStyle.Right Me.Panel1.Location = New System.Drawing.Point(1201, 30) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(99, 239) + Me.Panel1.Size = New System.Drawing.Size(99, 235) Me.Panel1.TabIndex = 2 ' + 'txtGuNr + ' + Me.txtGuNr._DateTimeOnly = False + Me.txtGuNr._numbersOnly = False + Me.txtGuNr._numbersOnlyKommastellen = "" + Me.txtGuNr._numbersOnlyTrennzeichen = True + Me.txtGuNr._Prozent = False + Me.txtGuNr._ShortDateNew = False + Me.txtGuNr._ShortDateOnly = False + Me.txtGuNr._TimeOnly = False + Me.txtGuNr._TimeOnly_Seconds = False + Me.txtGuNr._value = Nothing + Me.txtGuNr._Waehrung = False + Me.txtGuNr._WaehrungZeichen = False + Me.txtGuNr.Location = New System.Drawing.Point(695, 49) + Me.txtGuNr.MaxLength = 22 + Me.txtGuNr.MaxLineLength = -1 + Me.txtGuNr.MaxLines_Warning = "" + Me.txtGuNr.MaxLines_Warning_Label = Nothing + Me.txtGuNr.Name = "txtGuNr" + Me.txtGuNr.Size = New System.Drawing.Size(182, 20) + Me.txtGuNr.TabIndex = 32 + ' + 'Label18 + ' + 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(504, 92) + Me.Label18.Name = "Label18" + Me.Label18.Size = New System.Drawing.Size(58, 13) + Me.Label18.TabIndex = 33 + Me.Label18.Text = "Berufung" + ' + 'Label19 + ' + Me.Label19.AutoSize = True + Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) + Me.Label19.Location = New System.Drawing.Point(504, 112) + Me.Label19.Name = "Label19" + Me.Label19.Size = New System.Drawing.Size(107, 15) + Me.Label19.TabIndex = 34 + Me.Label19.Text = "Berufungs-Datum:" + ' 'ustCntlUSTV_ErstattungPosition ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -672,7 +630,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.Controls.Add(Me.pnl) Me.Controls.Add(Me.Panel2) Me.Name = "ustCntlUSTV_ErstattungPosition" - Me.Size = New System.Drawing.Size(1300, 269) + Me.Size = New System.Drawing.Size(1300, 265) Me.Panel2.ResumeLayout(False) Me.Panel2.PerformLayout() Me.pnl.ResumeLayout(False) @@ -690,7 +648,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Friend WithEvents Label1 As Label Friend WithEvents btnBildAuf As Button Friend WithEvents Button1 As Button - Friend WithEvents txtLeistungsbezeichnung As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtGuDatum As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label2 As Label Friend WithEvents Label3 As Label Friend WithEvents Label6 As Label @@ -707,16 +665,15 @@ Partial Class ustCntlUSTV_ErstattungPosition Friend WithEvents lblSachbearbeiter As Label Friend WithEvents pnl As Panel Friend WithEvents Panel1 As Panel - Friend WithEvents txtStrassenNr As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents txtOrt As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtBerufungshoehe As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtBerurunfgrund As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label16 As Label - Friend WithEvents txtPLZ As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label15 As Label - Friend WithEvents txtStrasse As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtBerufungsdatum As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label14 As Label - Friend WithEvents txtUIDNr As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents Label17 As Label - Friend WithEvents txtLand As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents sbLeistender As VERAG_PROG_ALLGEMEIN.MySearchBox + Friend WithEvents txtBemerkung As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents lblWarning As Label + Friend WithEvents Label18 As Label + Friend WithEvents txtGuNr As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label19 As Label End Class diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb index 0076057b..7e193597 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb @@ -5,12 +5,11 @@ Public Class ustCntlUSTV_ErstattungPosition Public UStV_ERS As VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen = Nothing Dim sql As New VERAG_PROG_ALLGEMEIN.SQL - Public Antrag_LandKz = "" Dim kdnr = "" Public Event EV_PREV() Public Event EV_NEXT() - Public Event CHANGED(UStVPo_ID) + Public Event CHANGED(UStV_ERS) Dim gridAktiv = False Dim txtChanged As Boolean = False Private Sub btnBildAuf_Click(sender As Object, e As EventArgs) Handles btnBildAuf.Click @@ -26,7 +25,7 @@ Public Class ustCntlUSTV_ErstattungPosition txtBelegNr._value = "" txtUmrechnungskurs._value = 1 - txtLeistungsbezeichnung._value = "" + txtGuDatum._value = "" txtUmrechnungskurs._value = 1 txtUSTBetrag._value = 0 txtUSTBetragEUR._value = 0 @@ -35,13 +34,13 @@ Public Class ustCntlUSTV_ErstattungPosition End Sub - Sub setValues(kdnr As Integer, UStV_ERS As VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen, Antrag_LandKz As String) + Sub setValues(kdnr As Integer, UStV_ERS As VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen) gridAktiv = False - Me.Antrag_LandKz = Antrag_LandKz + Me.UStV_ERS = UStV_ERS Me.kdnr = kdnr @@ -50,7 +49,7 @@ Public Class ustCntlUSTV_ErstattungPosition 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") - txtLeistungsbezeichnung.Text = If(UStV_ERS.Bemerkung, "") + txtGuDatum.Text = If(UStV_ERS.Bemerkung, "") txtUSTBetrag.Text = If(UStV_ERS.UStVEr_USteuerbetrag, "") txtUmrechnungskurs.Text = If(UStV_ERS.UStVEr_Umrechnungskurs, "") txtUSTBetragEUR.Text = If(UStV_ERS.UStVEr_USteuerbetragEUR, "") @@ -87,8 +86,8 @@ Public Class ustCntlUSTV_ErstattungPosition Else save = False End If - If txtLeistungsbezeichnung.Text <> "" Then - UStV_ERS.UStVPo_Leistungsbezeichnung = txtLeistungsbezeichnung.Text + If txtGuDatum.Text <> "" Then + UStV_ERS.UStVPo_Leistungsbezeichnung = txtGuDatum.Text Else save = False End If @@ -120,7 +119,7 @@ Public Class ustCntlUSTV_ErstattungPosition Return False End Function - Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtLeistungsbezeichnung.TextChanged, txtBelegDatum.TextChanged, txtBelegNr.TextChanged, txtUSTBetrag.TextChanged, txtUmrechnungskurs.TextChanged, txtUSTBetragEUR.TextChanged + Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtGuDatum.TextChanged, txtBelegDatum.TextChanged, txtBelegNr.TextChanged, txtUSTBetrag.TextChanged, txtUmrechnungskurs.TextChanged, txtUSTBetragEUR.TextChanged If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) Then Exit Sub @@ -205,4 +204,5 @@ Public Class ustCntlUSTV_ErstattungPosition End Sub + End Class From 28cf68eebbb02f3f2deceb74d9dbe91c3e4d980c Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 17 Feb 2025 09:45:28 +0100 Subject: [PATCH 5/6] ustva_Erstattungen --- SDL/USTV/frmMDM_USTVAntrag.Designer.vb | 146 ++++++++++++-------- SDL/USTV/frmMDM_USTVAntrag.vb | 117 +++++++++++++--- SDL/USTV/ustCntlUSTV_ErstattungPosition .vb | 73 ++++++++-- 3 files changed, 241 insertions(+), 95 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 8de53bf6..28f35a6a 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -101,13 +101,15 @@ Partial Class frmMDM_USTVAntrag Me.btnEintragloeschen = New System.Windows.Forms.Button() Me.btnNeuerEintrag = New System.Windows.Forms.Button() Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.Panel3 = New System.Windows.Forms.Panel() Me.dgvErstattungspositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.pnlErstattungsdetails = New System.Windows.Forms.Panel() + Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.Button2 = New System.Windows.Forms.Button() + Me.Button3 = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.Panel3 = New System.Windows.Forms.Panel() - Me.pnlErstattungsdetails = New System.Windows.Forms.Panel() - Me.Button4 = New System.Windows.Forms.Button() - Me.Button5 = New System.Windows.Forms.Button() Me.pnlBottom.SuspendLayout() CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlHeader.SuspendLayout() @@ -124,9 +126,10 @@ Partial Class frmMDM_USTVAntrag Me.Panel2.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabPage2.SuspendLayout() - CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel3.SuspendLayout() + CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlErstattungsdetails.SuspendLayout() + Me.Panel1.SuspendLayout() Me.SuspendLayout() ' 'pnlBottom @@ -1251,6 +1254,18 @@ Partial Class frmMDM_USTVAntrag Me.TabPage2.Text = "Erstattungspositionen" Me.TabPage2.UseVisualStyleBackColor = True ' + 'Panel3 + ' + Me.Panel3.BackColor = System.Drawing.Color.White + Me.Panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel3.Controls.Add(Me.dgvErstattungspositionen) + Me.Panel3.Controls.Add(Me.pnlErstattungsdetails) + Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel3.Location = New System.Drawing.Point(3, 3) + Me.Panel3.Name = "Panel3" + Me.Panel3.Size = New System.Drawing.Size(1438, 438) + Me.Panel3.TabIndex = 3 + ' 'dgvErstattungspositionen ' Me.dgvErstattungspositionen.AKTUALISIERUNGS_INTERVALL = 500 @@ -1272,6 +1287,66 @@ Partial Class frmMDM_USTVAntrag Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1438, 172) Me.dgvErstattungspositionen.TabIndex = 1 ' + 'pnlErstattungsdetails + ' + Me.pnlErstattungsdetails.BackColor = System.Drawing.Color.WhiteSmoke + Me.pnlErstattungsdetails.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlErstattungsdetails.Controls.Add(Me.UstCntlUSTV_AntragErstattungen1) + Me.pnlErstattungsdetails.Controls.Add(Me.Panel1) + Me.pnlErstattungsdetails.Dock = System.Windows.Forms.DockStyle.Bottom + Me.pnlErstattungsdetails.Location = New System.Drawing.Point(0, 175) + Me.pnlErstattungsdetails.Name = "pnlErstattungsdetails" + Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1436, 261) + Me.pnlErstattungsdetails.TabIndex = 0 + ' + 'UstCntlUSTV_AntragErstattungen1 + ' + Me.UstCntlUSTV_AntragErstattungen1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UstCntlUSTV_AntragErstattungen1.Location = New System.Drawing.Point(154, 0) + Me.UstCntlUSTV_AntragErstattungen1.Name = "UstCntlUSTV_AntragErstattungen1" + Me.UstCntlUSTV_AntragErstattungen1.Size = New System.Drawing.Size(1280, 259) + Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2 + ' + 'Panel1 + ' + Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke + Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel1.Controls.Add(Me.Button2) + Me.Panel1.Controls.Add(Me.Button3) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Left + Me.Panel1.Location = New System.Drawing.Point(0, 0) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(154, 259) + Me.Panel1.TabIndex = 3 + ' + 'Button2 + ' + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.ForeColor = System.Drawing.Color.Black + Me.Button2.Image = Global.SDL.My.Resources.Resources.del + Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button2.Location = New System.Drawing.Point(6, 50) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(135, 39) + Me.Button2.TabIndex = 1 + Me.Button2.Text = "Eintrag löschen" + Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button2.UseVisualStyleBackColor = True + ' + 'Button3 + ' + Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button3.ForeColor = System.Drawing.Color.Black + Me.Button3.Image = Global.SDL.My.Resources.Resources.plus + Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button3.Location = New System.Drawing.Point(6, 5) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(135, 39) + Me.Button3.TabIndex = 0 + Me.Button3.Text = "Neuer Eintrag" + Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button3.UseVisualStyleBackColor = True + ' 'ContextMenuStrip1 ' Me.ContextMenuStrip1.Name = "ContextMenuStrip1" @@ -1282,58 +1357,6 @@ Partial Class frmMDM_USTVAntrag Me.ContextMenuStrip2.Name = "ContextMenuStrip1" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' - 'Panel3 - ' - Me.Panel3.BackColor = System.Drawing.Color.White - Me.Panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel3.Controls.Add(Me.dgvErstattungspositionen) - Me.Panel3.Controls.Add(Me.pnlErstattungsdetails) - Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill - Me.Panel3.Location = New System.Drawing.Point(3, 3) - Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1438, 438) - Me.Panel3.TabIndex = 3 - ' - 'pnlErstattungsdetails - ' - Me.pnlErstattungsdetails.BackColor = System.Drawing.Color.WhiteSmoke - Me.pnlErstattungsdetails.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.pnlErstattungsdetails.Controls.Add(Me.Button4) - Me.pnlErstattungsdetails.Controls.Add(Me.Button5) - Me.pnlErstattungsdetails.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlErstattungsdetails.Location = New System.Drawing.Point(0, 175) - Me.pnlErstattungsdetails.Name = "pnlErstattungsdetails" - Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1436, 261) - Me.pnlErstattungsdetails.TabIndex = 0 - ' - 'Button4 - ' - Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button4.ForeColor = System.Drawing.Color.Black - Me.Button4.Image = Global.SDL.My.Resources.Resources.del - Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button4.Location = New System.Drawing.Point(6, 50) - Me.Button4.Name = "Button4" - Me.Button4.Size = New System.Drawing.Size(135, 39) - Me.Button4.TabIndex = 1 - Me.Button4.Text = "Eintrag löschen" - Me.Button4.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button4.UseVisualStyleBackColor = True - ' - 'Button5 - ' - Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button5.ForeColor = System.Drawing.Color.Black - Me.Button5.Image = Global.SDL.My.Resources.Resources.plus - Me.Button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button5.Location = New System.Drawing.Point(6, 5) - Me.Button5.Name = "Button5" - Me.Button5.Size = New System.Drawing.Size(135, 39) - Me.Button5.TabIndex = 0 - Me.Button5.Text = "Neuer Eintrag" - Me.Button5.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button5.UseVisualStyleBackColor = True - ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1369,9 +1392,10 @@ Partial Class frmMDM_USTVAntrag Me.Panel2.ResumeLayout(False) Me.Panel4.ResumeLayout(False) Me.TabPage2.ResumeLayout(False) - CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel3.ResumeLayout(False) + CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlErstattungsdetails.ResumeLayout(False) + Me.Panel1.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -1456,6 +1480,8 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents dgvErstattungspositionen As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents Panel3 As Panel Friend WithEvents pnlErstattungsdetails As Panel - Friend WithEvents Button4 As Button - Friend WithEvents Button5 As Button + Friend WithEvents UstCntlUSTV_AntragErstattungen1 As ustCntlUSTV_ErstattungPosition + Friend WithEvents Panel1 As Panel + Friend WithEvents Button2 As Button + Friend WithEvents Button3 As Button End Class diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 2cbabf60..55dcb9d3 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -14,6 +14,7 @@ Public Class frmMDM_USTVAntrag Dim USTV_ANTRAG As VERAG_PROG_ALLGEMEIN.cUSTVAntrag = Nothing Dim Antrag_LandKz As String = "" Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + Dim posTabisSelected As Boolean = True Dim von, bis As Date @@ -1141,18 +1142,33 @@ Public Class frmMDM_USTVAntrag End Sub - Private Sub dgvUSTVPositionen_SelectionChanged(sender As Object, e As EventArgs) Handles dgvUSTVPositionen.SelectionChanged - If TabControl1.SelectedTab Is TabPage1 Then - If dgvUSTVPositionen.SelectedRows.Count > 0 Then - initPosition(dgvUSTVPositionen.SelectedRows(0).Cells("UStVPo_ID").Value) - End If - ElseIf TabControl1.SelectedTab Is TabPage2 Then - 'TODO-Logik für Erstattung - + Sub initErstsattungsPosition(UStVEr_ID) + If UStVEr_ID > 0 Then + Dim ANTR_ERSTATTUNG As New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen(USTV_ANTRAG.UStVAn_ID, UStVEr_ID) + UstCntlUSTV_AntragErstattungen1.Enabled = True + UstCntlUSTV_AntragErstattungen1.setValues(USTV_ANTRAG.UStVAn_KuNr, ANTR_ERSTATTUNG) + Else + UstCntlUSTV_AntragErstattungen1.reset() + UstCntlUSTV_AntragErstattungen1.Enabled = False End If End Sub + Private Sub dgvUSTVPositionen_SelectionChanged(sender As Object, e As EventArgs) Handles dgvUSTVPositionen.SelectionChanged + + + If dgvUSTVPositionen.SelectedRows.Count > 0 Then + initPosition(dgvUSTVPositionen.SelectedRows(0).Cells("UStVPo_ID").Value) + End If + + End Sub + + Private Sub dgvErstattungspositionen_SelectionChanged(sender As Object, e As EventArgs) Handles dgvErstattungspositionen.SelectionChanged + If dgvErstattungspositionen.SelectedRows.Count > 0 Then + initErstsattungsPosition(dgvErstattungspositionen.SelectedRows(0).Cells("UStVEr_ID").Value) + End If + End Sub + Private Sub UstCntlUSTV_AntragPosition1_EV_NEXT() Handles UstCntlUSTV_AntragPosition1.EV_NEXT If dgvUSTVPositionen.SelectedRows.Count > 0 Then @@ -1165,6 +1181,21 @@ Public Class frmMDM_USTVAntrag End If End If + End Sub + + Private Sub UstCntlUSTV_AntragErstattungen1_EV_NEXT() Handles UstCntlUSTV_AntragErstattungen1.EV_NEXT + + + If dgvErstattungspositionen.SelectedRows.Count > 0 Then + If dgvErstattungspositionen.RowCount > dgvErstattungspositionen.SelectedRows(0).Index + 1 Then + UstCntlUSTV_AntragErstattungen1.Enabled = True + Dim selIndex = dgvErstattungspositionen.SelectedRows(0).Index + 1 + dgvErstattungspositionen.ClearSelection() + dgvErstattungspositionen.Rows(selIndex).Selected = True + dgvErstattungspositionen.CurrentCell = dgvErstattungspositionen.SelectedRows(0).Cells("UStVEr_ID") + End If + End If + End Sub Private Sub UstCntlUSTV_AntragPosition1_EV_PREV() Handles UstCntlUSTV_AntragPosition1.EV_PREV If dgvUSTVPositionen.SelectedRows.Count > 0 Then @@ -1179,14 +1210,38 @@ Public Class frmMDM_USTVAntrag End Sub + Private Sub UstCntlUSTV_AntragErstattungen1_EV_PREV() Handles UstCntlUSTV_AntragErstattungen1.EV_PREV + If dgvErstattungspositionen.SelectedRows.Count > 0 Then + If dgvErstattungspositionen.SelectedRows(0).Index > 0 Then + UstCntlUSTV_AntragErstattungen1.Enabled = True + Dim selIndex = dgvErstattungspositionen.SelectedRows(0).Index - 1 + dgvErstattungspositionen.ClearSelection() + dgvErstattungspositionen.Rows(selIndex).Selected = True + dgvErstattungspositionen.CurrentCell = dgvErstattungspositionen.SelectedRows(0).Cells("UStVEr_ID") + End If + End If + + End Sub + Private Sub ustCntlUSTV_AntragPosition_KeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles Me.PreviewKeyDown - If e.KeyValue = Keys.PageDown Then - UstCntlUSTV_AntragPosition1_EV_NEXT() - End If - If e.KeyValue = Keys.PageUp Then - UstCntlUSTV_AntragPosition1_EV_PREV() + If posTabisSelected = True Then + If e.KeyValue = Keys.PageDown Then + UstCntlUSTV_AntragPosition1_EV_NEXT() + End If + If e.KeyValue = Keys.PageUp Then + UstCntlUSTV_AntragPosition1_EV_PREV() + End If + Else + If e.KeyValue = Keys.PageDown Then + UstCntlUSTV_AntragErstattungen1_EV_NEXT() + End If + If e.KeyValue = Keys.PageUp Then + UstCntlUSTV_AntragErstattungen1_EV_PREV() + End If + End If + End Sub Private Sub frmMDM_USTVAntrag_Shown(sender As Object, e As EventArgs) Handles Me.Shown @@ -1412,7 +1467,7 @@ Public Class frmMDM_USTVAntrag End If If UstCntlUSTV_AntragPosition1.UStV_POS.DELETE(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID, UstCntlUSTV_AntragPosition1.UStV_POS.UStVPo_ID) Then - reorderPositions(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID) + reorderUSTVAPositions(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID) End If init() @@ -1842,7 +1897,7 @@ Public Class frmMDM_USTVAntrag End Function - Private Sub reorderPositions(UStVAn_ID As Integer) + Private Sub reorderUSTVAPositions(UStVAn_ID As Integer) If UStVAn_ID < 0 Then Exit Sub @@ -1916,6 +1971,10 @@ Public Class frmMDM_USTVAntrag End If + picPDF.Visible = posTabisSelected + btnAntrageeinarbeiten.Enabled = posTabisSelected + cbxArchivierteEintracheNochmalsEinarbetien.Enabled = posTabisSelected + End Sub Private Sub setinfofields() @@ -1976,10 +2035,23 @@ Public Class frmMDM_USTVAntrag End Sub - Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click - + Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click + UstCntlUSTV_AntragErstattungen1.reset() + UstCntlUSTV_AntragErstattungen1.UStV_ERS = Nothing + UstCntlUSTV_AntragErstattungen1.Enabled = True End Sub + Private Sub Button2_Click_1(sender As Object, e As EventArgs) Handles Button2.Click + + If dgvErstattungspositionen.Rows.Count = 0 Then Exit Sub + If vbYes = MsgBox("Möchten Sie den Erstattungseintrag wirklich löschen?", vbYesNoCancel) Then + + UstCntlUSTV_AntragErstattungen1.UStV_ERS.DELETE(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID, UstCntlUSTV_AntragErstattungen1.UStV_ERS) + End If + End Sub + + + Private Sub initdgvErstattungen() @@ -2003,7 +2075,7 @@ Public Class frmMDM_USTVAntrag .Columns("UStVEr_ID").Width = 40 .Columns("Belegdatum").Width = 80 - .Columns("Belegnummer").Width = 180 + .Columns("Belegnummer").Width = 130 .Columns("UStVEr_USteuerbetrag").HeaderText = "USt-Betrag" .Columns("UStVEr_USteuerbetrag").Width = 110 @@ -2014,11 +2086,16 @@ Public Class frmMDM_USTVAntrag .Columns("GutschriftsNr").HeaderText = "GS-Nr" .Columns("GutschriftsDatum").Width = 80 - .Columns("GutschriftsNr").Width = 180 + .Columns("GutschriftsNr").Width = 130 + + + .Columns("Berufungsdatum").HeaderText = "BE-Datum" + .Columns("Berufungshöhe").HeaderText = "BE-Höhe" + .Columns("Berufungsgrund").HeaderText = "BE-Grund" .Columns("Berufungsdatum").Width = 80 .Columns("Berufungshöhe").Width = 100 - .Columns("Berufungsgrund").Width = 200 + .Columns("Berufungsgrund").Width = 150 .Columns("Bemerkung").Width = 200 .Columns("UStVEr_Umrechnungskurs").HeaderText = "Umrechnungskurs" diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb index 7e193597..ef59ba65 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb @@ -24,11 +24,17 @@ Public Class ustCntlUSTV_ErstattungPosition txtBelegDatum._value = "" txtBelegNr._value = "" - txtUmrechnungskurs._value = 1 txtGuDatum._value = "" + txtGuNr._value = "" + + txtBerufungsdatum._value = "" + txtBerufungshoehe._value = "" + txtBerurunfgrund._value = "" + txtUmrechnungskurs._value = 1 txtUSTBetrag._value = 0 txtUSTBetragEUR._value = 0 + txtBemerkung.Text = "" @@ -36,8 +42,6 @@ Public Class ustCntlUSTV_ErstattungPosition Sub setValues(kdnr As Integer, UStV_ERS As VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen) - - gridAktiv = False @@ -46,59 +50,98 @@ Public Class ustCntlUSTV_ErstattungPosition txtBelegDatum._value = If(UStV_ERS.Belegdatum, "") txtBelegNr._value = If(UStV_ERS.Belegnummer, "") + + txtGuDatum._value = If(UStV_ERS.GutschriftsDatum, "") + txtGuNr._value = If(UStV_ERS.GutschriftsNr, "") + + txtBerufungsdatum._value = If(UStV_ERS.Berufungsdatum, "") + txtBerurunfgrund._value = If(UStV_ERS.Berufungsgrund, "") + txtBerufungshoehe._value = If(UStV_ERS.Berufungshöhe, "") + + 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") - txtGuDatum.Text = If(UStV_ERS.Bemerkung, "") txtUSTBetrag.Text = If(UStV_ERS.UStVEr_USteuerbetrag, "") txtUmrechnungskurs.Text = If(UStV_ERS.UStVEr_Umrechnungskurs, "") txtUSTBetragEUR.Text = If(UStV_ERS.UStVEr_USteuerbetragEUR, "") + txtBemerkung.Text = If(UStV_ERS.Bemerkung, "") gridAktiv = True End Sub - Sub getValues(ByRef UStV_ERS, ByRef save) + Sub getValues(ByRef UStV_ERS As cUStVErstattungPositionen, ByRef save As Boolean) If UStV_ERS Is Nothing Then UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen() - UStV_ERS.UStVPo_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME - UStV_ERS.UStVPo_Zeitstempel = Now + UStV_ERS.UStVEr_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + UStV_ERS.UStVEr_Zeitstempel = Now If txtBelegNr.Text <> "" Then - UStV_ERS.UStVPo_ReNr = txtBelegNr.Text + UStV_ERS.Belegnummer = txtBelegNr.Text Else save = False End If If txtBelegDatum.Text <> "" AndAlso IsDate(txtBelegDatum.Text) Then - UStV_ERS.UStVPo_ReDat = txtBelegDatum._value + UStV_ERS.Belegdatum = txtBelegDatum._value Else save = False End If + If txtUSTBetrag.Text <> "" Then - UStV_ERS.UStVPo_USteuerbetrag = txtUSTBetrag.Text.Replace(",", ".") + UStV_ERS.UStVEr_USteuerbetrag = txtUSTBetrag.Text.Replace(",", ".") Else save = False End If If txtUSTBetragEUR.Text <> "" Then - UStV_ERS.UStVPo_USteuerbetragEUR = txtUSTBetragEUR.Text.Replace(",", ".") + UStV_ERS.UStVEr_USteuerbetragEUR = txtUSTBetragEUR.Text.Replace(",", ".") Else save = False End If + If txtGuDatum.Text <> "" Then - UStV_ERS.UStVPo_Leistungsbezeichnung = txtGuDatum.Text - Else - save = False + UStV_ERS.GutschriftsDatum = txtGuDatum.Text End If + If Not txtUmrechnungskurs.Text = "" Then If txtUmrechnungskurs.Text <> "" Then - UStV_ERS.UStVPo_Umrechnungskurs = txtUmrechnungskurs.Text.Replace(",", ".") + UStV_ERS.UStVEr_Umrechnungskurs = txtUmrechnungskurs.Text.Replace(",", ".") End If Else save = False End If + If txtGuDatum.Text <> "" Then + UStV_ERS.GutschriftsDatum = txtGuDatum.Text + End If + + If txtGuNr.Text <> "" Then + UStV_ERS.GutschriftsNr = txtGuNr.Text + End If + + + + If txtBemerkung.Text <> "" Then + UStV_ERS.Bemerkung = txtBemerkung.Text + End If + + If txtBerufungsdatum.Text <> "" Then + UStV_ERS.Berufungsdatum = txtBerufungsdatum.Text + End If + + + If txtBerufungshoehe.Text <> "" Then + UStV_ERS.Berufungshöhe = txtBerufungshoehe.Text + End If + + If txtBerurunfgrund.Text <> "" Then + UStV_ERS.Berufungsgrund = txtBerurunfgrund.Text + End If + + + End Sub From 56aa1bdc37f176571267f94aa6c441b6aee3b8dd Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 17 Feb 2025 10:49:24 +0100 Subject: [PATCH 6/6] ustva_Erstattung --- SDL/USTV/frmMDM_USTVAntrag.vb | 13 +- ...stCntlUSTV_ErstattungPosition .Designer.vb | 120 +++++++++--------- SDL/USTV/ustCntlUSTV_ErstattungPosition .vb | 22 ++-- .../Classes/USTV/cUSTVAntrag.vb | 12 ++ 4 files changed, 96 insertions(+), 71 deletions(-) diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 55dcb9d3..fc9e7d41 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -1146,10 +1146,11 @@ Public Class frmMDM_USTVAntrag If UStVEr_ID > 0 Then Dim ANTR_ERSTATTUNG As New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen(USTV_ANTRAG.UStVAn_ID, UStVEr_ID) UstCntlUSTV_AntragErstattungen1.Enabled = True - UstCntlUSTV_AntragErstattungen1.setValues(USTV_ANTRAG.UStVAn_KuNr, ANTR_ERSTATTUNG) + UstCntlUSTV_AntragErstattungen1.setValues(USTV_ANTRAG, ANTR_ERSTATTUNG, USTV_ANTRAG.UStVAn_KuNr) Else UstCntlUSTV_AntragErstattungen1.reset() UstCntlUSTV_AntragErstattungen1.Enabled = False + UstCntlUSTV_AntragErstattungen1.setValues(USTV_ANTRAG) End If End Sub @@ -1965,9 +1966,11 @@ Public Class frmMDM_USTVAntrag If TabControl1.SelectedTab Is TabPage1 Then init() + posTabisSelected = True ElseIf TabControl1.SelectedTab Is TabPage2 Then initdgvErstattungen() + posTabisSelected = False End If @@ -2046,7 +2049,9 @@ Public Class frmMDM_USTVAntrag If dgvErstattungspositionen.Rows.Count = 0 Then Exit Sub If vbYes = MsgBox("Möchten Sie den Erstattungseintrag wirklich löschen?", vbYesNoCancel) Then - UstCntlUSTV_AntragErstattungen1.UStV_ERS.DELETE(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID, UstCntlUSTV_AntragErstattungen1.UStV_ERS) + If UstCntlUSTV_AntragErstattungen1.UStV_ERS.DELETE(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID, UstCntlUSTV_AntragErstattungen1.UStV_ERS) Then + initdgvErstattungen() + End If End If End Sub @@ -2062,7 +2067,7 @@ Public Class frmMDM_USTVAntrag .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] FROM [tblUStVErstattung] - where UStVAn_ID='" & UStVAn_ID & "' ORDER BY UStVEr_ID", "FMZOLL") + where UStVAn_ID=" & UStVAn_ID & " ORDER BY UStVEr_ID", "FMZOLL") .LOAD() .RowTemplate.Height = 20 .AllowUserToOrderColumns = False @@ -2116,6 +2121,8 @@ Public Class frmMDM_USTVAntrag End If + If .RowCount < 1 Then initErstsattungsPosition(-1) + End With diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb index d29593ac..2efe8331 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb @@ -41,6 +41,9 @@ 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.Label19 = New System.Windows.Forms.Label() + Me.Label18 = New System.Windows.Forms.Label() + Me.txtGuNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtBerufungsdatum = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblWarning = New System.Windows.Forms.Label() Me.txtBemerkung = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -56,9 +59,6 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtUmrechnungskurs = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtUSTBetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Panel1 = New System.Windows.Forms.Panel() - Me.txtGuNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label18 = New System.Windows.Forms.Label() - Me.Label19 = New System.Windows.Forms.Label() Me.Panel2.SuspendLayout() Me.pnl.SuspendLayout() Me.Panel1.SuspendLayout() @@ -123,7 +123,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.btnBildAuf.Location = New System.Drawing.Point(16, 7) Me.btnBildAuf.Name = "btnBildAuf" Me.btnBildAuf.Size = New System.Drawing.Size(71, 77) - Me.btnBildAuf.TabIndex = 0 + Me.btnBildAuf.TabIndex = 12 Me.btnBildAuf.Text = "Bild auf" Me.btnBildAuf.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.btnBildAuf.UseVisualStyleBackColor = True @@ -136,7 +136,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.Button1.Location = New System.Drawing.Point(16, 90) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(71, 77) - Me.Button1.TabIndex = 1 + Me.Button1.TabIndex = 13 Me.Button1.Text = "Bild ab" Me.Button1.TextAlign = System.Drawing.ContentAlignment.TopCenter Me.Button1.UseVisualStyleBackColor = True @@ -159,7 +159,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(87, 15) Me.Label3.TabIndex = 5 - Me.Label3.Text = "Gutschritfs-Nr.:" + Me.Label3.Text = "Gutschrifts-Nr.:" ' 'Label6 ' @@ -291,6 +291,49 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.pnl.Size = New System.Drawing.Size(1300, 235) Me.pnl.TabIndex = 1 ' + 'Label19 + ' + Me.Label19.AutoSize = True + Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) + Me.Label19.Location = New System.Drawing.Point(504, 112) + Me.Label19.Name = "Label19" + Me.Label19.Size = New System.Drawing.Size(107, 15) + Me.Label19.TabIndex = 34 + Me.Label19.Text = "Berufungs-Datum:" + ' + 'Label18 + ' + 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(504, 92) + Me.Label18.Name = "Label18" + Me.Label18.Size = New System.Drawing.Size(58, 13) + Me.Label18.TabIndex = 33 + Me.Label18.Text = "Berufung" + ' + 'txtGuNr + ' + Me.txtGuNr._DateTimeOnly = False + Me.txtGuNr._numbersOnly = False + Me.txtGuNr._numbersOnlyKommastellen = "" + Me.txtGuNr._numbersOnlyTrennzeichen = True + Me.txtGuNr._Prozent = False + Me.txtGuNr._ShortDateNew = False + Me.txtGuNr._ShortDateOnly = False + Me.txtGuNr._TimeOnly = False + Me.txtGuNr._TimeOnly_Seconds = False + Me.txtGuNr._value = Nothing + Me.txtGuNr._Waehrung = False + Me.txtGuNr._WaehrungZeichen = False + Me.txtGuNr.Location = New System.Drawing.Point(695, 49) + Me.txtGuNr.MaxLength = 22 + Me.txtGuNr.MaxLineLength = -1 + Me.txtGuNr.MaxLines_Warning = "" + Me.txtGuNr.MaxLines_Warning_Label = Nothing + Me.txtGuNr.Name = "txtGuNr" + Me.txtGuNr.Size = New System.Drawing.Size(182, 20) + Me.txtGuNr.TabIndex = 4 + ' 'txtBerufungsdatum ' Me.txtBerufungsdatum._DateTimeOnly = False @@ -313,7 +356,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBerufungsdatum.MaxLines_Warning_Label = Nothing Me.txtBerufungsdatum.Name = "txtBerufungsdatum" Me.txtBerufungsdatum.Size = New System.Drawing.Size(169, 20) - Me.txtBerufungsdatum.TabIndex = 15 + Me.txtBerufungsdatum.TabIndex = 8 ' 'lblWarning ' @@ -346,8 +389,8 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBemerkung.MaxLines_Warning = "" Me.txtBemerkung.MaxLines_Warning_Label = Nothing Me.txtBemerkung.Name = "txtBemerkung" - Me.txtBemerkung.Size = New System.Drawing.Size(431, 20) - Me.txtBemerkung.TabIndex = 20 + Me.txtBemerkung.Size = New System.Drawing.Size(458, 20) + Me.txtBemerkung.TabIndex = 11 ' 'Label14 ' @@ -391,7 +434,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBerufungshoehe.MaxLines_Warning_Label = Nothing Me.txtBerufungshoehe.Name = "txtBerufungshoehe" Me.txtBerufungshoehe.Size = New System.Drawing.Size(99, 20) - Me.txtBerufungshoehe.TabIndex = 16 + Me.txtBerufungshoehe.TabIndex = 10 ' 'txtBelegNr ' @@ -414,7 +457,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBelegNr.MaxLines_Warning_Label = Nothing Me.txtBelegNr.Name = "txtBelegNr" Me.txtBelegNr.Size = New System.Drawing.Size(183, 20) - Me.txtBelegNr.TabIndex = 7 + Me.txtBelegNr.TabIndex = 2 ' 'Label16 ' @@ -448,7 +491,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBerurunfgrund.MaxLines_Warning_Label = Nothing Me.txtBerurunfgrund.Name = "txtBerurunfgrund" Me.txtBerurunfgrund.Size = New System.Drawing.Size(154, 20) - Me.txtBerurunfgrund.TabIndex = 18 + Me.txtBerurunfgrund.TabIndex = 9 ' 'txtBelegDatum ' @@ -472,7 +515,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtBelegDatum.MaxLines_Warning_Label = Nothing Me.txtBelegDatum.Name = "txtBelegDatum" Me.txtBelegDatum.Size = New System.Drawing.Size(154, 20) - Me.txtBelegDatum.TabIndex = 6 + Me.txtBelegDatum.TabIndex = 1 ' 'txtGuDatum ' @@ -495,7 +538,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtGuDatum.MaxLines_Warning_Label = Nothing Me.txtGuDatum.Name = "txtGuDatum" Me.txtGuDatum.Size = New System.Drawing.Size(182, 20) - Me.txtGuDatum.TabIndex = 8 + Me.txtGuDatum.TabIndex = 3 ' 'txtUSTBetragEUR ' @@ -519,7 +562,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtUSTBetragEUR.MaxLines_Warning_Label = Nothing Me.txtUSTBetragEUR.Name = "txtUSTBetragEUR" Me.txtUSTBetragEUR.Size = New System.Drawing.Size(154, 20) - Me.txtUSTBetragEUR.TabIndex = 11 + Me.txtUSTBetragEUR.TabIndex = 7 ' 'txtUmrechnungskurs ' @@ -543,7 +586,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtUmrechnungskurs.MaxLines_Warning_Label = Nothing Me.txtUmrechnungskurs.Name = "txtUmrechnungskurs" Me.txtUmrechnungskurs.Size = New System.Drawing.Size(108, 20) - Me.txtUmrechnungskurs.TabIndex = 10 + Me.txtUmrechnungskurs.TabIndex = 6 ' 'txtUSTBetrag ' @@ -567,7 +610,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.txtUSTBetrag.MaxLines_Warning_Label = Nothing Me.txtUSTBetrag.Name = "txtUSTBetrag" Me.txtUSTBetrag.Size = New System.Drawing.Size(154, 20) - Me.txtUSTBetrag.TabIndex = 9 + Me.txtUSTBetrag.TabIndex = 5 ' 'Panel1 ' @@ -579,49 +622,6 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.Panel1.Size = New System.Drawing.Size(99, 235) Me.Panel1.TabIndex = 2 ' - 'txtGuNr - ' - Me.txtGuNr._DateTimeOnly = False - Me.txtGuNr._numbersOnly = False - Me.txtGuNr._numbersOnlyKommastellen = "" - Me.txtGuNr._numbersOnlyTrennzeichen = True - Me.txtGuNr._Prozent = False - Me.txtGuNr._ShortDateNew = False - Me.txtGuNr._ShortDateOnly = False - Me.txtGuNr._TimeOnly = False - Me.txtGuNr._TimeOnly_Seconds = False - Me.txtGuNr._value = Nothing - Me.txtGuNr._Waehrung = False - Me.txtGuNr._WaehrungZeichen = False - Me.txtGuNr.Location = New System.Drawing.Point(695, 49) - Me.txtGuNr.MaxLength = 22 - Me.txtGuNr.MaxLineLength = -1 - Me.txtGuNr.MaxLines_Warning = "" - Me.txtGuNr.MaxLines_Warning_Label = Nothing - Me.txtGuNr.Name = "txtGuNr" - Me.txtGuNr.Size = New System.Drawing.Size(182, 20) - Me.txtGuNr.TabIndex = 32 - ' - 'Label18 - ' - 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(504, 92) - Me.Label18.Name = "Label18" - Me.Label18.Size = New System.Drawing.Size(58, 13) - Me.Label18.TabIndex = 33 - Me.Label18.Text = "Berufung" - ' - 'Label19 - ' - Me.Label19.AutoSize = True - Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!) - Me.Label19.Location = New System.Drawing.Point(504, 112) - Me.Label19.Name = "Label19" - Me.Label19.Size = New System.Drawing.Size(107, 15) - Me.Label19.TabIndex = 34 - Me.Label19.Text = "Berufungs-Datum:" - ' 'ustCntlUSTV_ErstattungPosition ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb index ef59ba65..f4746a4d 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb @@ -1,8 +1,8 @@ -Imports GrapeCity.ActiveReports.ReportsCore.Tools -Imports VERAG_PROG_ALLGEMEIN +Imports VERAG_PROG_ALLGEMEIN Public Class ustCntlUSTV_ErstattungPosition Public UStV_ERS As VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen = Nothing + Public UstV_AN As cUSTVAntrag Dim sql As New VERAG_PROG_ALLGEMEIN.SQL Dim kdnr = "" @@ -40,13 +40,15 @@ Public Class ustCntlUSTV_ErstattungPosition End Sub - Sub setValues(kdnr As Integer, UStV_ERS As VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen) + Sub setValues(UstV_AN_ As cUSTVAntrag, Optional UStV_ERS As VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen = Nothing, Optional kdNr As Integer = -1) - gridAktiv = False + UstV_AN = UstV_AN_ + If UStV_ERS Is Nothing Then Exit Sub Me.UStV_ERS = UStV_ERS - Me.kdnr = kdnr + Me.kdnr = kdNr + txtBelegDatum._value = If(UStV_ERS.Belegdatum, "") txtBelegNr._value = If(UStV_ERS.Belegnummer, "") @@ -67,15 +69,19 @@ Public Class ustCntlUSTV_ErstattungPosition txtUSTBetragEUR.Text = If(UStV_ERS.UStVEr_USteuerbetragEUR, "") txtBemerkung.Text = If(UStV_ERS.Bemerkung, "") - gridAktiv = True End Sub Sub getValues(ByRef UStV_ERS As cUStVErstattungPositionen, ByRef save As Boolean) - If UStV_ERS Is Nothing Then UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen() + If UStV_ERS Is Nothing Then + UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen() + UStV_ERS.UStVEr_ID = UStV_ERS.getMaxPosNr() + End If UStV_ERS.UStVEr_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME UStV_ERS.UStVEr_Zeitstempel = Now + UStV_ERS.UStVAn_ID = UstV_AN.UStVAn_ID + If txtBelegNr.Text <> "" Then UStV_ERS.Belegnummer = txtBelegNr.Text @@ -182,7 +188,7 @@ Public Class ustCntlUSTV_ErstattungPosition Private Sub txtUSTBetrag_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtUSTBetrag.PreviewKeyDown, txtUSTBetragEUR.PreviewKeyDown, txtBelegDatum.PreviewKeyDown, txtBelegNr.PreviewKeyDown, txtUmrechnungskurs.PreviewKeyDown If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) Then Exit Sub - If gridAktiv And Me.FindForm IsNot Nothing Then + If Me.FindForm IsNot Nothing Then ' Eingabeprüfung If e.KeyValue = 9 Then diff --git a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb index 2ca49127..ccb9f506 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb @@ -582,4 +582,16 @@ Public Class cUStVErstattungPositionen Return SQL.doSQL(sqlstr, "FMZOLL") End Function + + Public Function getMaxPosNr() As Integer + Try + Dim maxPosNr = -1 + + Return SQL.getValueTxtBySql("SELECT isnull(max([UStVEr_ID]),0)+1 FROM [tblUStVErstattung] where UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL",,, "1") + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return -1 + End Function End Class