From a9557ee91cb38261b949911f54c4339f295a686d Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 14 Feb 2025 17:22:06 +0100 Subject: [PATCH] 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