From 8ce4b675e45e097d16344fa74ad82a4711e594fd Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 5 May 2025 14:00:30 +0200 Subject: [PATCH] ustva_erstattung, frmStartOpt. --- ...stCntlUSTV_ErstattungPosition .Designer.vb | 117 +++++++++--------- SDL/USTV/ustCntlUSTV_ErstattungPosition .vb | 27 +++- 2 files changed, 81 insertions(+), 63 deletions(-) diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb index 6a085ae7..4011f1f8 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb @@ -63,24 +63,24 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.Panel3 = New System.Windows.Forms.Panel() Me.tbcntr = New System.Windows.Forms.TabControl() Me.tabDok = New System.Windows.Forms.TabPage() - Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() + Me.scanSonstigesErst = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() + Me.tabVZ = New System.Windows.Forms.TabPage() + Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.Panel4 = New System.Windows.Forms.Panel() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.UsrcntlPDFScanList1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() Me.scanLieferschein = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan() - Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() - Me.tabVZ = New System.Windows.Forms.TabPage() Me.Panel2.SuspendLayout() Me.pnl.SuspendLayout() Me.Panel1.SuspendLayout() Me.Panel3.SuspendLayout() Me.tbcntr.SuspendLayout() Me.tabDok.SuspendLayout() + Me.tabVZ.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() - Me.tabVZ.SuspendLayout() Me.SuspendLayout() ' 'Label8 @@ -651,7 +651,6 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.Panel3.Name = "Panel3" Me.Panel3.Size = New System.Drawing.Size(264, 235) Me.Panel3.TabIndex = 26 - Me.Panel3.Visible = False ' 'tbcntr ' @@ -666,7 +665,7 @@ Partial Class ustCntlUSTV_ErstattungPosition ' 'tabDok ' - Me.tabDok.Controls.Add(Me.scanSonstiges) + Me.tabDok.Controls.Add(Me.scanSonstigesErst) Me.tabDok.Location = New System.Drawing.Point(4, 22) Me.tabDok.Name = "tabDok" Me.tabDok.Padding = New System.Windows.Forms.Padding(3) @@ -675,26 +674,58 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.tabDok.Text = "Bescheide/Anträge" Me.tabDok.UseVisualStyleBackColor = True ' - 'scanSonstiges + 'scanSonstigesErst ' - Me.scanSonstiges._DATENSERVER_KATEGORIE = "DOKUMENTE" - Me.scanSonstiges._DATENSERVER_ORDNER = "MDM" - Me.scanSonstiges._DATENSERVER_UOrdner1 = "" - Me.scanSonstiges._DATENSERVER_UOrdner2 = "" - Me.scanSonstiges._DATENSERVER_UOrdner3 = "" - Me.scanSonstiges._OPEN_ORIGINAL = False - Me.scanSonstiges._TYPE = "PDF" - Me.scanSonstiges.AllowDrop = True - Me.scanSonstiges.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.scanSonstiges.BackColor = System.Drawing.Color.White - Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.scanSonstiges.Cursor = System.Windows.Forms.Cursors.Hand - Me.scanSonstiges.Dock = System.Windows.Forms.DockStyle.Fill - Me.scanSonstiges.Location = New System.Drawing.Point(3, 3) - Me.scanSonstiges.Margin = New System.Windows.Forms.Padding(0) - Me.scanSonstiges.Name = "scanSonstiges" - Me.scanSonstiges.Size = New System.Drawing.Size(250, 187) - Me.scanSonstiges.TabIndex = 0 + Me.scanSonstigesErst._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanSonstigesErst._DATENSERVER_ORDNER = "MDM" + Me.scanSonstigesErst._DATENSERVER_UOrdner1 = "" + Me.scanSonstigesErst._DATENSERVER_UOrdner2 = "" + Me.scanSonstigesErst._DATENSERVER_UOrdner3 = "" + Me.scanSonstigesErst._OPEN_ORIGINAL = False + Me.scanSonstigesErst._TYPE = "PDF" + Me.scanSonstigesErst.AllowDrop = True + Me.scanSonstigesErst.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanSonstigesErst.BackColor = System.Drawing.Color.White + Me.scanSonstigesErst.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanSonstigesErst.Cursor = System.Windows.Forms.Cursors.Hand + Me.scanSonstigesErst.Dock = System.Windows.Forms.DockStyle.Fill + Me.scanSonstigesErst.Location = New System.Drawing.Point(3, 3) + Me.scanSonstigesErst.Margin = New System.Windows.Forms.Padding(0) + Me.scanSonstigesErst.Name = "scanSonstigesErst" + Me.scanSonstigesErst.Size = New System.Drawing.Size(250, 187) + Me.scanSonstigesErst.TabIndex = 0 + ' + 'tabVZ + ' + Me.tabVZ.Controls.Add(Me.scanUSTVVollmachten) + Me.tabVZ.Location = New System.Drawing.Point(4, 22) + Me.tabVZ.Name = "tabVZ" + Me.tabVZ.Padding = New System.Windows.Forms.Padding(3) + Me.tabVZ.Size = New System.Drawing.Size(256, 193) + Me.tabVZ.TabIndex = 2 + Me.tabVZ.Text = "Vorauszahlungen" + Me.tabVZ.UseVisualStyleBackColor = True + ' + 'scanUSTVVollmachten + ' + Me.scanUSTVVollmachten._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanUSTVVollmachten._DATENSERVER_ORDNER = "MDM" + Me.scanUSTVVollmachten._DATENSERVER_UOrdner1 = "" + Me.scanUSTVVollmachten._DATENSERVER_UOrdner2 = "" + Me.scanUSTVVollmachten._DATENSERVER_UOrdner3 = "" + Me.scanUSTVVollmachten._OPEN_ORIGINAL = False + Me.scanUSTVVollmachten._TYPE = "PDF" + Me.scanUSTVVollmachten.AllowDrop = True + Me.scanUSTVVollmachten.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanUSTVVollmachten.BackColor = System.Drawing.Color.White + Me.scanUSTVVollmachten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanUSTVVollmachten.Cursor = System.Windows.Forms.Cursors.Hand + Me.scanUSTVVollmachten.Dock = System.Windows.Forms.DockStyle.Fill + Me.scanUSTVVollmachten.Location = New System.Drawing.Point(3, 3) + Me.scanUSTVVollmachten.Margin = New System.Windows.Forms.Padding(0) + Me.scanUSTVVollmachten.Name = "scanUSTVVollmachten" + Me.scanUSTVVollmachten.Size = New System.Drawing.Size(250, 187) + Me.scanUSTVVollmachten.TabIndex = 1 ' 'Panel4 ' @@ -767,38 +798,6 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.scanLieferschein.TabIndex = 2 Me.scanLieferschein.Visible = False ' - 'scanUSTVVollmachten - ' - Me.scanUSTVVollmachten._DATENSERVER_KATEGORIE = "DOKUMENTE" - Me.scanUSTVVollmachten._DATENSERVER_ORDNER = "MDM" - Me.scanUSTVVollmachten._DATENSERVER_UOrdner1 = "" - Me.scanUSTVVollmachten._DATENSERVER_UOrdner2 = "" - Me.scanUSTVVollmachten._DATENSERVER_UOrdner3 = "" - Me.scanUSTVVollmachten._OPEN_ORIGINAL = False - Me.scanUSTVVollmachten._TYPE = "PDF" - Me.scanUSTVVollmachten.AllowDrop = True - Me.scanUSTVVollmachten.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.scanUSTVVollmachten.BackColor = System.Drawing.Color.White - Me.scanUSTVVollmachten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.scanUSTVVollmachten.Cursor = System.Windows.Forms.Cursors.Hand - Me.scanUSTVVollmachten.Dock = System.Windows.Forms.DockStyle.Fill - Me.scanUSTVVollmachten.Location = New System.Drawing.Point(3, 3) - Me.scanUSTVVollmachten.Margin = New System.Windows.Forms.Padding(0) - Me.scanUSTVVollmachten.Name = "scanUSTVVollmachten" - Me.scanUSTVVollmachten.Size = New System.Drawing.Size(250, 187) - Me.scanUSTVVollmachten.TabIndex = 1 - ' - 'tabVZ - ' - Me.tabVZ.Controls.Add(Me.scanUSTVVollmachten) - Me.tabVZ.Location = New System.Drawing.Point(4, 22) - Me.tabVZ.Name = "tabVZ" - Me.tabVZ.Padding = New System.Windows.Forms.Padding(3) - Me.tabVZ.Size = New System.Drawing.Size(256, 193) - Me.tabVZ.TabIndex = 2 - Me.tabVZ.Text = "Vorauszahlungen" - Me.tabVZ.UseVisualStyleBackColor = True - ' 'ustCntlUSTV_ErstattungPosition ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -816,10 +815,10 @@ Partial Class ustCntlUSTV_ErstattungPosition Me.Panel3.ResumeLayout(False) Me.tbcntr.ResumeLayout(False) Me.tabDok.ResumeLayout(False) + Me.tabVZ.ResumeLayout(False) Me.Panel4.ResumeLayout(False) Me.TabControl1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) - Me.tabVZ.ResumeLayout(False) Me.ResumeLayout(False) End Sub @@ -863,7 +862,7 @@ Partial Class ustCntlUSTV_ErstattungPosition Friend WithEvents Panel3 As Panel Friend WithEvents tbcntr As TabControl Friend WithEvents tabDok As TabPage - Friend WithEvents scanSonstiges As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList + Friend WithEvents scanSonstigesErst As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList Friend WithEvents Panel4 As Panel Friend WithEvents TabControl1 As TabControl Friend WithEvents TabPage1 As TabPage diff --git a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb index 6a6c29e5..add5c64e 100644 --- a/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb +++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb @@ -68,6 +68,15 @@ Public Class ustCntlUSTV_ErstattungPosition txtUSTBetragEUR.Text = If(UStV_ERS.UStVEr_USteuerbetragEUR, "") txtBemerkung.Text = If(UStV_ERS.Bemerkung, "") + If UStV_ERS.UStVEr_daId IsNot Nothing AndAlso UStV_ERS.UStVEr_daId > 0 Then + scanSonstigesErst.INIT_daId(UStV_ERS.UStVEr_daId) + Else + scanSonstigesErst.INIT(kdNr, "MDM", "MDM_DATEN", "USTVERS_" & UStV_ERS.UStVAn_ID & "_" & UStV_ERS.UStVEr_ID) + End If + + + + End Sub Sub getValues(ByRef UStV_ERS As cUStVErstattungPositionen, ByRef save As Boolean) @@ -236,8 +245,6 @@ Public Class ustCntlUSTV_ErstattungPosition - - ElseIf sender Is txtBelegDatum Then If txtBelegDatum.Text <> "" Then @@ -270,7 +277,19 @@ Public Class ustCntlUSTV_ErstattungPosition End Sub - Private Sub Panel1_Paint(sender As Object, e As PaintEventArgs) Handles Panel1.Paint - + Private Sub scanSonstiges_FileAdded(id As String, path As String, name As String) Handles scanSonstigesErst.FileAdded + getValues(UStV_ERS, True) + UStV_ERS.UStVEr_daId = id + If UStV_ERS.SAVE() Then + scanSonstigesErst.INIT_daId(UStV_ERS.UStVEr_daId) + RaiseEvent CHANGED(UStV_ERS.UStVEr_ID) + End If End Sub + + Private Sub scanSonstiges_FileDeleted() Handles scanSonstigesErst.FileDeleted + getValues(UStV_ERS, True) + UStV_ERS.UStVEr_daId = Nothing + If UStV_ERS.SAVE() Then RaiseEvent CHANGED(UStV_ERS.UStVEr_ID) + End Sub + End Class