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 07440f1d..28f35a6a 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()
@@ -41,7 +44,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()
@@ -63,11 +66,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()
@@ -86,46 +89,64 @@ 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.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.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()
+ Me.Panel3.SuspendLayout()
+ CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.pnlErstattungsdetails.SuspendLayout()
+ Me.Panel1.SuspendLayout()
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
'
@@ -199,42 +220,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.lblWarnung)
- 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.Label12)
- Me.Panel1.Controls.Add(Me.lblDiffernezbetrag)
- Me.Panel1.Controls.Add(Me.Label10)
- Me.Panel1.Controls.Add(Me.lblGesamtErstattung)
- Me.Panel1.Controls.Add(Me.Label7)
- Me.Panel1.Controls.Add(Me.Panel5)
- Me.Panel1.Controls.Add(Me.lblFirma)
- 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
'
@@ -335,7 +388,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)
@@ -362,17 +415,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
'
@@ -734,24 +787,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 +814,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 +842,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 +870,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
@@ -1051,16 +1104,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
'
@@ -1069,39 +1160,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
@@ -1111,7 +1212,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
@@ -1142,6 +1243,110 @@ Partial Class frmMDM_USTVAntrag
Me.btnNeuerEintrag.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnNeuerEintrag.UseVisualStyleBackColor = True
'
+ 'TabPage2
+ '
+ 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)
+ Me.TabPage2.Size = New System.Drawing.Size(1444, 444)
+ Me.TabPage2.TabIndex = 1
+ 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
+ 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, 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"
@@ -1152,33 +1357,24 @@ Partial Class frmMDM_USTVAntrag
Me.ContextMenuStrip2.Name = "ContextMenuStrip1"
Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
'
- '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()
@@ -1188,20 +1384,27 @@ 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)
+ Me.Panel3.ResumeLayout(False)
+ CType(Me.dgvErstattungspositionen, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.pnlErstattungsdetails.ResumeLayout(False)
+ Me.Panel1.ResumeLayout(False)
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
@@ -1211,7 +1414,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
@@ -1231,11 +1434,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
@@ -1267,5 +1470,18 @@ 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
+ Friend WithEvents TabControl1 As TabControl
+ 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 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 fc9949da..fc9e7d41 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
@@ -43,7 +44,12 @@ Public Class frmMDM_USTVAntrag
End Sub
Sub init(Optional Lieferant As String = "")
- pnlFilter.AutoScroll = False
+ pnlBody.AutoScroll = False
+
+ lblGesamtUSteuerFW.Text = "-"
+ lblGesamtErstattungFW.Text = "-"
+ lblDiffernezbetragFW.Text = "-"
+
lblGesamtUSteuer.Text = "-"
lblGesamtErstattung.Text = "-"
@@ -171,13 +177,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
@@ -222,20 +236,21 @@ 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
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
@@ -1127,14 +1142,34 @@ 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)
-
+ 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, ANTR_ERSTATTUNG, USTV_ANTRAG.UStVAn_KuNr)
+ Else
+ UstCntlUSTV_AntragErstattungen1.reset()
+ UstCntlUSTV_AntragErstattungen1.Enabled = False
+ UstCntlUSTV_AntragErstattungen1.setValues(USTV_ANTRAG)
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
@@ -1147,6 +1182,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
@@ -1161,14 +1211,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
@@ -1394,7 +1468,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()
@@ -1674,7 +1748,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)
@@ -1823,7 +1898,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
@@ -1847,6 +1922,64 @@ Public Class frmMDM_USTVAntrag
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 TabControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl1.SelectedIndexChanged
+
+ If TabControl1.SelectedTab Is TabPage1 Then
+ init()
+ posTabisSelected = True
+
+ ElseIf TabControl1.SelectedTab Is TabPage2 Then
+ initdgvErstattungen()
+ posTabisSelected = False
+ End If
+
+
+ picPDF.Visible = posTabisSelected
+ btnAntrageeinarbeiten.Enabled = posTabisSelected
+ cbxArchivierteEintracheNochmalsEinarbetien.Enabled = posTabisSelected
+
+ End Sub
+
Private Sub setinfofields()
@@ -1904,4 +2037,97 @@ Public Class frmMDM_USTVAntrag
End Sub
+
+ 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
+
+ If UstCntlUSTV_AntragErstattungen1.UStV_ERS.DELETE(UstCntlUSTV_AntragPosition1.UStV_POS.UStVAn_ID, UstCntlUSTV_AntragErstattungen1.UStV_ERS) Then
+ initdgvErstattungen()
+ End If
+ End If
+ 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 = 130
+
+ .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 = 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 = 150
+ .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
+
+ If .RowCount < 1 Then initErstsattungsPosition(-1)
+
+ 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..2efe8331
--- /dev/null
+++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .Designer.vb
@@ -0,0 +1,679 @@
+
+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.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()
+ Me.Label14 = New System.Windows.Forms.Label()
+ Me.Label15 = New System.Windows.Forms.Label()
+ 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.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.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(504, 14)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(62, 13)
+ Me.Label1.TabIndex = 1
+ Me.Label1.Text = "Gutschrift"
+ '
+ '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 = 12
+ 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 = 13
+ 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(504, 31)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(108, 15)
+ Me.Label2.TabIndex = 4
+ 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(692, 31)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(87, 15)
+ Me.Label3.TabIndex = 5
+ Me.Label3.Text = "Gutschrifts-Nr.:"
+ '
+ '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.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.txtBemerkung)
+ Me.pnl.Controls.Add(Me.Label14)
+ Me.pnl.Controls.Add(Me.Label15)
+ Me.pnl.Controls.Add(Me.Label6)
+ Me.pnl.Controls.Add(Me.Label9)
+ Me.pnl.Controls.Add(Me.lblAenderungsdatum)
+ 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.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.txtGuDatum)
+ 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, 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
+ 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 = 8
+ '
+ '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
+ '
+ 'txtBemerkung
+ '
+ 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(458, 20)
+ Me.txtBemerkung.TabIndex = 11
+ '
+ 'Label14
+ '
+ Me.Label14.AutoSize = True
+ Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+ Me.Label14.Location = New System.Drawing.Point(692, 112)
+ Me.Label14.Name = "Label14"
+ Me.Label14.Size = New System.Drawing.Size(95, 15)
+ Me.Label14.TabIndex = 23
+ 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(863, 112)
+ Me.Label15.Name = "Label15"
+ Me.Label15.Size = New System.Drawing.Size(91, 15)
+ Me.Label15.TabIndex = 25
+ Me.Label15.Text = "Berufungshöhe"
+ '
+ 'txtBerufungshoehe
+ '
+ 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 = 10
+ '
+ '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 = False
+ 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 = 2
+ '
+ '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 = 9
+ '
+ '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 = 1
+ '
+ 'txtGuDatum
+ '
+ 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 = 3
+ '
+ '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 = 7
+ '
+ '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 = 6
+ '
+ '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 = 5
+ '
+ '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, 235)
+ 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, 265)
+ 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 txtGuDatum 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 txtBerufungshoehe As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents txtBerurunfgrund As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents Label16 As Label
+ Friend WithEvents Label15 As Label
+ Friend WithEvents txtBerufungsdatum As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents Label14 As Label
+ 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 .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..f4746a4d
--- /dev/null
+++ b/SDL/USTV/ustCntlUSTV_ErstattungPosition .vb
@@ -0,0 +1,257 @@
+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 = ""
+
+ Public Event EV_PREV()
+ Public Event EV_NEXT()
+ 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
+ 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 = ""
+
+ txtGuDatum._value = ""
+ txtGuNr._value = ""
+
+ txtBerufungsdatum._value = ""
+ txtBerufungshoehe._value = ""
+ txtBerurunfgrund._value = ""
+
+ txtUmrechnungskurs._value = 1
+ txtUSTBetrag._value = 0
+ txtUSTBetragEUR._value = 0
+ txtBemerkung.Text = ""
+
+
+
+ End Sub
+
+ Sub setValues(UstV_AN_ As cUSTVAntrag, Optional UStV_ERS As VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen = Nothing, Optional kdNr As Integer = -1)
+
+ UstV_AN = UstV_AN_
+
+ If UStV_ERS Is Nothing Then Exit Sub
+
+ Me.UStV_ERS = UStV_ERS
+ Me.kdnr = kdNr
+
+
+ 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")
+
+ 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, "")
+
+ 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()
+ 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
+ Else
+ save = False
+ End If
+
+ If txtBelegDatum.Text <> "" AndAlso IsDate(txtBelegDatum.Text) Then
+ UStV_ERS.Belegdatum = txtBelegDatum._value
+ Else
+ save = False
+ End If
+
+ If txtUSTBetrag.Text <> "" Then
+ UStV_ERS.UStVEr_USteuerbetrag = txtUSTBetrag.Text.Replace(",", ".")
+ Else
+ save = False
+ End If
+
+ If txtUSTBetragEUR.Text <> "" Then
+ UStV_ERS.UStVEr_USteuerbetragEUR = txtUSTBetragEUR.Text.Replace(",", ".")
+ Else
+ save = False
+ End If
+
+ If txtGuDatum.Text <> "" Then
+ UStV_ERS.GutschriftsDatum = txtGuDatum.Text
+ End If
+
+ If Not txtUmrechnungskurs.Text = "" Then
+ If txtUmrechnungskurs.Text <> "" Then
+ 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
+
+ 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 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
+
+ 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 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/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/USTV/cUSTVAntrag.vb b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb
index 8cb95c7b..ccb9f506 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb
@@ -430,3 +430,168 @@ 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
+
+ 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
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